From fff70bf98c7a5a63aa0db11e93a3512c6a9a9359 Mon Sep 17 00:00:00 2001 From: Tomofumi Yagi Date: Sat, 7 Sep 2013 10:04:30 +0900 Subject: fdo#68790: fix build error on Win when system locale=="Japanese(Japan)" This patch modifies transex3. Modified transex3 outputs a file with BOM(if MergeMode is true). *.[hs]rc files with BOM avoid this problem. This problem is that MSVC interprets UTF-8 source code without BOM as local codepage when system locale is "Japanese(Japan)". Change-Id: I3e12499a91a954236f48e6d7e360d26c93d19ed6 Reviewed-on: https://gerrit.libreoffice.org/5851 Tested-by: Markus Mohrhard Tested-by: Kohei Yoshida Reviewed-by: Kohei Yoshida --- l10ntools/inc/common.hxx | 2 ++ l10ntools/inc/export.hxx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'l10ntools/inc') 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(); -- cgit