diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /l10ntools/source | |
| parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
| parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'l10ntools/source')
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 6 | ||||
| -rw-r--r-- | l10ntools/source/localize.cxx | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 42b6384394ea..7294e27339f6 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -266,7 +266,8 @@ sal_Bool LngParser::Merge( rtl::OString sText1( sLang ); sText1 += " = \""; - sText1 += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sText1 += "\""; *pLine = sText1; Text[ sLang ] = sNewText; @@ -301,7 +302,8 @@ sal_Bool LngParser::Merge( rtl::OString sLine; sLine += sCur; sLine += " = \""; - sLine += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sLine += "\""; nLastLangPos++; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index c4af640834af..107d516cd354 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -366,6 +366,7 @@ bool includeProject(rtl::OUString const & project) { "framework", "helpcontent2", "instsetoo_native", + "librelogo", "mysqlc", "nlpsolver", "officecfg", |