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

10 files changed, 29 insertions, 3 deletions

diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 9fea979482bc..7804470c05a7 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\
     i18nregexp \
 ))
 
+$(eval $(call gb_Executable_use_unpacked,cfgex,boost))
+
 $(eval $(call gb_Executable_add_scanners,cfgex,\
     l10ntools/source/cfglex \
 ))
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index 917c00fc5866..829a0296939f 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Executable_use_libraries,gsicheck,\
     sal \
 ))
 
+$(eval $(call gb_Executable_use_unpacked,gsicheck,boost))
+
 $(eval $(call gb_Executable_add_exception_objects,gsicheck,\
     l10ntools/source/gsicheck \
     l10ntools/source/tagtest \
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 3569dffb5156..22f2ae9288a4 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_use_libraries,helpex,\
 ))
 
 $(eval $(call gb_Executable_use_external,helpex,expat_utf8))
+$(eval $(call gb_Executable_use_unpacked,helpex,boost))
 
 $(eval $(call gb_Executable_use_static_libraries,helpex,\
     transex \
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 052f9d017284..520b010265f0 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_libraries,uiex,\
     i18nregexp \
 ))
 
+$(eval $(call gb_Executable_use_unpacked,uiex,boost))
+
 $(eval $(call gb_Executable_use_static_libraries,uiex,\
     transex \
 ))
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index f3fd559ac4f7..b975f5c47e11 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\
     i18nregexp \
 ))
 
+$(eval $(call gb_Executable_use_unpacked,ulfex,boost))
+
 $(eval $(call gb_Executable_use_static_libraries,ulfex,\
     transex \
 ))
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index b86dbc4b80d2..02e776a2277b 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\
     i18nregexp \
 ))
 
+$(eval $(call gb_Executable_use_unpacked,xrmex,boost))
+
 $(eval $(call gb_Executable_add_scanners,xrmex,\
     l10ntools/source/xrmlex \
 ))
diff --git a/l10ntools/README b/l10ntools/README
new file mode 100644
index 000000000000..4d2f19184adb
--- /dev/null
+++ b/l10ntools/README
@@ -0,0 +1,2 @@
+l10ntools contains a number of tools that handle internationalisation(i18n) during the build.
+
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index 82e20a012c5f..65b1f08e9c81 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -27,11 +27,21 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,transex))
 
+$(eval $(call gb_StaticLibrary_use_packages,transex,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,transex,\
     -I$(SRCDIR)/l10ntools/inc \
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_StaticLibrary_use_packages,transex,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_use_sdk_api,transex))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
@@ -39,7 +49,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
     l10ntools/source/merge \
     l10ntools/source/file \
     l10ntools/source/directory \
-	l10ntools/source/po \
+    l10ntools/source/po \
 ))
 
 # vim: set noet sw=4 ts=4:
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",