l10ntools/source/merge.cxx | 2 +- l10ntools/source/xrmmerge.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 1a9745b511be43ee9015654eb65d9e933c127816 Author: Andras Timar <[email protected]> Date: Sat Nov 24 11:02:27 2012 +0100 do not generate KeyIDs (qtz locale) when ENABLE_RELEASE_BUILD is TRUE Change-Id: If16741960b23ee05101849d17f1374d17751aa41 diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 3ff5400..2245c6a 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -261,7 +261,7 @@ MergeDataFile::MergeDataFile( aActPo.getLocalId(), sHack, sLang, sText, sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive ); - if( bFirstLang ) + if( bFirstLang && ( strcmp(getenv("ENABLE_RELEASE_BUILD"),"TRUE") ) ) { aLanguageSet.insert("qtz"); InsertEntry( commit 5ca6c75f2b1ea2dabcf8e89a20281931304b9467 Author: Andras Timar <[email protected]> Date: Sat Nov 24 08:16:16 2012 +0100 remove useless comment (old bug database) Change-Id: I85f661934a9ce84017018694e90aca5d050afb65 diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 5b562ea..5871948 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -73,7 +73,7 @@ extern char *GetOutputFile( int argc, char* argv[]) sOutputFile = aArgs.m_sOutputFile; sMergeSrc = aArgs.m_sMergeSrc; char *pReturn = new char[ sOutputFile.getLength() + 1 ]; - std::strcpy( pReturn, sOutputFile.getStr()); // #100211# - checked + std::strcpy( pReturn, sOutputFile.getStr()); return pReturn; } else _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
