diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-02 15:49:13 +0100 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-02 15:49:13 +0100 |
commit | 995db7246c606df15ad44ee5beb2f97ee3785f2f (patch) | |
tree | ffba4e0f3323a0a55a5c7ba5614e8205a390d19d /l10ntools | |
parent | masterfix: #i10000# resource fix (diff) | |
download | core-995db7246c606df15ad44ee5beb2f97ee3785f2f.tar.gz core-995db7246c606df15ad44ee5beb2f97ee3785f2f.zip |
ivo30: #i116651# fix for unlocalized help
Diffstat (limited to 'l10ntools')
-rw-r--r-- | l10ntools/source/merge.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 8c06d5a28171..b1c8993db7d9 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -216,8 +216,7 @@ MergeDataFile::MergeDataFile( { // 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 ); |