fdo#63756 build libxml2 with ICU support

Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab

20 files changed, 82 insertions, 47 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b0747f18cb0b..8a2ab1f0d546 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -915,23 +915,25 @@ define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_use_package,$(1),xml2)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,xml2)/include \
+	$(LIBXML_CFLAGS) \
 )
 
-ifeq ($(COM),MSC)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc/libxml2.lib \
-)
-else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2 \
+	$(LIBXML_LIBS) \
 )
+
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_use_external,$(1),icu_headers)
 endif
 
 endef
 define gb_ExternalProject__use_libxml2
 $(call gb_ExternalProject_use_package,$(1),xml2)
 
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_use_external_project,$(1),icu)
+endif
+
 endef
 
 endif # SYSTEM_LIBXML
diff --git a/configure.ac b/configure.ac
index b1befc2739ff..393490d1534a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7999,6 +7999,15 @@ if test "$with_system_libxml" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBXML=
+    LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/xml2/include"
+    if test "$COM" = "MSC"; then
+        LIBXML_CFLAGS="${LIBXML_CFLAGS} -I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common"
+    fi
+    if test "$COM" = "MSC"; then
+        LIBXML_LIBS="${WORKDIR}/UnpackedTarball/xml2/win32/bin.msvc/libxml2.lib"
+    else
+        LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/xml2/.libs -lxml2"
+    fi
     BUILD_TYPE="$BUILD_TYPE LIBXML2"
 fi
 AC_SUBST(SYSTEM_LIBXML)
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index 63d4e52136fa..49a2645064ac 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			--disable-werror \
 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-				-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
-			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+				-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 785aeb714f14..293028f1a791 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index ddf139420e78..84d6e7fc1a95 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			--without-tools \
 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
-			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index 33a7bf26bdcf..c3d411509cc3 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -25,10 +25,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
 		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
 		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
-		$(if $(SYSTEM_LIBXML),\
-			$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \
-			LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
-			LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")) \
+		LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
+		LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
 		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
 		$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 4ea2b238cf05..7d2c34aca774 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--disable-debug \
 			--disable-werror \
 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
-			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index 0e775f6c74c1..cb23686430d4 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -28,10 +28,12 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 		&& $(MAKE) \
 	)
 else # COM=MSC
+$(call gb_ExternalProject_use_external_project,xml2,icu)
+
 $(call gb_ExternalProject_get_state_target,xml2,build):
 	$(call gb_ExternalProject_run,build,\
 		cscript configure.js \
-			iconv=no sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
+			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
 		&& unset MAKEFLAGS \
 		&& LIB="$(ILIB)" nmake \
 	,win32)
diff --git a/external/libxml2/UnpackedTarball_xml2.mk b/external/libxml2/UnpackedTarball_xml2.mk
index ef00e8e2f97a..9c53b1fac6d5 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
 	external/libxml2/libxml2-global-symbols.patch \
 	external/libxml2/libxml2-vc10.patch \
 	$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
+	external/libxml2/libxml2-icu.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
new file mode 100644
index 000000000000..6a9f8e42aab3
--- /dev/null
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -0,0 +1,28 @@
+diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
+--- win32/Makefile.msvc.dt	2014-07-18 19:00:23.372103963 +0200
++++ win32/Makefile.msvc	2014-07-18 19:01:39.347982929 +0200
+@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+ CC = cl.exe
+ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME)
+ CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
+ !if "$(WITH_THREADS)" != "no"
+ CFLAGS = $(CFLAGS) /D "_REENTRANT"
+ !endif
+@@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC)
+ # The linker and its options.
+ LD = link.exe
+ LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
++LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
+ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
+ LIBS =
+ !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
+@@ -78,7 +78,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
+ LIBS = $(LIBS) iconv.lib
+ !endif 
+ !if "$(WITH_ICU)" == "1"
+-LIBS = $(LIBS) icu.lib
++LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
+ !endif
+ !if "$(WITH_ZLIB)" == "1"
+ # could be named differently zdll or zlib
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index ed65c70dbc28..f554ec839d7e 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -59,7 +59,6 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
 			$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
 			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
 		&& $(MAKE) \
diff --git a/external/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch
index f996b8b55aa0..0898d94fd697 100644
--- a/external/libxmlsec/xmlsec1-vc.patch
+++ b/external/libxmlsec/xmlsec1-vc.patch
@@ -19,7 +19,7 @@
  CFLAGS 			= $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
  CFLAGS 			= $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
  CFLAGS 			= $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
-+CFLAGS 			= $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include
++CFLAGS 			= $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
 +!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
 +CFLAGS 			= $(CFLAGS) /MDd
 +!endif
