]>
Commit | Line | Data |
---|---|---|
aa807849 AM |
1 | --- abiword-2.6.8/abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp~ 2007-10-11 22:05:55.000000000 +0200 |
2 | +++ abiword-2.6.8/abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp 2009-07-14 17:02:04.691251879 +0200 | |
3 | @@ -551,7 +551,7 @@ | |
4 | UT_UTF8String *pCom1 = | |
5 | const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1))); | |
6 | printf(" Filename %s \n",pCom1->utf8_str()); | |
7 | - char *suffix = rindex (pCom1->utf8_str (), '.'); | |
8 | + char *suffix = (char *)rindex (pCom1->utf8_str (), '.'); | |
9 | ||
10 | if (suffix != NULL) | |
11 | { | |
12 | --- abiword-2.6.8/src/wp/ap/unix/GNUmakefile.am~ 2007-11-04 15:46:12.000000000 +0100 | |
13 | +++ abiword-2.6.8/src/wp/ap/unix/GNUmakefile.am 2009-07-14 17:35:39.114130442 +0200 | |
14 | @@ -58,7 +58,6 @@ | |
15 | ap_UnixDialog_MailMerge.glade \ | |
16 | ap_UnixDialog_MetaData.glade \ | |
17 | ap_UnixDialog_Options.glade \ | |
18 | - ap_UnixDialog_HdrFtr.glade \ | |
19 | ap_UnixDialog_Options_ColorSel.glade \ | |
20 | ap_UnixDialog_PageNumbers.glade \ | |
21 | ap_UnixDialog_PageSetup.glade \ | |
22 | --- abiword-2.6.8/src/wp/ap/unix/GNUmakefile.am~ 2009-07-14 17:35:39.114130442 +0200 | |
23 | +++ abiword-2.6.8/src/wp/ap/unix/GNUmakefile.am 2009-07-14 17:37:17.458076101 +0200 | |
24 | @@ -57,7 +57,6 @@ | |
25 | ap_UnixDialog_Insert_DateTime.glade \ | |
26 | ap_UnixDialog_MailMerge.glade \ | |
27 | ap_UnixDialog_MetaData.glade \ | |
28 | - ap_UnixDialog_Options.glade \ | |
29 | ap_UnixDialog_Options_ColorSel.glade \ | |
30 | ap_UnixDialog_PageNumbers.glade \ | |
31 | ap_UnixDialog_PageSetup.glade \ |