diff options
| author | Jens-Heiner Rechtien [hr] <jens-heiner.rechtien@oracle.com> | 2011-02-09 18:01:40 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien [hr] <jens-heiner.rechtien@oracle.com> | 2011-02-09 18:01:40 +0100 |
| commit | d1cd5aa49f85429cab819d11bea4366342e78421 (patch) | |
| tree | fe05ed2b94f0b723c7339f35e392d29d07d00f2d /l10ntools | |
| parent | ac7b98abe6dec9b37953bea2f1b9ffdd2652ac7a (diff) | |
| parent | 995db7246c606df15ad44ee5beb2f97ee3785f2f (diff) | |
CWS-TOOLING: integrate CWS ivo30
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 e6893ba8c721..21002d79141e 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 ); |