diff --git a/external/libxslt/libxslt-vc10.patch b/external/libxslt/libxslt-vc10.patch
index b50f0abe2e80..c82ec8484fa8 100644
--- a/external/libxslt/libxslt-vc10.patch
+++ b/external/libxslt/libxslt-vc10.patch
@@ -4,7 +4,7 @@
  CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
  CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
-+CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include
++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
  
  # The linker and its options.
  LD = link.exe
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 7085d3edd7bf..4668dcb3f298 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -28,8 +28,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
-			$(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \
 		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-static --disable-gtk-doc \
@@ -51,8 +50,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
-		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2  \
-			$(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \
 		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-gtk-doc \
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 2c7bb57f54df..ea57d06feb8c 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -25,7 +25,6 @@
 
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
-using ::com::sun::star::lang::Locale;
 using ::com::sun::star::uno::Sequence;
 using ::std::list;
 using ::boost::unordered_map;
@@ -41,7 +40,7 @@ enum LocaleMatch
     LOCALE_MATCH_ALL
 };
 
-static LocaleMatch lclLocaleCompare(const Locale& rLocale1, const LanguageTag& rLanguageTag2)
+static LocaleMatch lclLocaleCompare(const lang::Locale& rLocale1, const LanguageTag& rLanguageTag2)
 {
     LocaleMatch eMatchLevel = LOCALE_MATCH_NONE;
     LanguageTag aLanguageTag1( rLocale1);
@@ -67,7 +66,7 @@ static LocaleMatch lclLocaleCompare(const Locale& rLocale1, const LanguageTag& r
     return eMatchLevel;
 }
 
-ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const Locale& rLocale) :
+ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const lang::Locale& rLocale) :
     mpName(pName),
     meOpCode(eOpCode),
     mrLocale(rLocale)
