fix mis-merge all-around.

4 files changed, 7 insertions, 10 deletions

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 0544171dbf..4e91bd83f7 100755
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -54,11 +54,10 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
     cppuhelper \
     i18nisolang1 \
     sal \
-    stl \
+    salhelper \
     svl \
     tl \
     utl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 455daadaf6..d891888645 100755
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -43,9 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
     cppuhelper \
     sal \
     salhelper \
-    stl \
     xo \
-    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xof,\
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 5930d12357..442ad50b00 100755
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -35,7 +35,7 @@
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //......................................................................................................................
 namespace xmloff { namespace metadata
@@ -83,7 +83,7 @@ namespace xmloff { namespace metadata
         // for some attribute or property, and otherwise delegate to the next instance.
 
         //..............................................................................................................
-        typedef ::std::hash_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName;
+        typedef ::boost::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName;
 
         //..............................................................................................................
         const DescriptionsByName& lcl_getPropertyDescriptions()
@@ -124,7 +124,7 @@ namespace xmloff { namespace metadata
         }
 
         //..............................................................................................................
-        typedef ::std::hash_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup;
+        typedef ::boost::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup;
 
         //..............................................................................................................
         const ReverseTokenLookup& getReverseTokenLookup()
@@ -153,7 +153,7 @@ namespace xmloff { namespace metadata
         };
 
         //..............................................................................................................
-        typedef ::std::hash_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
+        typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
 
         //..............................................................................................................
         const AttributeGroups& lcl_getAttributeGroups()
@@ -174,7 +174,7 @@ namespace xmloff { namespace metadata
         }
 
         //..............................................................................................................
-        typedef ::std::hash_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
+        typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
 
         //..............................................................................................................
         const AttributesWithoutGroup& lcl_getAttributesWithoutGroups()
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index bf0d8db82b..c1b890a232 100755
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -963,7 +963,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
     NfIndexTableOffset eBuiltIn = pFormatter->GetIndexTableOffset( nKey );
 
     short nFmtType = 0;
-    BOOL bThousand = sal_False;
+    sal_Bool bThousand = sal_False;
     sal_uInt16 nPrecision = 0;
     sal_uInt16 nLeading = 0;
     rFormat.GetNumForInfo( nPart, nFmtType, bThousand, nPrecision, nLeading);