summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/inc/common.hxx2
-rw-r--r--l10ntools/inc/export.hxx4
-rw-r--r--l10ntools/source/common.cxx9
-rw-r--r--l10ntools/source/export.cxx8
4 files changed, 17 insertions, 6 deletions
diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 5a12bbbbebe4..047d2f4f00b2 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -28,12 +28,14 @@ struct HandledArgs
OString m_sMergeSrc;
OString m_sLanguage;
bool m_bMergeMode;
+ bool m_bUTF8BOM;
HandledArgs()
: m_sInputFile( OString() )
, m_sOutputFile( OString() )
, m_sMergeSrc( OString() )
, m_sLanguage( OString() )
, m_bMergeMode( false )
+ , m_bUTF8BOM( false )
{}
};
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 595c0273fb5f..b9d260375d1c 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -226,9 +226,11 @@ private:
void CutComment( OString &rText );
+ void WriteUTF8ByteOrderMarkToOutput() { *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF'; }
+
public:
Export( const OString &rOutput );
- Export(const OString &rMergeSource, const OString &rOutput, const OString &rLanguage);
+ Export(const OString &rMergeSource, const OString &rOutput, const OString &rLanguage, bool bUTF8BOM);
~Export();
void Init();
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index db86845ac787..78274b810bb5 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -43,6 +43,10 @@ bool handleArguments(
{
nState = STATE_LANGUAGES;
}
+ else if ( OString( argv[ i ] ).toAsciiUpperCase() == "-B" )
+ {
+ o_aHandledArgs.m_bUTF8BOM = true;
+ }
else
{
switch ( nState )
@@ -90,12 +94,13 @@ void writeUsage(const OString& rName, const OString& rFileType)
{
std::cout
<< " Syntax: " << rName.getStr()
- << " -i FileIn -o FileOut [-m DataBase] [-l Lang]\n"
+ << " -i FileIn -o FileOut [-m DataBase] [-l Lang] [-b]\n"
<< " FileIn: Source files (" << rFileType.getStr() << ")\n"
<< " FileOut: Destination file (*.*)\n"
<< " DataBase: Mergedata (*.po)\n"
<< " Lang: Restrict the handled language; one element of\n"
- << " (de, en-US, ...) or all\n";
+ << " (de, en-US, ...) or all\n"
+ << " -b: Add UTF-8 Byte Order Mark to FileOut(use with -m option)\n";
}
void writePoEntry(
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index b43938966045..864e7b2290eb 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -69,8 +69,8 @@ FILE * init(int argc, char ** argv) {
}
if (aArgs.m_bMergeMode) {
- global::exporter.reset(
- new Export(aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage));
+ global::exporter.reset(new Export(aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
+ aArgs.m_sLanguage, aArgs.m_bUTF8BOM));
} else {
global::exporter.reset(new Export(aArgs.m_sOutputFile));
}
@@ -198,7 +198,7 @@ Export::Export(const OString &rOutput)
Export::Export(
const OString &rMergeSource, const OString &rOutput,
- const OString &rLanguage )
+ const OString &rLanguage, bool bUTF8BOM)
:
bDefine( sal_False ),
bNextMustBeDefineEOL( sal_False ),
@@ -218,6 +218,8 @@ Export::Export(
{
aOutput.mSimple = new std::ofstream();
aOutput.mSimple->open(rOutput.getStr(), std::ios_base::out | std::ios_base::trunc);
+
+ if ( bUTF8BOM ) WriteUTF8ByteOrderMarkToOutput();
}
void Export::Init()