diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-08-07 12:08:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:34 +0100 |
| commit | e190f0ab0dd466b6faa9c82597c628838f6af0f1 (patch) | |
| tree | fbee8cc16f217dc86a3218a4550afb833ba2e5c4 | |
| parent | e967b156cdd2329a1ea106b6ea9517318f5ed81e (diff) | |
merge tool not filtering on requested input file name
isFileEmpty = !sFileNormalized.isEmpty doesn't make sense to me
from commit 8b8162e0 I imagine it should be
isFileEmpty = sFileNormalized.isEmpty
which gives me the expected result of filtering out the files
I don't care about
Change-Id: Ic0967ac382a1fb912e7ad98d2fc5dcb626d4ff87
| -rw-r--r-- | l10ntools/source/merge.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 961edec2df5d..4d5d3f6bbc1e 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -144,7 +144,7 @@ MergeDataFile::MergeDataFile( std::ifstream aInputStream(rFileName.getStr()); const ::rtl::OString sHACK(RTL_CONSTASCII_STRINGPARAM("HACK")); const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(rFile)); - const bool isFileEmpty = !sFileNormalized.isEmpty(); + const bool isFileEmpty = sFileNormalized.isEmpty(); if (!aInputStream.is_open()) { @@ -160,7 +160,7 @@ MergeDataFile::MergeDataFile( sal_Int32 n = 0; // Skip all wrong filenames const ::rtl::OString filename = lcl_NormalizeFilename(sLine.getToken(1, '\t', n)); // token 1 - if(isFileEmpty || sFileNormalized.equals("") || (!isFileEmpty && filename.equals(sFileNormalized)) ) + if (isFileEmpty || (!isFileEmpty && filename.equals(sFileNormalized)) ) { const rtl::OString sTYP = sLine.getToken( 1, '\t', n ); // token 3 const rtl::OString sGID = sLine.getToken( 0, '\t', n ); // token 4 |