diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-27 20:08:50 +0100 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-27 20:09:31 +0100 |
commit | 8e26b4783f1f47ff5d489e7df5869240eefd1071 (patch) | |
tree | 80c4c9899fb3b05fcadc845444b06e1e3221e1c2 /l10ntools/source/xrmmerge.cxx | |
parent | 239fb4cb41cb0d1ed42bf5cf8ecdabdca4a28a68 (diff) |
Refactor l10ntools
Delete unused functions.
Make Export class more encapsulated.
Move to local that functions which are used only in one file.
Common contans method which are used by all executables.
Helper contains methods belong to xml parsing.
Change-Id: I28773a2c7eea90da7df7f32720fd38de2cb661ac
Diffstat (limited to 'l10ntools/source/xrmmerge.cxx')
-rw-r--r-- | l10ntools/source/xrmmerge.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index ed0896e038be..d531db496ca1 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -25,6 +25,7 @@ #include "common.hxx" #include "export.hxx" +#include "po.hxx" #include "xrmmerge.hxx" #include "tokens.h" #include "helper.hxx" @@ -59,8 +60,8 @@ extern char *GetOutputFile( int argc, char* argv[]) bDisplayName = sal_False; bExtensionDescription = sal_False; - HandledArgs aArgs; - if ( Export::handleArguments(argc, argv, aArgs) ) + common::HandledArgs aArgs; + if ( common::handleArguments(argc, argv, aArgs) ) { // command line is valid bMergeMode = aArgs.m_bMergeMode; @@ -75,7 +76,7 @@ extern char *GetOutputFile( int argc, char* argv[]) else { // command line is not valid - Export::writeUsage("xrmex","*.xrm/*.xml"); + common::writeUsage("xrmex","*.xrm/*.xml"); return NULL; } } @@ -421,7 +422,7 @@ void XRMResExport::EndOfText( pResData->sText[sCur].replaceAll("\x0A", rtl::OString())); if( !sAct.isEmpty() ) - Export::writePoEntry( + common::writePoEntry( "Xrmex", pOutputStream, sPath, sResourceType, pResData->sGId, OString(), OString(), sAct ); } @@ -565,7 +566,7 @@ void XRMResMerge::WorkOnText( PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); if ( pEntrys ) { rtl::OString sContent; - if ( Export::isAllowed( sLang ) && + if ( !sLang.equalsIgnoreAsciiCase("en-US") && ( pEntrys->GetText( sContent, STRING_TYP_TEXT, sLang )) && ( sContent != "-" ) && !sContent.isEmpty() && |