AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch [ 809066 ] Cleanup for text2rtf

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

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

@ -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);

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

@ -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);

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

@ -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)

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

@ -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 :