fix for VC6 sorry

[wxWidgets.git] / utils / tex2rtf / src / texutils.cpp

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 58d5bb707657e0d4559e2354c4a2456e7b557b52..4133290545e73ad2c6d89c372026548bfbd9f7cc 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -451,7 +451,7 @@ void ReadTexReferences(wxChar *filename)
         // were massive memory leaks
         TexReferences.DeleteContents(true);
         TexReferences.Put(
-            labelStr.c_str(),
+            labelStr,
             new TexRef(
                 labelStr.c_str(),
                 fileStr.c_str(),
@@ -479,9 +479,9 @@ void BibEatWhiteSpace(wxString& line)
     }
 
     // Ignore end-of-line comments
-    if (line[0] == _T('%') || line[0] == _T(';') || line[0] == _T('#'))
+    if ( !line.empty() && (line[0] == _T('%') || line[0] == _T(';') || line[0] == _T('#')))
     {
-        line = wxEmptyString;
+        line.clear();
     }
 }
 
@@ -569,7 +569,7 @@ wxString BibReadToEOL(wxString& line)
         val << line[0];
         line = line.substr(1);
     }
-    if (line[0] == '"')
+    if (!line.empty() && line[0] == '"')
         line = line.substr(1);
 
     return val;
@@ -1526,7 +1526,7 @@ bool ReadCustomMacros(const wxString& filename)
                 macro->macroBody = copystring(macroBody.c_str());
 
             BibEatWhiteSpace(line);
-            CustomMacroList.Append(macroName.c_str(), macro);
+            CustomMacroList.Append(macroName, macro);
             AddMacroDef(ltCUSTOM_MACRO, macroName.c_str(), noArgs);
         }