From: Julian Smart Date: Fri, 19 Sep 2003 16:09:29 +0000 (+0000) Subject: Applied patch [ 809066 ] Cleanup for text2rtf X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6a205442c40cd6e22efab15fd7170a0aeab99cae Applied patch [ 809066 ] Cleanup for text2rtf git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp index b384cf9a46..d21efe7abd 100644 --- a/utils/tex2rtf/src/htmlutil.cpp +++ b/utils/tex2rtf/src/htmlutil.cpp @@ -2526,7 +2526,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start) if (val) { bool isPicture = FALSE; - char *s = ParseColourString(val, &isPicture); + ParseColourString(val, &isPicture); if (isPicture) { if (backgroundImageString) @@ -2665,7 +2665,6 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start) startRows = TRUE; tableVerticalLineLeft = FALSE; tableVerticalLineRight = FALSE; - int currentWidth = 0; char *alignString = copystring(GetArgData()); ParseTableArgument(alignString); diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp index 55a0a1e04f..ef7a745683 100644 --- a/utils/tex2rtf/src/rtfutils.cpp +++ b/utils/tex2rtf/src/rtfutils.cpp @@ -247,7 +247,6 @@ void WriteWinHelpContentsFileLine(char *topicName, char *xitle, int level) char ch1=xitle[s+1]&0xff; char ch2=xitle[s+2]&0xff; char ch3=xitle[s+3]&0xff; - char ch4=xitle[s+4]&0xff; s+=4; // next character char a=0; if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='รถ'; a=1; } @@ -3370,7 +3369,6 @@ bool RTFOnArgument(int macroId, int arg_no, bool start) { if (useWord) { - char *s = GetArgData(); TexOutput("p. "); TexOutput("{\\field{\\*\\fldinst PAGEREF "); TexOutput(refName); @@ -3622,7 +3620,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start) } 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); } fclose(fd); diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp index f48428cc4c..2481b35b62 100644 --- a/utils/tex2rtf/src/tex2rtf.cpp +++ b/utils/tex2rtf/src/tex2rtf.cpp @@ -68,7 +68,7 @@ char *contentsString = NULL; bool suppressNameDecoration = FALSE; bool OkToClose = TRUE; int passNumber = 1; -int errorCount = 0; +unsigned long errorCount = 0; #ifndef NO_GUI @@ -442,7 +442,7 @@ bool MyApp::OnInit() #ifdef NO_GUI return 0; #else - return NULL; + return FALSE; #endif } @@ -450,7 +450,7 @@ bool MyApp::OnInit() // Return the main frame window return TRUE; #else - return FALSE; + return 0; #endif } @@ -1218,7 +1218,6 @@ bool SplitCommand(char *data, char *firstArg, char *secondArg) firstArg[0] = 0; secondArg[0] = 0; int i = 0; - int len = strlen(data); bool stop = FALSE; // Find first argument (command name) while (!stop) diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp index 604b6da8fc..30ce714099 100644 --- a/utils/tex2rtf/src/texutils.cpp +++ b/utils/tex2rtf/src/texutils.cpp @@ -1697,7 +1697,7 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, Sstr1.MakeUpper(); Sstr2.MakeUpper(); } - return Sstr2.Index(Sstr1) != wxNOT_FOUND; + return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND; } else return exact ? wxString(str2).Cmp(str1) == 0 :