Commits

Jens-Heiner Rechtien [hr]  committed fb987c8 Merge

CWS-TOOLING: integrate CWS ivo30

  • Participants
  • Parent commits d9ae150, e63829c

Comments (0)

Files changed (1)

File l10ntools/source/merge.cxx

         {
             // Skip all wrong filenames
             const ::rtl::OString filename = lcl_NormalizeFilename(sLine.GetToken( 1 , '\t' ));
-
-            if(isFileEmpty || (!isFileEmpty && filename.equals(sFileNormalized)))
+            if(isFileEmpty || sFileNormalized.equals("") || (!isFileEmpty && filename.equals(sFileNormalized)) )
             {
                 xub_StrLen rIdx = 0;
                 const ByteString sTYP = sLine.GetToken( 3, '\t', rIdx );