@@ -77,7 +76,7 @@ ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const Locale
 ::std::auto_ptr<ScCellKeywordTranslator> ScCellKeywordTranslator::spInstance(NULL);
 
 static void lclMatchKeyword(OUString& rName, const ScCellKeywordHashMap& aMap,
-                            OpCode eOpCode = ocNone, const Locale* pLocale = NULL)
+                            OpCode eOpCode = ocNone, const lang::Locale* pLocale = NULL)
 {
     ScCellKeywordHashMap::const_iterator itrEnd = aMap.end();
     ScCellKeywordHashMap::const_iterator itr = aMap.find(rName);
@@ -94,7 +93,7 @@ static void lclMatchKeyword(OUString& rName, const ScCellKeywordHashMap& aMap,
         return;
     }
 
-    LanguageTag aLanguageTag( pLocale ? *pLocale : Locale("","",""));
+    LanguageTag aLanguageTag( pLocale ? *pLocale : lang::Locale("","",""));
     const sal_Char* aBestMatchName = itr->second.front().mpName;
     LocaleMatch eLocaleMatchLevel = LOCALE_MATCH_NONE;
     bool bOpCodeMatched = false;
@@ -158,7 +157,7 @@ static void lclMatchKeyword(OUString& rName, const ScCellKeywordHashMap& aMap,
     rName = OUString::createFromAscii(aBestMatchName);
 }
 
-void ScCellKeywordTranslator::transKeyword(OUString& rName, const Locale* pLocale, OpCode eOpCode)
+void ScCellKeywordTranslator::transKeyword(OUString& rName, const lang::Locale* pLocale, OpCode eOpCode)
 {
     if ( !spInstance.get() )
         spInstance.reset( new ScCellKeywordTranslator );
@@ -204,7 +203,7 @@ void ScCellKeywordTranslator::init()
     #include "cellkeywords.inl"
 }
 
-void ScCellKeywordTranslator::addToMap(const OUString& rKey, const sal_Char* pName, const Locale& rLocale, OpCode eOpCode)
+void ScCellKeywordTranslator::addToMap(const OUString& rKey, const sal_Char* pName, const lang::Locale& rLocale, OpCode eOpCode)
 {
     ScCellKeyword aKeyItem( pName, eOpCode, rLocale );
 
@@ -222,7 +221,7 @@ void ScCellKeywordTranslator::addToMap(const OUString& rKey, const sal_Char* pNa
         itr->second.push_back(aKeyItem);
 }
 
-void ScCellKeywordTranslator::addToMap(const TransItem* pItems, const Locale& rLocale)
+void ScCellKeywordTranslator::addToMap(const TransItem* pItems, const lang::Locale& rLocale)
 {
     for (sal_uInt16 i = 0; pItems[i].from != NULL; ++i)
         addToMap(OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func);
diff --git a/sc/source/core/tool/cellkeywords.inl b/sc/source/core/tool/cellkeywords.inl
index 02c872dd3405..214005cd41e0 100644
--- a/sc/source/core/tool/cellkeywords.inl
+++ b/sc/source/core/tool/cellkeywords.inl
@@ -21,7 +21,7 @@
 
 // French language locale (automatically generated)
 
-static const Locale aFr("fr", "", "");
+static const lang::Locale aFr("fr", "", "");
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_address_fr[] = {
@@ -76,7 +76,7 @@ addToMap(pFr, aFr);
 
 // Hungarian language locale (automatically generated)
 
-static const Locale aHu("hu", "", "");
+static const lang::Locale aHu("hu", "", "");
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_address_hu[] = {
@@ -146,7 +146,7 @@ addToMap(pHu, aHu);
 
 // German language locale (automatically generated)
 
-static const Locale aDe("de", "", "");
+static const lang::Locale aDe("de", "", "");
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_row_de[] = {
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 581c2f734d5c..cea8940063ea 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -19,7 +19,7 @@
 
 using namespace utl;
 using namespace com::sun::star::uno;
-using ::com::sun::star::lang::Locale;
+namespace lang = ::com::sun::star::lang;
 using ::com::sun::star::i18n::LocaleDataItem;
 
 TYPEINIT1(ScTpFormulaItem, SfxPoolItem);
@@ -71,7 +71,7 @@ void ScFormulaOptions::GetDefaultFormulaSeparators(
     rSepArrayCol = ";";
     rSepArrayRow = "|";
 
-    const Locale& rLocale = *ScGlobal::GetLocale();
+    const lang::Locale& rLocale = *ScGlobal::GetLocale();
     const OUString& rLang = rLocale.Language;
     if (rLang == "ru")
         // Don't do automatic guess for these languages, and fall back to
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index b2f60843e4c2..6a3433997d3b 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -36,6 +36,7 @@ namespace calc
 
 #define PROP_HANDLE_BOUND_CELL  1
 
+    namespace lang = ::com::sun::star::lang;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::table;
@@ -370,7 +371,7 @@ namespace calc
             Reference<XNumberFormatTypes> xTypes( xFormats, UNO_QUERY );
             if ( xTypes.is() )
             {
-                Locale aLocale;
+                lang::Locale aLocale;
                 bool bWasBoolean = false;
 
                 sal_Int32 nOldIndex = ::comphelper::getINT32( xCellProp->getPropertyValue( sPropName ) );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index fdc154c644c6..37b1a464711c 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -208,7 +208,7 @@ namespace sfx2
     {
         OUString sSearchStr;
         sal_Int32 nStartPos = 0;
-        const Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
+        const lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
         Boundary aBoundary = xBreak->getWordBoundary(
             rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c7ae37f99367..3de3f71ee256 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -191,7 +191,7 @@ class SfxDocTplService_Impl
     Sequence< OUString >        maInternalTemplateDirs;
     OUString                    maRootURL;
     NameList_Impl               maNames;
-    Locale                      maLocale;
+    lang::Locale                      maLocale;
     Content                     maRootContent;
     Updater_Impl*               mpUpdater;
     bool                    mbIsInitialized : 1;
@@ -288,8 +288,8 @@ public:
     bool                    init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; }
     Content                     getContent() const { return maRootContent; }
 
-    void                        setLocale( const Locale & rLocale );
-    Locale                      getLocale();
+    void                        setLocale( const lang::Locale & rLocale );
+    lang::Locale                      getLocale();
 
     bool                    storeTemplate( const OUString& rGroupName,
                                                const OUString& rTemplateName,
@@ -1134,7 +1134,7 @@ SfxDocTplService_Impl::~SfxDocTplService_Impl()
 }
 
 
-Locale SfxDocTplService_Impl::getLocale()
+lang::Locale SfxDocTplService_Impl::getLocale()
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -1145,7 +1145,7 @@ Locale SfxDocTplService_Impl::getLocale()
 }
 
 
-void SfxDocTplService_Impl::setLocale( const Locale &rLocale )
+void SfxDocTplService_Impl::setLocale( const lang::Locale &rLocale )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -2285,7 +2285,7 @@ SfxDocTplService::~SfxDocTplService()
 //--- XLocalizable ---
 
 
-Locale SAL_CALL SfxDocTplService::getLocale()
+lang::Locale SAL_CALL SfxDocTplService::getLocale()
     throw( uno::RuntimeException, std::exception )
 {
     return pImp->getLocale();
@@ -2293,7 +2293,7 @@ Locale SAL_CALL SfxDocTplService::getLocale()
 
 
 
-void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale )
+void SAL_CALL SfxDocTplService::setLocale( const lang::Locale & rLocale )
     throw( uno::RuntimeException, std::exception )
 {
     pImp->setLocale( rLocale );