Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 809066 ] Cleanup for text2rtf

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-19 16:09:29 +00:00
parent cf1ae91a8c
commit 5ea8a0241b
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/tex2rtf/src/htmlutil.cpp
View File

@@ -2523,7 +2523,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
if (val) if (val)
{ {
bool isPicture = FALSE; bool isPicture = FALSE;
char *s = ParseColourString(val, &isPicture); ParseColourString(val, &isPicture);
if (isPicture) if (isPicture)
{ {
if (backgroundImageString) if (backgroundImageString)
@@ -2662,7 +2662,6 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
startRows = TRUE; startRows = TRUE;
tableVerticalLineLeft = FALSE; tableVerticalLineLeft = FALSE;
tableVerticalLineRight = FALSE; tableVerticalLineRight = FALSE;
int currentWidth = 0;
char *alignString = copystring(GetArgData()); char *alignString = copystring(GetArgData());
ParseTableArgument(alignString); ParseTableArgument(alignString);

4
utils/tex2rtf/src/rtfutils.cpp
View File

@@ -243,7 +243,6 @@ void WriteWinHelpContentsFileLine(char *topicName, char *xitle, int level)
char ch1=xitle[s+1]&0xff; char ch1=xitle[s+1]&0xff;
char ch2=xitle[s+2]&0xff; char ch2=xitle[s+2]&0xff;
char ch3=xitle[s+3]&0xff; char ch3=xitle[s+3]&0xff;
char ch4=xitle[s+4]&0xff;
s+=4; // next character s+=4; // next character
char a=0; char a=0;
if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='<EFBFBD>'; a=1; } if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='<EFBFBD>'; a=1; }
@@ -3366,7 +3365,6 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
{ {
if (useWord) if (useWord)
{ {
char *s = GetArgData();
TexOutput("p. "); TexOutput("p. ");
TexOutput("{\\field{\\*\\fldinst PAGEREF "); TexOutput("{\\field{\\*\\fldinst PAGEREF ");
TexOutput(refName); TexOutput(refName);
@@ -3618,7 +3616,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
} }
else else
{ {
sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", f); sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", (const char*)f);
OnError(buf); OnError(buf);
} }
fclose(fd); fclose(fd);

7
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -58,7 +58,7 @@ char *contentsString = NULL;
bool suppressNameDecoration = FALSE; bool suppressNameDecoration = FALSE;
bool OkToClose = TRUE; bool OkToClose = TRUE;
int passNumber = 1; int passNumber = 1;
int errorCount = 0; unsigned long errorCount = 0UL;
#ifndef NO_GUI #ifndef NO_GUI
@@ -432,7 +432,7 @@ bool MyApp::OnInit()
#ifdef NO_GUI #ifdef NO_GUI
return 0; return 0;
#else #else
return NULL; return FALSE;
#endif #endif
} }
@@ -440,7 +440,7 @@ bool MyApp::OnInit()
// Return the main frame window // Return the main frame window
return TRUE; return TRUE;
#else #else
return FALSE; return 0;
#endif #endif
} }
@@ -1208,7 +1208,6 @@ bool SplitCommand(char *data, char *firstArg, char *secondArg)
firstArg[0] = 0; firstArg[0] = 0;
secondArg[0] = 0; secondArg[0] = 0;
int i = 0; int i = 0;
int len = strlen(data);
bool stop = FALSE; bool stop = FALSE;
// Find first argument (command name) // Find first argument (command name)
while (!stop) while (!stop)

2
utils/tex2rtf/src/texutils.cpp
View File

@@ -1687,7 +1687,7 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
Sstr1.MakeUpper(); Sstr1.MakeUpper();
Sstr2.MakeUpper(); Sstr2.MakeUpper();
} }
return Sstr2.Index(Sstr1) != wxNOT_FOUND; return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND;
} }
else else
return exact ? wxString(str2).Cmp(str1) == 0 : return exact ? wxString(str2).Cmp(str1) == 0 :