From 6f3340ff6e4076f0677c2e7ff6de0f0d67e2ce18 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sat, 15 Apr 2000 20:37:33 +0000 Subject: [PATCH] reverted some earlier changes nuked by RR fixing the same problem -- only differently, breaking compilation again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/tex2rtf/src/tex2any.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp index 76d368880d..8827cea281 100644 --- a/utils/tex2rtf/src/tex2any.cpp +++ b/utils/tex2rtf/src/tex2any.cpp @@ -394,7 +394,7 @@ bool read_a_line(char *buf) if (rightCurly > leftCurly) { wxString errBuf; - errBuf.Printf("An extra right Curly brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFile.c_str()); + errBuf.Printf("An extra right Curly brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str()); OnError((char *)errBuf.c_str()); // Reduce the count of right curly braces, so the mismatched count @@ -478,7 +478,7 @@ bool read_a_line(char *buf) if (leftCurly != rightCurly) { wxString errBuf; - errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFile.c_str(),leftCurly,rightCurly); + errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly); OnError((char *)errBuf.c_str()); } leftCurly = 0; @@ -523,7 +523,7 @@ bool read_a_line(char *buf) if (buf[j-1] == '}') buf[j-1] = 0; // Ignore final brace wxString actualFile = TexPathList.FindValidPath(fileName); - currentFile = actualFile; + currentFileName = actualFile; if (actualFile == "") { char errBuf[300]; @@ -588,7 +588,7 @@ bool read_a_line(char *buf) // Ignore some types of input files (e.g. macro definition files) char *fileOnly = FileNameFromPath(fileName); - currentFile = fileOnly; + currentFileName = fileOnly; if (IgnorableInputFiles.Member(fileOnly)) return read_a_line(buf); @@ -599,7 +599,7 @@ bool read_a_line(char *buf) sprintf(buf2, "%s.tex", fileName); actualFile = TexPathList.FindValidPath(buf2); } - currentFile = actualFile; + currentFileName = actualFile; if (actualFile == "") { @@ -645,7 +645,7 @@ bool read_a_line(char *buf) if (ch == EOF && leftCurly != rightCurly) { wxString errBuf; - errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFile.c_str(),leftCurly,rightCurly); + errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly); OnError((char *)errBuf.c_str()); }