diff --git a/main/LICENSE b/main/LICENSE index 597c1d4a11c..ea21f813211 100644 --- a/main/LICENSE +++ b/main/LICENSE @@ -1056,6 +1056,39 @@ ____ For integration of HSQLDB - built in main/hsqldb/ +For work developed by the HSQL Development Group: + +Copyright (c) 2001-2019, The HSQL Development Group +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +Neither the name of the HSQL Development Group nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For work originally developed by the Hypersonic SQL Group: + Copyright (c) 1995-2000 by the Hypersonic SQL Group. All rights reserved. diff --git a/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index aec4d3809a6..6b29dfb31a7 100644 --- a/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -69,7 +69,7 @@ #endif #include #include -#include +#include class TextEngine; class TextView; @@ -343,7 +343,7 @@ private: }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::css::beans::PropertyValue, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > tPropValMap; diff --git a/main/accessibility/source/extended/textwindowaccessibility.cxx b/main/accessibility/source/extended/textwindowaccessibility.cxx index 900c63b818c..505cbcb9d1f 100644 --- a/main/accessibility/source/extended/textwindowaccessibility.cxx +++ b/main/accessibility/source/extended/textwindowaccessibility.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include namespace css = ::com::sun::star; diff --git a/main/animations/source/animcore/targetpropertiescreator.cxx b/main/animations/source/animcore/targetpropertiescreator.cxx index b7f9591a2c8..d6304eb7e3a 100644 --- a/main/animations/source/animcore/targetpropertiescreator.cxx +++ b/main/animations/source/animcore/targetpropertiescreator.cxx @@ -44,7 +44,7 @@ #include #include -#include +#include using namespace ::com::sun::star; @@ -136,7 +136,7 @@ namespace animcore */ sal_Int16 mnParagraphIndex; - /// Comparison needed for hash_map + /// Comparison needed for unordered_map bool operator==( const ShapeHashKey& rRHS ) const { return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex; @@ -165,7 +165,7 @@ namespace animcore }; // A hash map which maps a XShape to the corresponding vector of initial properties - typedef ::std::hash_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash; + typedef ::std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash; class NodeFunctor { diff --git a/main/avmedia/source/macavf/macavf_player.cxx b/main/avmedia/source/macavf/macavf_player.cxx index 57865396ac4..41807123215 100644 --- a/main/avmedia/source/macavf/macavf_player.cxx +++ b/main/avmedia/source/macavf/macavf_player.cxx @@ -28,8 +28,8 @@ using namespace ::com::sun::star; -#include -typedef std::hash_map HandlersForObject; +#include +typedef std::unordered_map HandlersForObject; @implementation MacAVObserverObject { diff --git a/main/basctl/source/inc/bastypes.hxx b/main/basctl/source/inc/bastypes.hxx index e1ac6b609e3..8d08327169a 100644 --- a/main/basctl/source/inc/bastypes.hxx +++ b/main/basctl/source/inc/bastypes.hxx @@ -48,7 +48,7 @@ class SfxItemSet; #include #include -#include +#include #define LINE_SEP_CR 0x0D #define LINE_SEP 0x0A @@ -305,7 +305,7 @@ private: } }; - typedef ::std::hash_map< LibInfoKey, LibInfoItem*, LibInfoKeyHash, ::std::equal_to< LibInfoKey > > LibInfoMap; + typedef ::std::unordered_map< LibInfoKey, LibInfoItem*, LibInfoKeyHash, ::std::equal_to< LibInfoKey > > LibInfoMap; LibInfoMap m_aLibInfoMap; public: diff --git a/main/basic/source/classes/sb.cxx b/main/basic/source/classes/sb.cxx index a7efe347ca2..5edd20be12d 100644 --- a/main/basic/source/classes/sb.cxx +++ b/main/basic/source/classes/sb.cxx @@ -58,7 +58,7 @@ #include #include "errobject.hxx" #include -#include +#include #include #include @@ -1194,7 +1194,7 @@ struct ClassModuleRunInitItem // Derive from has_map type instead of typedef // to allow forward declaration in sbmod.hxx class ModuleInitDependencyMap : public - std::hash_map< ::rtl::OUString, ClassModuleRunInitItem, + std::unordered_map< ::rtl::OUString, ClassModuleRunInitItem, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > {}; @@ -2069,7 +2069,7 @@ SbxInfoRef BasicCollection::xItemInfo = NULL; // Items may share a name (an item added without a key keeps the name of the // variable it was copied from), so each name maps to all of its holders. class CollectionNameMap : public - std::hash_map< ::rtl::OUString, std::vector< SbxVariable* >, + std::unordered_map< ::rtl::OUString, std::vector< SbxVariable* >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > {}; diff --git a/main/basic/source/classes/sbunoobj.cxx b/main/basic/source/classes/sbunoobj.cxx index 03b4fcda8bd..f7f15c43384 100644 --- a/main/basic/source/classes/sbunoobj.cxx +++ b/main/basic/source/classes/sbunoobj.cxx @@ -95,7 +95,7 @@ using namespace cppu; #include #include -#include +#include #include #include @@ -3389,7 +3389,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit refVar->PutBool( sal_True ); } -typedef std::hash_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; +typedef std::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash; // helper wrapper function to interact with TypeProvider and @@ -3416,7 +3416,7 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot, return xEnum; } -typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; +typedef std::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; SbxVariable* getVBAConstant( const String& rName ) { diff --git a/main/basic/source/comp/sbcomp.cxx b/main/basic/source/comp/sbcomp.cxx index 9e3714b13a9..d80e68ede44 100644 --- a/main/basic/source/comp/sbcomp.cxx +++ b/main/basic/source/comp/sbcomp.cxx @@ -37,7 +37,7 @@ // To activate tracing enable in sbtrace.hxx #ifdef DBG_TRACE_BASIC -#include +#include // Trace ini file (set NULL to ignore) // can be overridden with the environment variable OOO_BASICTRACEINI @@ -239,8 +239,8 @@ struct TraceTextData rtl::OString m_aTraceStr_STMNT; rtl::OString m_aTraceStr_PCode; }; -typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap; -typedef std::hash_map< ::rtl::OUString, PCToTextDataMap*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleTraceMap; +typedef std::unordered_map< sal_Int32, TraceTextData > PCToTextDataMap; +typedef std::unordered_map< ::rtl::OUString, PCToTextDataMap*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleTraceMap; ModuleTraceMap GaModuleTraceMap; ModuleTraceMap& rModuleTraceMap = GaModuleTraceMap; @@ -381,7 +381,7 @@ struct FunctionItem , m_bBlockSteps( false ) {} }; -typedef std::hash_map< ::rtl::OUString, FunctionItem*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > FunctionItemMap; +typedef std::unordered_map< ::rtl::OUString, FunctionItem*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > FunctionItemMap; static std::stack< double > GaCallEnterTimeStack; static std::stack< FunctionItem* > GaFunctionItemStack; diff --git a/main/basic/source/inc/namecont.hxx b/main/basic/source/inc/namecont.hxx index 1045c67ccca..942d4da64d4 100644 --- a/main/basic/source/inc/namecont.hxx +++ b/main/basic/source/inc/namecont.hxx @@ -24,7 +24,7 @@ #ifndef BASIC_NAMECONTAINER_HXX #define BASIC_NAMECONTAINER_HXX -#include +#include #include #include @@ -76,7 +76,7 @@ typedef ::cppu::WeakImplHelper3< class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE { - typedef std::hash_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap; + typedef std::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap; NameContainerNameMap mHashMap; ::com::sun::star::uno::Sequence< ::rtl::OUString > mNames; diff --git a/main/basic/source/inc/scriptcont.hxx b/main/basic/source/inc/scriptcont.hxx index 1d95a821f52..536249692a0 100644 --- a/main/basic/source/inc/scriptcont.hxx +++ b/main/basic/source/inc/scriptcont.hxx @@ -126,7 +126,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE { friend class SfxScriptLibraryContainer; - typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap; + typedef std::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap; sal_Bool mbLoadedSource; sal_Bool mbLoadedBinary; diff --git a/main/basic/source/runtime/step0.cxx b/main/basic/source/runtime/step0.cxx index ab8fb89e6d6..ea50342ee40 100644 --- a/main/basic/source/runtime/step0.cxx +++ b/main/basic/source/runtime/step0.cxx @@ -43,7 +43,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl:: const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj ); #include -#include +#include SbxVariable* getDefaultProp( SbxVariable* pRef ); @@ -445,7 +445,7 @@ struct SbxVariablePtrHash { return (size_t)pVar; } }; -typedef std::hash_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash > DimAsNewRecoverHash; +typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem, SbxVariablePtrHash > DimAsNewRecoverHash; static DimAsNewRecoverHash GaDimAsNewRecoverHash; diff --git a/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 2a9c07f1be1..8fb3c3e6cd3 100644 --- a/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/main/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -30,7 +30,7 @@ #include "sal/types.h" #include "typelib/typedescription.hxx" -#include +#include /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined (LINUX) || defined (FREEBSD) @@ -197,7 +197,7 @@ private: static void flushCode( unsigned char const * begin, unsigned char const * end); - typedef std::hash_map< rtl::OUString, Vtables, rtl::OUStringHash > Map; + typedef std::unordered_map< rtl::OUString, Vtables, rtl::OUStringHash > Map; osl::Mutex m_mutex; Map m_map; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/cpp2uno.cxx index c97b3c39988..43cf693ba21 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/cpp2uno.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/except.cxx index 2730e89963d..70bf97881da 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_aarch64/except.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -58,8 +58,8 @@ namespace CPPU_CURRENT_NAMESPACE namespace { -typedef hash_map< void *, typelib_TypeDescription * > ThrownTypes; -typedef hash_map< OUString, type_info *, OUStringHash > ObservedRttiMap; +typedef unordered_map< void *, typelib_TypeDescription * > ThrownTypes; +typedef unordered_map< OUString, type_info *, OUStringHash > ObservedRttiMap; ThrownTypes & thrownTypes() { @@ -178,7 +178,7 @@ static OString mangledRttiSymbol( OUString const & unoName ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx index 8bc0338223a..30396ad0c1a 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx index 94f479e726c..29c48a839f6 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -96,7 +96,7 @@ namespace CPPU_CURRENT_NAMESPACE //===================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx index 933ba9e2ece..c9113957ad1 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include @@ -104,7 +104,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/except.cxx index 888bccb6143..118d7efcaf1 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except.cxx index 888bccb6143..118d7efcaf1 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -97,7 +97,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx index a3f10a783fe..82969a11128 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include @@ -104,7 +104,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx index 8f24e9173bc..4d091647be2 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index 35e557f3692..b1880f40774 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index b3a58790077..7dd1152655a 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index fd2d70d5ae4..568ba7048ad 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index bb399142c0c..52d16a6529c 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx index 1b7ac9450d9..c52cf483365 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 2b75ef29918..b1279552cf1 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index 3a575388a31..e5995c9d24a 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index bb399142c0c..52d16a6529c 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index c3eaa9c5e18..39f9ef5f46f 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx index de9abf63916..b34ed3c5666 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx index de9abf63916..b34ed3c5666 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx index 1b7ac9450d9..c52cf483365 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx index 8f24e9173bc..4d091647be2 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 381289a2973..c7f48432a38 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 2a823bd2b07..d5751b79248 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 0b2dbcefe8e..55153472422 100644 --- a/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx index 93655350c7a..1aa39507591 100644 --- a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#include +#include #include #include @@ -401,7 +401,7 @@ void cpp_vtable_call( int nTableEntry, void** pCallStack ) //================================================================================================== class MediateClassData { - typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map; + typedef ::std::unordered_map< OUString, void *, OUStringHash > t_classdata_map; t_classdata_map m_map; Mutex m_mutex; diff --git a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx index 2330c111c23..96a7e8c3725 100644 --- a/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx index c460560ffe9..996e27cef7d 100644 --- a/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 72ba50221ab..05db3c3f2e1 100644 --- a/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 6d4c4fdbe4c..8c0bc93dbfe 100644 --- a/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/main/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/mingw_intel/except.cxx b/main/bridges/source/cpp_uno/mingw_intel/except.cxx index 92b997c7329..f8a5a8cdb5d 100644 --- a/main/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/main/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index fef28816bc0..cdad29bd686 100644 --- a/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -25,7 +25,7 @@ #include "precompiled_bridges.hxx" #pragma warning( disable : 4237 ) -#include +#include #include #include // was a Microsoft compatibility header, removed in VS2015+. diff --git a/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx b/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx index e2cde1caf21..0c5de115be7 100644 --- a/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx +++ b/main/bridges/source/cpp_uno/msvc_win64_x86-64/except.cxx @@ -25,7 +25,7 @@ #include "precompiled_bridges.hxx" #pragma warning( disable : 4237 ) -#include +#include #include #include // was a Microsoft compatibility header, removed in VS2015+. diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx index c6bb9149858..959254870e6 100644 --- a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx index f7e9343c84d..91dcf707eba 100644 --- a/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx +++ b/main/bridges/source/cpp_uno/s5abi_macosx_aarch64/except.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx index b1fa9fc5454..1b0c72e5952 100644 --- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx index 93c46683b71..caf0e12e249 100644 --- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx +++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx index fa7cd1bb4e4..3438b039759 100644 --- a/main/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/main/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -45,7 +45,7 @@ #include "sal/types.h" #include "typelib/typedescription.hxx" -#include +#include #include #include @@ -202,7 +202,7 @@ class VtableFactory::BaseOffset { sal_Int32 calculate( typelib_InterfaceTypeDescription * type, sal_Int32 offset); - typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map; + typedef std::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > Map; Map m_map; }; diff --git a/main/chart2/source/inc/DataSeriesHelper.hxx b/main/chart2/source/inc/DataSeriesHelper.hxx index f3f3bd8b26b..a32a37ba7cd 100644 --- a/main/chart2/source/inc/DataSeriesHelper.hxx +++ b/main/chart2/source/inc/DataSeriesHelper.hxx @@ -35,7 +35,7 @@ #include #include -#include +#include namespace chart { diff --git a/main/codemaker/inc/codemaker/dependencies.hxx b/main/codemaker/inc/codemaker/dependencies.hxx index d46af60d636..89fd9565363 100644 --- a/main/codemaker/inc/codemaker/dependencies.hxx +++ b/main/codemaker/inc/codemaker/dependencies.hxx @@ -26,7 +26,7 @@ #include "rtl/string.hxx" -#include +#include namespace rtl { class OUString; } class TypeManager; @@ -48,7 +48,7 @@ public: */ enum Kind { KIND_NO_BASE, KIND_BASE }; - typedef std::hash_map< rtl::OString, Kind, rtl::OStringHash > Map; + typedef std::unordered_map< rtl::OString, Kind, rtl::OStringHash > Map; /** Constructs the dependencies for a given type. diff --git a/main/codemaker/inc/codemaker/generatedtypeset.hxx b/main/codemaker/inc/codemaker/generatedtypeset.hxx index 0efebf9ffe6..af34edfb45b 100644 --- a/main/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/main/codemaker/inc/codemaker/generatedtypeset.hxx @@ -26,7 +26,7 @@ #include "rtl/string.hxx" -#include +#include /// @HTML @@ -67,7 +67,7 @@ private: GeneratedTypeSet(GeneratedTypeSet &); // not implemented void operator =(GeneratedTypeSet); // not implemented - std::hash_set< rtl::OString, rtl::OStringHash > m_set; + std::unordered_set< rtl::OString, rtl::OStringHash > m_set; }; } diff --git a/main/codemaker/inc/codemaker/options.hxx b/main/codemaker/inc/codemaker/options.hxx index e937a3e9f50..564f43385f4 100644 --- a/main/codemaker/inc/codemaker/options.hxx +++ b/main/codemaker/inc/codemaker/options.hxx @@ -24,7 +24,7 @@ #ifndef INCLUDED_CODEMAKER_OPTIONS_HXX #define INCLUDED_CODEMAKER_OPTIONS_HXX -#include +#include #include @@ -38,7 +38,7 @@ typedef ::std::__hash_map__ NewAlloc > OptionMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, ::rtl::OString, diff --git a/main/codemaker/inc/codemaker/typemanager.hxx b/main/codemaker/inc/codemaker/typemanager.hxx index fd77db01d42..6ce9d0a05bf 100644 --- a/main/codemaker/inc/codemaker/typemanager.hxx +++ b/main/codemaker/inc/codemaker/typemanager.hxx @@ -28,7 +28,7 @@ #include "registry/registry.hxx" #include "registry/types.h" -#include +#include #include namespace typereg { class Reader; } @@ -48,7 +48,7 @@ typedef ::std::__hash_map__ NewAlloc > T2TypeClassMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, // Typename RTTypeClass, // TypeClass diff --git a/main/codemaker/source/bonobowrappermaker/corbatype.cxx b/main/codemaker/source/bonobowrappermaker/corbatype.cxx index d173b42c1ab..01eea0573c4 100644 --- a/main/codemaker/source/bonobowrappermaker/corbatype.cxx +++ b/main/codemaker/source/bonobowrappermaker/corbatype.cxx @@ -30,7 +30,7 @@ #include "corbatype.hxx" #include "corbaoptions.hxx" -#include +#include #include using namespace rtl; diff --git a/main/codemaker/source/bonobowrappermaker/corbatype.hxx b/main/codemaker/source/bonobowrappermaker/corbatype.hxx index 2e010d77bc2..7f981a943ff 100644 --- a/main/codemaker/source/bonobowrappermaker/corbatype.hxx +++ b/main/codemaker/source/bonobowrappermaker/corbatype.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include enum BASETYPE { @@ -68,7 +68,7 @@ struct OStringHash { return rStr.hashCode(); } }; -typedef std::hash_set< ::rtl::OString, OStringHash, OStringEqual > TypeSet; +typedef std::unordered_set< ::rtl::OString, OStringHash, OStringEqual > TypeSet; class CorbaType { diff --git a/main/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/main/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx index a42dc18df4f..4c72f0bc297 100644 --- a/main/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx +++ b/main/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx @@ -32,7 +32,7 @@ /* * A ChainablePropertySetInfo is usually initialised with a pointer to the first element - * of a null-terminated static table of PropertyInfo structs. This is placed in a hash_map + * of a null-terminated static table of PropertyInfo structs. This is placed in a unordered_map * for fast access * */ diff --git a/main/comphelper/inc/comphelper/PropertyInfoHash.hxx b/main/comphelper/inc/comphelper/PropertyInfoHash.hxx index 696aafe1a58..c957d46f126 100644 --- a/main/comphelper/inc/comphelper/PropertyInfoHash.hxx +++ b/main/comphelper/inc/comphelper/PropertyInfoHash.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include namespace comphelper { struct PropertyInfo @@ -56,11 +56,11 @@ namespace comphelper }; } -typedef std::hash_map < ::rtl::OUString, +typedef std::unordered_map < ::rtl::OUString, ::comphelper::PropertyInfo*, ::rtl::OUStringHash, ::comphelper::eqFunc > PropertyInfoHash; -typedef std::hash_map < ::rtl::OUString, +typedef std::unordered_map < ::rtl::OUString, ::comphelper::PropertyData*, ::rtl::OUStringHash, ::comphelper::eqFunc > PropertyDataHash; diff --git a/main/comphelper/inc/comphelper/mediadescriptor.hxx b/main/comphelper/inc/comphelper/mediadescriptor.hxx index 28d1af781c1..c8cb3f903e7 100644 --- a/main/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/main/comphelper/inc/comphelper/mediadescriptor.hxx @@ -46,7 +46,7 @@ namespace comphelper{ /** @short can be used to work with a MediaDescriptor struct. - @descr It wraps a ::std::hash_map around the Sequence< css::beans::PropertyValue >, which + @descr It wraps a ::std::unordered_map around the Sequence< css::beans::PropertyValue >, which represent the MediaDescriptor item. Further this helper defines often used functions (as e.g. open of the required streams, consistent checks etcpp.) and it defines all useable property names. diff --git a/main/comphelper/inc/comphelper/numberedcollection.hxx b/main/comphelper/inc/comphelper/numberedcollection.hxx index acb1515412f..2b4be6c3a8a 100644 --- a/main/comphelper/inc/comphelper/numberedcollection.hxx +++ b/main/comphelper/inc/comphelper/numberedcollection.hxx @@ -39,7 +39,7 @@ #include #include -#include +#include //_______________________________________________ // namespace @@ -76,7 +76,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex ::sal_Int32 nNumber; }; - typedef ::std::hash_map< + typedef ::std::unordered_map< long , TNumberedItem , ::std::hash< long > , diff --git a/main/comphelper/inc/comphelper/sequenceashashmap.hxx b/main/comphelper/inc/comphelper/sequenceashashmap.hxx index 86068caa7cc..d970383d8ef 100644 --- a/main/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/main/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -28,7 +28,7 @@ // includes #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif @@ -70,7 +70,7 @@ namespace comphelper{ such name sequences very easy ... */ -struct SequenceAsHashMapBase : public ::std::hash_map< +struct SequenceAsHashMapBase : public ::std::unordered_map< ::rtl::OUString , ::com::sun::star::uno::Any , ::rtl::OUStringHash , diff --git a/main/comphelper/source/container/embeddedobjectcontainer.cxx b/main/comphelper/source/container/embeddedobjectcontainer.cxx index 1d1ca18db73..f30df72817a 100644 --- a/main/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/main/comphelper/source/container/embeddedobjectcontainer.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include @@ -72,7 +72,7 @@ struct eqObjectName_Impl } }; -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, ::com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >, diff --git a/main/comphelper/source/misc/namedvaluecollection.cxx b/main/comphelper/source/misc/namedvaluecollection.cxx index 203f17b5e7f..58211b67a3f 100644 --- a/main/comphelper/source/misc/namedvaluecollection.cxx +++ b/main/comphelper/source/misc/namedvaluecollection.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -61,7 +61,7 @@ namespace comphelper //==================================================================== //= NamedValueCollection_Impl //==================================================================== - typedef ::std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository; + typedef ::std::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository; struct NamedValueCollection_Impl { diff --git a/main/configure.ac b/main/configure.ac index 91bcd9e573a..f518686b11b 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -501,7 +501,7 @@ AC_ARG_WITH(system-mysql-cppconn, [ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system ],,) AC_ARG_WITH(system-hsqldb, -[ --with-system-hsqldb Use hsqldb already on system +[ --with-system-hsqldb Not supported: the bundled hsqldb carries the storage access patch ],,) AC_ARG_WITH(hsqldb-jar, [ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ], @@ -5001,42 +5001,9 @@ dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== AC_MSG_CHECKING([which hsqldb to use]) -if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ - test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then +if test -n "$with_system_hsqldb" && test "$with_system_hsqldb" != "no"; then AC_MSG_RESULT([external]) - SYSTEM_HSQLDB=YES - if test -z $HSQLDB_JAR; then - HSQLDB_JAR=/usr/share/java/hsqldb.jar - fi - AC_CHECK_FILE($HSQLDB_JAR, [], - [AC_MSG_ERROR(hsqldb.jar not found.)], []) - AC_MSG_CHECKING([whether hsqldb is 1.8.0.x]) - export HSQLDB_JAR - if $PERL -e 'use Archive::Zip; - my $file = "$ENV{'HSQLDB_JAR'}"; - my $zip = Archive::Zip->new( $file ); - my $mf = $zip->contents ( "META-INF/MANIFEST.MF" ); - if ( $mf =~ m/Specification-Version: 1.8.*/ ) { - push @l, split(/\n/, $mf); - foreach my $line (@l) { - if ($line =~ m/Specification-Version:/) { - ($t, $version) = split (/:/,$line); - $version =~ s/^\s//; - ($a, $b, $c, $d) = split (/\./,$version); - if ($c == "0" && $d > "8") { - exit 0; - } else { - exit 1; - } - } - } - } else { - exit 1; - }'; then - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1]) - fi + AC_MSG_ERROR([a system hsqldb cannot be used: the bundled hsqldb carries main/hsqldb/patches/aoo_integration.patch]) else AC_MSG_RESULT([internal]) SYSTEM_HSQLDB=NO diff --git a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java index fbd14bced9a..9847ab75567 100644 --- a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java +++ b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java @@ -43,6 +43,13 @@ public NativeOutputStreamHelper(String key,String _file) { out = new StorageNativeOutputStream(file,key); } + public NativeOutputStreamHelper(String key,String _file, boolean append) { + file = _file; + this.key = key; + int mode = append ? NativeStorageAccess.WRITE : (NativeStorageAccess.WRITE | NativeStorageAccess.TRUNCATE); + out = new StorageNativeOutputStream(file,key, mode); + } + public void write(byte[] b, int off, int len) throws java.io.IOException{ out.write(key,file,b, off, len); } diff --git a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java index bb9ee38becd..b9da661433c 100644 --- a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java +++ b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java @@ -149,6 +149,18 @@ public boolean wasNio() { return false; } + public boolean canAccess(int length) { + return true; + } + + public boolean canSeek(long position) { + return true; + } + + public org.hsqldb.Database getDatabase() { + return null; + } + public void writeLong(long v) throws java.io.IOException { //appLog.sendLine("NIOScaledRAFile.writeLong(" +v+") "); byte [] oneByte = new byte [8]; diff --git a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index 472ad300657..e904edf9e68 100644 --- a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -55,8 +55,8 @@ public java.io.InputStream openInputStreamElement(java.lang.String streamName) t return new NativeInputStreamHelper(key,streamName); } - public java.io.OutputStream openOutputStreamElement(java.lang.String streamName) throws java.io.IOException { - return new NativeOutputStreamHelper(key,streamName); + public java.io.OutputStream openOutputStreamElement(java.lang.String streamName, boolean append) throws java.io.IOException { + return new NativeOutputStreamHelper(key, streamName, append); } public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException { @@ -68,15 +68,15 @@ public void removeElement(java.lang.String filename) throws java.util.NoSuchElem } } - public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException { + public void renameElement(java.lang.String oldName, java.lang.String newName, boolean bPreserve) throws java.util.NoSuchElementException { try { if ( isStreamElement(key,oldName) ){ removeElement(key,newName); renameElement(key,oldName, newName); } - } catch (java.io.IOException e) { - throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRenameElementFailed ); - } + } catch (java.io.IOException e) { + throw new FileSystemRuntimeException( e, FileSystemRuntimeException.fileAccessRenameElementFailed ); + } } public class FileSync implements FileAccess.FileSync diff --git a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java index e765db70279..6a56307942a 100644 --- a/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java +++ b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java @@ -44,6 +44,12 @@ public StorageNativeOutputStream(String _name,Object _key) { openStream(name, (String)key, NativeStorageAccess.WRITE | NativeStorageAccess.TRUNCATE); } + public StorageNativeOutputStream(String _name,Object _key, int mode) { + name = _name; + key = _key; + openStream(name, (String)key, mode); + } + public native void openStream(String name,String key, int mode); /** * Writes len bytes from the specified byte array diff --git a/main/connectivity/qa/connectivity/tools/CRMDatabase.java b/main/connectivity/qa/connectivity/tools/CRMDatabase.java index 16e6536cc97..97115dc1cec 100644 --- a/main/connectivity/qa/connectivity/tools/CRMDatabase.java +++ b/main/connectivity/qa/connectivity/tools/CRMDatabase.java @@ -180,7 +180,7 @@ private void createTables() throws SQLException new HsqlColumnDescriptor( "Address",VARCHAR50), new HsqlColumnDescriptor( "City",VARCHAR50), new HsqlColumnDescriptor( "Postal",VARCHAR50), - new HsqlColumnDescriptor( "Comment","LONGVARCHAR")} ); + new HsqlColumnDescriptor( "Comment","CLOB")} ); m_database.createTable( table, true ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509','Prefered') " ); diff --git a/main/connectivity/source/drivers/hsqldb/HDriver.cxx b/main/connectivity/source/drivers/hsqldb/HDriver.cxx index 50c754a2d5d..249b16075e6 100644 --- a/main/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/main/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -40,6 +40,7 @@ #include #include #include +#include #include "HTerminateListener.hxx" #include "hsqldb/HCatalog.hxx" #include "diagnose_ex.h" @@ -48,8 +49,10 @@ #include #include #include +#include #include #include +#include #include "resource/hsqldb_res.hrc" #include "resource/sharedresources.hxx" #include @@ -59,6 +62,7 @@ namespace connectivity { //........................................................................ using namespace hsqldb; + using namespace ::comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; @@ -66,9 +70,9 @@ namespace connectivity using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::embed; - using namespace ::com::sun::star::io; + using namespace ::com::sun::star::io; + using namespace ::com::sun::star::util; using namespace ::com::sun::star::task; - using namespace ::com::sun::star::util; using namespace ::com::sun::star::reflection; namespace hsqldb @@ -183,6 +187,7 @@ namespace connectivity { ::rtl::OUString sURL; Reference xStorage; + Reference< XInteractionHandler > xInteraction; const PropertyValue* pIter = info.getConstArray(); const PropertyValue* pEnd = pIter + info.getLength(); @@ -196,6 +201,10 @@ namespace connectivity { pIter->Value >>= sURL; } + else if ( pIter->Name.equalsAscii("InteractionHandler") ) + { + pIter->Value >>= xInteraction; + } } if ( !xStorage.is() || !sURL.getLength() ) @@ -230,7 +239,7 @@ namespace connectivity // JDBC driver and driver's classpath aProperties.put( "JavaDriverClass", - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.hsqldb.jdbcDriver" ) ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.hsqldb.jdbc.JDBCDriver" ) ) ); aProperties.put( "JavaDriverClassPath", ::rtl::OUString( #ifdef SYSTEM_HSQLDB @@ -251,6 +260,8 @@ namespace connectivity // don't want to expose HSQLDB's schema capabilities which exist since 1.8.0RC10 aProperties.put( "default_schema", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) ); + aProperties.put( "hsqldb.default_table_type", + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cached" ) ) ); // security: permitted Java classes NamedValue aPermittedClasses( @@ -259,8 +270,12 @@ namespace connectivity ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); - const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) ); - ::rtl::OUString sMessage; + aProperties.put( "jdbc.interval_as_varchar", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) ); + aProperties.put( "get_column_name", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) ); + + bool bAskUser = false; + ::rtl::OUString sMessage; + ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) ); try { if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) ) @@ -268,8 +283,8 @@ namespace connectivity Reference xStream = xStorage->openStreamElement(sProperties,ElementModes::READ); if ( xStream.is() ) { - ::std::unique_ptr pStream( ::utl::UcbStreamHelper::CreateStream(xStream) ); - if ( pStream.get() ) + std::unique_ptr pStream( ::utl::UcbStreamHelper::CreateStream(xStream) ); + if ( pStream ) { ByteString sLine; ByteString sVersionString; @@ -285,25 +300,26 @@ namespace connectivity } else { - if ( sIniKey.Equals( "version" ) - && ( sVersionString.Len() == 0 ) + if ( ( sVersionString.Len() == 0 ) + && sIniKey.Equals( "version" ) ) { sVersionString = sValue; } } } - if ( sVersionString.Len() ) + if ( sVersionString.Len() ) { const sal_Int32 nMajor = sVersionString.GetToken(0,'.').ToInt32(); const sal_Int32 nMinor = sVersionString.GetToken(1,'.').ToInt32(); - const sal_Int32 nMicro = sVersionString.GetToken(2,'.').ToInt32(); - if ( nMajor > 1 - || ( nMajor == 1 && nMinor > 8 ) - || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) ) - { + if ( nMajor > 2 || (nMajor == 2 && nMinor > 5) ) + { ::connectivity::SharedResources aResources; sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION); + } + else if ( nMajor < 2 ) + { + bAskUser = true; } } } @@ -314,10 +330,30 @@ namespace connectivity catch(Exception&) { } + // reject databases from newer HSQLDB versions that cannot be opened if ( sMessage.getLength() ) { ::dbtools::throwGenericSQLException(sMessage ,*this); } + // need to convert file, ask for user approval + if ( xInteraction.is() && bAskUser ) + { + ::connectivity::SharedResources aResources; + const ::rtl::OUString sRequest( aResources.getResourceString(STR_CONVERT_TO_NEW_VERSION)); + SQLException aInfo(sRequest,*this,::rtl::OUString(),0,Any()); + OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aInfo)); + Reference< XInteractionRequest > xRequest(pRequest); + OInteraction< XInteractionApprove >* pApprove = new OInteraction< XInteractionApprove >(); + pRequest->addContinuation(pApprove); + OInteraction< XInteractionDisapprove >* pDisApprove = new OInteraction< XInteractionDisapprove >; + pRequest->addContinuation(pDisApprove); + xInteraction->handle(xRequest); + if ( pDisApprove->wasSelected() ) + { + StorageContainer::revokeStorage(sKey,NULL); + ::dbtools::throwGenericSQLException(aResources.getResourceString(STR_CONVERSION_DECLINED) ,*this); + } + } // readonly? Reference xProp(xStorage,UNO_QUERY); @@ -327,7 +363,7 @@ namespace connectivity xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenMode"))) >>= nMode; if ( (nMode & ElementModes::WRITE) != ElementModes::WRITE ) { - aProperties.put( "readonly", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) ); + aProperties.put( "readonly", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) ); } } @@ -341,11 +377,17 @@ namespace connectivity try { xOrig = xDriver->connect( sConnectURL, aConnectionArgs ); + } + catch(const SQLException& e) + { + StorageContainer::revokeStorage(sKey,NULL); + OSL_UNUSED(e); + throw; } catch(const Exception& e) { StorageContainer::revokeStorage(sKey,NULL); - (void)e; + OSL_UNUSED(e); throw; } diff --git a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 91da80c0b66..5909c29c6c0 100644 --- a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -435,6 +435,8 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst if ( xOut.is() ) { jbyte *buf = env->GetByteArrayElements(buffer,NULL); + OSL_ENSURE(len <= env->GetArrayLength(buffer),"Length is greater than the buffer!"); + if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); diff --git a/main/connectivity/source/drivers/hsqldb/HUser.cxx b/main/connectivity/source/drivers/hsqldb/HUser.cxx index 59de21b53cc..8fa80ee9e5a 100644 --- a/main/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/main/connectivity/source/drivers/hsqldb/HUser.cxx @@ -271,6 +271,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" FROM "); sGrant += m_Name; + sGrant += ::rtl::OUString::createFromAscii(" RESTRICT"); Reference xStmt = m_xConnection->createStatement(); if(xStmt.is()) diff --git a/main/connectivity/source/inc/TSkipDeletedSet.hxx b/main/connectivity/source/inc/TSkipDeletedSet.hxx index e312452c0a1..e4a2ea4695c 100644 --- a/main/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/main/connectivity/source/inc/TSkipDeletedSet.hxx @@ -25,7 +25,7 @@ #include "TResultSetHelper.hxx" #include -#include +#include #include #include "connectivity/dbtoolsdllapi.hxx" diff --git a/main/connectivity/source/inc/resource/hsqldb_res.hrc b/main/connectivity/source/inc/resource/hsqldb_res.hrc index c76ab335194..d5964ced9ad 100644 --- a/main/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/main/connectivity/source/inc/resource/hsqldb_res.hrc @@ -38,5 +38,7 @@ #define STR_NO_TABLENAME ( STR_HSQLDB_BASE + 4 ) #define STR_NO_DOCUMENTUI ( STR_HSQLDB_BASE + 5 ) #define STR_ERROR_NEW_VERSION ( STR_HSQLDB_BASE + 6 ) +#define STR_CONVERT_TO_NEW_VERSION ( STR_HSQLDB_BASE + 7 ) +#define STR_CONVERSION_DECLINED ( STR_HSQLDB_BASE + 8 ) #endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC diff --git a/main/connectivity/source/resource/conn_shared_res.src b/main/connectivity/source/resource/conn_shared_res.src index 598e9dfd81e..96b98520285 100644 --- a/main/connectivity/source/resource/conn_shared_res.src +++ b/main/connectivity/source/resource/conn_shared_res.src @@ -633,5 +633,13 @@ String STR_ERROR_NEW_VERSION { Text = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME." ; }; +String STR_CONVERT_TO_NEW_VERSION +{ + Text [ en-US ] = "The database file is stored in an old version. Do you want to convert into the new version?" ; +}; +String STR_CONVERSION_DECLINED +{ + Text [ en-US ] = "The database was not opened because it was not converted to the new version." ; +}; // ********************************************************************** EOF diff --git a/main/cppu/source/LogBridge/LogBridge.cxx b/main/cppu/source/LogBridge/LogBridge.cxx index 8958b1d620f..2457ef538b5 100644 --- a/main/cppu/source/LogBridge/LogBridge.cxx +++ b/main/cppu/source/LogBridge/LogBridge.cxx @@ -34,7 +34,7 @@ #include "rtl/logfile.hxx" #include "uno/environment.hxx" #include -#include +#include #include namespace diff --git a/main/cppu/source/threadpool/threadpool.cxx b/main/cppu/source/threadpool/threadpool.cxx index 6bbb2fba549..13add130f95 100644 --- a/main/cppu/source/threadpool/threadpool.cxx +++ b/main/cppu/source/threadpool/threadpool.cxx @@ -23,7 +23,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" -#include +#include #include #include @@ -400,7 +400,7 @@ struct uno_ThreadPool_Hash -typedef ::std::hash_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; +typedef ::std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; static ThreadpoolHashSet *g_pThreadpoolHashSet; diff --git a/main/cppu/source/threadpool/threadpool.hxx b/main/cppu/source/threadpool/threadpool.hxx index 779704b2ce1..dd582c99ab7 100644 --- a/main/cppu/source/threadpool/threadpool.hxx +++ b/main/cppu/source/threadpool/threadpool.hxx @@ -20,7 +20,7 @@ *************************************************************/ -#include +#include #include @@ -55,7 +55,7 @@ namespace cppu_threadpool { } }; - typedef ::std::hash_map + typedef ::std::unordered_map < ByteSequence, // ThreadID ::std::pair < JobQueue * , JobQueue * >, diff --git a/main/cppu/source/typelib/typelib.cxx b/main/cppu/source/typelib/typelib.cxx index 588122f953c..ef3f5e0903b 100644 --- a/main/cppu/source/typelib/typelib.cxx +++ b/main/cppu/source/typelib/typelib.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" -#include +#include #include #include #include @@ -177,7 +177,7 @@ struct hashStr_Impl //----------------------------------------------------------------------------- // Heavy hack, the const sal_Unicode * is held by the type description reference -typedef hash_map< const sal_Unicode *, typelib_TypeDescriptionReference *, +typedef unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *, hashStr_Impl, equalStr_Impl > WeakMap_Impl; typedef pair< void *, typelib_typedescription_Callback > CallbackEntry; diff --git a/main/cppu/source/uno/EnvStack.cxx b/main/cppu/source/uno/EnvStack.cxx index c787742e2f3..9f753aca914 100644 --- a/main/cppu/source/uno/EnvStack.cxx +++ b/main/cppu/source/uno/EnvStack.cxx @@ -29,7 +29,7 @@ #include "osl/thread.h" #include "osl/mutex.hxx" -#include +#include using namespace com::sun::star; @@ -58,7 +58,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const return s1; } -typedef ::std::hash_map ThreadMap; diff --git a/main/cppu/source/uno/lbenv.cxx b/main/cppu/source/uno/lbenv.cxx index 9f244faa647..44c92aa7d4f 100644 --- a/main/cppu/source/uno/lbenv.cxx +++ b/main/cppu/source/uno/lbenv.cxx @@ -46,7 +46,7 @@ #include "destr.hxx" #include "loadmodule.hxx" -#include +#include #include #include @@ -117,16 +117,16 @@ struct FctOUStringHash }; // mapping from environment name to environment -typedef ::std::hash_map< +typedef ::std::unordered_map< OUString, uno_Environment *, FctOUStringHash, ::std::equal_to< OUString > > OUString2EnvironmentMap; // mapping from ptr to object entry -typedef ::std::hash_map< +typedef ::std::unordered_map< void *, ObjectEntry *, FctPtrHash, ::std::equal_to< void * > > Ptr2ObjectMap; // mapping from oid to object entry -typedef ::std::hash_map< +typedef ::std::unordered_map< OUString, ObjectEntry *, FctOUStringHash, ::std::equal_to< OUString > > OId2ObjectMap; diff --git a/main/cppu/source/uno/lbmap.cxx b/main/cppu/source/uno/lbmap.cxx index 3cffd0bb24d..db16ad82e0d 100644 --- a/main/cppu/source/uno/lbmap.cxx +++ b/main/cppu/source/uno/lbmap.cxx @@ -26,7 +26,7 @@ #include "IdentityMapping.hxx" -#include +#include #include #include @@ -141,9 +141,9 @@ struct FctPtrHash { return (size_t)pKey; } }; -typedef hash_map< +typedef unordered_map< OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry; -typedef hash_map< +typedef unordered_map< uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry; typedef set< uno_getMappingFunc > t_CallbackSet; diff --git a/main/cppuhelper/source/component_context.cxx b/main/cppuhelper/source/component_context.cxx index 91d7dd8afee..163c778d77c 100644 --- a/main/cppuhelper/source/component_context.cxx +++ b/main/cppuhelper/source/component_context.cxx @@ -33,7 +33,7 @@ #endif #include -#include +#include #ifdef CONTEXT_DIAG #include #endif @@ -59,7 +59,7 @@ #include #include "com/sun/star/uno/RuntimeException.hpp" -#include +#include #include #define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager" @@ -352,7 +352,7 @@ class ComponentContext , lateInit( lateInit_ ) {} }; - typedef ::std::hash_map< OUString, ContextEntry * , OUStringHash > t_map; + typedef ::std::unordered_map< OUString, ContextEntry * , OUStringHash > t_map; t_map m_map; Reference< lang::XMultiComponentFactory > m_xSMgr; diff --git a/main/cppuhelper/source/interfacecontainer.cxx b/main/cppuhelper/source/interfacecontainer.cxx index 1f7aa4b9a08..46f0f807fdf 100644 --- a/main/cppuhelper/source/interfacecontainer.cxx +++ b/main/cppuhelper/source/interfacecontainer.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/main/crashrep/source/unx/main.cxx b/main/crashrep/source/unx/main.cxx index 3524b1350f5..4e9d80e6af4 100644 --- a/main/crashrep/source/unx/main.cxx +++ b/main/crashrep/source/unx/main.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include @@ -178,7 +178,7 @@ static size_t fcopy( FILE *fpout, FILE *fpin ) from which it can be reviewed and sent */ -bool write_report( const hash_map< string, string >& rSettings ) +bool write_report( const std::unordered_map< string, string >& rSettings ) { FILE *fp = fopen( tmpnam( g_szReportFile ), "w" ); const char *pszUserType = getenv( "STAROFFICE_USERTYPE" ); @@ -245,7 +245,7 @@ bool write_report( const hash_map< string, string >& rSettings ) } -bool write_description( const hash_map< string, string >& rSettings ) +bool write_description( const std::unordered_map< string, string >& rSettings ) { bool bSuccess = false; FILE *fp = fopen( tmpnam( g_szDescriptionFile ), "w" ); @@ -263,17 +263,17 @@ bool write_description( const hash_map< string, string >& rSettings ) #if 0 // unused -static void printSettings( const hash_map& rSettings ) +static void printSettings( const std::unordered_map& rSettings ) { printf( "Settings:\n" ); - for( hash_map::const_iterator it = rSettings.begin(); it != rSettings.end(); ++it ) + for( std::unordered_map::const_iterator it = rSettings.begin(); it != rSettings.end(); ++it ) { printf( "%s=\"%s\"\n", it->first.c_str(), it->second.c_str() ); } } #endif -bool save_crash_report( const string& rFileName, const hash_map< string, string >& /*rSettings*/ ) +bool save_crash_report( const string& rFileName, const std::unordered_map< string, string >& /*rSettings*/ ) { bool bSuccess = false; FILE *fpout = fopen( rFileName.c_str(), "w" ); @@ -489,7 +489,7 @@ struct RequestParams }; -bool send_crash_report( const hash_map< string, string >& rSettings ) +bool send_crash_report( const std::unordered_map< string, string >& rSettings ) { if ( 0 == strcasecmp( rSettings.find( "CONTACT" )->second.c_str(), "true" ) && !trim_string(rSettings.find( "EMAIL" )->second).length() ) @@ -553,7 +553,7 @@ static bool append_file( const char *filename, string& rString ) return true; } -string crash_get_details( const hash_map< string, string >& rSettings ) +string crash_get_details( const std::unordered_map< string, string >& rSettings ) { string aRet; @@ -907,7 +907,7 @@ static bool write_crash_data() #if 0 // unused -static bool write_settings( const hash_map< string, string >& rSettings ) +static bool write_settings( const std::unordered_map< string, string >& rSettings ) { bool success = false; string sRCFile = get_home_dir(); @@ -932,7 +932,7 @@ static bool write_settings( const hash_map< string, string >& rSettings ) } #endif -static void read_settings( hash_map< string, string >& rSettings ) +static void read_settings( std::unordered_map< string, string >& rSettings ) { string sRCFile = get_home_dir(); @@ -948,7 +948,7 @@ static void read_settings( hash_map< string, string >& rSettings ) rSettings[ "TITLE" ] = ""; } -static void read_settings_from_environment( hash_map< string, string >& rSettings ) +static void read_settings_from_environment( std::unordered_map< string, string >& rSettings ) { string strEnv; @@ -1067,7 +1067,7 @@ int main( int argc, char** argv ) if ( g_bSendReport ) { - hash_map< string, string > aDialogSettings; + std::unordered_map< string, string > aDialogSettings; read_settings( aDialogSettings ); read_settings_from_environment( aDialogSettings ); @@ -1076,7 +1076,7 @@ int main( int argc, char** argv ) } else { - hash_map< string, string > aDialogSettings; + std::unordered_map< string, string > aDialogSettings; read_settings( aDialogSettings ); read_settings_from_environment( aDialogSettings ); diff --git a/main/crashrep/source/win32/soreport.cpp b/main/crashrep/source/win32/soreport.cpp index 850f5111bb6..5002c4bbf11 100644 --- a/main/crashrep/source/win32/soreport.cpp +++ b/main/crashrep/source/win32/soreport.cpp @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include @@ -1695,7 +1695,7 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum, #endif //*************************************************************************** -static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries, DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers ) +static bool WriteStackFile( FILE *fout, std::unordered_map< string, string >& rLibraries, DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers ) { bool fSuccess = false; @@ -1841,7 +1841,7 @@ static bool WriteStackFile( FILE *fout, hash_map< string, string >& rLibraries, return fSuccess; } -bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibraries ) +bool WriteChecksumFile( FILE *fchksum, const std::unordered_map< string, string >& rLibraries ) { bool success = false; @@ -1849,7 +1849,7 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar { fprintf( fchksum, "\n" ); - hash_map< string, string >::const_iterator iter; + std::unordered_map< string, string >::const_iterator iter; for ( iter = rLibraries.begin(); iter != rLibraries.end(); @@ -2902,7 +2902,7 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int if( bGotDumpFile ) { - hash_map< string, string > aLibraries; + std::unordered_map< string, string > aLibraries; if ( g_bLoadReport ) { diff --git a/main/cui/source/customize/cfg.cxx b/main/cui/source/customize/cfg.cxx index c8434defc7b..18f5fbb1486 100644 --- a/main/cui/source/customize/cfg.cxx +++ b/main/cui/source/customize/cfg.cxx @@ -3971,7 +3971,7 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarInfo; @@ -4032,7 +4032,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() pEntry->SetStyle( GetSystemStyle( url ) ); - // insert into hash_map to filter duplicates from the parent + // insert into unordered_map to filter duplicates from the parent aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true )); OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR); @@ -5077,7 +5077,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { FreeResource(); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageInfo; diff --git a/main/cui/source/inc/macropg.hxx b/main/cui/source/inc/macropg.hxx index a5188088dd9..ba60548dd1c 100644 --- a/main/cui/source/inc/macropg.hxx +++ b/main/cui/source/inc/macropg.hxx @@ -36,10 +36,10 @@ #endif #include -#include +#include #include -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; +typedef ::std::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; struct EventDisplayName { diff --git a/main/cui/source/inc/scriptdlg.hxx b/main/cui/source/inc/scriptdlg.hxx index 31fa9c717db..8be55d154d1 100644 --- a/main/cui/source/inc/scriptdlg.hxx +++ b/main/cui/source/inc/scriptdlg.hxx @@ -39,7 +39,7 @@ #include #include -#include +#include #define OBJTYPE_BASICMANAGER 1L //#define OBJTYPE_LIB 2L @@ -62,7 +62,7 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , +typedef ::std::unordered_map < ::rtl::OUString, ::rtl::OUString , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; class SFEntry; diff --git a/main/dbaccess/source/core/api/KeySet.cxx b/main/dbaccess/source/core/api/KeySet.cxx index 0d4721a3303..929a5f54823 100644 --- a/main/dbaccess/source/core/api/KeySet.cxx +++ b/main/dbaccess/source/core/api/KeySet.cxx @@ -1338,7 +1338,7 @@ sal_Bool OKeySet::previous_checked( sal_Bool i_bFetchRow ) if ( i_bFetchRow ) refreshRow(); } - return m_aKeyIter != m_aKeyMap.begin(); + return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OKeySet::previous( ) diff --git a/main/dbaccess/source/core/dataaccess/datasource.cxx b/main/dbaccess/source/core/dataaccess/datasource.cxx index 67a21fbfa7f..5c16f7aed48 100644 --- a/main/dbaccess/source/core/dataaccess/datasource.cxx +++ b/main/dbaccess/source/core/dataaccess/datasource.cxx @@ -764,6 +764,15 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")); Reference< css::document::XDocumentSubStorageSupplier> xDocSup( m_pImpl->getDocumentSubStorageSupplier() ); aDriverInfo[nCount++].Value <<= xDocSup->getDocumentSubStorage(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database")),ElementModes::READWRITE); + + // lets the embedded driver ask before it converts a database from an older engine + Reference< XInteractionHandler > xHandler( m_pImpl->getMediaDescriptor().getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ) ); + if ( xHandler.is() ) + { + aDriverInfo.realloc( nCount + 1 ); + aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")); + aDriverInfo[nCount++].Value <<= xHandler; + } } if (nAdditionalArgs) xReturn = xManager->getConnectionWithInfo(m_pImpl->m_sConnectURL, ::comphelper::concatSequences(aUserPwd,aDriverInfo)); diff --git a/main/dbaccess/source/core/inc/column.hxx b/main/dbaccess/source/core/inc/column.hxx index 724ebfeeebf..2ae1561e9ef 100644 --- a/main/dbaccess/source/core/inc/column.hxx +++ b/main/dbaccess/source/core/inc/column.hxx @@ -57,7 +57,7 @@ #include #include -#include +#include namespace dbaccess { @@ -153,7 +153,7 @@ namespace dbaccess //= general columns map, could be used for readonly access //= no appending and dropping is supported //============================================================ - typedef ::std::hash_map OColumnMap; + typedef ::std::unordered_map OColumnMap; typedef ::std::vector OColumnArray; class OContainerMediator; diff --git a/main/dbaccess/source/core/recovery/subcomponents.hxx b/main/dbaccess/source/core/recovery/subcomponents.hxx index 3397a0b973a..070f4dafc49 100644 --- a/main/dbaccess/source/core/recovery/subcomponents.hxx +++ b/main/dbaccess/source/core/recovery/subcomponents.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include //........................................................................ @@ -75,7 +75,7 @@ namespace dbaccess }; // ------------------------------------------------------------------- - typedef ::std::hash_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc; + typedef ::std::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc; typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; diff --git a/main/dbaccess/source/ui/app/subcomponentmanager.cxx b/main/dbaccess/source/ui/app/subcomponentmanager.cxx index 69f9785cb01..11bf1f6d9e2 100644 --- a/main/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/main/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/main/dbaccess/source/ui/browser/genericcontroller.cxx b/main/dbaccess/source/ui/browser/genericcontroller.cxx index 1ec83b14063..66e8c5d6a30 100644 --- a/main/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/main/dbaccess/source/ui/browser/genericcontroller.cxx @@ -123,7 +123,7 @@ #endif #include #include -#include +#include #include #include @@ -149,7 +149,7 @@ using namespace ::comphelper; #define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) // ------------------------------------------------------------------------- -typedef ::std::hash_map< sal_Int16, sal_Int16 > CommandHashMap; +typedef ::std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; typedef ::std::list< DispatchInformation > DispatchInfoList; diff --git a/main/desktop/source/app/app.cxx b/main/desktop/source/app/app.cxx index a2c72f06648..8c5adee4e71 100644 --- a/main/desktop/source/app/app.cxx +++ b/main/desktop/source/app/app.cxx @@ -162,7 +162,7 @@ #include "com/sun/star/task/XInteractionApprove.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" #include "cppuhelper/compbase3.hxx" -#include +#include #include "com/sun/star/deployment/VersionException.hpp" #include diff --git a/main/desktop/source/app/dispatchwatcher.hxx b/main/desktop/source/app/dispatchwatcher.hxx index 2b06a031bb6..1a05440b699 100644 --- a/main/desktop/source/app/dispatchwatcher.hxx +++ b/main/desktop/source/app/dispatchwatcher.hxx @@ -29,7 +29,7 @@ #include #include "officeipcthread.hxx" -#include +#include #include namespace desktop @@ -51,7 +51,7 @@ struct OUStringHashCode } }; -class DispatchWatcherHashMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::std::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() diff --git a/main/desktop/source/deployment/manager/dp_activepackages.cxx b/main/desktop/source/deployment/manager/dp_activepackages.cxx index 478930da647..8d6b9d1b443 100644 --- a/main/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/main/desktop/source/deployment/manager/dp_activepackages.cxx @@ -36,7 +36,7 @@ #include "rtl/uri.h" #include "rtl/uri.hxx" #include "rtl/ustring.hxx" -#include +#include #include "dp_identifier.hxx" #include "dp_persmap.h" diff --git a/main/desktop/source/deployment/manager/dp_extensionmanager.cxx b/main/desktop/source/deployment/manager/dp_extensionmanager.cxx index 4cf89f6f02a..4e77b030870 100644 --- a/main/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/main/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -60,6 +60,7 @@ #include "boost/bind.hpp" #include +#include #include namespace deploy = com::sun::star::deployment; diff --git a/main/desktop/source/deployment/registry/component/dp_component.cxx b/main/desktop/source/deployment/registry/component/dp_component.cxx index 7611f495658..2f16309cbf5 100644 --- a/main/desktop/source/deployment/registry/component/dp_component.cxx +++ b/main/desktop/source/deployment/registry/component/dp_component.cxx @@ -50,7 +50,7 @@ #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/util/XMacroExpander.hpp" #include -#include +#include #include #include #include @@ -236,7 +236,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool m_unorc_modified; bool bSwitchedRdbFiles; - typedef ::std::hash_map< OUString, Reference, + typedef ::std::unordered_map< OUString, Reference, ::rtl::OUStringHash > t_string2object; t_string2object m_backendObjects; diff --git a/main/desktop/source/deployment/registry/dp_registry.cxx b/main/desktop/source/deployment/registry/dp_registry.cxx index 8b4ac81f07b..3de353f984d 100644 --- a/main/desktop/source/deployment/registry/dp_registry.cxx +++ b/main/desktop/source/deployment/registry/dp_registry.cxx @@ -45,9 +45,9 @@ #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/container/XContentEnumerationAccess.hpp" #include "com/sun/star/deployment/PackageRegistryBackend.hpp" -#include +#include #include -#include +#include #include using namespace ::dp_misc; @@ -86,10 +86,10 @@ class PackageRegistryImpl : private MutexHolder, public t_helper return str1.equalsIgnoreAsciiCase( str2 ); } }; - typedef ::std::hash_map< + typedef ::std::unordered_map< OUString, Reference, ci_string_hash, ci_string_equals > t_string2registry; - typedef ::std::hash_map< + typedef ::std::unordered_map< OUString, OUString, ci_string_hash, ci_string_equals > t_string2string; typedef ::std::set< @@ -195,7 +195,7 @@ void PackageRegistryImpl::insertBackend( Reference const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::std::hash_set t_stringset; + typedef ::std::unordered_set t_stringset; t_stringset ambiguousFilters; const Sequence< Reference > packageTypes( diff --git a/main/desktop/source/migration/migration_impl.hxx b/main/desktop/source/migration/migration_impl.hxx index 39c8aa98c70..d4bb888d66e 100644 --- a/main/desktop/source/migration/migration_impl.hxx +++ b/main/desktop/source/migration/migration_impl.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "migration.hxx" @@ -133,7 +133,7 @@ struct MigrationItem ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::std::vector< MigrationItem >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; diff --git a/main/embedserv/source/inc/embeddoc.hxx b/main/embedserv/source/inc/embeddoc.hxx index bd0a2fbcf65..442dc2f0797 100644 --- a/main/embedserv/source/inc/embeddoc.hxx +++ b/main/embedserv/source/inc/embeddoc.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ #include @@ -43,8 +43,8 @@ #include "embeddocaccess.hxx" #include "docholder.hxx" -typedef ::std::hash_map< DWORD, IAdviseSink* > AdviseSinkHashMap; -typedef ::std::hash_map< DWORD, IAdviseSink* >::iterator AdviseSinkHashMapIterator; +typedef ::std::unordered_map< DWORD, IAdviseSink* > AdviseSinkHashMap; +typedef ::std::unordered_map< DWORD, IAdviseSink* >::iterator AdviseSinkHashMapIterator; class GDIMetaFile; class CIIAObj; diff --git a/main/extensions/source/bibliography/framectr.cxx b/main/extensions/source/bibliography/framectr.cxx index 0bac4e0eefe..5aee6ce59dc 100644 --- a/main/extensions/source/bibliography/framectr.cxx +++ b/main/extensions/source/bibliography/framectr.cxx @@ -57,7 +57,7 @@ #include #include -#include +#include using namespace osl; using namespace cppu; @@ -106,7 +106,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::std::hash_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::std::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; SV_IMPL_PTRARR( BibStatusDispatchArr, BibStatusDispatchPtr ); diff --git a/main/extensions/source/ole/oleobjw.cxx b/main/extensions/source/ole/oleobjw.cxx index a0255b5fa68..fd9ab1c2de9 100644 --- a/main/extensions/source/ole/oleobjw.cxx +++ b/main/extensions/source/ole/oleobjw.cxx @@ -86,16 +86,16 @@ namespace ole_adapter // called. // Before UNO object is wrapped to COM object this map is checked // to see if the UNO object is already a wrapper. -hash_map AdapterToWrapperMap; +unordered_map AdapterToWrapperMap; // key: XInterface of the wrapper object. // value: XInterface of the Interface created by the Invocation Adapter Factory. // A COM wrapper is responsible for removing the corresponding entry // in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not // know about its adapted interface it uses WrapperToAdapterMap to get the // adapted interface which is then used to locate the entry in AdapterToWrapperMap. -hash_map WrapperToAdapterMap; +unordered_map WrapperToAdapterMap; -hash_map > ComPtrToWrapperMap; +unordered_map > ComPtrToWrapperMap; /***************************************************************************** class implementation IUnknownWrapper_Impl @@ -122,7 +122,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() #endif // remove entries in global maps - typedef hash_map::iterator _IT; + typedef unordered_map::iterator _IT; _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot); if( it != WrapperToAdapterMap.end()) { diff --git a/main/extensions/source/ole/oleobjw.hxx b/main/extensions/source/ole/oleobjw.hxx index ead37161e4d..9e4ef7efe0b 100644 --- a/main/extensions/source/ole/oleobjw.hxx +++ b/main/extensions/source/ole/oleobjw.hxx @@ -38,7 +38,7 @@ #endif #include #include -#include +#include #include #ifdef _MSC_VER @@ -71,9 +71,9 @@ namespace ole_adapter -typedef hash_map, hashOUString_Impl, equalOUString_Impl> DispIdMap; +typedef std::unordered_map, hashOUString_Impl, equalOUString_Impl> DispIdMap; -typedef hash_multimap TLBFuncIndexMap; +typedef std::unordered_multimap TLBFuncIndexMap; // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. diff --git a/main/extensions/source/ole/unoconversionutilities.hxx b/main/extensions/source/ole/unoconversionutilities.hxx index f2d7a0044cd..6aa4dda4bcc 100644 --- a/main/extensions/source/ole/unoconversionutilities.hxx +++ b/main/extensions/source/ole/unoconversionutilities.hxx @@ -36,7 +36,7 @@ #include "ole2uno.hxx" #include "unotypewrapper.hxx" -#include +#include // for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved. typedef unsigned char BYTE; @@ -67,17 +67,17 @@ using namespace com::sun::star::bridge::oleautomation; using namespace boost; namespace ole_adapter { -extern hash_map AdapterToWrapperMap; -extern hash_map WrapperToAdapterMap; -typedef hash_map::iterator IT_Wrap; -typedef hash_map::iterator CIT_Wrap; +extern std::unordered_map AdapterToWrapperMap; +extern std::unordered_map WrapperToAdapterMap; +typedef std::unordered_map::iterator IT_Wrap; +typedef std::unordered_map::iterator CIT_Wrap; //Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g. // IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when // it is being destroyed. // Used to ensure that an Automation object is always mapped to the same UNO objects. -extern hash_map > ComPtrToWrapperMap; -typedef hash_map >::iterator IT_Com; -typedef hash_map >::const_iterator CIT_Com; +extern std::unordered_map > ComPtrToWrapperMap; +typedef std::unordered_map >::iterator IT_Com; +typedef std::unordered_map >::const_iterator CIT_Com; // Maps XInterface pointers to a weak reference of its wrapper class (i.e. // InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when @@ -85,9 +85,9 @@ typedef hash_map >::const_iterator CIT_Com // is mapped to IDispatch which is kept alive in the COM environment. If the same // UNO interface is mapped again to COM then the IDispatch of the first mapped instance // must be returned. -extern hash_map > UnoObjToWrapperMap; -typedef hash_map >::iterator IT_Uno; -typedef hash_map >::const_iterator CIT_Uno; +extern std::unordered_map > UnoObjToWrapperMap; +typedef std::unordered_map >::iterator IT_Uno; +typedef std::unordered_map >::const_iterator CIT_Uno; #ifdef __MINGW32__ inline void reduceRange( Any& any); #endif @@ -1407,7 +1407,7 @@ void UnoConversionUtilities::createUnoObjectWrapper(const Any & rObj, VARIANT else { Reference xIntComWrapper = xInt; - typedef hash_map::iterator _IT; + typedef std::unordered_map::iterator _IT; // Adapter? then get the COM wrapper to which the adapter delegates its calls _IT it= AdapterToWrapperMap.find( (sal_uInt32) xInt.get()); if( it != AdapterToWrapperMap.end() ) @@ -1897,7 +1897,7 @@ Reference UnoConversionUtilities::createAdapter(const Sequence::value_type VALUE; + typedef std::unordered_map::value_type VALUE; AdapterToWrapperMap.insert( VALUE( (sal_uInt32) xIntAdapted.get(), (sal_uInt32) receiver.get())); WrapperToAdapterMap.insert( VALUE( (sal_uInt32) receiver.get(), (sal_uInt32) xIntAdapted.get())); } diff --git a/main/extensions/source/ole/unoobjw.cxx b/main/extensions/source/ole/unoobjw.cxx index 62e6a9077da..0f775ff7b56 100644 --- a/main/extensions/source/ole/unoobjw.cxx +++ b/main/extensions/source/ole/unoobjw.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "comifaces.hxx" #include @@ -82,7 +82,7 @@ extern "C" const GUID IID_IDispatchEx; namespace ole_adapter { -hash_map > UnoObjToWrapperMap; +std::unordered_map > UnoObjToWrapperMap; static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource); static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource); static HRESULT mapCannotConvertException( CannotConvertException e, unsigned int * puArgErr); diff --git a/main/extensions/source/ole/unoobjw.hxx b/main/extensions/source/ole/unoobjw.hxx index b35580af824..f13271ed860 100644 --- a/main/extensions/source/ole/unoobjw.hxx +++ b/main/extensions/source/ole/unoobjw.hxx @@ -84,7 +84,7 @@ struct MemberInfo OUString name; }; -typedef hash_map +typedef unordered_map < OUString, DISPID, @@ -92,7 +92,7 @@ typedef hash_map equalOUString_Impl > NameToIdMap; -typedef hash_map +typedef unordered_map < OUString, sal_Bool, @@ -100,7 +100,7 @@ typedef hash_map equalOUString_Impl > BadNameMap; -typedef hash_map +typedef unordered_map < DISPID, MemberInfo diff --git a/main/extensions/source/propctrlr/browserlistbox.hxx b/main/extensions/source/propctrlr/browserlistbox.hxx index 3d652de352b..1ae8f72cc6c 100644 --- a/main/extensions/source/propctrlr/browserlistbox.hxx +++ b/main/extensions/source/propctrlr/browserlistbox.hxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include //............................................................................ @@ -75,7 +75,7 @@ namespace pcr { } }; - typedef ::std::hash_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; + typedef ::std::unordered_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; typedef ::std::vector< ListBoxLines::iterator > OrderedListBoxLines; //======================================================================== diff --git a/main/extensions/source/propctrlr/eventhandler.cxx b/main/extensions/source/propctrlr/eventhandler.cxx index fde873f2b4e..7ee795efd35 100644 --- a/main/extensions/source/propctrlr/eventhandler.cxx +++ b/main/extensions/source/propctrlr/eventhandler.cxx @@ -351,7 +351,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::std::hash_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::std::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; diff --git a/main/extensions/source/propctrlr/eventhandler.hxx b/main/extensions/source/propctrlr/eventhandler.hxx index b592831ffcb..2e5c606da27 100644 --- a/main/extensions/source/propctrlr/eventhandler.hxx +++ b/main/extensions/source/propctrlr/eventhandler.hxx @@ -72,7 +72,7 @@ namespace pcr const rtl::OString& _sUniqueBrowseId ); }; - typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::std::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; //==================================================================== //= EventHandler diff --git a/main/extensions/source/propctrlr/pcrcommontypes.hxx b/main/extensions/source/propctrlr/pcrcommontypes.hxx index 2a29d9fb891..fd36490cf94 100644 --- a/main/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/main/extensions/source/propctrlr/pcrcommontypes.hxx @@ -29,14 +29,14 @@ /** === end UNO includes === **/ #include -#include +#include //........................................................................ namespace pcr { //........................................................................ - typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::std::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > PropertyMap; //........................................................................ diff --git a/main/extensions/source/propctrlr/propcontroller.hxx b/main/extensions/source/propctrlr/propcontroller.hxx index f455bf2245f..bea96831cfd 100644 --- a/main/extensions/source/propctrlr/propcontroller.hxx +++ b/main/extensions/source/propctrlr/propcontroller.hxx @@ -66,7 +66,7 @@ #include #include -#include +#include #include #include @@ -135,9 +135,9 @@ namespace pcr typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::std::hash_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::std::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerRepository; - typedef ::std::hash_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::std::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -155,7 +155,7 @@ namespace pcr /// the property we're just committing ::rtl::OUString m_sCommittingProperty; - typedef ::std::hash_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::std::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; diff --git a/main/external_deps.lst b/main/external_deps.lst index 2f754194b56..b9ec18f3a8c 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -81,9 +81,9 @@ if (SYSTEM_LIBTEXTCAT != YES) URL3 = https://software.wise-guys.nl/download/libtextcat-2.2.tar.gz if (SOLAR_JAVA == TRUE) - MD5 = 17410483b5b5f267aa18b7e00b65e6e0 - name = hsqldb_1_8_0.zip - URL1 = https://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_1_8_0/hsqldb_1_8_0_10.zip + MD5 = 8140e899c4cdf04e31a06743230f8523 + name = hsqldb-2.5.0.zip + URL1 = https://downloads.sourceforge.net/project/hsqldb/hsqldb/hsqldb_2_5/hsqldb-2.5.0.zip URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) diff --git a/main/filter/inc/filter/msfilter/msocximex.hxx b/main/filter/inc/filter/msfilter/msocximex.hxx index 7f14d551b67..eabc578803a 100644 --- a/main/filter/inc/filter/msfilter/msocximex.hxx +++ b/main/filter/inc/filter/msfilter/msocximex.hxx @@ -32,7 +32,7 @@ //#endif #include "filter/msfilter/msfilterdllapi.h" #include -#include +#include namespace com{namespace sun{namespace star{ namespace drawing{ @@ -513,7 +513,7 @@ class RBGroup std::vector mpControls; }; -typedef ::std::hash_map < ::rtl::OUString, RBGroup*, ::rtl::OUStringHash, +typedef ::std::unordered_map < ::rtl::OUString, RBGroup*, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > RBGroupHash; typedef std::vector::iterator GroupIterator; diff --git a/main/filter/source/config/cache/cacheitem.hxx b/main/filter/source/config/cache/cacheitem.hxx index df7f7810c9d..ce505d64e4b 100644 --- a/main/filter/source/config/cache/cacheitem.hxx +++ b/main/filter/source/config/cache/cacheitem.hxx @@ -27,7 +27,7 @@ //_______________________________________________ // includes -#include +#include #include #include #include @@ -185,7 +185,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::std::hash_map< ::rtl::OUString , +typedef ::std::unordered_map< ::rtl::OUString , CacheItem , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > CacheItemList; @@ -204,7 +204,7 @@ typedef ::std::hash_map< ::rtl::OUString , there we need key-value pairs too, which can't be provided by a pur vector! */ -typedef ::std::hash_map< ::rtl::OUString , +typedef ::std::unordered_map< ::rtl::OUString , OUStringList , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > CacheItemRegistration; diff --git a/main/filter/source/config/cache/filtercache.cxx b/main/filter/source/config/cache/filtercache.cxx index e79df9319df..3aadbec7858 100644 --- a/main/filter/source/config/cache/filtercache.cxx +++ b/main/filter/source/config/cache/filtercache.cxx @@ -1395,7 +1395,7 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList const ::rtl::OUString& sType) { CacheItem& rItem = (*pList)[sItem]; - // In case it's a new created entry (automatically done by the hash_map index operator!) + // In case it's a new created entry (automatically done by the unordered_map index operator!) // we must be sure, that this entry has its own name as property available. // It's needed later at our container interface! rItem[PROPNAME_NAME] <<= sItem; diff --git a/main/filter/source/config/cache/querytokenizer.hxx b/main/filter/source/config/cache/querytokenizer.hxx index c642527a830..4fc3d5e533a 100644 --- a/main/filter/source/config/cache/querytokenizer.hxx +++ b/main/filter/source/config/cache/querytokenizer.hxx @@ -27,7 +27,7 @@ //_______________________________________________ // includes -#include +#include #include //_______________________________________________ @@ -56,7 +56,7 @@ namespace filter{ @attention This class is not threadsafe implemented. Because it's not necessary. But you have to make sure, that it's not used as such :-) */ -class QueryTokenizer : public ::std::hash_map< ::rtl::OUString , +class QueryTokenizer : public ::std::unordered_map< ::rtl::OUString , ::rtl::OUString , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > diff --git a/main/filter/source/msfilter/svxmsbas.cxx b/main/filter/source/msfilter/svxmsbas.cxx index ae850886e5e..aaa2cc698c9 100644 --- a/main/filter/source/msfilter/svxmsbas.cxx +++ b/main/filter/source/msfilter/svxmsbas.cxx @@ -282,9 +282,9 @@ sal_Bool SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, catch( Exception& ) { } } } - typedef std::hash_map< rtl::OUString, uno::Any, ::rtl::OUStringHash, + typedef std::unordered_map< rtl::OUString, uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameModuleDataHash; - typedef std::hash_map< rtl::OUString, script::ModuleInfo, ::rtl::OUStringHash, + typedef std::unordered_map< rtl::OUString, script::ModuleInfo, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameModuleInfoHash; NameModuleDataHash moduleData; diff --git a/main/filter/source/svg/svgfilter.hxx b/main/filter/source/svg/svgfilter.hxx index c2945266663..31f0dc75f66 100644 --- a/main/filter/source/svg/svgfilter.hxx +++ b/main/filter/source/svg/svgfilter.hxx @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include #include @@ -225,7 +225,7 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter, XServiceInfo > #endif { - typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; + typedef ::std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap; typedef ::std::vector< ::rtl::OUString > UniqueIdVector; private: diff --git a/main/forms/source/component/DatabaseForm.cxx b/main/forms/source/component/DatabaseForm.cxx index 04cdaf24a31..1db0565754c 100644 --- a/main/forms/source/component/DatabaseForm.cxx +++ b/main/forms/source/component/DatabaseForm.cxx @@ -88,7 +88,7 @@ #include #include -#include +#include // compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ... namespace com { diff --git a/main/forms/source/component/Filter.hxx b/main/forms/source/component/Filter.hxx index 5265db3cd6a..0759c7e384a 100644 --- a/main/forms/source/component/Filter.hxx +++ b/main/forms/source/component/Filter.hxx @@ -41,7 +41,7 @@ #include #include -#include +#include //......................................................................... namespace frm @@ -70,7 +70,7 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; - typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String; + typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; ::rtl::OUString m_aText; diff --git a/main/forms/source/inc/InterfaceContainer.hxx b/main/forms/source/inc/InterfaceContainer.hxx index 08511c1a919..6ed6586edc6 100644 --- a/main/forms/source/inc/InterfaceContainer.hxx +++ b/main/forms/source/inc/InterfaceContainer.hxx @@ -24,7 +24,7 @@ #ifndef _FRM_INTERFACE_CONTAINER_HXX_ #define _FRM_INTERFACE_CONTAINER_HXX_ -#include +#include #include #include #include @@ -79,7 +79,7 @@ namespace frm }; typedef ::std::vector OInterfaceArray; -typedef ::std::hash_multimap< ::rtl::OUString, InterfaceRef, ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap; +typedef ::std::unordered_multimap< ::rtl::OUString, InterfaceRef, ::comphelper::UStringHash, ::comphelper::UStringEqual> OInterfaceMap; //================================================================== // OInterfaceContainer diff --git a/main/formula/inc/formula/FormulaCompiler.hxx b/main/formula/inc/formula/FormulaCompiler.hxx index fde9001698e..64673788bc0 100644 --- a/main/formula/inc/formula/FormulaCompiler.hxx +++ b/main/formula/inc/formula/FormulaCompiler.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include @@ -72,8 +72,8 @@ struct FORMULA_DLLPUBLIC StringHashCode } }; -typedef ::std::hash_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap; -typedef ::std::hash_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap; +typedef ::std::unordered_map< String, OpCode, StringHashCode, ::std::equal_to< String > > OpCodeHashMap; +typedef ::std::unordered_map< String, String, StringHashCode, ::std::equal_to< String > > ExternalHashMap; class FORMULA_DLLPUBLIC FormulaCompiler { diff --git a/main/fpicker/source/win32/filepicker/propmap.hxx b/main/fpicker/source/win32/filepicker/propmap.hxx index 03ee9852d00..0833298cd5c 100644 --- a/main/fpicker/source/win32/filepicker/propmap.hxx +++ b/main/fpicker/source/win32/filepicker/propmap.hxx @@ -24,11 +24,11 @@ #ifndef _PROPMAP_HXX_ #define _PROPMAP_HXX_ -#include +#include #include #include -typedef ::std::hash_map< ::rtl::OUString , +typedef ::std::unordered_map< ::rtl::OUString , void* , ::rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > TPropMapBase; diff --git a/main/framework/inc/classes/filtercachedata.hxx b/main/framework/inc/classes/filtercachedata.hxx index dc22b5a6941..2e6bdbd75ce 100644 --- a/main/framework/inc/classes/filtercachedata.hxx +++ b/main/framework/inc/classes/filtercachedata.hxx @@ -27,7 +27,7 @@ /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble with solaris headers ... */ -#include +#include #include #include @@ -459,7 +459,7 @@ struct ContentHandler // and could be used in a generic way //***************************************************************************************************************** template< class HashType > -class SetNodeHash : public ::std::hash_map< ::rtl::OUString , +class SetNodeHash : public ::std::unordered_map< ::rtl::OUString , HashType , rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > @@ -500,7 +500,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. //***************************************************************************************************************** -class PerformanceHash : public ::std::hash_map< ::rtl::OUString , +class PerformanceHash : public ::std::unordered_map< ::rtl::OUString , OUStringList , rtl::OUStringHash , ::std::equal_to< ::rtl::OUString > > diff --git a/main/framework/inc/framework/titlehelper.hxx b/main/framework/inc/framework/titlehelper.hxx index fa2caf09fe2..6f2c31697c8 100644 --- a/main/framework/inc/framework/titlehelper.hxx +++ b/main/framework/inc/framework/titlehelper.hxx @@ -44,7 +44,7 @@ #include -#include +#include #include //_______________________________________________ diff --git a/main/framework/inc/services/substitutepathvars.hxx b/main/framework/inc/services/substitutepathvars.hxx index 64a2393ce46..e94e9a705ea 100644 --- a/main/framework/inc/services/substitutepathvars.hxx +++ b/main/framework/inc/services/substitutepathvars.hxx @@ -29,7 +29,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -106,7 +106,7 @@ struct SubstitutePathNotify const com::sun::star::uno::Sequence aPropertyNames; }; -class SubstituteVariables : public ::std::hash_map< ::rtl::OUString, +class SubstituteVariables : public ::std::unordered_map< ::rtl::OUString, SubstituteRule, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > @@ -268,7 +268,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init ::rtl::OUString impl_getSubstituteVariableValue( const ::rtl::OUString& variable ); private: - class VarNameToIndexMap : public std::hash_map< ::rtl::OUString, + class VarNameToIndexMap : public std::unordered_map< ::rtl::OUString, PreDefVariable, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > diff --git a/main/framework/inc/stdtypes.h b/main/framework/inc/stdtypes.h index a02e637bd5c..8d2c93e8235 100644 --- a/main/framework/inc/stdtypes.h +++ b/main/framework/inc/stdtypes.h @@ -147,7 +147,7 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue; //_________________________________________________________________________________________________________________ /** - Basic hash based on a std::hash_map() which provides key=[OUString] and value=[template type] pairs + Basic hash based on a std::unordered_map() which provides key=[OUString] and value=[template type] pairs It implements some additional functionality which can be useful but is missing at the normal hash implementation. */ diff --git a/main/framework/inc/uiconfiguration/globalsettings.hxx b/main/framework/inc/uiconfiguration/globalsettings.hxx index e6259fdffa8..f2f1358d878 100644 --- a/main/framework/inc/uiconfiguration/globalsettings.hxx +++ b/main/framework/inc/uiconfiguration/globalsettings.hxx @@ -29,7 +29,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes diff --git a/main/framework/inc/uiconfiguration/imagemanager.hxx b/main/framework/inc/uiconfiguration/imagemanager.hxx index 7539c3253f3..a8829b7ede7 100644 --- a/main/framework/inc/uiconfiguration/imagemanager.hxx +++ b/main/framework/inc/uiconfiguration/imagemanager.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include #include //_________________________________________________________________________________________________________________ diff --git a/main/framework/inc/uiconfiguration/imagetype.hxx b/main/framework/inc/uiconfiguration/imagetype.hxx index c0d5e175e88..cd246b8f521 100644 --- a/main/framework/inc/uiconfiguration/imagetype.hxx +++ b/main/framework/inc/uiconfiguration/imagetype.hxx @@ -24,7 +24,7 @@ #ifndef __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_ #define __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_ -#include +#include #include namespace framework @@ -39,11 +39,11 @@ enum ImageType ImageType_COUNT }; -typedef std::hash_map< rtl::OUString, +typedef std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap; -typedef std::hash_map< rtl::OUString, +typedef std::unordered_map< rtl::OUString, bool, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CommandMap; diff --git a/main/framework/inc/uiconfiguration/moduleimagemanager.hxx b/main/framework/inc/uiconfiguration/moduleimagemanager.hxx index 828718df76b..e946bb89dd5 100644 --- a/main/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/main/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include #include //_________________________________________________________________________________________________________________ diff --git a/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index dd6a14ac20f..58714c7f9ab 100644 --- a/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/main/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -89,7 +89,7 @@ namespace framework virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier ); private: - typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr; + typedef ::std::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); diff --git a/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index eac564d709b..b26a6bf196c 100644 --- a/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/main/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -164,7 +164,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -184,7 +184,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/main/framework/inc/uiconfiguration/uicategorydescription.hxx b/main/framework/inc/uiconfiguration/uicategorydescription.hxx index dd19b9392b9..a1064f94962 100644 --- a/main/framework/inc/uiconfiguration/uicategorydescription.hxx +++ b/main/framework/inc/uiconfiguration/uicategorydescription.hxx @@ -29,7 +29,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes diff --git a/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index e21519ac044..c75b1b33a4c 100644 --- a/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/main/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -152,7 +152,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -172,7 +172,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx index 9e0ba486509..505d6975965 100644 --- a/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/main/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -29,7 +29,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -99,12 +99,12 @@ class WindowStateConfiguration : private ThreadHelpBase , // Struct for ri virtual ::com::sun::star::uno::Type SAL_CALL getElementType(); virtual sal_Bool SAL_CALL hasElements(); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap; diff --git a/main/framework/inc/uielement/menubarwrapper.hxx b/main/framework/inc/uielement/menubarwrapper.hxx index 7e419863b58..60667566c7d 100644 --- a/main/framework/inc/uielement/menubarwrapper.hxx +++ b/main/framework/inc/uielement/menubarwrapper.hxx @@ -46,7 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#include +#include namespace framework { diff --git a/main/framework/inc/uielement/newmenucontroller.hxx b/main/framework/inc/uielement/newmenucontroller.hxx index edd241e8a93..233502628d9 100644 --- a/main/framework/inc/uielement/newmenucontroller.hxx +++ b/main/framework/inc/uielement/newmenucontroller.hxx @@ -57,7 +57,7 @@ #ifndef _VCL_MENU_HXX_ #include #endif -#include +#include namespace framework { @@ -102,7 +102,7 @@ namespace framework rtl::OUString aImageId; }; - typedef ::std::hash_map< int, AddInfo > AddInfoForId; + typedef ::std::unordered_map< int, AddInfo > AddInfoForId; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, diff --git a/main/framework/inc/uielement/uicommanddescription.hxx b/main/framework/inc/uielement/uicommanddescription.hxx index bf1a92de939..2007b2e2196 100644 --- a/main/framework/inc/uielement/uicommanddescription.hxx +++ b/main/framework/inc/uielement/uicommanddescription.hxx @@ -29,7 +29,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -80,12 +80,12 @@ private: virtual sal_Bool SAL_CALL hasElements(); public: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > UICommandsHashMap; diff --git a/main/framework/inc/xml/eventsdocumenthandler.hxx b/main/framework/inc/xml/eventsdocumenthandler.hxx index ebd5adf35cf..27cb9eedfc4 100644 --- a/main/framework/inc/xml/eventsdocumenthandler.hxx +++ b/main/framework/inc/xml/eventsdocumenthandler.hxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include @@ -110,7 +110,7 @@ class FWE_DLLPUBLIC OReadEventsDocumentHandler : private ThreadHelpBase, // Stru private: ::rtl::OUString getErrorLineString(); - class EventsHashMap : public ::std::hash_map< ::rtl::OUString , + class EventsHashMap : public ::std::unordered_map< ::rtl::OUString , Events_XML_Entry , rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > diff --git a/main/framework/inc/xml/imagesdocumenthandler.hxx b/main/framework/inc/xml/imagesdocumenthandler.hxx index 5d600af5015..7352b72ca44 100644 --- a/main/framework/inc/xml/imagesdocumenthandler.hxx +++ b/main/framework/inc/xml/imagesdocumenthandler.hxx @@ -40,7 +40,7 @@ #include #include -#include +#include #include @@ -109,7 +109,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right i private: ::rtl::OUString getErrorLineString(); - class ImageHashMap : public ::std::hash_map< ::rtl::OUString , + class ImageHashMap : public ::std::unordered_map< ::rtl::OUString , Image_XML_Entry , rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > diff --git a/main/framework/inc/xml/statusbardocumenthandler.hxx b/main/framework/inc/xml/statusbardocumenthandler.hxx index f0df8bda53d..13feb554ab3 100644 --- a/main/framework/inc/xml/statusbardocumenthandler.hxx +++ b/main/framework/inc/xml/statusbardocumenthandler.hxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include @@ -109,7 +109,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S private: ::rtl::OUString getErrorLineString(); - class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString , + class StatusBarHashMap : public ::std::unordered_map< ::rtl::OUString , StatusBar_XML_Entry , rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > diff --git a/main/framework/source/fwe/classes/addonsoptions.cxx b/main/framework/source/fwe/classes/addonsoptions.cxx index cf81d0e452f..96cbd3f5301 100644 --- a/main/framework/source/fwe/classes/addonsoptions.cxx +++ b/main/framework/source/fwe/classes/addonsoptions.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -330,10 +330,10 @@ class AddonsOptions_Impl : public ConfigItem Image aImageBigHCNoScale; }; - typedef std::hash_map< ::rtl::OUString, ImageEntry, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageManager; - typedef std::hash_map< ::rtl::OUString, sal_uInt32, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringToIndexMap; + typedef std::unordered_map< ::rtl::OUString, ImageEntry, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageManager; + typedef std::unordered_map< ::rtl::OUString, sal_uInt32, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringToIndexMap; typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; - typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions; + typedef ::std::unordered_map< ::rtl::OUString, MergeToolbarInstructionContainer, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions; enum ImageSize { diff --git a/main/framework/source/services/desktop.cxx b/main/framework/source/services/desktop.cxx index 84d86c779c8..f47d4864356 100644 --- a/main/framework/source/services/desktop.cxx +++ b/main/framework/source/services/desktop.cxx @@ -746,7 +746,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 )) aCommand = aURL.Path; - // Make hash_map lookup if the current URL is in the disabled list + // Make unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/main/framework/source/services/frame.cxx b/main/framework/source/services/frame.cxx index 6be0ec6e4bb..7e5d22de178 100644 --- a/main/framework/source/services/frame.cxx +++ b/main/framework/source/services/frame.cxx @@ -2085,7 +2085,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 )) aCommand = aURL.Path; - // Make hash_map lookup if the current URL is in the disabled list + // Make unordered_map lookup if the current URL is in the disabled list if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) ) return css::uno::Reference< css::frame::XDispatch >(); else diff --git a/main/framework/source/uiconfiguration/imagemanagerimpl.hxx b/main/framework/source/uiconfiguration/imagemanagerimpl.hxx index 90768475b08..f4e8056c7f7 100644 --- a/main/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/main/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -157,7 +157,7 @@ namespace framework void clear(); - typedef std::hash_map< rtl::OUString, + typedef std::unordered_map< rtl::OUString, sal_Bool, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageNameMap; diff --git a/main/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/main/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index ff9e8e3fdeb..f6d2474894c 100644 --- a/main/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/main/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -211,7 +211,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons , m_aListenerContainer( m_aLock.getShareableOslMutex() ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" ); - // Retrieve known modules and insert them into our hash_map to speed-up access time. + // Retrieve known modules and insert them into our unordered_map to speed-up access time. Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY ); const Sequence< ::rtl::OUString > aNameSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pNameSeq = aNameSeq.getConstArray(); diff --git a/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index d45c3c27185..658b3ed91e9 100644 --- a/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -284,7 +284,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, aUIElementData.bDefaultNode = false; } - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -405,7 +405,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType ); impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // first try to look into our user-defined vector/hash_map combination + // first try to look into our user-defined vector/unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) @@ -419,7 +419,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl } } - // Not successful, we have to look into our default vector/hash_map combination + // Not successful, we have to look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) @@ -1443,7 +1443,7 @@ Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSetti // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // Look into our default vector/hash_map combination + // Look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/main/framework/source/uiconfiguration/uicategorydescription.cxx b/main/framework/source/uiconfiguration/uicategorydescription.cxx index 1ce3663a813..2cf8973101a 100644 --- a/main/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/main/framework/source/uiconfiguration/uicategorydescription.cxx @@ -129,7 +129,7 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ sal_Bool fillCache(); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > IdToInfoCache; diff --git a/main/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/main/framework/source/uiconfiguration/uiconfigurationmanager.cxx index a860b2d6745..8e3785c3ba6 100644 --- a/main/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/main/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -222,7 +222,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy aUIElementData.bModified = false; aUIElementData.bDefault = false; - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -341,7 +341,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen // preload list of element types on demand impl_preloadUIElementTypeList( nElementType ); - // try to look into our document vector/hash_map combination + // try to look into our document vector/unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) diff --git a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 04d375d6b14..7be7d49bc77 100644 --- a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -254,7 +254,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa aUIElementData.bDefaultNode = false; } - // Create hash_map entries for all user interface elements inside the storage. We don't load the + // Create unordered_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); } @@ -375,7 +375,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin if ( m_bUseDefault ) impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // first try to look into our user-defined vector/hash_map combination + // first try to look into our user-defined vector/unordered_map combination UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL ); if ( pIter != rUserHashMap.end() ) @@ -391,7 +391,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin if ( m_bUseDefault ) { - // Not successful, we have to look into our default vector/hash_map combination + // Not successful, we have to look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) @@ -1529,7 +1529,7 @@ Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType ); - // Look into our default vector/hash_map combination + // Look into our default vector/unordered_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index 27af5e717cb..80753cdb598 100644 --- a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx @@ -30,7 +30,7 @@ */ #include #include -#include +#include //_________________________________________________________________________________________________________________ // my own includes @@ -154,7 +154,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; struct UIElementType { @@ -174,7 +174,7 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::std::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); diff --git a/main/framework/source/uiconfiguration/windowstateconfiguration.cxx b/main/framework/source/uiconfiguration/windowstateconfiguration.cxx index b24b38fc5e8..8dfed23ac0b 100644 --- a/main/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/main/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -242,7 +242,7 @@ class ConfigurationAccess_WindowState : // interfaces sal_Bool impl_initializeConfigAccess(); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, WindowStateInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache; diff --git a/main/framework/source/uielement/newmenucontroller.cxx b/main/framework/source/uielement/newmenucontroller.cxx index a273ec3e44f..3c6aa2da28b 100644 --- a/main/framework/source/uielement/newmenucontroller.cxx +++ b/main/framework/source/uielement/newmenucontroller.cxx @@ -366,7 +366,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup AddInfo aAddInfo; // retrieve additional parameters from bookmark menu and - // store it in a hash_map. + // store it in a unordered_map. for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ ) { sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast( i ) ); diff --git a/main/framework/source/uielement/toolbarsmenucontroller.cxx b/main/framework/source/uielement/toolbarsmenucontroller.cxx index 12b6dbbb49d..44a21c84315 100644 --- a/main/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/main/framework/source/uielement/toolbarsmenucontroller.cxx @@ -108,7 +108,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; namespace framework { -typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap; +typedef std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap; struct ToolBarEntry { diff --git a/main/framework/source/uielement/uicommanddescription.cxx b/main/framework/source/uielement/uicommanddescription.cxx index aedfeab539b..094edc32cb3 100644 --- a/main/framework/source/uielement/uicommanddescription.cxx +++ b/main/framework/source/uielement/uicommanddescription.cxx @@ -164,7 +164,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa std::vector< ::rtl::OUString >& aImageMirrorVector); private: - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, CmdToInfoMap, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CommandToInfoCache; diff --git a/main/framework/test/typecfg/cfgview.cxx b/main/framework/test/typecfg/cfgview.cxx index e87b1c7a6e8..2eb42d7b442 100644 --- a/main/framework/test/typecfg/cfgview.cxx +++ b/main/framework/test/typecfg/cfgview.cxx @@ -51,7 +51,7 @@ #include #ifndef __SGI_STL_HASH_MAP -#include +#include #endif #include diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk index 0583bb51c70..351708e0e95 100644 --- a/main/hsqldb/makefile.mk +++ b/main/hsqldb/makefile.mk @@ -40,16 +40,15 @@ ANT_BUILDFILE=build$/build.xml .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- -TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) -TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0 +TARFILE_NAME=hsqldb-$(HSQLDB_VERSION) +TARFILE_MD5=8140e899c4cdf04e31a06743230f8523 -TARFILE_ROOTDIR=hsqldb +TARFILE_ROOTDIR=hsqldb-$(HSQLDB_VERSION)$/hsqldb CONVERTFILES=build$/build.xml \ - src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ - src$/org$/hsqldb$/Library.java + src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java -PATCH_FILES=patches$/i121754.patch patches$/script.patch patches$/runfinalizers.patch patches$/text_tables.patch +PATCH_FILES=patches$/aoo_integration.patch patches$/jar_duplicates.patch # hsqldb's build.xml javac tasks specify no source/target; pin them so bytecode # stays Java 8 compatible regardless of the (possibly much newer) build JDK. @@ -58,12 +57,12 @@ JAVAC_SRCTGT=-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) hsqldb .ELSE .IF "$(debug)"!="" -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) hsqldb .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" $(JAVAC_SRCTGT) -f $(ANT_BUILDFILE) hsqldb .ENDIF .ENDIF diff --git a/main/hsqldb/patches/aoo_integration.patch b/main/hsqldb/patches/aoo_integration.patch new file mode 100644 index 00000000000..cbd2d43bc4a --- /dev/null +++ b/main/hsqldb/patches/aoo_integration.patch @@ -0,0 +1,296 @@ +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/Logger.java ++++ misc/build/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/Logger.java +@@ -34,6 +34,7 @@ + import java.io.File; + import java.io.FileInputStream; + import java.io.IOException; ++import java.lang.reflect.Constructor; + import java.text.SimpleDateFormat; + import java.util.Locale; + import java.util.concurrent.atomic.AtomicInteger; +@@ -137,6 +138,7 @@ + private Crypto crypto; + boolean cryptLobs; + public FileAccess fileAccess; ++ private boolean isStoredFileAccess; + String tempDirectoryPath; + + // +@@ -198,7 +200,12 @@ + boolean hasFileProps = false; + boolean hasScript = false; + +- fileAccess = FileUtil.getFileAccess(database.isFilesInJar()); ++ fileAccess = newStoredFileAccess(); ++ ++ if (fileAccess == null) { ++ fileAccess = FileUtil.getFileAccess(database.isFilesInJar()); ++ } ++ + propIsFileDatabase = database.getType().isFileBased(); + database.databaseProperties = new HsqlDatabaseProperties(database); + propTextAllowFullPath = database.databaseProperties.isPropertyTrue( +@@ -283,6 +290,12 @@ + database.databaseProperties.setProperty( + HsqlDatabaseProperties.hsqldb_lock_file, false); + } ++ } ++ ++ // the shadow file used for incremental backup is not reachable through FileAccess ++ if (isStoredFileAccess) { ++ database.databaseProperties.setProperty( ++ HsqlDatabaseProperties.hsqldb_inc_backup, false); + } + + setVariables(); +@@ -391,6 +404,10 @@ + if (database.getType() == DatabaseType.DB_MEM) { + tempDirectoryPath = database.getProperties().getStringProperty( + HsqlDatabaseProperties.hsqldb_temp_directory); ++ } else if (isStoredFileAccess) { ++ ++ // no temporary directory next to the document ++ tempDirectoryPath = null; + } else { + tempDirectoryPath = database.getPath() + ".tmp"; + } +@@ -1102,7 +1119,7 @@ + + public synchronized void setIncrementBackup(boolean val) { + +- if (val == propIncrementBackup) { ++ if (val == propIncrementBackup || isStoredFileAccess) { + return; + } + +@@ -1313,8 +1330,67 @@ + + public FileAccess getFileAccess() { + return fileAccess; ++ } ++ ++ /** ++ * True if the database files are kept in a storage supplied by the host ++ * application instead of the file system. ++ */ ++ public boolean isStoredFileAccess() { ++ return isStoredFileAccess; ++ } ++ ++ // oj@openoffice.org - the database files are accessed through a class ++ // named in the connection properties, with a key identifying the storage ++ static final String url_fileaccess_class_name = "fileaccess_class_name"; ++ static final String url_storage_class_name = "storage_class_name"; ++ static final String url_storage_key = "storage_key"; ++ ++ static Class loadStorageClass(String name) throws ClassNotFoundException { ++ ++ ClassLoader loader = Thread.currentThread().getContextClassLoader(); ++ ++ if (loader != null) { ++ try { ++ return loader.loadClass(name); ++ } catch (ClassNotFoundException e) {} ++ } ++ ++ return Class.forName(name); + } + ++ private FileAccess newStoredFileAccess() { ++ ++ String className = ++ database.urlProperties.getProperty(url_fileaccess_class_name); ++ ++ if (className == null) { ++ return null; ++ } ++ ++ try { ++ Class fileAccessClass = loadStorageClass(className); ++ ++ if (!FileAccess.class.isAssignableFrom(fileAccessClass)) { ++ throw new ClassCastException(className); ++ } ++ ++ Constructor constructor = ++ fileAccessClass.getConstructor(Object.class); ++ FileAccess access = (FileAccess) constructor.newInstance( ++ database.urlProperties.getProperty(url_storage_key)); ++ ++ isStoredFileAccess = true; ++ ++ return access; ++ } catch (Throwable t) { ++ throw Error.error(t, ErrorCode.FILE_IO_ERROR, ++ ErrorCode.M_Message_Pair, new Object[] { ++ t.toString(), className ++ }); ++ } ++ } ++ + public boolean isFileDatabase() { + return propIsFileDatabase; + } +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/RAStorageWrapper.java ++++ misc/build/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/RAStorageWrapper.java +@@ -32,7 +32,9 @@ + package org.hsqldb.persist; + + import java.io.IOException; ++import java.lang.reflect.Constructor; + ++import org.hsqldb.Database; + import org.hsqldb.lib.Storage; + + /** +@@ -52,6 +54,36 @@ + this.file = virtualFile; + } + ++ /** ++ * Opens a file in the storage supplied by the host application, using the ++ * class and key given in the connection properties. ++ */ ++ static RAStorageWrapper newInstance(Database database, String name, ++ boolean readonly) throws IOException { ++ ++ String className = ++ database.urlProperties.getProperty(Logger.url_storage_class_name); ++ ++ try { ++ Class storageClass = Logger.loadStorageClass(className); ++ ++ if (!Storage.class.isAssignableFrom(storageClass)) { ++ throw new ClassCastException(className); ++ } ++ ++ Constructor constructor = ++ storageClass.getConstructor(String.class, Boolean.class, ++ Object.class); ++ Storage storage = (Storage) constructor.newInstance(name, ++ Boolean.valueOf(readonly), ++ database.urlProperties.getProperty(Logger.url_storage_key)); ++ ++ return new RAStorageWrapper(storage); ++ } catch (Exception e) { ++ throw new IOException("invalid storage class: " + e, e); ++ } ++ } ++ + public long length() throws IOException { + return file.length(); + } +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/RAFile.java ++++ misc/build/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/RAFile.java +@@ -92,6 +92,10 @@ + static RandomAccessInterface newScaledRAFile(Database database, + String name, boolean readonly, + int type) throws FileNotFoundException, IOException { ++ ++ if (type == DATA_FILE_STORED) { ++ return RAStorageWrapper.newInstance(database, name, readonly); ++ } + + if (type == DATA_FILE_JAR) { + return new RAFileInJar(name); +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/DataFileCache.java ++++ misc/build/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/DataFileCache.java +@@ -156,7 +156,7 @@ + cache = new Cache(this); + + try { +- dataFile = new RAFileSimple(database.logger, dataFileName, "rw"); ++ dataFile = newSimpleFile(false); + } catch (Throwable t) { + throw Error.error(ErrorCode.FILE_IO_ERROR, t); + } +@@ -224,6 +224,8 @@ + + if (database.isFilesInJar()) { + fileType = RAFile.DATA_FILE_JAR; ++ } else if (database.logger.isStoredFileAccess()) { ++ fileType = RAFile.DATA_FILE_STORED; + } else if (isNio) { + fileType = RAFile.DATA_FILE_NIO; + } else { +@@ -263,8 +265,7 @@ + boolean isSaved = false; + + if (preexists) { +- dataFile = new RAFileSimple(database.logger, dataFileName, +- "r"); ++ dataFile = newSimpleFile(true); + + long length = dataFile.length(); + boolean wrongVersion = false; +@@ -389,7 +390,20 @@ + ErrorCode.M_DataFileCache_open, new Object[] { + t.toString(), dataFileName + }); ++ } ++ } ++ ++ private RandomAccessInterface newSimpleFile(boolean readonly) ++ throws IOException { ++ ++ if (database.logger.isStoredFileAccess()) { ++ return RAStorageWrapper.newInstance(database, dataFileName, ++ readonly); + } ++ ++ return new RAFileSimple(database.logger, dataFileName, ++ readonly ? "r" ++ : "rw"); + } + + boolean setDataSpaceManager() { +@@ -1368,7 +1382,29 @@ + * @throws HsqlException + */ + void backupDataFile(boolean newFile) { +- backupFile(database, dataFileName, backupFileName, newFile); ++ ++ if (!database.logger.isStoredFileAccess() || dataFile == null) { ++ backupFile(database, dataFileName, backupFileName, newFile); ++ ++ return; ++ } ++ ++ // the storage keeps one handle per file: reading the data file for ++ // the archive would close the handle held by this cache ++ try { ++ dataFile.close(); ++ backupFile(database, dataFileName, backupFileName, newFile); ++ } catch (IOException e) { ++ throw Error.error(ErrorCode.DATA_FILE_ERROR, e); ++ } finally { ++ try { ++ dataFile = RAFile.newScaledRAFile(database, dataFileName, ++ false, ++ RAFile.DATA_FILE_STORED); ++ } catch (IOException e) { ++ throw Error.error(ErrorCode.DATA_FILE_ERROR, e); ++ } ++ } + } + + void backupNewDataFile(boolean newFile) { +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/LobStoreRAFile.java ++++ misc/build/hsqldb-2.5.0/hsqldb/src/org/hsqldb/persist/LobStoreRAFile.java +@@ -70,8 +70,14 @@ + try { + boolean readonly = database.isFilesReadOnly(); + +- file = new RAFileSimple(database.logger, fileName, readonly ? "r" +- : "rws"); ++ if (database.logger.isStoredFileAccess()) { ++ file = RAStorageWrapper.newInstance(database, fileName, ++ readonly); ++ } else { ++ file = new RAFileSimple(database.logger, fileName, ++ readonly ? "r" ++ : "rws"); ++ } + } catch (Throwable t) { + throw Error.error(ErrorCode.DATA_FILE_ERROR, t); + } diff --git a/main/hsqldb/patches/i121754.patch b/main/hsqldb/patches/i121754.patch deleted file mode 100644 index fe3d6fb9e54..00000000000 --- a/main/hsqldb/patches/i121754.patch +++ /dev/null @@ -1,430 +0,0 @@ -diff -urbwB ext_sources/hsqldb/build/build.xml ext_sources/hsqldb_1_8_0_11/build/build.xml ---- misc/hsqldb/build/build.xml 2008-06-01 23:56:57.000000000 +0200 -+++ misc/build/hsqldb/build/build.xml 2013-07-05 23:25:40.000000000 +0200 -@@ -1,6 +1,6 @@ - -- -- -+ -+ - - - - -- -+ - - -- - - -@@ -26,7 +26,7 @@ - - - -- -+ - - - -@@ -213,10 +213,11 @@ - - - -- - - -+ - - - -@@ -251,6 +252,7 @@ - - -+ - - - -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/Expression.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Expression.java ---- misc/hsqldb/src/org/hsqldb/Expression.java 2008-05-27 17:15:05.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2013-07-05 23:40:51.000000000 +0200 -@@ -807,6 +807,14 @@ - - case COUNT : - buf.append(' ').append(Token.T_COUNT).append('('); -+ -+ if ("(*)".equals(left)) { -+ buf.append('*'); -+ } else { -+ buf.append(left); -+ } -+ -+ buf.append(')'); - break; - - case SUM : -@@ -858,11 +866,15 @@ - buf.append(' ').append(Token.T_VAR_SAMP).append('('); - buf.append(left).append(')'); - break; -- } - -+ default : - throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED); - } - -+ // changes used in OpenOffice 3.4 have been incorporated -+ return buf.toString(); -+ } -+ - private String describe(Session session, int blanks) { - - int lIType; -@@ -1523,6 +1535,12 @@ - return columnName; - } - -+ if (isAggregate(exprType)) { -+ try { -+ return getDDL(); -+ } catch (Exception e) {} -+ } -+ - return ""; - } - -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcCallableStatement.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2013-07-05 23:45:50.000000000 +0200 -@@ -3376,7 +3376,26 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - -+ public T getObject(int parameterIndex, -+ Class type) throws SQLException { -+ return (T) this.getObject(parameterIndex); -+ } -+ -+ public T getObject(String parameterName, -+ Class type) throws SQLException { -+ return getObject(this.findParameterIndex(parameterName), type); -+ } -+ -+ public void closeOnCompletion() throws SQLException { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+ public boolean isCloseOnCompletion() throws SQLException { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+ -+*/ - //#endif JAVA6 -+ - } -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcConnection.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2013-07-05 23:46:02.000000000 +0200 -@@ -2794,6 +2794,36 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } -+ -+ public int getNetworkTimeout() throws SQLException { -+ return 0; -+ } -+ -+ public void setNetworkTimeout(java.util.concurrent.Executor executor, -+ int milliseconds) throws SQLException { -+ -+ checkClosed(); -+ -+ throw Util.notSupported(); -+ } -+ -+ public void setSchema(String schema) throws SQLException { -+ checkClosed(); -+ -+ throw Util.notSupported(); -+ } -+ -+ public String getSchema() throws SQLException { -+ checkClosed(); -+ -+ throw Util.notSupported(); -+ } -+ public void abort( -+ java.util.concurrent.Executor executor) throws SQLException { -+ checkClosed(); -+ -+ throw Util.notSupported(); -+ } - */ - - //#endif JAVA6 -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2013-07-05 23:46:18.000000000 +0200 -@@ -5694,7 +5694,17 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - -+ public ResultSet getPseudoColumns( -+ String catalog, String schemaPattern, String tableNamePattern, -+ String columnNamePattern) throws SQLException { -+ throw Util.notSupported(); -+ } -+ -+ public boolean generatedKeyAlwaysReturned() throws SQLException { -+ return true; -+ } -+ -+*/ - //#endif JAVA6 - } -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcDataSource.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2008-05-28 22:23:02.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2013-07-05 23:46:39.000000000 +0200 -@@ -322,6 +322,11 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } -+ -+ public java.util.logging.Logger getParentLogger() -+ throws java.sql.SQLFeatureNotSupportedException { -+ throw (java.sql.SQLFeatureNotSupportedException) Util.notSupported(); -+ } - */ - - //#endif JAVA6 -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcPreparedStatement.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java 2013-07-05 23:46:54.000000000 +0200 -@@ -2403,6 +2403,15 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } -+ -+ public void closeOnCompletion() throws SQLException { -+ checkClosed(); -+ } -+ -+ public boolean isCloseOnCompletion() throws SQLException { -+ checkClosed(); -+ return false; -+ } - */ - - //#endif JAVA6 -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcResultSet.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2013-07-05 23:47:15.000000000 +0200 -@@ -5325,7 +5325,16 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } --*/ - -+ public T getObject(int columnIndex, Class type) throws SQLException { -+ return (T) getObject(columnIndex); -+ } -+ -+ public T getObject(String columnLabel, -+ Class type) throws SQLException { -+ return getObject(findColumn(columnLabel), type); -+ } -+ -+*/ - //#endif JAVA6 - } -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcStatement.java ---- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2008-03-20 02:44:28.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2013-07-05 23:47:29.000000000 +0200 -@@ -1608,6 +1608,16 @@ - { - throw new UnsupportedOperationException("Not supported yet."); - } -+ -+ public void closeOnCompletion() throws SQLException { -+ checkClosed(); -+ } -+ -+ public boolean isCloseOnCompletion() throws SQLException { -+ checkClosed(); -+ return false; -+ } -+ - */ - //#endif JAVA6 - } -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbcDriver.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbcDriver.java ---- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2006-04-11 17:03:24.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2013-07-05 23:48:06.000000000 +0200 -@@ -321,4 +321,16 @@ - DriverManager.registerDriver(new jdbcDriver()); - } catch (Exception e) {} - } -+ -+//#ifdef JAVA6 -+/* -+ public java.util.logging -+ .Logger getParentLogger() throws java.sql -+ .SQLFeatureNotSupportedException { -+ throw new UnsupportedOperationException("Not supported yet."); -+ } -+*/ -+ -+//#endif -+ - } -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/lib/StringComparator.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/lib/StringComparator.java ---- misc/hsqldb/src/org/hsqldb/lib/StringComparator.java 2013-07-06 00:32:59.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/lib/StringComparator.java 2013-07-06 00:09:04.000000000 +0200 -@@ -0,0 +1,53 @@ -+/* Copyright (c) 2001-2008, The HSQL Development Group -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * Redistributions of source code must retain the above copyright notice, this -+ * list of conditions and the following disclaimer. -+ * -+ * Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * -+ * Neither the name of the HSQL Development Group nor the names of its -+ * contributors may be used to endorse or promote products derived from this -+ * software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, -+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+ -+package org.hsqldb.lib; -+ -+public class StringComparator implements ObjectComparator { -+ -+ public int compare(Object a, Object b) { -+ -+ // handle nulls -+ if (a == b) { -+ return 0; -+ } -+ -+ if (a == null) { -+ return -1; -+ } -+ -+ if (b == null) { -+ return 1; -+ } -+ -+ return ((String) a).compareTo((String) b); -+ } -+} -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/Library.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Library.java ---- misc/hsqldb/src/org/hsqldb/Library.java 2006-07-17 00:29:33.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/Library.java 2013-07-05 23:51:13.000000000 +0200 -@@ -1957,7 +1957,7 @@ - functionMap.put("bitand", bitand); - functionMap.put("bitlength", bitLength); - functionMap.put("bitor", bitor); -- functionMap.put("bitxor", bitor); -+ functionMap.put("bitxor", bitxor); - functionMap.put("character", character); - functionMap.put("concat", concat); - functionMap.put("cot", cot); -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/persist/HsqlDatabaseProperties.java ---- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2013-07-05 23:52:14.000000000 +0200 -@@ -429,6 +429,7 @@ - setProperty(hsqldb_log_size, 10); - setProperty(sql_enforce_strict_size, true); - setProperty(hsqldb_nio_data_file, false); -+ setProperty(hsqldb_lock_file, true); - } - - // OOo end -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/Select.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Select.java ---- misc/hsqldb/src/org/hsqldb/Select.java 2007-07-17 18:14:09.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/Select.java 2013-07-05 23:57:48.000000000 +0200 -@@ -33,7 +33,7 @@ - * - * For work added by the HSQL Development Group: - * -- * Copyright (c) 2001-2008, The HSQL Development Group -+ * Copyright (c) 2001-2005, The HSQL Development Group - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -1255,6 +1255,7 @@ - for (int i = 0; i < iResultLen; i++) { - e = exprColumns[i]; - rmd.colTypes[i] = e.getDataType(); -+ rmd.classNames[i] = e.getValueClassName(); - rmd.colSizes[i] = e.getColumnSize(); - rmd.colScales[i] = e.getColumnScale(); - rmd.colLabels[i] = e.getAlias(); -@@ -1263,6 +1264,7 @@ - rmd.colNames[i] = e.getColumnName(); - - if (rmd.isTableColumn(i)) { -+ rmd.schemaNames[i] = e.getTableSchemaName(); - rmd.colNullable[i] = e.nullability; - rmd.isIdentity[i] = e.isIdentity; - rmd.isWritable[i] = e.isWritable; -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/Table.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Table.java ---- misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/Table.java 2013-07-05 23:58:46.000000000 +0200 -@@ -149,10 +149,10 @@ - Constraint[] constraintList; // constrainst for the table - HsqlArrayList[] triggerLists; // array of trigger lists - private int[] colTypes; // fredt - types of columns -- private int[] colSizes; // fredt - copy of SIZE values for columns -+ int[] colSizes; // fredt - copy of SIZE values for columns - private int[] colScales; // fredt - copy of SCALE values for columns - private boolean[] colNullable; // fredt - modified copy of isNullable() values -- private Expression[] colDefaults; // fredt - expressions of DEFAULT values -+ Expression[] colDefaults; // fredt - expressions of DEFAULT values - private int[] defaultColumnMap; // fred - holding 0,1,2,3,... - private boolean hasDefaultValues; //fredt - shortcut for above - boolean sqlEnforceSize; // inherited from the database - -diff -urbwB ext_sources/hsqldb/src/org/hsqldb/TableWorks.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/TableWorks.java ---- misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2013-07-05 23:59:03.000000000 +0200 -@@ -670,7 +670,10 @@ - // default expressions can change - oldCol.setType(newCol); - oldCol.setDefaultExpression(newCol.getDefaultExpression()); -- table.setColumnTypeVars(colIndex); -+ -+ table.colSizes[colIndex] = oldCol.getSize(); -+ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); -+ - table.resetDefaultsFlag(); - - return; diff --git a/main/hsqldb/patches/jar_duplicates.patch b/main/hsqldb/patches/jar_duplicates.patch new file mode 100644 index 00000000000..127fba430e8 --- /dev/null +++ b/main/hsqldb/patches/jar_duplicates.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/build/build.xml ++++ misc/build/hsqldb-2.5.0/hsqldb/build/build.xml +@@ -595,7 +595,7 @@ + + +- ++ + + + diff --git a/main/hsqldb/patches/runfinalizers.patch b/main/hsqldb/patches/runfinalizers.patch deleted file mode 100644 index dfeafdfee22..00000000000 --- a/main/hsqldb/patches/runfinalizers.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java -+++ misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java -@@ -160,7 +160,7 @@ - public static void runFinalizers() { - - //#ifdef JAVA2FULL -- System.runFinalizersOnExit(true); -+ // System.runFinalizersOnExit(boolean) was removed in Java 11+; dropped for modern JDK compatibility - - //#endif - } ---- misc/build/hsqldb/src/org/hsqldb/lib/HsqlArrayList.java -+++ misc/build/hsqldb/src/org/hsqldb/lib/HsqlArrayList.java -@@ -57,7 +57,7 @@ - Reporter() { - - try { -- System.runFinalizersOnExit(true); -+ // System.runFinalizersOnExit(boolean) was removed in Java 11+; dropped for modern JDK compatibility - } catch (SecurityException e) {} - } - diff --git a/main/hsqldb/patches/script.patch b/main/hsqldb/patches/script.patch deleted file mode 100644 index dc722d8198b..00000000000 --- a/main/hsqldb/patches/script.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java ---- misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2008-05-27 14:26:44.000000000 +0200 -+++ misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-19 15:28:44.167555700 +0100 -@@ -402,6 +402,9 @@ - if (tokenizer.getType() != Types.VARCHAR) { - throw Trace.error(Trace.INVALID_IDENTIFIER); - } -+ if (session.isProcessingScript() || session.isProcessingLog()) { -+ return new Result(ResultConstants.UPDATECOUNT); -+ } - - dsw = new ScriptWriterText(database, token, true, true, true); - diff --git a/main/hsqldb/patches/text_tables.patch b/main/hsqldb/patches/text_tables.patch deleted file mode 100644 index 896c8dc3ce2..00000000000 --- a/main/hsqldb/patches/text_tables.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru misc/hsqldb/src/org/hsqldb/persist/Log.java misc/build/hsqldb/src/org/hsqldb/persist/Log.java ---- misc/hsqldb/src/org/hsqldb/persist/Log.java 2008-03-14 16:47:42.000000000 +0100 -+++ misc/build/hsqldb/src/org/hsqldb/persist/Log.java 2026-09-08 22:40:39.681242533 +0200 -@@ -763,7 +763,7 @@ - - closeTextCache(table); - -- if (!properties.isPropertyTrue( -+ if (database.isStoredFileAccess() || !properties.isPropertyTrue( - HsqlDatabaseProperties.textdb_allow_full_path)) { - if (source.indexOf("..") != -1) { - throw (Trace.error(Trace.ACCESS_IS_DENIED, source)); - diff --git a/main/hsqldb/prj/d.lst b/main/hsqldb/prj/d.lst index 8801f4fecfc..38758af25b6 100644 --- a/main/hsqldb/prj/d.lst +++ b/main/hsqldb/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar +..\%__SRC%\misc\build\hsqldb-2.5.0\hsqldb\lib\hsqldb.jar %_DEST%\bin%_EXT%\hsqldb.jar diff --git a/main/hsqldb/version.mk b/main/hsqldb/version.mk index 2ca6ca2df52..9413eaef6f4 100644 --- a/main/hsqldb/version.mk +++ b/main/hsqldb/version.mk @@ -20,7 +20,7 @@ # ************************************************************* # when you want to change the HSQLDB version, you must update the d.lst # in the HSQLDB_thon project accordingly !!! -HSQLDB_MAJOR=1 -HSQLDB_MINOR=8 +HSQLDB_MAJOR=2 +HSQLDB_MINOR=5 HSQLDB_MICRO=0 -HSQLDB_VERSION=$(HSQLDB_MAJOR)_$(HSQLDB_MINOR)_$(HSQLDB_MICRO) +HSQLDB_VERSION=$(HSQLDB_MAJOR).$(HSQLDB_MINOR).$(HSQLDB_MICRO) diff --git a/main/idlc/inc/idlc/idlctypes.hxx b/main/idlc/inc/idlc/idlctypes.hxx index 35c179a6dd2..421b7299395 100644 --- a/main/idlc/inc/idlc/idlctypes.hxx +++ b/main/idlc/inc/idlc/idlctypes.hxx @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ typedef ::std::list< AstUnionLabel* > LabelList; class AstDeclaration; -typedef ::std::hash_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap; +typedef ::std::unordered_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap; typedef ::std::list< AstDeclaration* > DeclList; class AstScope; diff --git a/main/idlc/inc/idlc/options.hxx b/main/idlc/inc/idlc/options.hxx index 853de687293..51e9d130143 100644 --- a/main/idlc/inc/idlc/options.hxx +++ b/main/idlc/inc/idlc/options.hxx @@ -28,7 +28,7 @@ #include #endif -typedef ::std::hash_map< ::rtl::OString, +typedef ::std::unordered_map< ::rtl::OString, ::rtl::OString, HashString, EqualString > OptionMap; diff --git a/main/io/source/acceptor/acc_socket.cxx b/main/io/source/acceptor/acc_socket.cxx index c23d4208aa4..7e7f0e1d8eb 100644 --- a/main/io/source/acceptor/acc_socket.cxx +++ b/main/io/source/acceptor/acc_socket.cxx @@ -25,7 +25,7 @@ #include "precompiled_io.hxx" #include "acceptor.hxx" -#include +#include #include #include @@ -63,7 +63,7 @@ namespace io_acceptor { }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef ::std::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/main/io/source/connector/connector.hxx b/main/io/source/connector/connector.hxx index 9da711698f4..710b6718f46 100644 --- a/main/io/source/connector/connector.hxx +++ b/main/io/source/connector/connector.hxx @@ -28,7 +28,7 @@ #include #include -#include +#include # include # include @@ -55,7 +55,7 @@ namespace stoc_connector } }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef ::std::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/main/io/source/stm/odata.cxx b/main/io/source/stm/odata.cxx index 41e23734072..9abb56d11f4 100644 --- a/main/io/source/stm/odata.cxx +++ b/main/io/source/stm/odata.cxx @@ -26,7 +26,7 @@ // streams -#include +#include #include #include @@ -876,7 +876,7 @@ struct hashObjectContainer_Impl } }; -typedef hash_map +typedef unordered_map < Reference< XInterface >, sal_Int32, diff --git a/main/l10ntools/inc/cfgmerge.hxx b/main/l10ntools/inc/cfgmerge.hxx index 967daabf13e..c5629d8b44e 100644 --- a/main/l10ntools/inc/cfgmerge.hxx +++ b/main/l10ntools/inc/cfgmerge.hxx @@ -26,9 +26,9 @@ #include #include -#include +#include -typedef std::hash_map +typedef std::unordered_map ByteStringHashMap; diff --git a/main/l10ntools/inc/export.hxx b/main/l10ntools/inc/export.hxx index 9ebcf244b3a..2d5a929ed3f 100644 --- a/main/l10ntools/inc/export.hxx +++ b/main/l10ntools/inc/export.hxx @@ -37,7 +37,7 @@ #include #include -#include /* std::hashmap*/ +#include /* std::hashmap*/ #include /* std::iterator*/ #include /* std::set*/ #include /* std::vector*/ @@ -57,16 +57,16 @@ class PFormEntrys; class MergeData; typedef std::set ByteStringSet; -typedef std::hash_map +typedef std::unordered_map ByteStringHashMap; -typedef std::hash_map +typedef std::unordered_map ByteStringBoolHashMap; -typedef std::hash_map +typedef std::unordered_map PFormEntrysHashMap; -typedef std::hash_map +typedef std::unordered_map MergeDataHashMap; #define SOURCE_LANGUAGE ByteString("en-US") diff --git a/main/l10ntools/inc/inireader.hxx b/main/l10ntools/inc/inireader.hxx index c6fd05157cd..d36d2db2002 100644 --- a/main/l10ntools/inc/inireader.hxx +++ b/main/l10ntools/inc/inireader.hxx @@ -20,7 +20,7 @@ *************************************************************/ #include -#include +#include #include using namespace std; @@ -36,8 +36,8 @@ struct eqstr } }; -typedef std::hash_map< string , string > stringmap; -typedef std::hash_map< string, stringmap* > INImap; +typedef std::unordered_map< string , string > stringmap; +typedef std::unordered_map< string, stringmap* > INImap; class INIreader { @@ -59,7 +59,7 @@ class INIreader delete section_match; delete parameter_match; } - // open "filename", fill hash_map with sections / parameters + // open "filename", fill unordered_map with sections / parameters bool read( INImap& myMap , string& filename ); private: diff --git a/main/l10ntools/inc/tagtest.hxx b/main/l10ntools/inc/tagtest.hxx index 9080abcf7ba..1e135257c39 100644 --- a/main/l10ntools/inc/tagtest.hxx +++ b/main/l10ntools/inc/tagtest.hxx @@ -26,7 +26,7 @@ #include #include -#include /* std::hashmap*/ +#include /* std::hashmap*/ #include class GSILine; @@ -60,7 +60,7 @@ struct hashByteString{ -typedef std::hash_map +typedef std::unordered_map StringHashMap; class TokenInfo diff --git a/main/l10ntools/inc/xmlparse.hxx b/main/l10ntools/inc/xmlparse.hxx index 0d64440f0d8..8c66ead6f99 100644 --- a/main/l10ntools/inc/xmlparse.hxx +++ b/main/l10ntools/inc/xmlparse.hxx @@ -46,7 +46,7 @@ class XMLElement; using namespace ::rtl; using namespace std; -#include /* std::hashmap*/ +#include /* std::hashmap*/ #include /* std::deque*/ #include /* std::iterator*/ #include /* std::list*/ @@ -187,17 +187,17 @@ public: DECLARE_LIST( XMLStringList, XMLElement* ) /// Mapping numeric Language code <-> XML Element -typedef std::hash_map< ByteString ,XMLElement* , hashByteString,equalByteString > LangHashMap; +typedef std::unordered_map< ByteString ,XMLElement* , hashByteString,equalByteString > LangHashMap; /// Mapping XML Element string identifier <-> Language Map -typedef std::hash_map XMLHashMap; /// Mapping iso alpha string code <-> iso numeric code -typedef std::hash_map HashMap; +typedef std::unordered_map HashMap; /// Mapping XML tag names <-> have localizable strings -typedef std::hash_map TagMap; /** Holds information of a XML file, is root node of tree diff --git a/main/l10ntools/source/help/HelpCompiler.hxx b/main/l10ntools/source/help/HelpCompiler.hxx index 4f67cb886fc..d02d717497c 100644 --- a/main/l10ntools/source/help/HelpCompiler.hxx +++ b/main/l10ntools/source/help/HelpCompiler.hxx @@ -25,7 +25,7 @@ #define HELPCOMPILER_HXX #include -#include +#include #include #include #include @@ -213,11 +213,11 @@ struct SuperFastHash #define pref_hash joaat_hash -typedef std::hash_map Stringtable; +typedef std::unordered_map Stringtable; typedef std::list LinkedList; typedef std::vector HashSet; -typedef std::hash_map Hashtable; +typedef std::unordered_map Hashtable; class StreamTable { diff --git a/main/l10ntools/source/help/HelpLinker.cxx b/main/l10ntools/source/help/HelpLinker.cxx index 56fc77674a0..35cac1437c6 100644 --- a/main/l10ntools/source/help/HelpLinker.cxx +++ b/main/l10ntools/source/help/HelpLinker.cxx @@ -199,7 +199,7 @@ void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const std::s class HelpKeyword { private: - typedef std::hash_map DataHashtable; + typedef std::unordered_map DataHashtable; DataHashtable _hash; public: diff --git a/main/linguistic/source/convdic.hxx b/main/linguistic/source/convdic.hxx index 1e6cea619e1..7ec7fc25a19 100644 --- a/main/linguistic/source/convdic.hxx +++ b/main/linguistic/source/convdic.hxx @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include "linguistic/misc.hxx" @@ -68,12 +68,12 @@ struct StrEQ } }; -typedef std::hash_multimap< const rtl::OUString, rtl::OUString, +typedef std::unordered_multimap< const rtl::OUString, rtl::OUString, const rtl::OUStringHash, StrEQ > ConvMap; typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; -typedef std::hash_multimap< const rtl::OUString, sal_Int16, +typedef std::unordered_multimap< const rtl::OUString, sal_Int16, rtl::OUStringHash, StrEQ > PropTypeMap; /////////////////////////////////////////////////////////////////////////// diff --git a/main/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/main/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h index 0ee54e12d21..21184d8a869 100644 --- a/main/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h +++ b/main/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h @@ -20,7 +20,7 @@ *************************************************************/ #include -#include +#include #include #include @@ -32,14 +32,14 @@ typedef std::vector < com::sun::star::uno::Reference < com::sun::star::frame::XStatusListener > > StatusListeners; -typedef std::hash_map < rtl::OUString, +typedef std::unordered_map < rtl::OUString, StatusListeners, rtl::OUStringHash, std::equal_to< rtl::OUString > > ListenerMap; // For every frame there is *one* Dispatch object for all possible commands // this struct contains an array of listeners for every supported command -// these arrays are accessed by a hash_map (with the command string as index) +// these arrays are accessed by a std::unordered_map (with the command string as index) struct ListenerItem { ListenerMap aContainer; diff --git a/main/oox/inc/oox/export/shapes.hxx b/main/oox/inc/oox/export/shapes.hxx index 6af7b9140f7..317c1f2504c 100644 --- a/main/oox/inc/oox/export/shapes.hxx +++ b/main/oox/inc/oox/export/shapes.hxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace com { namespace sun { namespace star { namespace beans { @@ -67,7 +67,7 @@ private: size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const; }; - typedef std::hash_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; + typedef std::unordered_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap; ShapeHashMap maShapeMap; public: diff --git a/main/oox/source/drawingml/customshapegeometry.cxx b/main/oox/source/drawingml/customshapegeometry.cxx index b9f0db65cea..88190904fac 100644 --- a/main/oox/source/drawingml/customshapegeometry.cxx +++ b/main/oox/source/drawingml/customshapegeometry.cxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include "oox/helper/helper.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" @@ -86,7 +86,7 @@ static FormularCommandNameTable pFormularCommandNameTable[] = { "val", FC_VAL } }; -typedef std::hash_map< rtl::OUString, FormularCommand, comphelper::UStringHash, comphelper::UStringEqual > FormulaCommandHMap; +typedef std::unordered_map< rtl::OUString, FormularCommand, comphelper::UStringHash, comphelper::UStringEqual > FormulaCommandHMap; static const FormulaCommandHMap* pCommandHashMap; diff --git a/main/oox/source/export/shapes.cxx b/main/oox/source/export/shapes.cxx index 5b6c624622e..836b81707a4 100644 --- a/main/oox/source/export/shapes.cxx +++ b/main/oox/source/export/shapes.cxx @@ -307,7 +307,7 @@ static const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] { "mso-spt202", "rect" } }; -typedef std::hash_map< const char*, const char*, CStringHash, CStringEqual> CustomShapeTypeTranslationHashMap; +typedef std::unordered_map< const char*, const char*, CStringHash, CStringEqual> CustomShapeTypeTranslationHashMap; static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL; static const char* lcl_GetPresetGeometry( const char* sShapeType ) @@ -861,7 +861,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape ) } typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > ); -typedef std::hash_map< const char*, ShapeConverter, CStringHash, CStringEqual> NameToConvertMapType; +typedef std::unordered_map< const char*, ShapeConverter, CStringHash, CStringEqual> NameToConvertMapType; static const NameToConvertMapType& lcl_GetConverters() { diff --git a/main/package/inc/HashMaps.hxx b/main/package/inc/HashMaps.hxx index 4c1bd9e67d0..928ca05bdbe 100644 --- a/main/package/inc/HashMaps.hxx +++ b/main/package/inc/HashMaps.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include struct eqFunc { @@ -41,17 +41,17 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef std::hash_map < rtl::OUString, +typedef std::unordered_map < rtl::OUString, ZipPackageFolder *, ::rtl::OUStringHash, eqFunc > FolderHash; -typedef std::hash_map < rtl::OUString, +typedef std::unordered_map < rtl::OUString, vos::ORef < com::sun::star::packages::ContentInfo >, ::rtl::OUStringHash, eqFunc > ContentHash; -typedef std::hash_map < rtl::OUString, +typedef std::unordered_map < rtl::OUString, ZipEntry, rtl::OUStringHash, eqFunc > EntryHash; diff --git a/main/package/source/package/manifest/ManifestImport.hxx b/main/package/source/package/manifest/ManifestImport.hxx index 8b0c5496a6d..58e7b5f5d29 100644 --- a/main/package/source/package/manifest/ManifestImport.hxx +++ b/main/package/source/package/manifest/ManifestImport.hxx @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; +typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { diff --git a/main/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx b/main/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx index bedea58989c..0ffc79e5bc2 100644 --- a/main/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx +++ b/main/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx @@ -42,7 +42,7 @@ protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (std::hash_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (std::unordered_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration( void ); diff --git a/main/package/source/xstor/ohierarchyholder.hxx b/main/package/source/xstor/ohierarchyholder.hxx index 491786d0b81..0f7adfe5fc0 100644 --- a/main/package/source/xstor/ohierarchyholder.hxx +++ b/main/package/source/xstor/ohierarchyholder.hxx @@ -33,7 +33,7 @@ #include -#include +#include #include #include @@ -47,7 +47,7 @@ struct eqFunc return r1 == r2; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::rtl::Reference< OHierarchyElement_Impl >, ::rtl::OUStringHash, eqFunc > OHierarchyElementList_Impl; diff --git a/main/padmin/source/adddlg.cxx b/main/padmin/source/adddlg.cxx index 530a65e6df3..d8d17a3ebf4 100644 --- a/main/padmin/source/adddlg.cxx +++ b/main/padmin/source/adddlg.cxx @@ -33,7 +33,7 @@ #include "osl/thread.h" -#include +#include using namespace rtl; @@ -1071,7 +1071,7 @@ String AddPrinterDialog::uniquePrinterName( const String& rBase ) int nVersion = 1; list< OUString > aPrinterList; rManager.listPrinters( aPrinterList ); - hash_set< OUString, OUStringHash > aPrinters; + unordered_set< OUString, OUStringHash > aPrinters; for( list< OUString >::const_iterator it = aPrinterList.begin(); it != aPrinterList.end(); ++it ) aPrinters.insert( *it ); while( aPrinters.find( aResult ) != aPrinters.end() ) diff --git a/main/padmin/source/fontentry.cxx b/main/padmin/source/fontentry.cxx index 6a971bcd412..bceb434a385 100644 --- a/main/padmin/source/fontentry.cxx +++ b/main/padmin/source/fontentry.cxx @@ -255,7 +255,7 @@ void FontNameDlg::init() m_aRemoveButton.Enable( sal_False ); m_aRenameButton.Enable( sal_False ); - ::std::hash_map< OUString, int, OUStringHash > aFamilies; + ::std::unordered_map< OUString, int, OUStringHash > aFamilies; ::std::list< fontID >::iterator font_it; for( font_it = aFonts.begin(); font_it != aFonts.end(); ++font_it ) { @@ -572,8 +572,8 @@ void FontImportDialog::fillFontBox() rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); m_aNewFontsBox.Clear(); - ::std::hash_map< OUString, int, OUStringHash > aFamilies; - ::std::hash_map< OString, ::std::list< FastPrintFontInfo >, OStringHash >::iterator it; + ::std::unordered_map< OUString, int, OUStringHash > aFamilies; + ::std::unordered_map< OString, ::std::list< FastPrintFontInfo >, OStringHash >::iterator it; for( it = m_aNewFonts.begin(); it != m_aNewFonts.end(); ++it ) { const OUString& rFamily( it->second.front().m_aFamilyName ); diff --git a/main/padmin/source/fontentry.hxx b/main/padmin/source/fontentry.hxx index 2023dbea0de..ec94df4e97d 100644 --- a/main/padmin/source/fontentry.hxx +++ b/main/padmin/source/fontentry.hxx @@ -69,7 +69,7 @@ namespace padmin { String m_aNoWritableFontsDirText; String m_aFontsImportedText; - ::std::hash_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash > + ::std::unordered_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash > m_aNewFonts; Timer m_aRefreshTimer; @@ -114,7 +114,7 @@ namespace padmin { ::psp::PrintFontManager& m_rFontManager; // maps fontID to XLFD - ::std::hash_map< ::psp::fontID, String > + ::std::unordered_map< ::psp::fontID, String > m_aFonts; void init(); public: diff --git a/main/padmin/source/prtsetup.cxx b/main/padmin/source/prtsetup.cxx index 84f5e8a00bf..b2a338a95ff 100644 --- a/main/padmin/source/prtsetup.cxx +++ b/main/padmin/source/prtsetup.cxx @@ -632,7 +632,7 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) : ::std::list< FastPrintFontInfo > aFonts; rFontManager.getFontListWithFastInfo( aFonts, m_pParent->m_aJobData.m_pParser, false ); ::std::list< FastPrintFontInfo >::const_iterator it; - ::std::hash_map< OUString, int, OUStringHash > aToMap, aFromMap; + ::std::unordered_map< OUString, int, OUStringHash > aToMap, aFromMap; for( it = aFonts.begin(); it != aFonts.end(); ++it ) { if( it->m_eType == fonttype::Builtin ) @@ -684,7 +684,7 @@ void RTSFontSubstPage::update() m_aSubstitutionsBox.Clear(); m_aRemoveButton.Enable( sal_False ); // fill substitutions box - ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; + ::std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin(); it != m_pParent->m_aJobData.m_aFontSubstitutes.end(); ++it ) { diff --git a/main/pyuno/source/module/pyuno_impl.hxx b/main/pyuno/source/module/pyuno_impl.hxx index 136921e9706..2e846d34806 100644 --- a/main/pyuno/source/module/pyuno_impl.hxx +++ b/main/pyuno/source/module/pyuno_impl.hxx @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include #include #include @@ -86,7 +86,7 @@ static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW( () ); //-------------------------------------------------- -typedef ::std::hash_map +typedef ::std::unordered_map < PyRef, com::sun::star::uno::WeakReference< com::sun::star::script::XInvocation >, @@ -95,7 +95,7 @@ typedef ::std::hash_map > PyRef2Adapter; -typedef ::std::hash_map +typedef ::std::unordered_map < rtl::OUString, PyRef, @@ -103,7 +103,7 @@ rtl::OUStringHash, std::equal_to > ExceptionClassMap; -typedef ::std::hash_map +typedef ::std::unordered_map < rtl::OUString, com::sun::star::uno::Sequence< sal_Int16 >, @@ -111,7 +111,7 @@ typedef ::std::hash_map std::equal_to< rtl::OUString > > MethodOutIndexMap; -typedef ::std::hash_set< PyRef , PyRef::Hash , std::equal_to > ClassSet; +typedef ::std::unordered_set< PyRef , PyRef::Hash , std::equal_to > ClassSet; PyObject* PyUNO_new( const com::sun::star::uno::Any & targetInterface, diff --git a/main/rdbmaker/inc/codemaker/dependency.hxx b/main/rdbmaker/inc/codemaker/dependency.hxx index ed01036da0b..e80750877c4 100644 --- a/main/rdbmaker/inc/codemaker/dependency.hxx +++ b/main/rdbmaker/inc/codemaker/dependency.hxx @@ -24,7 +24,7 @@ #ifndef _CODEMAKER_DEPENDENCY_HXX_ #define _CODEMAKER_DEPENDENCY_HXX_ -#include +#include #include #ifndef __REGISTRY_REFLREAD_HXX__ #include @@ -96,7 +96,7 @@ typedef ::std::__hash_map__ NewAlloc > GenerationMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, TypeUsingSet, @@ -104,7 +104,7 @@ typedef ::std::hash_map EqualString > DependencyMap; -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, sal_uInt16, diff --git a/main/rdbmaker/inc/codemaker/options.hxx b/main/rdbmaker/inc/codemaker/options.hxx index d8923352344..9ab58b1860b 100644 --- a/main/rdbmaker/inc/codemaker/options.hxx +++ b/main/rdbmaker/inc/codemaker/options.hxx @@ -24,7 +24,7 @@ #ifndef _CODEMAKER_OPTIONS_HXX_ #define _CODEMAKER_OPTIONS_HXX_ -#include +#include #include #if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) @@ -37,7 +37,7 @@ typedef ::std::__hash_map__ NewAlloc > OptionMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, ::rtl::OString, diff --git a/main/rdbmaker/inc/codemaker/typemanager.hxx b/main/rdbmaker/inc/codemaker/typemanager.hxx index 790afc54c04..bf39a59383e 100644 --- a/main/rdbmaker/inc/codemaker/typemanager.hxx +++ b/main/rdbmaker/inc/codemaker/typemanager.hxx @@ -20,7 +20,7 @@ *************************************************************/ -#include +#include #ifndef _CODEMAKER_TYPEMANAGER_HXX_ #define _CODEMAKER_TYPEMANAGER_HXX_ @@ -38,7 +38,7 @@ typedef ::std::__hash_map__ NewAlloc > T2TypeClassMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, // Typename RTTypeClass, // TypeClass diff --git a/main/registry/source/regimpl.hxx b/main/registry/source/regimpl.hxx index 939d89f47dc..364941422c8 100644 --- a/main/registry/source/regimpl.hxx +++ b/main/registry/source/regimpl.hxx @@ -25,7 +25,7 @@ #define _REGIMPL_HXX_ #include -#include +#include #include #include @@ -163,7 +163,7 @@ private: const rtl::OUString& sName, sal_Int16 nSpace) const; - typedef std::hash_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap; + typedef std::unordered_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap; sal_uInt32 m_refCount; osl::Mutex m_mutex; diff --git a/main/reportdesign/source/core/sdr/UndoEnv.cxx b/main/reportdesign/source/core/sdr/UndoEnv.cxx index 41e99f92939..366e2a4ae54 100644 --- a/main/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/main/reportdesign/source/core/sdr/UndoEnv.cxx @@ -83,7 +83,7 @@ struct PropertyInfo } }; -typedef ::std::hash_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash > PropertiesInfo; +typedef ::std::unordered_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash > PropertiesInfo; struct ObjectInfo { diff --git a/main/rsc/inc/rschash.hxx b/main/rsc/inc/rschash.hxx index c592c68fd13..76989e4d467 100644 --- a/main/rsc/inc/rschash.hxx +++ b/main/rsc/inc/rschash.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include typedef sal_uInt32 Atom; @@ -34,8 +34,8 @@ typedef sal_uInt32 Atom; class AtomContainer { Atom m_nNextID; - std::hash_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID; - std::hash_map< Atom, rtl::OString > m_aIDToString; + std::unordered_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID; + std::unordered_map< Atom, rtl::OString > m_aIDToString; public: AtomContainer(); diff --git a/main/rsc/source/parser/rscibas.cxx b/main/rsc/source/parser/rscibas.cxx index be092bff5b6..011fc74c056 100644 --- a/main/rsc/source/parser/rscibas.cxx +++ b/main/rsc/source/parser/rscibas.cxx @@ -45,7 +45,7 @@ #include "rsclex.hxx" #include -#include +#include /****************** M A C R O S ******************************************/ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) @@ -73,7 +73,7 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) |* Beschreibung *************************************************************************/ -typedef std::hash_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; +typedef std::unordered_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; static langmap ULong_Iso_map; sal_uInt32 GetLangId( const ByteString& aLang ) diff --git a/main/rsc/source/parser/rsclex.cxx b/main/rsc/source/parser/rsclex.cxx index c620097efa5..976f9766502 100644 --- a/main/rsc/source/parser/rsclex.cxx +++ b/main/rsc/source/parser/rsclex.cxx @@ -51,7 +51,7 @@ const char* StringContainer::putString( const char* pString ) { OString aString( static_cast(pString) ); std::pair< - std::hash_set< OString, OStringHash >::iterator, + std::unordered_set< OString, OStringHash >::iterator, bool > aInsert = m_aStrings.insert( aString ); diff --git a/main/rsc/source/parser/rsclex.hxx b/main/rsc/source/parser/rsclex.hxx index 0353d4c43a5..1155612b8ab 100644 --- a/main/rsc/source/parser/rsclex.hxx +++ b/main/rsc/source/parser/rsclex.hxx @@ -22,14 +22,14 @@ #include -#include +#include #include #include // a buffer for unique strings class StringContainer { - std::hash_set< rtl::OString, rtl::OStringHash > m_aStrings; + std::unordered_set< rtl::OString, rtl::OStringHash > m_aStrings; public: StringContainer() {} ~StringContainer() {} diff --git a/main/rsc/source/tools/rschash.cxx b/main/rsc/source/tools/rschash.cxx index 637f2456210..eacd0ddc28b 100644 --- a/main/rsc/source/tools/rschash.cxx +++ b/main/rsc/source/tools/rschash.cxx @@ -41,7 +41,7 @@ AtomContainer::~AtomContainer() Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) { OString aKey = rStr.toAsciiLowerCase(); - std::hash_map< OString, Atom, OStringHash >::const_iterator it = + std::unordered_map< OString, Atom, OStringHash >::const_iterator it = m_aStringToID.find( aKey ); if( it != m_aStringToID.end() ) return it->second; @@ -58,7 +58,7 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) const OString& AtomContainer::getString( Atom nAtom ) { - std::hash_map< Atom, OString >::const_iterator it = + std::unordered_map< Atom, OString >::const_iterator it = m_aIDToString.find( nAtom ); return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0]; } diff --git a/main/sal/inc/osl/diagnose.hxx b/main/sal/inc/osl/diagnose.hxx index 6e7df083ae8..81c68a0db77 100644 --- a/main/sal/inc/osl/diagnose.hxx +++ b/main/sal/inc/osl/diagnose.hxx @@ -27,7 +27,7 @@ #include "osl/interlck.h" #include "osl/mutex.hxx" #include "rtl/instance.hxx" -#include +#include #include #include @@ -82,7 +82,7 @@ struct VoidPtrHash { } }; -typedef ::std::hash_set > VoidPointerSet; +typedef ::std::unordered_set > VoidPointerSet; struct ObjectRegistryData { ObjectRegistryData( ::std::type_info const& rTypeInfo ) diff --git a/main/sal/inc/rtl/string.hxx b/main/sal/inc/rtl/string.hxx index 22ac13a0133..95035ca56fa 100644 --- a/main/sal/inc/rtl/string.hxx +++ b/main/sal/inc/rtl/string.hxx @@ -434,7 +434,7 @@ public: @return a hash code value for this object. - @see rtl::OStringHash for convenient use of hash_map / unordered_map + @see rtl::OStringHash for convenient use of unordered_map / unordered_map */ sal_Int32 hashCode() const SAL_THROW(()) { @@ -926,7 +926,7 @@ public: /** A helper to use OStrings with hash maps. Instances of this class are unary function objects that can be used as - hash function arguments to unordered_map, hash_map and similar constructs. + hash function arguments to unordered_map, unordered_map and similar constructs. */ struct OStringHash { diff --git a/main/sal/inc/rtl/ustring.hxx b/main/sal/inc/rtl/ustring.hxx index bea0e980eb4..ae1f5a71c61 100644 --- a/main/sal/inc/rtl/ustring.hxx +++ b/main/sal/inc/rtl/ustring.hxx @@ -741,7 +741,7 @@ public: @return a hash code value for this object. - @see rtl::OUStringHash for convenient use of STLPort's hash_map + @see rtl::OUStringHash for convenient use of STLPort's unordered_map */ sal_Int32 hashCode() const SAL_THROW(()) { @@ -1472,7 +1472,7 @@ public: /** A helper to use OUStrings with hash maps. Instances of this class are unary function objects that can be used as - hash function arguments to STLPort's hash_map and similar constructs. + hash function arguments to STLPort's unordered_map and similar constructs. */ struct OUStringHash { diff --git a/main/sal/rtl/source/bootstrap.cxx b/main/sal/rtl/source/bootstrap.cxx index 2ca20daa1d0..1dcc0f20e51 100644 --- a/main/sal/rtl/source/bootstrap.cxx +++ b/main/sal/rtl/source/bootstrap.cxx @@ -44,7 +44,7 @@ #include "macro.hxx" -#include +#include #include #define MY_STRING_(x) # x @@ -623,7 +623,7 @@ void Bootstrap_Impl::expandValue( namespace { struct bootstrap_map { - typedef std::hash_map< const rtl::OUString, Bootstrap_Impl*, rtl::OUStringHash > t; + typedef std::unordered_map< const rtl::OUString, Bootstrap_Impl*, rtl::OUStringHash > t; // get and release must only be called properly synchronized via some mutex // (e.g., osl::Mutex::getGlobalMutex()): diff --git a/main/sal/rtl/source/hash.cxx b/main/sal/rtl/source/hash.cxx index db7243bf931..b66cd2bf04b 100644 --- a/main/sal/rtl/source/hash.cxx +++ b/main/sal/rtl/source/hash.cxx @@ -27,7 +27,7 @@ #include "hash.h" #include "strimp.h" -#include +#include namespace { @@ -51,7 +51,7 @@ struct UStringEqual } }; -typedef std::hash_set< rtl_uString *, UStringHash, UStringEqual > StringHashTable; +typedef std::unordered_set< rtl_uString *, UStringHash, UStringEqual > StringHashTable; StringHashTable * getHashTable () diff --git a/main/sal/rtl/source/unload.cxx b/main/sal/rtl/source/unload.cxx index 40a948d4973..7fc70b84cf1 100644 --- a/main/sal/rtl/source/unload.cxx +++ b/main/sal/rtl/source/unload.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -151,7 +151,7 @@ struct hashModule } }; -typedef std::hash_map< +typedef std::unordered_map< const oslModule, std::pair, hashModule, @@ -299,7 +299,7 @@ struct hashListener } }; -typedef std::hash_map< +typedef std::unordered_map< const sal_Int32, std::pair, hashListener, diff --git a/main/sax/source/fastparser/fastparser.hxx b/main/sax/source/fastparser/fastparser.hxx index 1b812bff0ac..aa0b91095c5 100644 --- a/main/sax/source/fastparser/fastparser.hxx +++ b/main/sax/source/fastparser/fastparser.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ struct SaxContextImpl; typedef ::boost::shared_ptr< SaxContextImpl > SaxContextImplPtr; typedef ::boost::shared_ptr< NamespaceDefine > NamespaceDefineRef; -typedef ::std::hash_map< ::rtl::OUString, sal_Int32, +typedef ::std::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NamespaceMap; // -------------------------------------------------------------------- diff --git a/main/sc/inc/addincol.hxx b/main/sc/inc/addincol.hxx index 52012cdab7e..f8d6afda591 100644 --- a/main/sc/inc/addincol.hxx +++ b/main/sc/inc/addincol.hxx @@ -42,7 +42,7 @@ #include "scmatrix.hxx" #endif -#include +#include class String; @@ -52,7 +52,7 @@ class ScMatrix; class ScFuncDesc; -typedef ::std::hash_map< String, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< String > > ScAddInHashMap; +typedef ::std::unordered_map< String, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< String > > ScAddInHashMap; enum ScAddInArgumentType diff --git a/main/sc/inc/autonamecache.hxx b/main/sc/inc/autonamecache.hxx index d30fe6629a3..9b2891c8e8a 100644 --- a/main/sc/inc/autonamecache.hxx +++ b/main/sc/inc/autonamecache.hxx @@ -25,12 +25,12 @@ #define SC_AUTONAMECACHE_HXX #include -#include +#include #include "address.hxx" #include "global.hxx" typedef ::std::vector< ScAddress > ScAutoNameAddresses; -typedef ::std::hash_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::equal_to< String > > ScAutoNameHashMap; +typedef ::std::unordered_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::equal_to< String > > ScAutoNameHashMap; // // Cache for faster lookup of automatic names during CompileXML diff --git a/main/sc/inc/chart2uno.hxx b/main/sc/inc/chart2uno.hxx index bccb6058a4e..77e228be332 100644 --- a/main/sc/inc/chart2uno.hxx +++ b/main/sc/inc/chart2uno.hxx @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include #include @@ -330,14 +330,14 @@ private: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - const ::std::hash_set& getAllFileIds(); + const ::std::unordered_set& getAllFileIds(); private: ExternalRefListener(); ExternalRefListener(const ExternalRefListener& r); ScChart2DataSequence& mrParent; - ::std::hash_set maFileIds; + ::std::unordered_set maFileIds; ScDocument* mpDoc; }; diff --git a/main/sc/inc/chartlis.hxx b/main/sc/inc/chartlis.hxx index a17db9ed1dd..1edbb873f2f 100644 --- a/main/sc/inc/chartlis.hxx +++ b/main/sc/inc/chartlis.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include class ScDocument; class ScChartUnoData; @@ -53,14 +53,14 @@ public: virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); - ::std::hash_set& getAllFileIds(); + ::std::unordered_set& getAllFileIds(); private: ExternalRefListener(); ExternalRefListener(const ExternalRefListener& r); ScChartListener& mrParent; - ::std::hash_set maFileIds; + ::std::unordered_set maFileIds; ScDocument* mpDoc; }; diff --git a/main/sc/inc/compiler.hxx b/main/sc/inc/compiler.hxx index c6d008b1d62..1cffb2b3dcb 100644 --- a/main/sc/inc/compiler.hxx +++ b/main/sc/inc/compiler.hxx @@ -48,7 +48,7 @@ #endif #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif diff --git a/main/sc/inc/dpcachetable.hxx b/main/sc/inc/dpcachetable.hxx index 49e2a4947c0..612bc63e8cc 100644 --- a/main/sc/inc/dpcachetable.hxx +++ b/main/sc/inc/dpcachetable.hxx @@ -30,8 +30,8 @@ #include "collect.hxx" #include -#include -#include +#include +#include #include #include @@ -178,7 +178,7 @@ public: /** Set filter on/off flag to each row to control visibility. The caller must ensure that the table is filled before calling this function. */ - void filterByPageDimension(const ::std::vector& rCriteria, const ::std::hash_set& rRepeatIfEmptyDims); + void filterByPageDimension(const ::std::vector& rCriteria, const ::std::unordered_set& rRepeatIfEmptyDims); /** Get the cell instance at specified location within the data grid. Note that the data grid doesn't include the header row. Don't delete the @@ -205,7 +205,7 @@ public: a drill-down data table. */ void filterTable(const ::std::vector& rCriteria, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTabData, - const ::std::hash_set& rRepeatIfEmptyDims); + const ::std::unordered_set& rRepeatIfEmptyDims); void clear(); void swap(ScDPCacheTable& rOther); @@ -221,7 +221,7 @@ private: * @param nRow index of row to be tested. * @param rCriteria a list of criteria */ - bool isRowQualified(sal_Int32 nRow, const ::std::vector& rCriteria, const ::std::hash_set& rRepeatIfEmptyDims) const; + bool isRowQualified(sal_Int32 nRow, const ::std::vector& rCriteria, const ::std::unordered_set& rRepeatIfEmptyDims) const; void getValueData(ScDocument* pDoc, const ScAddress& rPos, ScDPCacheCell& rCell); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance diff --git a/main/sc/inc/dpglobal.hxx b/main/sc/inc/dpglobal.hxx index d6ccb36cc59..e87a409b55c 100644 --- a/main/sc/inc/dpglobal.hxx +++ b/main/sc/inc/dpglobal.hxx @@ -175,7 +175,7 @@ protected: size_t operator() (const ScDPItemData &rData) const { return rData.Hash(); } }; - typedef ::std::hash_multimap< ScDPItemData, sal_Int32, DataHashFunc > DataHash; + typedef ::std::unordered_multimap< ScDPItemData, sal_Int32, DataHashFunc > DataHash; ::std::vector< ScDPItemData > maItems; DataHash maItemIds; diff --git a/main/sc/inc/dpgroup.hxx b/main/sc/inc/dpgroup.hxx index 0a3dbf50970..32a0e7041d8 100644 --- a/main/sc/inc/dpgroup.hxx +++ b/main/sc/inc/dpgroup.hxx @@ -25,7 +25,7 @@ #define SC_DPGROUP_HXX #include -#include +#include #include #include "dptabdat.hxx" @@ -189,7 +189,7 @@ public: class ScDPGroupTableData : public ScDPTableData { - typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet; + typedef ::std::unordered_set< ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > StringHashSet; ::boost::shared_ptr pSourceData; long nSourceCount; @@ -240,9 +240,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::hash_set& rDataDims); + virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::unordered_set& rDataDims); virtual void GetDrillDownData(const ::std::vector& rCriteria, - const ::std::hash_set& rCatDims, + const ::std::unordered_set& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/main/sc/inc/dpsave.hxx b/main/sc/inc/dpsave.hxx index 218ec43cee4..2d08a541979 100644 --- a/main/sc/inc/dpsave.hxx +++ b/main/sc/inc/dpsave.hxx @@ -29,7 +29,7 @@ #include #include #include "scdllapi.h" -#include +#include #include #include @@ -110,7 +110,7 @@ private: ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: - typedef std::hash_map MemberHash; + typedef std::unordered_map MemberHash; typedef std::list MemberList; private: MemberHash maMemberHash; @@ -180,7 +180,7 @@ public: com::sun::star::sheet::XDimensionsSupplier>& xSource , const std::list & deletedDims); - void UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); + void UpdateMemberVisibility(const ::std::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); bool HasInvisibleMember() const; }; diff --git a/main/sc/inc/dpsdbtab.hxx b/main/sc/inc/dpsdbtab.hxx index 4372e4dc1d1..92e02d811b7 100644 --- a/main/sc/inc/dpsdbtab.hxx +++ b/main/sc/inc/dpsdbtab.hxx @@ -79,9 +79,9 @@ public: virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::hash_set& rDataDims); + virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::unordered_set& rDataDims); virtual void GetDrillDownData(const ::std::vector& rCriteria, - const ::std::hash_set& rCatDims, + const ::std::unordered_set& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/main/sc/inc/dpshttab.hxx b/main/sc/inc/dpshttab.hxx index a08585113d9..18a2c144d32 100644 --- a/main/sc/inc/dpshttab.hxx +++ b/main/sc/inc/dpshttab.hxx @@ -92,9 +92,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable(); - virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::hash_set& rCatDims); + virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::unordered_set& rCatDims); virtual void GetDrillDownData(const ::std::vector& rCriteria, - const ::std::hash_set& rCatDims, + const ::std::unordered_set& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData); virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; diff --git a/main/sc/inc/dptabdat.hxx b/main/sc/inc/dptabdat.hxx index 1773f55e69f..5d8b21b5abc 100644 --- a/main/sc/inc/dptabdat.hxx +++ b/main/sc/inc/dptabdat.hxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; @@ -153,9 +153,9 @@ public: virtual bool IsRepeatIfEmpty(); virtual void CreateCacheTable() = 0; - virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::hash_set& rDataDims) = 0; + virtual void FilterCacheTable(const ::std::vector& rCriteria, const ::std::unordered_set& rDataDims) = 0; virtual void GetDrillDownData(const ::std::vector& rCriteria, - const ::std::hash_set& rCatDims, + const ::std::unordered_set& rCatDims, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) = 0; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) = 0; virtual const ScDPCacheTable& GetCacheTable() const = 0; diff --git a/main/sc/inc/dptabres.hxx b/main/sc/inc/dptabres.hxx index 410c57b3f13..8adf23495fb 100644 --- a/main/sc/inc/dptabres.hxx +++ b/main/sc/inc/dptabres.hxx @@ -31,8 +31,8 @@ #include #include "global.hxx" // enum ScSubTotalFunc #include "dpcachetable.hxx" -#include -#include +#include +#include #include #include @@ -256,7 +256,7 @@ public: }; typedef std::vector DimMemberArray; -typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash; +typedef std::unordered_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMemberHash; class ResultMembers { @@ -725,8 +725,8 @@ private: { size_t operator()(const ScDPItemData& r) const; }; - typedef ::std::hash_set VisibleMemberType; - typedef ::std::hash_map DimMemberType; + typedef ::std::unordered_set VisibleMemberType; + typedef ::std::unordered_map DimMemberType; DimMemberType maDimensions; ScDPSource* mpSource; diff --git a/main/sc/inc/dptabsrc.hxx b/main/sc/inc/dptabsrc.hxx index fcc97b08a2d..9d183789b67 100644 --- a/main/sc/inc/dptabsrc.hxx +++ b/main/sc/inc/dptabsrc.hxx @@ -25,7 +25,7 @@ #define SC_DPTABSRC_HXX #include -#include +#include // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance #include @@ -152,7 +152,7 @@ private: * Compile a list of dimension indices that are either, column, row or * page dimensions (i.e. all but data dimensions). */ - void GetCategoryDimensionIndices(::std::hash_set& rCatDims); + void GetCategoryDimensionIndices(::std::unordered_set& rCatDims); /** * Set visibilities of individual rows in the cache table based on the @@ -593,7 +593,7 @@ public: }; // hash map from name to index in the member array, for fast name access -typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > ScDPMembersHashMap; +typedef ::std::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > ScDPMembersHashMap; class ScDPMembers : public cppu::WeakImplHelper2< com::sun::star::container::XNameAccess, diff --git a/main/sc/inc/externalrefmgr.hxx b/main/sc/inc/externalrefmgr.hxx index 9e251f21388..c034cd68b7c 100644 --- a/main/sc/inc/externalrefmgr.hxx +++ b/main/sc/inc/externalrefmgr.hxx @@ -34,8 +34,8 @@ #include "scmatrix.hxx" #include "rangelst.hxx" -#include -#include +#include +#include #include #include #include @@ -116,8 +116,8 @@ private: TokenRef mxToken; sal_uInt32 mnFmtIndex; }; - typedef ::std::hash_map RowDataType; - typedef ::std::hash_map RowsDataType; + typedef ::std::unordered_map RowDataType; + typedef ::std::unordered_map RowsDataType; public: // SUNWS needs a forward declared friend, otherwise types and members @@ -202,7 +202,7 @@ public: }; typedef ::boost::shared_ptr TableTypeRef; - typedef ::std::hash_map TableNameIndexMap; + typedef ::std::unordered_map TableNameIndexMap; ScExternalRefCache(); ~ScExternalRefCache(); @@ -316,9 +316,9 @@ private: } }; - typedef ::std::hash_map RangeNameMap; - typedef ::std::hash_map RangeArrayMap; - typedef ::std::hash_map NamePairMap; + typedef ::std::unordered_map RangeNameMap; + typedef ::std::unordered_map RangeArrayMap; + typedef ::std::unordered_map NamePairMap; // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. @@ -345,7 +345,7 @@ private: DocItem() : mbInitFromSource(false) {} }; - typedef ::std::hash_map DocDataType; + typedef ::std::unordered_map DocDataType; DocItem* getDocItem(sal_uInt16 nFileId) const; private: @@ -359,7 +359,7 @@ class SC_DLLPUBLIC ScExternalRefManager : public formula::ExternalReferenceHelpe public: typedef ::std::set RefCellSet; - typedef ::std::hash_map RefCellMap; + typedef ::std::unordered_map RefCellMap; enum LinkUpdateType { LINK_MODIFIED, LINK_BROKEN }; @@ -407,14 +407,14 @@ private: Time maLastAccess; }; - typedef ::std::hash_map DocShellMap; - typedef ::std::hash_map LinkedDocMap; + typedef ::std::unordered_map DocShellMap; + typedef ::std::unordered_map LinkedDocMap; - typedef ::std::hash_map NumFmtMap; + typedef ::std::unordered_map NumFmtMap; - typedef ::std::hash_set LinkListeners; - typedef ::std::hash_map LinkListenerMap; + typedef ::std::unordered_set LinkListeners; + typedef ::std::unordered_map LinkListenerMap; public: /** Source document meta-data container. */ diff --git a/main/sc/inc/formulaparserpool.hxx b/main/sc/inc/formulaparserpool.hxx index 092620c5d03..238cfffc0b0 100644 --- a/main/sc/inc/formulaparserpool.hxx +++ b/main/sc/inc/formulaparserpool.hxx @@ -24,7 +24,7 @@ #ifndef SC_FORMULAPARSERPOOL_HXX #define SC_FORMULAPARSERPOOL_HXX -#include +#include #include class ScDocument; @@ -47,7 +47,7 @@ public: getFormulaParser( const ::rtl::OUString& rNamespace ); private: - typedef ::std::hash_map< + typedef ::std::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >, ::rtl::OUStringHash, diff --git a/main/sc/inc/global.hxx b/main/sc/inc/global.hxx index 1048348b353..9d069897cda 100644 --- a/main/sc/inc/global.hxx +++ b/main/sc/inc/global.hxx @@ -31,7 +31,7 @@ #include #include "scdllapi.h" -#include +#include class ImageList; class Bitmap; diff --git a/main/sc/inc/linkuno.hxx b/main/sc/inc/linkuno.hxx index 60dac7aea0f..551abd4ea0a 100644 --- a/main/sc/inc/linkuno.hxx +++ b/main/sc/inc/linkuno.hxx @@ -48,7 +48,7 @@ #include "externalrefmgr.hxx" -#include +#include #include class ScAreaLink; diff --git a/main/sc/inc/lookupcache.hxx b/main/sc/inc/lookupcache.hxx index 72a2f8d4f35..233533de2ab 100644 --- a/main/sc/inc/lookupcache.hxx +++ b/main/sc/inc/lookupcache.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include class ScDocument; @@ -236,7 +236,7 @@ private: } }; - typedef ::std::hash_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap; + typedef ::std::unordered_map< QueryKey, QueryCriteriaAndResult, QueryKey::Hash, ::std::equal_to< QueryKey > > QueryMap; QueryMap maQueryMap; ScRange maRange; ScDocument * mpDoc; @@ -248,6 +248,6 @@ private: }; -typedef ::std::hash_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; +typedef ::std::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; #endif diff --git a/main/sc/inc/sheetdata.hxx b/main/sc/inc/sheetdata.hxx index c09024adadd..c8c0ba4b2f4 100644 --- a/main/sc/inc/sheetdata.hxx +++ b/main/sc/inc/sheetdata.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "address.hxx" @@ -109,7 +109,7 @@ struct ScLoadedNamespaceEntry class ScSheetSaveData { - std::hash_set maInitialPrefixes; + std::unordered_set maInitialPrefixes; std::vector maLoadedNamespaces; std::vector maCellStyles; diff --git a/main/sc/source/core/data/bcaslot.cxx b/main/sc/source/core/data/bcaslot.cxx index 0ad15b97933..5cf2fd9a1a2 100644 --- a/main/sc/source/core/data/bcaslot.cxx +++ b/main/sc/source/core/data/bcaslot.cxx @@ -138,7 +138,7 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot() // deleted. ScBroadcastArea* pArea = *aIter; // Erase all so no hash will be accessed upon destruction of the - // hash_set. + // unordered_set. aBroadcastAreaTbl.erase( aIter++); if (!pArea->DecRef()) delete pArea; diff --git a/main/sc/source/core/data/dpcachetable.cxx b/main/sc/source/core/data/dpcachetable.cxx index cf73d8f96e8..2e3cd99dac5 100644 --- a/main/sc/source/core/data/dpcachetable.cxx +++ b/main/sc/source/core/data/dpcachetable.cxx @@ -49,8 +49,8 @@ using namespace ::com::sun::star; using ::rtl::OUString; using ::std::vector; using ::std::pair; -using ::std::hash_map; -using ::std::hash_set; +using ::std::unordered_map; +using ::std::unordered_set; using ::std::unique_ptr; using ::com::sun::star::i18n::LocaleDataItem; using ::com::sun::star::uno::Exception; @@ -292,7 +292,7 @@ bool ScDPCacheTable::isRowActive(sal_Int32 nRow) const return maRowsVisible[nRow]; } -void ScDPCacheTable::filterByPageDimension(const vector& rCriteria, const hash_set& rRepeatIfEmptyDims) +void ScDPCacheTable::filterByPageDimension(const vector& rCriteria, const unordered_set& rRepeatIfEmptyDims) { sal_Int32 nRowSize = getRowSize(); if (nRowSize != static_cast(maRowsVisible.size())) @@ -349,7 +349,7 @@ const ::std::vector& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn } void ScDPCacheTable::filterTable(const vector& rCriteria, Sequence< Sequence >& rTabData, - const hash_set& rRepeatIfEmptyDims) + const unordered_set& rRepeatIfEmptyDims) { sal_Int32 nRowSize = getRowSize(); sal_Int32 nColSize = getColSize(); @@ -430,7 +430,7 @@ bool ScDPCacheTable::empty() const } bool ScDPCacheTable::isRowQualified(sal_Int32 nRow, const vector& rCriteria, - const hash_set& rRepeatIfEmptyDims) const + const unordered_set& rRepeatIfEmptyDims) const { sal_Int32 nColSize = getColSize(); vector::const_iterator itrEnd = rCriteria.end(); diff --git a/main/sc/source/core/data/dpgroup.cxx b/main/sc/source/core/data/dpgroup.cxx index 9a866351d84..584e0580e96 100644 --- a/main/sc/source/core/data/dpgroup.cxx +++ b/main/sc/source/core/data/dpgroup.cxx @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include using namespace ::com::sun::star; using ::com::sun::star::uno::Any; @@ -62,8 +62,8 @@ using ::rtl::OUString; using ::rtl::OUStringHash; using ::std::vector; -using ::std::hash_set; -using ::std::hash_map; +using ::std::unordered_set; +using ::std::unordered_map; using ::boost::shared_ptr; #define D_TIMEFACTOR 86400.0 @@ -1201,12 +1201,12 @@ void ScDPGroupTableData::CreateCacheTable() void ScDPGroupTableData::ModifyFilterCriteria(vector& rCriteria) { - typedef hash_map GroupFieldMapType; + typedef unordered_map GroupFieldMapType; GroupFieldMapType aGroupFieldIds; { ScDPGroupDimensionVec::const_iterator itr = aGroups.begin(), itrEnd = aGroups.end(); for (; itr != itrEnd; ++itr) - aGroupFieldIds.insert( hash_map::value_type(itr->GetGroupDim(), &(*itr)) ); + aGroupFieldIds.insert( unordered_map::value_type(itr->GetGroupDim(), &(*itr)) ); } vector aNewCriteria; @@ -1304,14 +1304,14 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector& rCriteria.swap(aNewCriteria); } -void ScDPGroupTableData::FilterCacheTable(const vector& rCriteria, const hash_set& rCatDims) +void ScDPGroupTableData::FilterCacheTable(const vector& rCriteria, const unordered_set& rCatDims) { vector aNewCriteria(rCriteria); ModifyFilterCriteria(aNewCriteria); pSourceData->FilterCacheTable(aNewCriteria, rCatDims); } -void ScDPGroupTableData::GetDrillDownData(const vector& rCriteria, const hash_set& rCatDims, Sequence< Sequence >& rData) +void ScDPGroupTableData::GetDrillDownData(const vector& rCriteria, const unordered_set& rCatDims, Sequence< Sequence >& rData) { vector aNewCriteria(rCriteria); ModifyFilterCriteria(aNewCriteria); diff --git a/main/sc/source/core/data/dpsave.cxx b/main/sc/source/core/data/dpsave.cxx index dd72cd0b70a..249c9bc09d3 100644 --- a/main/sc/source/core/data/dpsave.cxx +++ b/main/sc/source/core/data/dpsave.cxx @@ -65,14 +65,14 @@ using namespace ScDPGlobal; using namespace com::sun::star::sheet; // End Comments -#include +#include using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::rtl::OUString; using ::rtl::OUStringHash; -using ::std::hash_map; +using ::std::unordered_map; using ::std::unique_ptr; // ----------------------------------------------------------------------- @@ -714,9 +714,9 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference& xD ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_HAS_HIDDEN_MEMBER, bHasHiddenMember); } -void ScDPSaveDimension::UpdateMemberVisibility(const hash_map& rData) +void ScDPSaveDimension::UpdateMemberVisibility(const unordered_map& rData) { - typedef hash_map DataMap; + typedef unordered_map DataMap; MemberList::iterator itrMem = maMemberList.begin(), itrMemEnd = maMemberList.end(); for (; itrMem != itrMemEnd; ++itrMem) { @@ -1235,7 +1235,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData) return; // First, build a dimension name-to-index map. - typedef hash_map NameIndexMap; + typedef unordered_map NameIndexMap; NameIndexMap aMap; long nColCount = pData->GetColumnCount(); for (long i = 0; i < nColCount; ++i) @@ -1292,7 +1292,7 @@ void ScDPSaveData::BuildAllDimensionMembersFromSource( ScDPObject* pDPObj ) uno::Sequence aDimNames = xDimsName->getElementNames(); // First, build a dimension name-to-index map. - typedef hash_map NameIndexMap; + typedef unordered_map NameIndexMap; NameIndexMap aMap; long nColCount = aDimNames.getLength(); for (long i = 0; i < nColCount; ++i) diff --git a/main/sc/source/core/data/dpsdbtab.cxx b/main/sc/source/core/data/dpsdbtab.cxx index f477c32817f..6ac14a6f776 100644 --- a/main/sc/source/core/data/dpsdbtab.cxx +++ b/main/sc/source/core/data/dpsdbtab.cxx @@ -57,8 +57,8 @@ using namespace com::sun::star; using ::std::vector; -using ::std::hash_map; -using ::std::hash_set; +using ::std::unordered_map; +using ::std::unordered_set; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -271,14 +271,14 @@ void ScDatabaseDPData::CreateCacheTable() aCacheTable.fillTable(); } -void ScDatabaseDPData::FilterCacheTable(const vector& rCriteria, const hash_set& rCatDims) +void ScDatabaseDPData::FilterCacheTable(const vector& rCriteria, const unordered_set& rCatDims) { CreateCacheTable(); aCacheTable.filterByPageDimension( - rCriteria, (IsRepeatIfEmpty() ? rCatDims : hash_set())); + rCriteria, (IsRepeatIfEmpty() ? rCatDims : unordered_set())); } -void ScDatabaseDPData::GetDrillDownData(const vector& rCriteria, const hash_set& rCatDims, Sequence< Sequence >& rData) +void ScDatabaseDPData::GetDrillDownData(const vector& rCriteria, const unordered_set& rCatDims, Sequence< Sequence >& rData) { CreateCacheTable(); sal_Int32 nRowSize = aCacheTable.getRowSize(); @@ -286,7 +286,7 @@ void ScDatabaseDPData::GetDrillDownData(const vector& return; aCacheTable.filterTable( - rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : hash_set()); + rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : unordered_set()); } void ScDatabaseDPData::CalcResults(CalcInfo& rInfo, bool bAutoShow) diff --git a/main/sc/source/core/data/dpshttab.cxx b/main/sc/source/core/data/dpshttab.cxx index 564283165ea..75aaa50f2f2 100644 --- a/main/sc/source/core/data/dpshttab.cxx +++ b/main/sc/source/core/data/dpshttab.cxx @@ -52,8 +52,8 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::std::vector; -using ::std::hash_map; -using ::std::hash_set; +using ::std::unordered_map; +using ::std::unordered_set; // ----------------------------------------------------------------------- @@ -201,14 +201,14 @@ void ScSheetDPData::CreateCacheTable() bIgnoreEmptyRows, bRepeatIfEmpty ); } -void ScSheetDPData::FilterCacheTable(const vector& rCriteria, const hash_set& rCatDims) +void ScSheetDPData::FilterCacheTable(const vector& rCriteria, const unordered_set& rCatDims) { CreateCacheTable(); aCacheTable.filterByPageDimension( - rCriteria, (IsRepeatIfEmpty() ? rCatDims : hash_set())); + rCriteria, (IsRepeatIfEmpty() ? rCatDims : unordered_set())); } -void ScSheetDPData::GetDrillDownData(const vector& rCriteria, const hash_set& rCatDims, Sequence< Sequence >& rData) +void ScSheetDPData::GetDrillDownData(const vector& rCriteria, const unordered_set& rCatDims, Sequence< Sequence >& rData) { CreateCacheTable(); sal_Int32 nRowSize = aCacheTable.getRowSize(); @@ -216,7 +216,7 @@ void ScSheetDPData::GetDrillDownData(const vector& rC return; aCacheTable.filterTable( - rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : hash_set()); + rCriteria, rData, IsRepeatIfEmpty() ? rCatDims : unordered_set()); } void ScSheetDPData::CalcResults(CalcInfo& rInfo, bool bAutoShow) diff --git a/main/sc/source/core/data/dptabres.cxx b/main/sc/source/core/data/dptabres.cxx index 4b392b7fa14..bfa43a44a98 100644 --- a/main/sc/source/core/data/dptabres.cxx +++ b/main/sc/source/core/data/dptabres.cxx @@ -44,7 +44,7 @@ #include #include //! Test !!! #include -#include +#include #include #include @@ -58,7 +58,7 @@ using namespace com::sun::star; using ::std::vector; using ::std::pair; -using ::std::hash_map; +using ::std::unordered_map; using ::com::sun::star::uno::Sequence; using ::rtl::OUString; @@ -3872,7 +3872,7 @@ void ScDPResultVisibilityData::addVisibleMember(const String& rDimName, const Sc void ScDPResultVisibilityData::fillFieldFilters(vector& rFilters) const { - typedef hash_map FieldNameMapType; + typedef unordered_map FieldNameMapType; FieldNameMapType aFieldNames; ScDPTableData* pData = mpSource->GetData(); long nColumnCount = pData->GetColumnCount(); diff --git a/main/sc/source/core/data/dptabsrc.cxx b/main/sc/source/core/data/dptabsrc.cxx index fec648a71d9..bf431dbf308 100644 --- a/main/sc/source/core/data/dptabsrc.cxx +++ b/main/sc/source/core/data/dptabsrc.cxx @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -72,8 +72,8 @@ using namespace com::sun::star; using ::std::vector; using ::std::set; -using ::std::hash_map; -using ::std::hash_set; +using ::std::unordered_map; +using ::std::unordered_set; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -442,7 +442,7 @@ Sequence< Sequence > SAL_CALL ScDPSource::getDrillDownData(const SequenceGetColumnCount(); - typedef hash_map FieldNameMapType; + typedef unordered_map FieldNameMapType; FieldNameMapType aFieldNames; for (long i = 0; i < nColumnCount; ++i) { @@ -485,7 +485,7 @@ Sequence< Sequence > SAL_CALL ScDPSource::getDrillDownData(const Sequence > aTabData; - hash_set aCatDims; + unordered_set aCatDims; GetCategoryDimensionIndices(aCatDims); pData->GetDrillDownData(aFilterCriteria, aCatDims, aTabData); return aTabData; @@ -706,9 +706,9 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool } } -void ScDPSource::GetCategoryDimensionIndices(hash_set& rCatDims) +void ScDPSource::GetCategoryDimensionIndices(unordered_set& rCatDims) { - hash_set aCatDims; + unordered_set aCatDims; for (long i = 0; i < nColDimCount; ++i) { sal_Int32 nDim = static_cast(nColDims[i]); @@ -791,7 +791,7 @@ void ScDPSource::FilterCacheTableByPageDimensions() } if (!aCriteria.empty()) { - hash_set aCatDims; + unordered_set aCatDims; GetCategoryDimensionIndices(aCatDims); pData->FilterCacheTable(aCriteria, aCatDims); bPageFiltered = true; diff --git a/main/sc/source/core/inc/bcaslot.hxx b/main/sc/source/core/inc/bcaslot.hxx index cd33adafd95..da96a3ea54a 100644 --- a/main/sc/source/core/inc/bcaslot.hxx +++ b/main/sc/source/core/inc/bcaslot.hxx @@ -25,7 +25,7 @@ #define SC_BCASLOT_HXX #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ struct ScBroadcastAreaEqual } }; -typedef ::std::hash_set< ScBroadcastArea*, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas; +typedef ::std::unordered_set< ScBroadcastArea*, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas; //============================================================================= @@ -112,7 +112,7 @@ struct ScBroadcastAreaBulkEqual } }; -typedef ::std::hash_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash, +typedef ::std::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash, ScBroadcastAreaBulkEqual > ScBroadcastAreasBulk; //============================================================================= diff --git a/main/sc/source/core/inc/cellkeytranslator.hxx b/main/sc/source/core/inc/cellkeytranslator.hxx index 3c1e6e40acb..d7b84ff4f13 100644 --- a/main/sc/source/core/inc/cellkeytranslator.hxx +++ b/main/sc/source/core/inc/cellkeytranslator.hxx @@ -27,7 +27,7 @@ #include "global.hxx" #include "formula/opcode.hxx" #include "unotools/transliterationwrapper.hxx" -#include +#include #include #include @@ -44,7 +44,7 @@ struct ScCellKeyword ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const ::com::sun::star::lang::Locale& rLocale); }; -typedef ::std::hash_map< String, ::std::list, ScStringHashCode, ::std::equal_to > ScCellKeywordHashMap; +typedef ::std::unordered_map< String, ::std::list, ScStringHashCode, ::std::equal_to > ScCellKeywordHashMap; /** Translate cell function keywords. diff --git a/main/sc/source/core/tool/cellkeytranslator.cxx b/main/sc/source/core/tool/cellkeytranslator.cxx index c79cb880263..ed4401aa1e9 100644 --- a/main/sc/source/core/tool/cellkeytranslator.cxx +++ b/main/sc/source/core/tool/cellkeytranslator.cxx @@ -35,7 +35,7 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::uno::Sequence; using ::std::list; -using ::std::hash_map; +using ::std::unordered_map; using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/main/sc/source/core/tool/chartlis.cxx b/main/sc/source/core/tool/chartlis.cxx index 71b257bbb1d..1151101b758 100644 --- a/main/sc/source/core/tool/chartlis.cxx +++ b/main/sc/source/core/tool/chartlis.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star; using ::std::vector; using ::std::list; -using ::std::hash_set; +using ::std::unordered_set; using ::std::unique_ptr; using ::std::for_each; @@ -111,7 +111,7 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -hash_set& ScChartListener::ExternalRefListener::getAllFileIds() +unordered_set& ScChartListener::ExternalRefListener::getAllFileIds() { return maFileIds; } @@ -181,9 +181,9 @@ ScChartListener::ScChartListener( const ScChartListener& r ) : // was listening to. ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager(); - const hash_set& rFileIds = r.mpExtRefListener->getAllFileIds(); + const unordered_set& rFileIds = r.mpExtRefListener->getAllFileIds(); mpExtRefListener.reset(new ExternalRefListener(*this, pDoc)); - hash_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + unordered_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); for (; itr != itrEnd; ++itr) { pRefMgr->addLinkListener(*itr, mpExtRefListener.get()); @@ -202,8 +202,8 @@ ScChartListener::~ScChartListener() { // Stop listening to all external files. ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager(); - const hash_set& rFileIds = mpExtRefListener->getAllFileIds(); - hash_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + const unordered_set& rFileIds = mpExtRefListener->getAllFileIds(); + unordered_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); for (; itr != itrEnd; ++itr) pRefMgr->removeLinkListener(*itr, mpExtRefListener.get()); } diff --git a/main/sc/source/core/tool/formulaparserpool.cxx b/main/sc/source/core/tool/formulaparserpool.cxx index bce41e7d46a..88503c49eff 100644 --- a/main/sc/source/core/tool/formulaparserpool.cxx +++ b/main/sc/source/core/tool/formulaparserpool.cxx @@ -57,7 +57,7 @@ class ScParserFactoryMap const OUString& rNamespace ); private: - typedef ::std::hash_map< OUString, Reference< XSingleComponentFactory >, OUStringHash > FactoryMap; + typedef ::std::unordered_map< OUString, Reference< XSingleComponentFactory >, OUStringHash > FactoryMap; Reference< XComponentContext > mxContext; /// Global component context. FactoryMap maFactories; /// All parser factories, mapped by formula namespace. diff --git a/main/sc/source/filter/inc/namebuff.hxx b/main/sc/source/filter/inc/namebuff.hxx index 948b8db12f4..9cdd9c9a524 100644 --- a/main/sc/source/filter/inc/namebuff.hxx +++ b/main/sc/source/filter/inc/namebuff.hxx @@ -31,7 +31,7 @@ #include "xiroot.hxx" #include "rangenam.hxx" -#include +#include #include class ScDocument; @@ -173,7 +173,7 @@ class ShrfmlaBuffer : public ExcRoot typedef size_t result_type; size_t operator() (const ScAddress &addr) const; }; - typedef std::hash_map ShrfmlaHash; + typedef std::unordered_map ShrfmlaHash; typedef std::list ShrfmlaList; ShrfmlaHash index_hash; diff --git a/main/sc/source/filter/xml/sheetdata.cxx b/main/sc/source/filter/xml/sheetdata.cxx index 1cc61a5fedc..eb8e59c91f0 100644 --- a/main/sc/source/filter/xml/sheetdata.cxx +++ b/main/sc/source/filter/xml/sheetdata.cxx @@ -182,7 +182,7 @@ void ScSheetSaveData::UseSaveEntries() void ScSheetSaveData::StoreInitialNamespaces( const SvXMLNamespaceMap& rNamespaces ) { // the initial namespaces are just removed from the list of loaded namespaces, - // so only a hash_set of the prefixes is needed. + // so only a unordered_set of the prefixes is needed. const NameSpaceHash& rNameHash = rNamespaces.GetAllEntries(); NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end(); diff --git a/main/sc/source/filter/xml/xmldpimp.hxx b/main/sc/source/filter/xml/xmldpimp.hxx index 98baae52218..f8198752e20 100644 --- a/main/sc/source/filter/xml/xmldpimp.hxx +++ b/main/sc/source/filter/xml/xmldpimp.hxx @@ -35,7 +35,7 @@ #include "dpsave.hxx" #include "queryparam.hxx" -#include +#include class ScXMLImport; class ScDPSaveNumGroupDimension; @@ -75,7 +75,7 @@ public: class ScXMLDataPilotTableContext : public SvXMLImportContext { - typedef ::std::hash_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet; + typedef ::std::unordered_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet; StringSet maHiddenMemberFields; struct GrandTotalItem diff --git a/main/sc/source/filter/xml/xmlexprt.hxx b/main/sc/source/filter/xml/xmlexprt.hxx index 422523c4634..3348fe3b808 100644 --- a/main/sc/source/filter/xml/xmlexprt.hxx +++ b/main/sc/source/filter/xml/xmlexprt.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -#include +#include class ScOutlineArray; class SvXMLExportPropertyMapper; @@ -82,7 +82,7 @@ class ScXMLExport : public SvXMLExport UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper; UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; - typedef ::std::hash_map NumberFormatIndexMap; + typedef ::std::unordered_map NumberFormatIndexMap; NumberFormatIndexMap aNumFmtIndexMap; ScMySharedData* pSharedData; ScColumnStyles* pColumnStyles; diff --git a/main/sc/source/filter/xml/xmlimprt.hxx b/main/sc/source/filter/xml/xmlimprt.hxx index ec2ade8988d..662bfdf6c07 100644 --- a/main/sc/source/filter/xml/xmlimprt.hxx +++ b/main/sc/source/filter/xml/xmlimprt.hxx @@ -48,7 +48,7 @@ #include #include -#include +#include class ScRangeList; class ScMyStyleNumberFormats; @@ -658,7 +658,7 @@ class ScMyStylesImportHelper; class ScXMLImport: public SvXMLImport { - typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + typedef ::std::unordered_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; CellTypeMap aCellTypeMap; ScDocument* pDoc; diff --git a/main/sc/source/ui/cctrl/dpcontrol.cxx b/main/sc/source/ui/cctrl/dpcontrol.cxx index 802fcf8a673..25909b94339 100644 --- a/main/sc/source/ui/cctrl/dpcontrol.cxx +++ b/main/sc/source/ui/cctrl/dpcontrol.cxx @@ -52,7 +52,7 @@ using ::com::sun::star::accessibility::XAccessibleContext; using ::rtl::OUString; using ::rtl::OUStringHash; using ::std::vector; -using ::std::hash_map; +using ::std::unordered_map; using ::std::unique_ptr; ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : @@ -1380,9 +1380,9 @@ const Size& ScDPFieldPopupWindow::getWindowSize() const return maWndSize; } -void ScDPFieldPopupWindow::getResult(hash_map& rResult) +void ScDPFieldPopupWindow::getResult(unordered_map& rResult) { - typedef hash_map ResultMap; + typedef unordered_map ResultMap; ResultMap aResult; size_t n = maMembers.size(); for (size_t i = 0; i < n; ++i) diff --git a/main/sc/source/ui/inc/crnrdlg.hxx b/main/sc/source/ui/inc/crnrdlg.hxx index 0f49d8aec3d..5385b7d76e9 100644 --- a/main/sc/source/ui/inc/crnrdlg.hxx +++ b/main/sc/source/ui/inc/crnrdlg.hxx @@ -29,7 +29,7 @@ #include #include -#include +#include class ScViewData; class ScDocument; @@ -74,7 +74,7 @@ private: ScRangePairListRef xColNameRanges; ScRangePairListRef xRowNameRanges; - typedef ::std::hash_map< String, ScRange, ScStringHashCode, ::std::equal_to > NameRangeMap; + typedef ::std::unordered_map< String, ScRange, ScStringHashCode, ::std::equal_to > NameRangeMap; NameRangeMap aRangeMap; ScViewData* pViewData; ScDocument* pDoc; diff --git a/main/sc/source/ui/inc/docsh.hxx b/main/sc/source/ui/inc/docsh.hxx index 501a1ac2a49..3c62631c0d8 100644 --- a/main/sc/source/ui/inc/docsh.hxx +++ b/main/sc/source/ui/inc/docsh.hxx @@ -37,7 +37,7 @@ #include "shellids.hxx" #include "refreshtimer.hxx" -#include +#include class ScEditEngineDefaulter; class FontList; @@ -67,7 +67,7 @@ class ScSheetSaveData; namespace sfx2 { class FileDialogHelper; } struct DocShell_Impl; -typedef ::std::hash_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; +typedef ::std::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; //================================================================== diff --git a/main/sc/source/ui/inc/dpcontrol.hxx b/main/sc/source/ui/inc/dpcontrol.hxx index 26e511840b1..4c2cd7e3ba7 100644 --- a/main/sc/source/ui/inc/dpcontrol.hxx +++ b/main/sc/source/ui/inc/dpcontrol.hxx @@ -35,7 +35,7 @@ #include #include -#include +#include namespace com { namespace sun { namespace star { @@ -277,7 +277,7 @@ public: const Size& getWindowSize() const; - void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult); + void getResult(::std::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult); void close(bool bOK); /** diff --git a/main/sc/source/ui/inc/pvfundlg.hxx b/main/sc/source/ui/inc/pvfundlg.hxx index fa8ba88dd72..9dfe1715046 100644 --- a/main/sc/source/ui/inc/pvfundlg.hxx +++ b/main/sc/source/ui/inc/pvfundlg.hxx @@ -38,7 +38,7 @@ #include #include "pivot.hxx" -#include +#include // ============================================================================ @@ -219,7 +219,7 @@ private: CancelButton maBtnCancel; HelpButton maBtnHelp; - typedef ::std::hash_map DimNameIndexMap; + typedef ::std::unordered_map DimNameIndexMap; DimNameIndexMap maNameIndexMap; ScDPObject& mrDPObj; }; diff --git a/main/sc/source/ui/unoobj/cellsuno.cxx b/main/sc/source/ui/unoobj/cellsuno.cxx index ee0e1ab8afa..0075d65dd21 100644 --- a/main/sc/source/ui/unoobj/cellsuno.cxx +++ b/main/sc/source/ui/unoobj/cellsuno.cxx @@ -9471,7 +9471,7 @@ struct ScPatternHashCode }; // Hash map to find a range by its start row -typedef ::std::hash_map< SCROW, ScRange > ScRowRangeHashMap; +typedef ::std::unordered_map< SCROW, ScRange > ScRowRangeHashMap; typedef ::std::vector ScRangeVector; @@ -9590,7 +9590,7 @@ const ScRangeList& ScUniqueFormatsEntry::GetRanges() return *aReturnRanges; } -typedef ::std::hash_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap; +typedef ::std::unordered_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap; // function object to sort the range lists by start of first range struct ScUniqueFormatsOrder diff --git a/main/sc/source/ui/unoobj/chart2uno.cxx b/main/sc/source/ui/unoobj/chart2uno.cxx index 2f0c9aa4339..02c21a55faf 100644 --- a/main/sc/source/ui/unoobj/chart2uno.cxx +++ b/main/sc/source/ui/unoobj/chart2uno.cxx @@ -75,7 +75,8 @@ using ::std::unique_ptr; using ::std::vector; using ::std::list; using ::std::distance; -using ::std::hash_set; +using ::std::unary_function; +using ::std::unordered_set; using ::boost::shared_ptr; namespace @@ -2741,8 +2742,8 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs() if (!m_pExtRefListener.get()) return; - const hash_set& rFileIds = m_pExtRefListener->getAllFileIds(); - hash_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + const unordered_set& rFileIds = m_pExtRefListener->getAllFileIds(); + unordered_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager(); for (; itr != itrEnd; ++itr) pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get()); @@ -2774,8 +2775,8 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r) ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager(); m_pExtRefListener.reset(new ExternalRefListener(*this, m_pDocument)); - const hash_set& rFileIds = r.m_pExtRefListener->getAllFileIds(); - hash_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + const unordered_set& rFileIds = r.m_pExtRefListener->getAllFileIds(); + unordered_set::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); for (; itr != itrEnd; ++itr) { pRefMgr->addLinkListener(*itr, m_pExtRefListener.get()); @@ -2959,7 +2960,7 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } -const hash_set& ScChart2DataSequence::ExternalRefListener::getAllFileIds() +const unordered_set& ScChart2DataSequence::ExternalRefListener::getAllFileIds() { return maFileIds; } diff --git a/main/sc/source/ui/vba/vbachartobjects.hxx b/main/sc/source/ui/vba/vbachartobjects.hxx index 2bf0c981968..5dd7a2a09b0 100644 --- a/main/sc/source/ui/vba/vbachartobjects.hxx +++ b/main/sc/source/ui/vba/vbachartobjects.hxx @@ -31,11 +31,11 @@ #include #include #include "excelvbahelper.hxx" -#include +#include typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; /* #TODO see if this hash table is 'really' necessary -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, css::uno::Reference< ov::excel::XChartObject >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > aHashTable; diff --git a/main/sc/source/ui/vba/vbacharts.hxx b/main/sc/source/ui/vba/vbacharts.hxx index 6f09ba79cfd..ee52a450592 100644 --- a/main/sc/source/ui/vba/vbacharts.hxx +++ b/main/sc/source/ui/vba/vbacharts.hxx @@ -26,7 +26,7 @@ #include #include #include "excelvbahelper.hxx" -#include +#include typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE; diff --git a/main/sc/source/ui/vba/vbawindow.cxx b/main/sc/source/ui/vba/vbawindow.cxx index 6a44f0ab74e..30ddb7f15bc 100644 --- a/main/sc/source/ui/vba/vbawindow.cxx +++ b/main/sc/source/ui/vba/vbawindow.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include "unonames.hxx" @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef std::hash_map< rtl::OUString, +typedef std::unordered_map< rtl::OUString, SCTAB, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameIndexHash; diff --git a/main/sc/source/ui/vba/vbawindows.cxx b/main/sc/source/ui/vba/vbawindows.cxx index f57f3774799..37fdddd1478 100644 --- a/main/sc/source/ui/vba/vbawindows.cxx +++ b/main/sc/source/ui/vba/vbawindows.cxx @@ -22,7 +22,7 @@ #include "vbawindows.hxx" -#include +#include #include #include @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef std::hash_map< rtl::OUString, +typedef std::unordered_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameIndexHash; diff --git a/main/sc/source/ui/vba/vbaworkbooks.cxx b/main/sc/source/ui/vba/vbaworkbooks.cxx index d2c1e3a444a..252f13f698a 100644 --- a/main/sc/source/ui/vba/vbaworkbooks.cxx +++ b/main/sc/source/ui/vba/vbaworkbooks.cxx @@ -57,7 +57,7 @@ #include "vbaworkbooks.hxx" #include -#include +#include #include #include using namespace ::ooo::vba; diff --git a/main/sc/source/ui/view/dbfunc3.cxx b/main/sc/source/ui/view/dbfunc3.cxx index 2dbaf68b7bd..4fcaa70e74a 100644 --- a/main/sc/source/ui/view/dbfunc3.cxx +++ b/main/sc/source/ui/view/dbfunc3.cxx @@ -69,8 +69,8 @@ #include "cell.hxx" #include "userlist.hxx" -#include -#include +#include +#include #include #include #include @@ -89,8 +89,8 @@ using ::rtl::OUStringBuffer; using ::std::unique_ptr; using ::std::list; using ::std::vector; -using ::std::hash_map; -using ::std::hash_set; +using ::std::unordered_map; +using ::std::unordered_set; // STATIC DATA ----------------------------------------------------------- @@ -1786,7 +1786,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 typedef ScDPSaveDimension::MemberList MemList; const MemList& rDimMembers = pSaveDim->GetMembers(); list aMembers; - hash_set aMemberSet; + unordered_set aMemberSet; size_t nMemberCount = 0; for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end(); itr != itrEnd; ++itr) @@ -1803,7 +1803,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 // Collect and rank those custom sort strings that also exist in the member name list. - typedef hash_map UserSortMap; + typedef unordered_map UserSortMap; UserSortMap aSubStrs; sal_uInt16 nSubCount = 0; if (pUserListId) @@ -1907,7 +1907,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field // look through the source range - std::hash_set< rtl::OUString, rtl::OUStringHash, std::equal_to > aMembersSet; // for lookup + std::unordered_set< rtl::OUString, rtl::OUStringHash, std::equal_to > aMembersSet; // for lookup std::vector< rtl::OUString > aMembersVector; // members in original order, for inserting aMembersVector.reserve( std::max( static_cast( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ), static_cast( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) ); diff --git a/main/sc/source/ui/view/gridwin2.cxx b/main/sc/source/ui/view/gridwin2.cxx index 76aa6be6f34..bb5fb7cdaf5 100644 --- a/main/sc/source/ui/view/gridwin2.cxx +++ b/main/sc/source/ui/view/gridwin2.cxx @@ -57,13 +57,13 @@ #include "scabstdlg.hxx" //CHINA001 #include -#include +#include using namespace com::sun::star; using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::std::vector; using ::std::unique_ptr; -using ::std::hash_map; +using ::std::unordered_map; using ::rtl::OUString; using ::rtl::OUStringHash; @@ -557,8 +557,8 @@ void ScGridWindow::DPLaunchFieldPopupMenu( void ScGridWindow::UpdateDPFromFieldPopupMenu() { - typedef hash_map MemNameMapType; - typedef hash_map MemVisibilityType; + typedef unordered_map MemNameMapType; + typedef unordered_map MemVisibilityType; if (!mpDPFieldPopup.get()) return; diff --git a/main/scripting/source/dlgprov/dlgevtatt.hxx b/main/scripting/source/dlgprov/dlgevtatt.hxx index ccafd3248bc..ab988ca6388 100644 --- a/main/scripting/source/dlgprov/dlgevtatt.hxx +++ b/main/scripting/source/dlgprov/dlgevtatt.hxx @@ -38,7 +38,7 @@ #include -#include +#include //......................................................................... namespace dlgprov @@ -48,7 +48,7 @@ namespace dlgprov // ============================================================================= // class DialogEventsAttacherImpl // ============================================================================= - typedef std::hash_map< rtl::OUString, + typedef std::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ListenerHash; diff --git a/main/scripting/source/provider/ActiveMSPList.hxx b/main/scripting/source/provider/ActiveMSPList.hxx index 7ff35109e81..88fd11ab4ba 100644 --- a/main/scripting/source/provider/ActiveMSPList.hxx +++ b/main/scripting/source/provider/ActiveMSPList.hxx @@ -23,7 +23,7 @@ #ifndef _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_ #define _FRAMEWORK_SCRIPT_PROVIDER_OPENDOCUMENTLIST_HXX_ -#include +#include #include #include @@ -54,7 +54,7 @@ typedef ::std::map < css::uno::Reference< css::uno::XInterface > , ::comphelper::OInterfaceCompare< css::uno::XInterface > > ScriptComponent_map; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, css::uno::Reference< css::script::provider::XScriptProvider >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Msp_hash; diff --git a/main/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/main/scripting/source/provider/BrowseNodeFactoryImpl.cxx index d282954523e..10564170ab1 100644 --- a/main/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/main/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -161,7 +161,7 @@ class BrowseNodeAggregator : //typedef ::std::map< ::rtl::OUString, Reference< browse::XBrowseNode > > -typedef ::std::hash_map< ::rtl::OUString, Reference< browse::XBrowseNode >, +typedef ::std::unordered_map< ::rtl::OUString, Reference< browse::XBrowseNode >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > BrowseNodeAggregatorHash; typedef ::std::vector< ::rtl::OUString > vString; diff --git a/main/scripting/source/provider/ProviderCache.hxx b/main/scripting/source/provider/ProviderCache.hxx index 006c369108a..4781bfc0017 100644 --- a/main/scripting/source/provider/ProviderCache.hxx +++ b/main/scripting/source/provider/ProviderCache.hxx @@ -24,7 +24,7 @@ #ifndef _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_ #define _FRAMEWORK_SCRIPT_PROVIDER_PROVIDERCACHE_HXX_ -#include +#include #include #include #include @@ -53,7 +53,7 @@ struct ProviderDetails css::uno::Reference< css::lang::XSingleComponentFactory > factory; css::uno::Reference< css::script::provider::XScriptProvider > provider; }; -typedef ::std::hash_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, +typedef ::std::unordered_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash; diff --git a/main/scripting/source/storage/ScriptData.hxx b/main/scripting/source/storage/ScriptData.hxx index 9975d4a7256..7af6598c9c6 100644 --- a/main/scripting/source/storage/ScriptData.hxx +++ b/main/scripting/source/storage/ScriptData.hxx @@ -25,7 +25,7 @@ #define _SCRIPTING_STORAGE_SCRIPTDATA_HXX_ #include -#include +#include #include #include @@ -37,11 +37,11 @@ namespace scripting_impl typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > str_pair; typedef ::std::vector< str_pair > props_vec; -typedef ::std::hash_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash, +typedef ::std::unordered_map< ::rtl::OUString, props_vec, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > strpairvec_map; -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > strpair_map; -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map; +typedef ::std::unordered_map< ::rtl::OUString, ::std::pair< props_vec, strpairvec_map >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > filesets_map; struct ScriptData { diff --git a/main/scripting/source/storage/ScriptInfo.cxx b/main/scripting/source/storage/ScriptInfo.cxx index 5f94a861622..72e185506ac 100644 --- a/main/scripting/source/storage/ScriptInfo.cxx +++ b/main/scripting/source/storage/ScriptInfo.cxx @@ -25,7 +25,7 @@ #include "precompiled_scripting.hxx" #include -#include +#include #include #include @@ -47,7 +47,7 @@ using namespace ::drafts::com::sun::star::script::framework::storage; namespace scripting_impl { -typedef ::std::hash_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash, +typedef ::std::unordered_map < ::rtl::OUString, css::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertySet_hash; class PropertySetImpl : public ::cppu::WeakImplHelper1< css::beans::XPropertySet > diff --git a/main/scripting/source/storage/ScriptSecurityManager.hxx b/main/scripting/source/storage/ScriptSecurityManager.hxx index 072e6017ccd..22e604db20c 100644 --- a/main/scripting/source/storage/ScriptSecurityManager.hxx +++ b/main/scripting/source/storage/ScriptSecurityManager.hxx @@ -25,7 +25,7 @@ #ifndef _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_ #define _FRAMEWORK_SCRIPT_SCRIPTSECURITYMANAGER_HXX_ -#include +#include #include #include #include @@ -45,7 +45,7 @@ struct StoragePerm { sal_Bool execPermission; }; -typedef ::std::hash_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash, +typedef ::std::unordered_map< ::rtl::OUString, StoragePerm, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Permission_Hash; /** * Class responsible for managing the ScriptSecurity. diff --git a/main/scripting/source/storage/ScriptStorage.hxx b/main/scripting/source/storage/ScriptStorage.hxx index e57fcc69602..638cf43ec0d 100644 --- a/main/scripting/source/storage/ScriptStorage.hxx +++ b/main/scripting/source/storage/ScriptStorage.hxx @@ -24,7 +24,7 @@ #define __SCRIPTING_STORAGE_SCRIPTSTORAGE_HXX_ #include -#include +#include #include #include // helper for component factory @@ -53,20 +53,20 @@ namespace scripting_impl typedef ::std::vector< ScriptData > Datas_vec; //----------------------------------------------------------------------------- // function name -> ScriptData -typedef ::std::hash_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash, +typedef ::std::unordered_map < ::rtl::OUString, ScriptData, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptFunction_hash; //----------------------------------------------------------------------------- // language -> hash of function name -> ScriptData -typedef ::std::hash_map < ::rtl::OUString, ScriptFunction_hash, +typedef ::std::unordered_map < ::rtl::OUString, ScriptFunction_hash, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptData_hash; //----------------------------------------------------------------------------- -typedef ::std::hash_map < ::rtl::OUString, +typedef ::std::unordered_map < ::rtl::OUString, css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptOutput_hash; //----------------------------------------------------------------------------- -typedef ::std::hash_map < ::rtl::OUString, +typedef ::std::unordered_map < ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ScriptLanguages_hash; diff --git a/main/scripting/source/storage/ScriptStorageManager.cxx b/main/scripting/source/storage/ScriptStorageManager.cxx index 58714701bf9..af651dc696d 100644 --- a/main/scripting/source/storage/ScriptStorageManager.cxx +++ b/main/scripting/source/storage/ScriptStorageManager.cxx @@ -160,7 +160,7 @@ ScriptStorageManager::setupAnyStorage( UNO_QUERY_THROW ); - // and place it in the hash_map. Increment the counter + // and place it in the unordered_map. Increment the counter m_ScriptStorageMap[ m_count++ ] = xInterface; sal_Int32 sid = m_count - 1; diff --git a/main/scripting/source/storage/ScriptStorageManager.hxx b/main/scripting/source/storage/ScriptStorageManager.hxx index 5d55dcb9973..2467c659f55 100644 --- a/main/scripting/source/storage/ScriptStorageManager.hxx +++ b/main/scripting/source/storage/ScriptStorageManager.hxx @@ -25,7 +25,7 @@ #ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_ #define _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_STORAGE_SCRIPTSTORAGEMANAGER_HXX_ -#include +#include #include #include @@ -54,7 +54,7 @@ namespace scripting_impl typedef ::std::map < sal_Int32, css::uno::Reference < css::uno::XInterface > > ScriptStorage_map; -typedef ::std::hash_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash> +typedef ::std::unordered_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash> StorageId_hash; class ScriptStorageManager : public diff --git a/main/scripting/source/stringresource/stringresource.hxx b/main/scripting/source/stringresource/stringresource.hxx index b3d8872a276..c87f8ac31fa 100644 --- a/main/scripting/source/stringresource/stringresource.hxx +++ b/main/scripting/source/stringresource/stringresource.hxx @@ -42,7 +42,7 @@ #include #include -#include +#include //......................................................................... namespace stringresource @@ -77,7 +77,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, ::rtl::OUString, @@ -86,7 +86,7 @@ typedef std::hash_map > IdToStringMap; -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, sal_Int32, diff --git a/main/scripting/source/vbaevents/eventhelper.cxx b/main/scripting/source/vbaevents/eventhelper.cxx index 33824f6cbb2..8f5cabaf760 100644 --- a/main/scripting/source/vbaevents/eventhelper.cxx +++ b/main/scripting/source/vbaevents/eventhelper.cxx @@ -83,7 +83,7 @@ #include #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::script; @@ -267,7 +267,7 @@ struct TranslateInfo }; -typedef std::hash_map< rtl::OUString, +typedef std::unordered_map< rtl::OUString, std::list< TranslateInfo >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventInfoHash; @@ -563,7 +563,7 @@ class ReadOnlyEventsNameContainer : public NameContainer_BASE { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: -typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash, +typedef std::unordered_map< rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventSupplierHash; EventSupplierHash m_hEvents; diff --git a/main/sd/inc/CustomAnimationPreset.hxx b/main/sd/inc/CustomAnimationPreset.hxx index c8f4ec58488..ad5ef7a0118 100644 --- a/main/sd/inc/CustomAnimationPreset.hxx +++ b/main/sd/inc/CustomAnimationPreset.hxx @@ -35,12 +35,12 @@ #endif #include -#include +#include namespace sd { -typedef std::hash_map< rtl::OUString, CustomAnimationEffectPtr, comphelper::UStringHash, comphelper::UStringEqual > EffectsSubTypeMap; -typedef std::hash_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap; +typedef std::unordered_map< rtl::OUString, CustomAnimationEffectPtr, comphelper::UStringHash, comphelper::UStringEqual > EffectsSubTypeMap; +typedef std::unordered_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap; typedef std::vector< rtl::OUString > UStringList; class CustomAnimationPreset @@ -79,7 +79,7 @@ private: }; typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr; -typedef std::hash_map EffectDescriptorMap; +typedef std::unordered_map EffectDescriptorMap; typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList; struct PresetCategory diff --git a/main/sd/inc/TransitionPreset.hxx b/main/sd/inc/TransitionPreset.hxx index 6ceaa4d17ff..ad6da73a313 100644 --- a/main/sd/inc/TransitionPreset.hxx +++ b/main/sd/inc/TransitionPreset.hxx @@ -34,7 +34,7 @@ #endif #include -#include +#include namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } @@ -49,7 +49,7 @@ namespace sd { class TransitionPreset; typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr; typedef std::list< TransitionPresetPtr > TransitionPresetList; -typedef std::hash_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap; +typedef std::unordered_map< rtl::OUString, rtl::OUString, comphelper::UStringHash, comphelper::UStringEqual > UStringMap; class TransitionPreset { diff --git a/main/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/main/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 1dfbfb1445b..2b0053fb588 100644 --- a/main/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/main/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include namespace css = ::com::sun::star; @@ -122,7 +122,7 @@ private: css::uno::Any maUserData; }; typedef ::std::vector ListenerList; - typedef ::std::hash_map + typedef ::std::unordered_map #include #include -#include +#include namespace css = ::com::sun::star; @@ -85,7 +85,7 @@ public: private: ::osl::Mutex maMutex; - typedef ::std::hash_map< + typedef ::std::unordered_map< ::rtl::OUString, css::uno::Reference, ::comphelper::UStringHash, diff --git a/main/sd/source/ui/framework/module/ModuleController.cxx b/main/sd/source/ui/framework/module/ModuleController.cxx index 4652873df16..c3be047f259 100644 --- a/main/sd/source/ui/framework/module/ModuleController.cxx +++ b/main/sd/source/ui/framework/module/ModuleController.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include @@ -51,7 +51,7 @@ static const sal_uInt32 snStartupPropertyCount (1); class ModuleController::ResourceToFactoryMap - : public ::std::hash_map< + : public ::std::unordered_map< rtl::OUString, rtl::OUString, ::comphelper::UStringHash, @@ -63,7 +63,7 @@ class ModuleController::ResourceToFactoryMap class ModuleController::LoadedFactoryContainer - : public ::std::hash_map< + : public ::std::unordered_map< rtl::OUString, WeakReference, ::comphelper::UStringHash, diff --git a/main/sd/source/ui/framework/tools/FrameworkHelper.cxx b/main/sd/source/ui/framework/tools/FrameworkHelper.cxx index 68dc62e858d..63173b940ed 100644 --- a/main/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/main/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -300,7 +300,7 @@ namespace drawing framework and the enums defined in the ViewShell class. */ class FrameworkHelper::ViewURLMap - : public ::std::hash_map< + : public ::std::unordered_map< rtl::OUString, ViewShell::ShellType, ::comphelper::UStringHash, diff --git a/main/sd/source/ui/sidebar/MasterPageObserver.cxx b/main/sd/source/ui/sidebar/MasterPageObserver.cxx index e6b451bb7f5..984ff5c13a7 100644 --- a/main/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/main/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -26,7 +26,7 @@ #include #include "drawdoc.hxx" #include "sdpage.hxx" -#include +#include #include #include #include @@ -86,7 +86,7 @@ class MasterPageObserver::Implementation size_t operator()(SdDrawDocument* argument) const { return reinterpret_cast(argument); } }; - typedef ::std::hash_map MasterPageContainer; diff --git a/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 28e014ee9c9..2e6d16f2369 100644 --- a/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -100,7 +100,7 @@ class CacheHash { }; class BitmapCache::CacheBitmapContainer - : public ::std::hash_map + : public ::std::unordered_map { public: CacheBitmapContainer (void) {} diff --git a/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index c027ce8890b..590589e1abe 100644 --- a/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/main/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -30,7 +30,7 @@ class SdrPage; #include #include #include -#include +#include namespace sd { namespace slidesorter { namespace cache { diff --git a/main/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/main/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index f43ce2538f2..0d24c447288 100644 --- a/main/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/main/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -128,7 +128,7 @@ namespace sd { namespace slidesorter { namespace cache { /** Container for the active caches. */ class PageCacheManager::PageCacheContainer - : public ::std::hash_map, CacheDescriptor::Hash, CacheDescriptor::Equal> diff --git a/main/sd/source/ui/tools/IconCache.cxx b/main/sd/source/ui/tools/IconCache.cxx index dcfe1fee7cb..22a9505ed9a 100644 --- a/main/sd/source/ui/tools/IconCache.cxx +++ b/main/sd/source/ui/tools/IconCache.cxx @@ -27,7 +27,7 @@ #include "tools/IconCache.hxx" #include "sdresid.hxx" -#include +#include #include #include @@ -46,7 +46,7 @@ class IconCache::Implementation */ static IconCache* mpInstance; - typedef ::std::hash_map ImageContainer; + typedef ::std::unordered_map ImageContainer; ImageContainer maContainer; Image GetIcon (sal_uInt16 nResourceId); diff --git a/main/sd/source/ui/unoidl/facreg.cxx b/main/sd/source/ui/unoidl/facreg.cxx index 1c4e18caaf1..d751718b4a2 100644 --- a/main/sd/source/ui/unoidl/facreg.cxx +++ b/main/sd/source/ui/unoidl/facreg.cxx @@ -38,7 +38,7 @@ #define INCLUDED_STRING_H #endif #include -#include +#include #include using namespace rtl; @@ -204,7 +204,7 @@ enum FactoryId SlideLayoutControllerFactoryId, InsertSlideControllerFactoryId, }; -typedef ::std::hash_map FactoryMap; +typedef ::std::unordered_map FactoryMap; namespace { diff --git a/main/sd/source/ui/view/ViewShellManager.cxx b/main/sd/source/ui/view/ViewShellManager.cxx index 2e3cca877e7..b1b5aa931c7 100644 --- a/main/sd/source/ui/view/ViewShellManager.cxx +++ b/main/sd/source/ui/view/ViewShellManager.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #undef VERBOSE //#define VERBOSE 2 @@ -177,7 +177,7 @@ class ViewShellManager::Implementation mutable ::osl::Mutex maMutex; class ShellHash{public: size_t operator()(const SfxShell* p) const { return (size_t)p;} }; - typedef ::std::hash_multimap + typedef ::std::unordered_multimap FactoryList; FactoryList maShellFactories; @@ -189,7 +189,7 @@ class ViewShellManager::Implementation ActiveShellList maActiveViewShells; typedef ::std::list SubShellSubList; - typedef ::std::hash_map SubShellList; + typedef ::std::unordered_map SubShellList; SubShellList maActiveSubShells; /** In this member we remember what shells we have pushed on the shell diff --git a/main/sdext/source/minimizer/pppoptimizertoken.cxx b/main/sdext/source/minimizer/pppoptimizertoken.cxx index aba42cb69e4..f24427587c2 100644 --- a/main/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/main/sdext/source/minimizer/pppoptimizertoken.cxx @@ -24,10 +24,10 @@ #include "pppoptimizertoken.hxx" #include -#include +#include #include -typedef std::hash_map< const char*, PPPOptimizerTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; +typedef std::unordered_map< const char*, PPPOptimizerTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/main/sdext/source/pdfimport/filterdet.cxx b/main/sdext/source/pdfimport/filterdet.cxx index 3158acac352..d59f042d447 100644 --- a/main/sdext/source/pdfimport/filterdet.cxx +++ b/main/sdext/source/pdfimport/filterdet.cxx @@ -655,7 +655,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& if( pTrailer && pTrailer->m_pDict ) { // search document checksum entry - std::hash_map< rtl::OString, + std::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator chk; chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); @@ -672,7 +672,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // search for AdditionalStreams entry - std::hash_map< rtl::OString, + std::unordered_map< rtl::OString, pdfparse::PDFEntry*, rtl::OStringHash >::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); diff --git a/main/sdext/source/pdfimport/inc/pdfihelper.hxx b/main/sdext/source/pdfimport/inc/pdfihelper.hxx index 6ddd950ef02..94e5f11f22e 100644 --- a/main/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/main/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include // virtual resolution of the PDF OutputDev in dpi #define PDFI_OUTDEV_RESOLUTION 7200 @@ -46,7 +46,7 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together diff --git a/main/sdext/source/pdfimport/inc/pdfparse.hxx b/main/sdext/source/pdfimport/inc/pdfparse.hxx index 62a50b4f0f5..fac73367e99 100644 --- a/main/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/main/sdext/source/pdfimport/inc/pdfparse.hxx @@ -29,7 +29,7 @@ #include #include -#include +#include namespace pdfparse { @@ -184,7 +184,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef std::hash_map Map; + typedef std::unordered_map Map; Map m_aMap; PDFDict() {} diff --git a/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 485f951731f..4321c6178c8 100644 --- a/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/main/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -541,7 +541,7 @@ void PDFDict::insertValue( const OString& rName, PDFEntry* pValue ) if( ! pValue ) eraseValue( rName ); - std::hash_map::iterator it = m_aMap.find( rName ); + std::unordered_map::iterator it = m_aMap.find( rName ); if( it == m_aMap.end() ) { // new name/value, pair, append it @@ -635,7 +635,7 @@ unsigned int PDFStream::getDictLength( const PDFContainer* pContainer ) const if( ! m_pDict ) return 0; // find /Length entry, can either be a direct or indirect number object - std::hash_map::const_iterator it = + std::unordered_map::const_iterator it = m_pDict->m_aMap.find( "Length" ); if( it == m_pDict->m_aMap.end() ) return 0; @@ -690,7 +690,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const return false; } // is there a filter entry ? - std::hash_map::const_iterator it = + std::unordered_map::const_iterator it = m_pStream->m_pDict->m_aMap.find( "Filter" ); if( it != m_pStream->m_pDict->m_aMap.end() ) { @@ -861,7 +861,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const if( bDeflate && rWriteContext.m_bDeflate ) { // delete flatedecode filter - std::hash_map::const_iterator it = + std::unordered_map::const_iterator it = pClone->m_pStream->m_pDict->m_aMap.find( "Filter" ); if( it != pClone->m_pStream->m_pDict->m_aMap.end() ) { diff --git a/main/sdext/source/pdfimport/sax/saxattrlist.cxx b/main/sdext/source/pdfimport/sax/saxattrlist.cxx index 9fdc2e4e66b..2499587bd57 100644 --- a/main/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/main/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -29,10 +29,10 @@ namespace pdfi { -SaxAttrList::SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) +SaxAttrList::SaxAttrList( const std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) { m_aAttributes.reserve(rMap.size()); - for( std::hash_map< rtl::OUString, + for( std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rMap.begin(); it != rMap.end(); ++it ) @@ -87,7 +87,7 @@ rtl::OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw( rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rName) throw() { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString(); } diff --git a/main/sdext/source/pdfimport/sax/saxattrlist.hxx b/main/sdext/source/pdfimport/sax/saxattrlist.hxx index 9ed484c6cd3..175d3c3cd03 100644 --- a/main/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/main/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -48,11 +48,11 @@ namespace pdfi : m_aName( i_rName ), m_aValue( i_rValue ) {} }; std::vector< AttrEntry > m_aAttributes; - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; public: SaxAttrList() {} - SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); + SaxAttrList( const std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); diff --git a/main/sdext/source/pdfimport/test/pdfunzip.cxx b/main/sdext/source/pdfimport/test/pdfunzip.cxx index daed0e23491..eeda2248105 100644 --- a/main/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/main/sdext/source/pdfimport/test/pdfunzip.cxx @@ -302,7 +302,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi if( pTrailer && pTrailer->m_pDict ) { // search for AdditionalStreams entry - std::hash_map::iterator add_stream; + std::unordered_map::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream != pTrailer->m_pDict->m_aMap.end() ) { @@ -329,7 +329,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pDict ) continue; - std::hash_map::iterator map_it = + std::unordered_map::iterator map_it = pDict->m_aMap.find( "Type" ); if( map_it == pDict->m_aMap.end() ) continue; diff --git a/main/sdext/source/pdfimport/test/tests.cxx b/main/sdext/source/pdfimport/test/tests.cxx index 3c01044e4c4..fb443cab92f 100644 --- a/main/sdext/source/pdfimport/test/tests.cxx +++ b/main/sdext/source/pdfimport/test/tests.cxx @@ -66,7 +66,7 @@ #include #include -#include +#include using namespace ::pdfparse; @@ -395,11 +395,11 @@ namespace { } - typedef std::hash_map IdToFontMap; - typedef std::hash_map FontToIdMap; + typedef std::unordered_map IdToFontMap; + typedef std::unordered_map FontToIdMap; - typedef std::hash_map IdToGCMap; - typedef std::hash_map GCToIdMap; + typedef std::unordered_map IdToGCMap; + typedef std::unordered_map GCToIdMap; typedef std::vector GraphicsContextStack; diff --git a/main/sdext/source/pdfimport/tree/imagecontainer.hxx b/main/sdext/source/pdfimport/tree/imagecontainer.hxx index e7b56424ab3..176fa46be21 100644 --- a/main/sdext/source/pdfimport/tree/imagecontainer.hxx +++ b/main/sdext/source/pdfimport/tree/imagecontainer.hxx @@ -32,7 +32,7 @@ #include #include -#include +#include namespace pdfi { diff --git a/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 2940c869d3c..46f55d20faf 100644 --- a/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -45,7 +45,7 @@ #include #include -#include +#include #include "imagecontainer.hxx" #include "contentsink.hxx" @@ -203,11 +203,11 @@ namespace pdfi void setupImage(ImageId nImage); - typedef std::hash_map IdToFontMap; - typedef std::hash_map FontToIdMap; + typedef std::unordered_map IdToFontMap; + typedef std::unordered_map FontToIdMap; - typedef std::hash_map IdToGCMap; - typedef std::hash_map GCToIdMap; + typedef std::unordered_map IdToGCMap; + typedef std::unordered_map GCToIdMap; typedef std::vector GraphicsContextStack; diff --git a/main/sdext/source/pdfimport/tree/style.cxx b/main/sdext/source/pdfimport/tree/style.cxx index fb78ba5c08b..e828c5301f9 100644 --- a/main/sdext/source/pdfimport/tree/style.cxx +++ b/main/sdext/source/pdfimport/tree/style.cxx @@ -55,7 +55,7 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle ) for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n ) aSearchStyle.SubStyles.push_back( impl_getStyleId( *rStyle.SubStyles[n], true ) ); - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator it = + std::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator it = m_aStyleToId.find( aSearchStyle ); if( it != m_aStyleToId.end() ) @@ -93,7 +93,7 @@ sal_Int32 StyleContainer::getStandardStyleId( const rtl::OString& rName ) const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = + std::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); return it != m_aIdToStyle.end() ? &(it->second.Properties) : NULL; } @@ -101,7 +101,7 @@ const PropertyMap* StyleContainer::getProperties( sal_Int32 nStyleId ) const sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& rNewProps ) { sal_Int32 nRet = -1; - std::hash_map< sal_Int32, HashedStyle >::iterator it = + std::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { @@ -129,7 +129,7 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap& aSearchStyle.IsSubStyle = it->second.IsSubStyle; // find out whether this new style already exists - std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = + std::unordered_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it = m_aStyleToId.find( aSearchStyle ); if( new_it != m_aStyleToId.end() ) { @@ -155,7 +155,7 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const { OUStringBuffer aRet( 64 ); - std::hash_map< sal_Int32, HashedStyle >::const_iterator style_it = + std::unordered_map< sal_Int32, HashedStyle >::const_iterator style_it = m_aIdToStyle.find( nStyle ); if( style_it != m_aIdToStyle.end() ) { @@ -192,7 +192,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { - std::hash_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); + std::unordered_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId ); if( it != m_aIdToStyle.end() ) { const HashedStyle& rStyle = it->second; @@ -216,7 +216,7 @@ void StyleContainer::emit( EmitContext& rContext, ElementTreeVisitor& rContainedElemVisitor ) { std::vector< sal_Int32 > aMasterPageSection, aAutomaticStyleSection, aOfficeStyleSection; - for( std::hash_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); + for( std::unordered_map< sal_Int32, HashedStyle >::iterator it = m_aIdToStyle.begin(); it != m_aIdToStyle.end(); ++it ) { if( ! it->second.IsSubStyle ) diff --git a/main/sdext/source/pdfimport/tree/style.hxx b/main/sdext/source/pdfimport/tree/style.hxx index 44fd0e5a025..2674efe813c 100644 --- a/main/sdext/source/pdfimport/tree/style.hxx +++ b/main/sdext/source/pdfimport/tree/style.hxx @@ -25,7 +25,7 @@ #define INCLUDED_PDFI_STYLE_HXX #include "pdfihelper.hxx" -#include +#include #include #include #include @@ -128,16 +128,16 @@ namespace pdfi friend struct StyleIdNameSort; struct StyleIdNameSort { - const std::hash_map< sal_Int32, HashedStyle >* m_pMap; + const std::unordered_map< sal_Int32, HashedStyle >* m_pMap; - StyleIdNameSort( const std::hash_map< sal_Int32, HashedStyle >* pMap ) : + StyleIdNameSort( const std::unordered_map< sal_Int32, HashedStyle >* pMap ) : m_pMap(pMap) {} bool operator()( sal_Int32 nLeft, sal_Int32 nRight ) { - const std::hash_map< sal_Int32, HashedStyle >::const_iterator left_it = + const std::unordered_map< sal_Int32, HashedStyle >::const_iterator left_it = m_pMap->find( nLeft ); - const std::hash_map< sal_Int32, HashedStyle >::const_iterator right_it = + const std::unordered_map< sal_Int32, HashedStyle >::const_iterator right_it = m_pMap->find( nRight ); if( left_it == m_pMap->end() ) return false; @@ -149,8 +149,8 @@ namespace pdfi }; sal_Int32 m_nNextId; - std::hash_map< sal_Int32, HashedStyle > m_aIdToStyle; - std::hash_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; + std::unordered_map< sal_Int32, HashedStyle > m_aIdToStyle; + std::unordered_map< HashedStyle, sal_Int32, StyleHash > m_aStyleToId; void impl_emitStyle( sal_Int32 nStyleId, EmitContext& rContext, diff --git a/main/sdext/source/pdfimport/wrapper/wrapper.cxx b/main/sdext/source/pdfimport/wrapper/wrapper.cxx index aa95ba6bc91..11ced3b346b 100644 --- a/main/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/main/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -64,7 +64,7 @@ #include #include -#include +#include #include #include #include @@ -139,7 +139,7 @@ enum parseKey { class Parser { - typedef std::hash_map< sal_Int64, + typedef std::unordered_map< sal_Int64, FontAttributes > FontMapType; const uno::Reference m_xContext; diff --git a/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 94d242c6e93..4b307bfbf82 100644 --- a/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -645,7 +645,7 @@ void PDFOutDev::updateFont(GfxState *state) Ref* pID = gfxFont->getID(); // TODO(Q3): Portability problem long long fontID = (long long)pID->gen << 32 | (long long)pID->num; - std::hash_map< long long, FontAttributes >::const_iterator it = + std::unordered_map< long long, FontAttributes >::const_iterator it = m_aFontMap.find( fontID ); if( it == m_aFontMap.end() ) { diff --git a/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 0ea19b3077d..f314c382186 100644 --- a/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -46,7 +46,7 @@ #pragma warning(pop) #endif -#include +#include #include class GfxPath; @@ -132,7 +132,7 @@ namespace pdfi { // not owned by this class PDFDoc* m_pDoc; - mutable std::hash_map< long long, + mutable std::unordered_map< long long, FontAttributes > m_aFontMap; UnicodeMap* m_pUtf8Map; diff --git a/main/sdext/source/presenter/PresenterProtocolHandler.hxx b/main/sdext/source/presenter/PresenterProtocolHandler.hxx index 2c21d5964c1..ef6091ad024 100644 --- a/main/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/main/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/setup_native/source/win32/customactions/rebase/rebase.cxx b/main/setup_native/source/win32/customactions/rebase/rebase.cxx index bde60fdad96..e3a38d25c56 100644 --- a/main/setup_native/source/win32/customactions/rebase/rebase.cxx +++ b/main/setup_native/source/win32/customactions/rebase/rebase.cxx @@ -40,11 +40,11 @@ #include #include #include -#include +#include const DWORD PE_Signature = 0x00004550; typedef std::pair< std::string, bool > StringPair; -typedef std::hash_map< std::string, bool > ExcludeLibsMap; +typedef std::unordered_map< std::string, bool > ExcludeLibsMap; #ifdef DEBUG static void OutputDebugStringFormat( LPCSTR pFormat, ... ) diff --git a/main/sfx2/inc/sfx2/sidebar/Theme.hxx b/main/sfx2/inc/sfx2/sidebar/Theme.hxx index 34d2b2b76dc..e3b8460d341 100644 --- a/main/sfx2/inc/sfx2/sidebar/Theme.hxx +++ b/main/sfx2/inc/sfx2/sidebar/Theme.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include #include @@ -203,7 +203,7 @@ private: bool mbIsHighContrastMode; bool mbIsHighContrastModeSetManually; - typedef ::std::hash_map PropertyNameToIdMap; + typedef ::std::unordered_map PropertyNameToIdMap; PropertyNameToIdMap maPropertyNameToIdMap; typedef ::std::vector PropertyIdToNameMap; PropertyIdToNameMap maPropertyIdToNameMap; diff --git a/main/sfx2/source/appl/imagemgr.cxx b/main/sfx2/source/appl/imagemgr.cxx index 0968a86840c..2ca27b625a9 100644 --- a/main/sfx2/source/appl/imagemgr.cxx +++ b/main/sfx2/source/appl/imagemgr.cxx @@ -48,7 +48,7 @@ #include #include -#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -57,7 +57,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::frame; -typedef std::hash_map< ::rtl::OUString, +typedef std::unordered_map< ::rtl::OUString, WeakReference< XImageManager >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr; diff --git a/main/sfx2/source/appl/newhelp.cxx b/main/sfx2/source/appl/newhelp.cxx index 7e1beb59d51..db57a794c78 100644 --- a/main/sfx2/source/appl/newhelp.cxx +++ b/main/sfx2/source/appl/newhelp.cxx @@ -41,7 +41,7 @@ #include "newhelp.hrc" #include "helpid.hrc" -#include +#include #include #include #include @@ -609,7 +609,7 @@ namespace sfx2 { } }; - typedef ::std::hash_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; + typedef ::std::unordered_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; } #define UNIFY_AND_INSERT_TOKEN( aToken ) \ diff --git a/main/sfx2/source/appl/workwin.cxx b/main/sfx2/source/appl/workwin.cxx index db6ee56ac9a..b57fa1a78f2 100644 --- a/main/sfx2/source/appl/workwin.cxx +++ b/main/sfx2/source/appl/workwin.cxx @@ -28,7 +28,7 @@ #endif #include -#include +#include #include #include @@ -319,7 +319,7 @@ void SAL_CALL LayoutManagerListener::layoutEvent( //==================================================================== -typedef std::hash_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; +typedef std::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; static sal_Bool bMapInitialized = sal_False; static ToolBarResIdToResourceURLMap aResIdToResourceURLMap; diff --git a/main/sfx2/source/control/bindings.cxx b/main/sfx2/source/control/bindings.cxx index b7ddc7bc34c..b1540b872cf 100644 --- a/main/sfx2/source/control/bindings.cxx +++ b/main/sfx2/source/control/bindings.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include +#include #include #include #include @@ -96,7 +96,7 @@ static sal_uInt16 nTimeOut = 300; static sal_uInt32 nCache1 = 0; static sal_uInt32 nCache2 = 0; -typedef std::hash_map< sal_uInt16, bool > InvalidateSlotMap; +typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap; //==================================================================== diff --git a/main/sfx2/source/doc/Metadatable.cxx b/main/sfx2/source/doc/Metadatable.cxx index 071e31cdabd..39df8b8a914 100644 --- a/main/sfx2/source/doc/Metadatable.cxx +++ b/main/sfx2/source/doc/Metadatable.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #if OSL_DEBUG_LEVEL > 0 @@ -397,11 +397,11 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const /// generate unique xml:id template< typename T > /*static*/ ::rtl::OUString create_id(const - ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap) + ::std::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap) { static rtlRandomPool s_Pool( rtl_random_createPool() ); const ::rtl::OUString prefix( ::rtl::OUString::createFromAscii(s_prefix) ); - typename ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > + typename ::std::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > ::const_iterator iter; ::rtl::OUString id; do @@ -422,7 +422,7 @@ template< typename T > typedef ::std::list< Metadatable* > XmlIdList_t; /// Idref -> (content.xml element list, styles.xml element list) -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::std::pair< XmlIdList_t, XmlIdList_t >, ::rtl::OUStringHash > XmlIdMap_t; /// pointer hash template @@ -435,7 +435,7 @@ template struct PtrHash }; /// element -> (stream name, idref) -typedef ::std::hash_map< const Metadatable*, +typedef ::std::unordered_map< const Metadatable*, ::std::pair< ::rtl::OUString, ::rtl::OUString>, PtrHash > XmlIdReverseMap_t; @@ -918,13 +918,13 @@ struct RMapEntry }; /// element -> (stream name, idref, source) -typedef ::std::hash_map< const Metadatable*, +typedef ::std::unordered_map< const Metadatable*, struct RMapEntry, PtrHash > ClipboardXmlIdReverseMap_t; /// Idref -> (content.xml element, styles.xml element) -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::std::pair< Metadatable*, Metadatable* >, ::rtl::OUStringHash > ClipboardXmlIdMap_t; diff --git a/main/sfx2/source/inc/objshimp.hxx b/main/sfx2/source/inc/objshimp.hxx index 41d5adc2e63..6900ccc6f43 100644 --- a/main/sfx2/source/inc/objshimp.hxx +++ b/main/sfx2/source/inc/objshimp.hxx @@ -23,7 +23,7 @@ #ifndef _SFX_OBJSHIMP_HXX #define _SFX_OBJSHIMP_HXX -//#include +//#include #include #include diff --git a/main/sfx2/source/toolbox/imgmgr.cxx b/main/sfx2/source/toolbox/imgmgr.cxx index d9db942f1fa..c2bc2a20759 100644 --- a/main/sfx2/source/toolbox/imgmgr.cxx +++ b/main/sfx2/source/toolbox/imgmgr.cxx @@ -25,7 +25,7 @@ #include "precompiled_sfx2.hxx" #include -#include +#include #include "sfx2/imgmgr.hxx" #include @@ -78,7 +78,7 @@ class SfxImageManager_Impl ~SfxImageManager_Impl(); }; -typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap; +typedef std::unordered_map< sal_Int64, sal_Int64 > SfxImageManagerMap; // global image lists static SfxImageManager_Impl* pGlobalImageManager = 0; diff --git a/main/sfx2/source/view/sfxbasecontroller.cxx b/main/sfx2/source/view/sfxbasecontroller.cxx index 65539939dd2..82861f673d1 100644 --- a/main/sfx2/source/view/sfxbasecontroller.cxx +++ b/main/sfx2/source/view/sfxbasecontroller.cxx @@ -86,7 +86,7 @@ #include #include -#include +#include #include #include "sfx2/viewfac.hxx" @@ -173,7 +173,7 @@ static GroupIDToCommandGroup GroupIDCommandGroupMap[] = { 0 , 0 } }; -typedef std::hash_map< sal_Int16, sal_Int16 > GroupHashMap; +typedef std::unordered_map< sal_Int16, sal_Int16 > GroupHashMap; sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ) diff --git a/main/slideshow/source/engine/eventmultiplexer.cxx b/main/slideshow/source/engine/eventmultiplexer.cxx index dbf290458ae..887908f1370 100644 --- a/main/slideshow/source/engine/eventmultiplexer.cxx +++ b/main/slideshow/source/engine/eventmultiplexer.cxx @@ -57,7 +57,7 @@ #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/main/slideshow/source/engine/slide/layermanager.hxx b/main/slideshow/source/engine/slide/layermanager.hxx index 39ca6e3780d..5ac675d34d5 100644 --- a/main/slideshow/source/engine/slide/layermanager.hxx +++ b/main/slideshow/source/engine/slide/layermanager.hxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -240,7 +240,7 @@ namespace slideshow Provides quicker lookup than ShapeSet for simple mappings */ - typedef ::std::hash_map< + typedef ::std::unordered_map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >, ShapeSharedPtr, diff --git a/main/sot/source/sdstor/stgcache.cxx b/main/sot/source/sdstor/stgcache.cxx index 7c34c3e5aae..bb5488f3b4f 100644 --- a/main/sot/source/sdstor/stgcache.cxx +++ b/main/sot/source/sdstor/stgcache.cxx @@ -27,7 +27,7 @@ #if defined(_MSC_VER) && (_MSC_VER<1200) #include #endif -#include +#include #if defined(_MSC_VER) && (_MSC_VER<1200) #include #endif @@ -46,7 +46,7 @@ /*************************************************************************/ //----------------------------------------------------------------------------- -typedef std::hash_map +typedef std::unordered_map < sal_Int32, StgPage *, diff --git a/main/stoc/source/corereflection/base.hxx b/main/stoc/source/corereflection/base.hxx index 93d4b87d7cc..79e85fc619e 100644 --- a/main/stoc/source/corereflection/base.hxx +++ b/main/stoc/source/corereflection/base.hxx @@ -39,7 +39,7 @@ #include #include #endif -#include +#include #include #include @@ -89,9 +89,9 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName ) return pTypeDescr; } -typedef std::hash_map< OUString, WeakReference< XIdlField >, +typedef std::unordered_map< OUString, WeakReference< XIdlField >, FctHashOUString, equal_to< OUString > > OUString2Field; -typedef std::hash_map< OUString, WeakReference< XIdlMethod >, +typedef std::unordered_map< OUString, WeakReference< XIdlMethod >, FctHashOUString, equal_to< OUString > > OUString2Method; //================================================================================================== diff --git a/main/stoc/source/corereflection/lrucache.hxx b/main/stoc/source/corereflection/lrucache.hxx index 7d122bbe2dd..5eb35ea4bb1 100644 --- a/main/stoc/source/corereflection/lrucache.hxx +++ b/main/stoc/source/corereflection/lrucache.hxx @@ -29,7 +29,7 @@ #include #include "rtl/ustring.hxx" -#include +#include /** Implementation of a least recently used (lru) cache.
@@ -45,7 +45,7 @@ class LRU_Cache CacheEntry * pPred; CacheEntry * pSucc; }; - typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; + typedef ::std::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; mutable ::osl::Mutex _aCacheMutex; sal_Int32 _nCachedElements; diff --git a/main/stoc/source/inspect/introspection.cxx b/main/stoc/source/inspect/introspection.cxx index f0257dcf26a..44d21f6941d 100644 --- a/main/stoc/source/inspect/introspection.cxx +++ b/main/stoc/source/inspect/introspection.cxx @@ -71,7 +71,7 @@ #include #include #include -#include +#include using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -168,7 +168,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, sal_Int32, @@ -180,7 +180,7 @@ IntrospectionNameMap; // Hashtable zur Zuordnung der exakten Namen zu den zu Lower-Case // konvertierten Namen, dient zur Unterst�tzung von XExactName -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, ::rtl::OUString, @@ -1487,7 +1487,7 @@ struct hashIntrospectionAccessCache_Impl }; -typedef std::hash_map +typedef std::unordered_map < hashIntrospectionKey_Impl, IntrospectionAccessStatic_Impl*, @@ -1586,7 +1586,7 @@ size_t TypeProviderAccessCache_Impl::operator()(const hashTypeProviderKey_Impl & } -typedef std::hash_map +typedef std::unordered_map < hashTypeProviderKey_Impl, IntrospectionAccessStatic_Impl*, @@ -1908,7 +1908,7 @@ struct eqInterface_Impl } }; -typedef std::hash_map +typedef std::unordered_map < void*, void*, diff --git a/main/stoc/source/invocation_adapterfactory/iafactory.cxx b/main/stoc/source/invocation_adapterfactory/iafactory.cxx index 57ce55376e9..2efaae5e8f6 100644 --- a/main/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/main/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -24,8 +24,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include -#include +#include +#include #include #include @@ -106,8 +106,8 @@ struct hash_ptr inline size_t operator() ( void * p ) const { return (size_t)p; } }; -typedef hash_set< void *, hash_ptr, equal_to< void * > > t_ptr_set; -typedef hash_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map; +typedef unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set; +typedef unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map; //============================================================================== class FactoryImpl diff --git a/main/stoc/source/namingservice/namingservice.cxx b/main/stoc/source/namingservice/namingservice.cxx index ef4e3bded47..9e135a83005 100644 --- a/main/stoc/source/namingservice/namingservice.cxx +++ b/main/stoc/source/namingservice/namingservice.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include +#include #include #include #include @@ -100,7 +100,7 @@ struct hashOWString_Impl { return rName.hashCode(); } }; -typedef hash_map +typedef unordered_map < OUString, Reference, diff --git a/main/stoc/source/security/file_policy.cxx b/main/stoc/source/security/file_policy.cxx index 1e103a1e7c5..481571ecb8b 100644 --- a/main/stoc/source/security/file_policy.cxx +++ b/main/stoc/source/security/file_policy.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include +#include #include #include @@ -93,7 +93,7 @@ class FilePolicy AccessControl m_ac; Sequence< Any > m_defaultPermissions; - typedef std::hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions; + typedef std::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions; t_permissions m_userPermissions; bool m_init; diff --git a/main/stoc/source/servicemanager/servicemanager.cxx b/main/stoc/source/servicemanager/servicemanager.cxx index 0260a2f8964..bfb217372b1 100644 --- a/main/stoc/source/servicemanager/servicemanager.cxx +++ b/main/stoc/source/servicemanager/servicemanager.cxx @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -282,7 +282,7 @@ struct equaltoRef_Impl { return rName1 == rName2; } }; -typedef hash_set +typedef unordered_set < Reference, hashRef_Impl, @@ -436,14 +436,14 @@ struct hashOWString_Impl { return rName.hashCode(); } }; -typedef hash_set +typedef unordered_set < OUString, hashOWString_Impl, equalOWString_Impl > HashSet_OWString; -typedef hash_multimap +typedef unordered_multimap < OUString, Reference, @@ -451,7 +451,7 @@ typedef hash_multimap equalOWString_Impl > HashMultimap_OWString_Interface; -typedef hash_map +typedef unordered_map < OUString, Reference, diff --git a/main/stoc/source/tdmanager/lrucache.hxx b/main/stoc/source/tdmanager/lrucache.hxx index bb057369554..c90661652fe 100644 --- a/main/stoc/source/tdmanager/lrucache.hxx +++ b/main/stoc/source/tdmanager/lrucache.hxx @@ -29,7 +29,7 @@ #include #include "rtl/ustring.hxx" -#include +#include /** Implementation of a least recently used (lru) cache. @@ -46,7 +46,7 @@ class LRU_Cache CacheEntry * pPred; CacheEntry * pSucc; }; - typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; + typedef ::std::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; mutable ::osl::Mutex _aCacheMutex; sal_Int32 _nCachedElements; diff --git a/main/svgio/inc/svgio/svgreader/svgdocument.hxx b/main/svgio/inc/svgio/svgreader/svgdocument.hxx index 9eabedd6076..9b296e61574 100644 --- a/main/svgio/inc/svgio/svgreader/svgdocument.hxx +++ b/main/svgio/inc/svgio/svgreader/svgdocument.hxx @@ -42,12 +42,12 @@ namespace svgio const rtl::OUString maAbsolutePath; /// hash mapper to find nodes by their id - typedef std::hash_map< const rtl::OUString, const SvgNode*, rtl::OUStringHash > IdTokenMapper; + typedef std::unordered_map< const rtl::OUString, const SvgNode*, rtl::OUStringHash > IdTokenMapper; typedef std::pair< const rtl::OUString, const SvgNode* > IdTokenValueType; IdTokenMapper maIdTokenMapperList; /// hash mapper to find css styles by their id - typedef std::hash_map< const rtl::OUString, const SvgStyleAttributes*, rtl::OUStringHash > IdStyleTokenMapper; + typedef std::unordered_map< const rtl::OUString, const SvgStyleAttributes*, rtl::OUStringHash > IdStyleTokenMapper; typedef std::pair< const rtl::OUString, const SvgStyleAttributes* > IdStyleTokenValueType; IdStyleTokenMapper maIdStyleTokenMapperList; diff --git a/main/svgio/inc/svgio/svgreader/svgnode.hxx b/main/svgio/inc/svgio/svgreader/svgnode.hxx index 392a10960fe..2f122925d50 100644 --- a/main/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/main/svgio/inc/svgio/svgreader/svgnode.hxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// // predefines diff --git a/main/svgio/inc/svgio/svgreader/svgtoken.hxx b/main/svgio/inc/svgio/svgreader/svgtoken.hxx index a20ae26325e..a48486cac95 100644 --- a/main/svgio/inc/svgio/svgreader/svgtoken.hxx +++ b/main/svgio/inc/svgio/svgreader/svgtoken.hxx @@ -24,7 +24,7 @@ #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// diff --git a/main/svgio/source/svgreader/svgtoken.cxx b/main/svgio/source/svgreader/svgtoken.cxx index 15eb5dc6610..c2121a78629 100644 --- a/main/svgio/source/svgreader/svgtoken.cxx +++ b/main/svgio/source/svgreader/svgtoken.cxx @@ -169,7 +169,7 @@ namespace svgio SVGToken StrToSVGToken(const rtl::OUString& rStr, bool bCaseIndependent) { - typedef std::hash_map< rtl::OUString, SVGToken, rtl::OUStringHash > SVGTokenMapper; + typedef std::unordered_map< rtl::OUString, SVGToken, rtl::OUStringHash > SVGTokenMapper; typedef std::pair< rtl::OUString, SVGToken > SVGTokenValueType; static SVGTokenMapper aSVGTokenMapperList; diff --git a/main/svgio/source/svgreader/svgtools.cxx b/main/svgio/source/svgreader/svgtools.cxx index 987ddd8a425..08d14becfb1 100644 --- a/main/svgio/source/svgreader/svgtools.cxx +++ b/main/svgio/source/svgreader/svgtools.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// @@ -651,7 +651,7 @@ namespace svgio const rtl::OUString& rName, bool bCaseIndependent) { - typedef std::hash_map< rtl::OUString, Color, rtl::OUStringHash > ColorTokenMapper; + typedef std::unordered_map< rtl::OUString, Color, rtl::OUStringHash > ColorTokenMapper; typedef std::pair< rtl::OUString, Color > ColorTokenValueType; ColorTokenMapper aColorTokenMapperList; diff --git a/main/svl/inc/pch/precompiled_svl.hxx b/main/svl/inc/pch/precompiled_svl.hxx index 53e6d9fefb7..ce7c182c3f7 100644 --- a/main/svl/inc/pch/precompiled_svl.hxx +++ b/main/svl/inc/pch/precompiled_svl.hxx @@ -298,7 +298,7 @@ #include #include -#include +#include #include #include diff --git a/main/svl/source/items/itemprop.cxx b/main/svl/source/items/itemprop.cxx index 5887b0ec016..302e33b6116 100644 --- a/main/svl/source/items/itemprop.cxx +++ b/main/svl/source/items/itemprop.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include /************************************************************************* UNO III Implementation *************************************************************************/ @@ -49,7 +49,7 @@ struct equalOUString } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, SfxItemPropertySimpleEntry, ::rtl::OUStringHash, equalOUString > SfxItemPropertyHashMap_t; diff --git a/main/svtools/inc/pch/precompiled_svtools.hxx b/main/svtools/inc/pch/precompiled_svtools.hxx index d79586210e9..30566c9377e 100644 --- a/main/svtools/inc/pch/precompiled_svtools.hxx +++ b/main/svtools/inc/pch/precompiled_svtools.hxx @@ -298,7 +298,7 @@ #include #include -#include +#include #include #include diff --git a/main/svtools/inc/svtools/framestatuslistener.hxx b/main/svtools/inc/svtools/framestatuslistener.hxx index c806fb0a123..d599c53650c 100644 --- a/main/svtools/inc/svtools/framestatuslistener.hxx +++ b/main/svtools/inc/svtools/framestatuslistener.hxx @@ -36,7 +36,7 @@ #include #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif @@ -95,7 +95,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; diff --git a/main/svtools/inc/svtools/statusbarcontroller.hxx b/main/svtools/inc/svtools/statusbarcontroller.hxx index 91531627fc9..9baebd2e6d4 100644 --- a/main/svtools/inc/svtools/statusbarcontroller.hxx +++ b/main/svtools/inc/svtools/statusbarcontroller.hxx @@ -37,7 +37,7 @@ #include #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif @@ -115,7 +115,7 @@ class SVT_DLLPUBLIC StatusbarController : ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; diff --git a/main/svtools/inc/svtools/toolboxcontroller.hxx b/main/svtools/inc/svtools/toolboxcontroller.hxx index e33f33f0d46..7c6c9f89c06 100644 --- a/main/svtools/inc/svtools/toolboxcontroller.hxx +++ b/main/svtools/inc/svtools/toolboxcontroller.hxx @@ -47,7 +47,7 @@ //end #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif @@ -157,7 +157,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* ); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::std::unordered_map< ::rtl::OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; diff --git a/main/svtools/source/table/cellvalueconversion.cxx b/main/svtools/source/table/cellvalueconversion.cxx index b6456d6ed2a..a258c633644 100644 --- a/main/svtools/source/table/cellvalueconversion.cxx +++ b/main/svtools/source/table/cellvalueconversion.cxx @@ -45,7 +45,7 @@ #include #include -#include +#include //...................................................................................................................... namespace svt @@ -118,7 +118,7 @@ namespace svt }; typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization; - typedef ::std::hash_map< ::rtl::OUString, PValueNormalization, ::rtl::OUStringHash > NormalizerCache; + typedef ::std::unordered_map< ::rtl::OUString, PValueNormalization, ::rtl::OUStringHash > NormalizerCache; //================================================================================================================== //= CellValueConversion_Data diff --git a/main/svtools/source/uno/framestatuslistener.cxx b/main/svtools/source/uno/framestatuslistener.cxx index 92f4867e1bb..2ebfe6ff62b 100644 --- a/main/svtools/source/uno/framestatuslistener.cxx +++ b/main/svtools/source/uno/framestatuslistener.cxx @@ -192,7 +192,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) // initialize is called. if ( !m_bInitialized ) { - // Put into the hash_map of status listener. Will be activated when initialized is called + // Put into the unordered_map of status listener. Will be activated when initialized is called m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() )); return; } diff --git a/main/svtools/source/uno/statusbarcontroller.cxx b/main/svtools/source/uno/statusbarcontroller.cxx index b4fdaa18c4d..87c97290a26 100644 --- a/main/svtools/source/uno/statusbarcontroller.cxx +++ b/main/svtools/source/uno/statusbarcontroller.cxx @@ -386,7 +386,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL ) // initialize is called. if ( !m_bInitialized ) { - // Put into the hash_map of status listener. Will be activated when initialized is called + // Put into the unordered_map of status listener. Will be activated when initialized is called m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() )); return; } diff --git a/main/svtools/source/uno/toolboxcontroller.cxx b/main/svtools/source/uno/toolboxcontroller.cxx index 629418884f1..924d76b9b8d 100644 --- a/main/svtools/source/uno/toolboxcontroller.cxx +++ b/main/svtools/source/uno/toolboxcontroller.cxx @@ -403,7 +403,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) // initialize is called. if ( !m_bInitialized ) { - // Put into the hash_map of status listener. Will be activated when initialized is called + // Put into the unordered_map of status listener. Will be activated when initialized is called m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() )); return; } diff --git a/main/svx/inc/svx/ShapeTypeHandler.hxx b/main/svx/inc/svx/ShapeTypeHandler.hxx index 9f5b166a989..84a445cd9b8 100644 --- a/main/svx/inc/svx/ShapeTypeHandler.hxx +++ b/main/svx/inc/svx/ShapeTypeHandler.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include namespace accessibility { @@ -198,7 +198,7 @@ private: /** This hash map allows the fast look up of a type descriptor for a given service name. */ - typedef ::std::hash_map< + typedef ::std::unordered_map< ::rtl::OUString,ShapeTypeId, ::rtl::OUStringHash, // ::comphelper::UStringHash, diff --git a/main/svx/inc/svx/sdasitm.hxx b/main/svx/inc/svx/sdasitm.hxx index 39695382a2f..983dad490bb 100644 --- a/main/svx/inc/svx/sdasitm.hxx +++ b/main/svx/inc/svx/sdasitm.hxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" @@ -67,8 +67,8 @@ private: { size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const; }; - typedef std::hash_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; - typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; + typedef std::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; + typedef std::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; diff --git a/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index aa151635d50..a5b626ccb5e 100644 --- a/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -23,7 +23,7 @@ #include "precompiled_svx.hxx" #include "svx/EnhancedCustomShapeTypeNames.hxx" #include -#include +#include struct TCheck { @@ -32,7 +32,7 @@ struct TCheck return strcmp( s1, s2 ) == 0; } }; -typedef std::hash_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; +typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { @@ -314,7 +314,7 @@ rtl::OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) ? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) : rtl::OUString(); } -typedef std::hash_map< const char*, const char*, std::hash, TCheck> TypeACCNameHashMap; +typedef std::unordered_map< const char*, const char*, std::hash, TCheck> TypeACCNameHashMap; static TypeACCNameHashMap* pACCHashMap = NULL; struct ACCNameTypeTable { diff --git a/main/svx/source/inc/DGColorNameLookUp.hxx b/main/svx/source/inc/DGColorNameLookUp.hxx index 32d1474ce14..3964d1a67fe 100644 --- a/main/svx/source/inc/DGColorNameLookUp.hxx +++ b/main/svx/source/inc/DGColorNameLookUp.hxx @@ -25,7 +25,7 @@ #define _SVX_ACCESSIBILITY_DG_COLOR_NAME_LOOK_UP_HXX #include -#include +#include namespace accessibility { @@ -66,7 +66,7 @@ public: private: /// Define hash map type to convert numerical color values to names. - typedef std::hash_map + typedef std::unordered_map tColorValueToNameMap; /// This ma translates from numerical color values to names. diff --git a/main/svx/source/table/accessibletableshape.cxx b/main/svx/source/table/accessibletableshape.cxx index 1a6f68cfb54..fb301743644 100644 --- a/main/svx/source/table/accessibletableshape.cxx +++ b/main/svx/source/table/accessibletableshape.cxx @@ -70,7 +70,7 @@ struct hash } }; -typedef std::hash_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; +typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap; //----------------------------------------------------------------------------- // AccessibleTableShapeImpl diff --git a/main/svx/source/table/propertyset.hxx b/main/svx/source/table/propertyset.hxx index 164dcce1817..886119bfd80 100644 --- a/main/svx/source/table/propertyset.hxx +++ b/main/svx/source/table/propertyset.hxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -40,7 +40,7 @@ namespace comphelper { // ----------------------------------------------------------------------------- typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef std::hash_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; +typedef std::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; // ----------------------------------------------------------------------------- diff --git a/main/svx/source/unodraw/shapepropertynotifier.cxx b/main/svx/source/unodraw/shapepropertynotifier.cxx index bcbd7a9bb18..0c895e4ec51 100644 --- a/main/svx/source/unodraw/shapepropertynotifier.cxx +++ b/main/svx/source/unodraw/shapepropertynotifier.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include namespace { @@ -72,7 +72,7 @@ namespace svx using ::com::sun::star::beans::XPropertySet; /** === end UNO using === **/ - typedef ::std::hash_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; + typedef ::std::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString , ::comphelper::UStringHash diff --git a/main/sw/inc/IDocumentExternalData.hxx b/main/sw/inc/IDocumentExternalData.hxx index 7d931eda680..6504d07253f 100644 --- a/main/sw/inc/IDocumentExternalData.hxx +++ b/main/sw/inc/IDocumentExternalData.hxx @@ -23,7 +23,7 @@ #ifndef INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX #define INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX -#include +#include #include namespace sw @@ -49,7 +49,7 @@ typedef ::boost::shared_ptr tExternalDataPointer; class IDocumentExternalData { protected: - typedef ::std::hash_map + typedef ::std::unordered_map tExternalData; tExternalData m_externalData; diff --git a/main/sw/inc/SwStyleNameMapper.hxx b/main/sw/inc/SwStyleNameMapper.hxx index f3c3d7955e5..fe6e5dd8dcd 100644 --- a/main/sw/inc/SwStyleNameMapper.hxx +++ b/main/sw/inc/SwStyleNameMapper.hxx @@ -29,7 +29,7 @@ #include "swdllapi.h" #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif #include @@ -83,7 +83,7 @@ class String; struct SwTableEntry; -typedef ::std::hash_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash; +typedef ::std::unordered_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash; class SwStyleNameMapper { diff --git a/main/sw/inc/dbgoutsw.hxx b/main/sw/inc/dbgoutsw.hxx index ee82e50684f..06305330d72 100644 --- a/main/sw/inc/dbgoutsw.hxx +++ b/main/sw/inc/dbgoutsw.hxx @@ -25,7 +25,7 @@ #ifdef DEBUG -#include +#include #include class String; @@ -89,11 +89,11 @@ SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl); SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange); template -String lcl_dbg_out(const std::hash_map & rMap) +String lcl_dbg_out(const std::unordered_map & rMap) { String aResult("[", RTL_TEXTENCODING_ASCII_US); - typename std::hash_map::const_iterator aIt; + typename std::unordered_map::const_iterator aIt; for (aIt = rMap.begin(); aIt != rMap.end(); aIt++) { @@ -113,7 +113,7 @@ String lcl_dbg_out(const std::hash_map & rMap) } template -const char * dbg_out(const std::hash_map & rMap) +const char * dbg_out(const std::unordered_map & rMap) { return dbg_out(lcl_dbg_out(rMap)); } diff --git a/main/sw/inc/doc.hxx b/main/sw/inc/doc.hxx index 672fdb017c3..4e4daf32832 100644 --- a/main/sw/inc/doc.hxx +++ b/main/sw/inc/doc.hxx @@ -78,7 +78,7 @@ class SwList; #include #endif -#include +#include #include #include @@ -363,10 +363,10 @@ class SW_DLLPUBLIC SwDoc : mutable SwNumRuleTbl *pNumRuleTbl; // Liste aller benannten NumRules // Hash map to find numrules by name - mutable std::hash_map maNumRuleMap; + mutable std::unordered_map maNumRuleMap; // --> OD 2008-03-12 #refactorlists# - typedef std::hash_map< String, SwList*, StringHash > tHashMapForLists; + typedef std::unordered_map< String, SwList*, StringHash > tHashMapForLists; // container to hold the lists of the text document tHashMapForLists maLists; // relation between list style and its default list diff --git a/main/sw/inc/numrule.hxx b/main/sw/inc/numrule.hxx index 3dfe9d4a733..907b7002174 100644 --- a/main/sw/inc/numrule.hxx +++ b/main/sw/inc/numrule.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -142,9 +142,9 @@ private: // #i36749# /** - hash_map containing "name->rule" relation + unordered_map containing "name->rule" relation */ - std::hash_map * pNumRuleMap; + std::unordered_map * pNumRuleMap; String sName; SwNumRuleType eRuleType; @@ -239,7 +239,7 @@ public: @param pNumRuleMap map to register in */ void SetNumRuleMap( - std::hash_map* pNumRuleMap ); + std::unordered_map* pNumRuleMap ); static char* GetOutlineRuleName() { return pDefOutlineName; } diff --git a/main/sw/inc/swwait.hxx b/main/sw/inc/swwait.hxx index 94133586b4b..2e38e25c31a 100644 --- a/main/sw/inc/swwait.hxx +++ b/main/sw/inc/swwait.hxx @@ -26,7 +26,7 @@ #include #include "swdllapi.h" -#include +#include class SwDocShell; class SfxDispatcher; diff --git a/main/sw/source/core/access/accpara.hxx b/main/sw/source/core/access/accpara.hxx index 0344838926e..2b111f8bca9 100644 --- a/main/sw/source/core/access/accpara.hxx +++ b/main/sw/source/core/access/accpara.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include // --> OD 2010-02-19 #i108125# #include @@ -58,7 +58,7 @@ namespace com { namespace sun { namespace star { namespace style { struct TabStop; } } } } -typedef ::std::hash_map< ::rtl::OUString, +typedef ::std::unordered_map< ::rtl::OUString, ::com::sun::star::beans::PropertyValue, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap; diff --git a/main/sw/source/core/doc/docnew.cxx b/main/sw/source/core/doc/docnew.cxx index b2f641546af..62a9f3bbbc8 100644 --- a/main/sw/source/core/doc/docnew.cxx +++ b/main/sw/source/core/doc/docnew.cxx @@ -689,7 +689,7 @@ SwDoc::~SwDoc() // --> OD 2008-03-26 #refactorlists# { - for ( std::hash_map< String, SwList*, StringHash >::iterator + for ( std::unordered_map< String, SwList*, StringHash >::iterator aListIter = maLists.begin(); aListIter != maLists.end(); ++aListIter ) @@ -873,7 +873,7 @@ void SwDoc::ClearDoc() pNumRuleTbl->DeleteAndDestroy( 0, pNumRuleTbl->Count() ); // --> OD #i114725#,#i115828# { - for ( std::hash_map< String, SwList*, StringHash >::iterator + for ( std::unordered_map< String, SwList*, StringHash >::iterator aListIter = maLists.begin(); aListIter != maLists.end(); ++aListIter ) diff --git a/main/sw/source/core/doc/docnum.cxx b/main/sw/source/core/doc/docnum.cxx index 125d5d5dd90..34ca590dcad 100644 --- a/main/sw/source/core/doc/docnum.cxx +++ b/main/sw/source/core/doc/docnum.cxx @@ -2710,7 +2710,7 @@ SwList* SwDoc::getListByName( const String sListId ) const { SwList* pList = 0; - std::hash_map< String, SwList*, StringHash >::const_iterator + std::unordered_map< String, SwList*, StringHash >::const_iterator aListIter = maLists.find( sListId ); if ( aListIter != maLists.end() ) { @@ -2760,7 +2760,7 @@ SwList* SwDoc::getListForListStyle( const String sListStyleName ) const { SwList* pList = 0; - std::hash_map< String, SwList*, StringHash >::const_iterator + std::unordered_map< String, SwList*, StringHash >::const_iterator aListIter = maListStyleLists.find( sListStyleName ); if ( aListIter != maListStyleLists.end() ) { diff --git a/main/sw/source/core/doc/number.cxx b/main/sw/source/core/doc/number.cxx index 8a4c187f562..665869aed67 100644 --- a/main/sw/source/core/doc/number.cxx +++ b/main/sw/source/core/doc/number.cxx @@ -51,7 +51,7 @@ #include #include -#include +#include // --> OD 2008-02-19 #refactorlists# #include #include @@ -167,7 +167,7 @@ void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode ) } // <-- -void SwNumRule::SetNumRuleMap(std::hash_map * +void SwNumRule::SetNumRuleMap(std::unordered_map * _pNumRuleMap) { pNumRuleMap = _pNumRuleMap; diff --git a/main/sw/source/core/doc/swstylemanager.cxx b/main/sw/source/core/doc/swstylemanager.cxx index 6d19dd4378b..4bc8c1a0dde 100644 --- a/main/sw/source/core/doc/swstylemanager.cxx +++ b/main/sw/source/core/doc/swstylemanager.cxx @@ -26,7 +26,7 @@ #include "swstylemanager.hxx" -#include +#include #include #include #include @@ -34,7 +34,7 @@ #include #include -typedef ::std::hash_map< const ::rtl::OUString, +typedef ::std::unordered_map< const ::rtl::OUString, StylePool::SfxItemSet_Pointer_t, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > SwStyleNameCache; diff --git a/main/sw/source/core/inc/layouter.hxx b/main/sw/source/core/inc/layouter.hxx index 46a512dddcd..f67743a2ce7 100644 --- a/main/sw/source/core/inc/layouter.hxx +++ b/main/sw/source/core/inc/layouter.hxx @@ -50,7 +50,7 @@ class SwFrm; // <-- // --> OD 2006-05-10 #i65250# #include -#include +#include class SwFlowFrm; class SwLayoutFrm; // <-- @@ -113,7 +113,7 @@ private: p_key1.mnFreeSpaceInNewUpper == p_key2.mnFreeSpaceInNewUpper; } }; - std::hash_map< const tMoveBwdLayoutInfoKey, sal_uInt16, + std::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, fMoveBwdLayoutInfoKeyHash, fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo; // <-- diff --git a/main/sw/source/filter/ww8/WW8TableInfo.hxx b/main/sw/source/filter/ww8/WW8TableInfo.hxx index cf704742d0d..cb72046bdba 100644 --- a/main/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/main/sw/source/filter/ww8/WW8TableInfo.hxx @@ -23,7 +23,7 @@ #ifndef WW8_TABLE_INFO_HXX #define WW8_TABLE_INFO_HXX -#include +#include #include #include #include @@ -291,13 +291,13 @@ public: class WW8TableInfo { friend class WW8TableNodeInfoInner; - typedef hash_map Map_t; + typedef unordered_map Map_t; Map_t mMap; - typedef hash_map CellGridMap_t; + typedef unordered_map CellGridMap_t; CellGridMap_t mCellGridMap; - typedef hash_map FirstInTableMap_t; + typedef unordered_map FirstInTableMap_t; FirstInTableMap_t mFirstInTableMap; WW8TableNodeInfo * diff --git a/main/sw/source/filter/ww8/hash_wrap.hxx b/main/sw/source/filter/ww8/hash_wrap.hxx index e967cca2cad..c0ddcd1d9a1 100644 --- a/main/sw/source/filter/ww8/hash_wrap.hxx +++ b/main/sw/source/filter/ww8/hash_wrap.hxx @@ -22,16 +22,16 @@ -//this is a shameless rip from sortedarray.hxx but changed to hash_set +//this is a shameless rip from sortedarray.hxx but changed to unordered_set #ifndef WW_HASH_WRAP_HXX #define WW_HASH_WRAP_HXX -#include +#include #include #include // ASSERT() -//simple wrapper around hash_set to behave like sorted array +//simple wrapper around unordered_set to behave like sorted array namespace ww { /** simple template that manages a hash @@ -43,7 +43,7 @@ namespace ww template > class WrappedHash { private: - std::hash_set mHashSet; + std::unordered_set mHashSet; //No copying WrappedHash(const WrappedHash&); @@ -52,7 +52,7 @@ namespace ww //Find an entry, return its address if found and 0 if not const C* search(C aSrch) const { - typename std::hash_set::const_iterator it; + typename std::unordered_set::const_iterator it; it= mHashSet.find(aSrch); if (it != mHashSet.end()) return &(*it); diff --git a/main/sw/source/filter/ww8/wrtww8.cxx b/main/sw/source/filter/ww8/wrtww8.cxx index 1d4c82ce72a..eb0bc481b80 100644 --- a/main/sw/source/filter/ww8/wrtww8.cxx +++ b/main/sw/source/filter/ww8/wrtww8.cxx @@ -2585,7 +2585,7 @@ struct SwNodeHash size_t operator()(SwNode * pNode) const { return reinterpret_cast(pNode); } }; -typedef ::std::hash_set SwNodeHashSet; +typedef ::std::unordered_set SwNodeHashSet; typedef ::std::deque SwNodeDeque; #endif diff --git a/main/sw/source/filter/ww8/ww8par.cxx b/main/sw/source/filter/ww8/ww8par.cxx index d1b9c59f7de..3e4b3b67f00 100644 --- a/main/sw/source/filter/ww8/ww8par.cxx +++ b/main/sw/source/filter/ww8/ww8par.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -1545,7 +1545,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) } bool bFound = false; - ::std::hash_set aLoopWatch; + ::std::unordered_set aLoopWatch; while (pSty && !bFound) { const SfxPoolItem* pTabs; diff --git a/main/sw/source/filter/xml/xmlimp.cxx b/main/sw/source/filter/xml/xmlimp.cxx index b2c586967f3..9b62dea0592 100644 --- a/main/sw/source/filter/xml/xmlimp.cxx +++ b/main/sw/source/filter/xml/xmlimp.cxx @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include @@ -1171,7 +1171,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xInfo.is() ) return; - hash_set< String, StringHashRef, StringEqRef > aSet; + unordered_set< String, StringHashRef, StringEqRef > aSet; aSet.insert(String("ForbiddenCharacters", RTL_TEXTENCODING_ASCII_US)); aSet.insert(String("IsKernAsianPunctuation", RTL_TEXTENCODING_ASCII_US)); aSet.insert(String("CharacterCompressionType", RTL_TEXTENCODING_ASCII_US)); diff --git a/main/sw/source/filter/xml/xmltbli.cxx b/main/sw/source/filter/xml/xmltbli.cxx index 94e64c17240..f348e46e6aa 100644 --- a/main/sw/source/filter/xml/xmltbli.cxx +++ b/main/sw/source/filter/xml/xmltbli.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -using ::std::hash_map; +using ::std::unordered_map; enum SwXMLTableElemTokens { diff --git a/main/sw/source/filter/xml/xmltbli.hxx b/main/sw/source/filter/xml/xmltbli.hxx index b6fe404bcd2..958fae0f52d 100644 --- a/main/sw/source/filter/xml/xmltbli.hxx +++ b/main/sw/source/filter/xml/xmltbli.hxx @@ -27,7 +27,7 @@ #include // STL include -#include +#include #if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_BOOLS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL) #define _SVSTDARR_USHORTS @@ -83,7 +83,7 @@ class SwXMLTableContext : public XMLTextTableContext // hash map of shared format, indexed by the (XML) style name, // the column width, and protection flag - typedef std::hash_map map_BoxFmt; map_BoxFmt* pSharedBoxFormats; diff --git a/main/sw/source/ui/vba/vbadocumentproperties.cxx b/main/sw/source/ui/vba/vbadocumentproperties.cxx index 72f56d52b6f..5ce822f16bb 100644 --- a/main/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/main/sw/source/ui/vba/vbadocumentproperties.cxx @@ -232,7 +232,7 @@ class DocPropInfo }; -typedef std::hash_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; +typedef std::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo; class BuiltInIndexHelper { @@ -478,7 +478,7 @@ typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess ,com::sun::star::container::XEnumerationAccess > PropertiesImpl_BASE; -typedef std::hash_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; +typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps; typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE; class DocPropEnumeration : public DocPropEnumeration_BASE @@ -500,7 +500,7 @@ class DocPropEnumeration : public DocPropEnumeration_BASE } }; -typedef std::hash_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; +typedef std::unordered_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; class BuiltInPropertiesImpl : public PropertiesImpl_BASE { diff --git a/main/sw/source/ui/vba/vbadocumentproperties.hxx b/main/sw/source/ui/vba/vbadocumentproperties.hxx index c9575c8942e..bb8863f71b6 100644 --- a/main/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/main/sw/source/ui/vba/vbadocumentproperties.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE; diff --git a/main/sw/source/ui/vba/vbadocuments.cxx b/main/sw/source/ui/vba/vbadocuments.cxx index 7c08e58001a..723f5d6c80c 100644 --- a/main/sw/source/ui/vba/vbadocuments.cxx +++ b/main/sw/source/ui/vba/vbadocuments.cxx @@ -51,7 +51,7 @@ #include "vbadocuments.hxx" #include -#include +#include #include using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/main/sw/source/ui/vba/vbafont.cxx b/main/sw/source/ui/vba/vbafont.cxx index 987b431e59b..c16077a97fc 100644 --- a/main/sw/source/ui/vba/vbafont.cxx +++ b/main/sw/source/ui/vba/vbafont.cxx @@ -22,7 +22,7 @@ #include "vbafont.hxx" #include #include -#include +#include #include using namespace ::ooo::vba; @@ -58,7 +58,7 @@ static MapPair UnderLineTable[] = { { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH }, }; -typedef std::hash_map< sal_Int32, sal_Int32 > ConstToConst; +typedef std::unordered_map< sal_Int32, sal_Int32 > ConstToConst; class UnderLineMapper { ConstToConst MSO2OOO; diff --git a/main/testtools/source/performance/ubtest.cxx b/main/testtools/source/performance/ubtest.cxx index 1bcfe8f20b7..02f0d6dc146 100644 --- a/main/testtools/source/performance/ubtest.cxx +++ b/main/testtools/source/performance/ubtest.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -557,7 +557,7 @@ void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nT } //================================================================================================== -typedef std::hash_map< std::string, TimingSheet > t_TimingSheetMap; +typedef std::unordered_map< std::string, TimingSheet > t_TimingSheetMap; //-------------------------------------------------------------------------------------------------- static void benchmark( diff --git a/main/toolkit/inc/toolkit/controls/eventcontainer.hxx b/main/toolkit/inc/toolkit/controls/eventcontainer.hxx index f0b589ac790..2551d2acaa2 100644 --- a/main/toolkit/inc/toolkit/controls/eventcontainer.hxx +++ b/main/toolkit/inc/toolkit/controls/eventcontainer.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XContainer > NameContainerHelper; @@ -58,7 +58,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef std::unordered_map < ::rtl::OUString, sal_Int32, diff --git a/main/toolkit/source/controls/geometrycontrolmodel.cxx b/main/toolkit/source/controls/geometrycontrolmodel.cxx index eca1bd81a3b..67fda202177 100644 --- a/main/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/main/toolkit/source/controls/geometrycontrolmodel.cxx @@ -450,7 +450,7 @@ //==================================================================== //-------------------------------------------------------------------- - typedef ::std::hash_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; + typedef ::std::unordered_map< ::rtl::OUString, sal_Int32, ::comphelper::UStringHash > HashMapString2Int; typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; diff --git a/main/toolkit/source/layout/core/import.hxx b/main/toolkit/source/layout/core/import.hxx index c2b9b1d61ac..2ae4f969078 100644 --- a/main/toolkit/source/layout/core/import.hxx +++ b/main/toolkit/source/layout/core/import.hxx @@ -27,7 +27,7 @@ #include #include #define _BACKWARD_BACKWARD_WARNING_H 1 -#include +#include #include @@ -121,7 +121,7 @@ protected: css::uno::Reference< css::awt::XToolkit > mxToolkit; Widget *mpToplevel; - typedef std::hash_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >, + typedef std::unordered_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >, rtl::OUStringHash > ItemHash; ItemHash maItems; }; diff --git a/main/toolkit/source/layout/core/root.hxx b/main/toolkit/source/layout/core/root.hxx index 46b8961d84b..6308ae2f8f0 100644 --- a/main/toolkit/source/layout/core/root.hxx +++ b/main/toolkit/source/layout/core/root.hxx @@ -25,7 +25,7 @@ #define LAYOUT_CORE_ROOT_HXX #define _BACKWARD_BACKWARD_WARNING_H 1 -#include +#include #include #include @@ -68,7 +68,7 @@ class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3< protected: ::osl::Mutex maMutex; - typedef std::hash_map< rtl::OUString, + typedef std::unordered_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >, ::rtl::OUStringHash > ItemHash; ItemHash maItems; diff --git a/main/tools/inc/tools/pstm.hxx b/main/tools/inc/tools/pstm.hxx index dec679660e9..7b415c0475d 100644 --- a/main/tools/inc/tools/pstm.hxx +++ b/main/tools/inc/tools/pstm.hxx @@ -23,7 +23,7 @@ #ifndef _PSTM_HXX #define _PSTM_HXX -#include +#include #include "tools/toolsdllapi.h" #ifndef _TABLE_HXX @@ -48,7 +48,7 @@ typedef void * (*SvCreateInstancePersist)( SvPersistBase ** ); class TOOLS_DLLPUBLIC SvClassManager { - typedef std::hash_map< sal_uInt16, SvCreateInstancePersist > Map; + typedef std::unordered_map< sal_uInt16, SvCreateInstancePersist > Map; Map aAssocTable; public: void Register( sal_uInt16 nClassId, SvCreateInstancePersist pFunc ); diff --git a/main/tools/source/rc/resmgr.cxx b/main/tools/source/rc/resmgr.cxx index 410442c86dd..8ab3f302ff5 100644 --- a/main/tools/source/rc/resmgr.cxx +++ b/main/tools/source/rc/resmgr.cxx @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include @@ -101,7 +101,7 @@ class InternalResMgr OUString aResName; bool bSingular; com::sun::star::lang::Locale aLocale; - std::hash_map* pResUseDump; + std::unordered_map* pResUseDump; InternalResMgr( const OUString& rFileURL, const OUString& aPrefix, @@ -139,7 +139,7 @@ class ResMgrContainer {} }; - std::hash_map< OUString, ContainerElement, OUStringHash> m_aResFiles; + std::unordered_map< OUString, ContainerElement, OUStringHash> m_aResFiles; com::sun::star::lang::Locale m_aDefLocale; ResMgrContainer() { init(); } @@ -176,7 +176,7 @@ ResMgrContainer& ResMgrContainer::get() ResMgrContainer::~ResMgrContainer() { - for( std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = + for( std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.begin(); it != m_aResFiles.end(); ++it ) { OSL_TRACE( "Resource file %s loaded %d times\n", @@ -257,7 +257,7 @@ void ResMgrContainer::init() #endif } #if OSL_DEBUG_LEVEL > 1 - for( std::hash_map< OUString, ContainerElement, OUStringHash >::const_iterator it = + for( std::unordered_map< OUString, ContainerElement, OUStringHash >::const_iterator it = m_aResFiles.begin(); it != m_aResFiles.end(); ++it ) { OSL_TRACE( "ResMgrContainer: %s -> %s\n", @@ -278,7 +278,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, { com::sun::star::lang::Locale aLocale( rLocale ); OUStringBuffer aSearch( rPrefix.getLength() + 16 ); - std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); + std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); int nTries = 0; if( aLocale.Language.getLength() > 0 ) @@ -460,7 +460,7 @@ void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr ) delete pResMgr; else { - std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = + std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.find( pResMgr->aResName ); if( it != m_aResFiles.end() ) { @@ -578,7 +578,7 @@ InternalResMgr::~InternalResMgr() aLine.Append( ByteString( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ) ) ); aStm.WriteLine( aLine ); - for( std::hash_map::const_iterator it = pResUseDump->begin(); + for( std::unordered_map::const_iterator it = pResUseDump->begin(); it != pResUseDump->end(); ++it ) { sal_uInt64 nKeyId = it->first; @@ -635,7 +635,7 @@ sal_Bool InternalResMgr::Create() const sal_Char* pLogFile = getenv( "STAR_RESOURCE_LOGGING" ); if ( pLogFile ) { - pResUseDump = new std::hash_map; + pResUseDump = new std::unordered_map; for( sal_uInt32 i = 0; i < nEntries; ++i ) (*pResUseDump)[pContent[i].nTypeAndId] = 1; } diff --git a/main/ucb/source/core/ucbstore.cxx b/main/ucb/source/core/ucbstore.cxx index 145c25ad997..7eab0fe67e6 100644 --- a/main/ucb/source/core/ucbstore.cxx +++ b/main/ucb/source/core/ucbstore.cxx @@ -29,7 +29,7 @@ *************************************************************************/ #include -#include +#include #include #include #include @@ -125,7 +125,7 @@ struct hashString_Impl // //========================================================================= -typedef std::hash_map +typedef std::unordered_map < OUString, PersistentPropertySet*, diff --git a/main/ucb/source/ucp/file/filnot.hxx b/main/ucb/source/ucp/file/filnot.hxx index d19a9e44a74..62ec45f3bf3 100644 --- a/main/ucb/source/ucp/file/filnot.hxx +++ b/main/ucb/source/ucp/file/filnot.hxx @@ -23,7 +23,7 @@ #ifndef _FILNOT_HXX_ #define _FILNOT_HXX_ -#include +#include #include #include #include @@ -88,7 +88,7 @@ namespace fileaccess { }; - typedef std::hash_map< rtl::OUString, + typedef std::unordered_map< rtl::OUString, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, hashOUString, equalOUString > ListenerMap; diff --git a/main/ucb/source/ucp/file/filtask.hxx b/main/ucb/source/ucp/file/filtask.hxx index 3b8173c19a2..e2119ba4a3b 100644 --- a/main/ucb/source/ucp/file/filtask.hxx +++ b/main/ucb/source/ucp/file/filtask.hxx @@ -24,7 +24,7 @@ #define _FILTASK_HXX_ #endif -#include +#include #include #include "osl/mutex.hxx" @@ -143,7 +143,7 @@ namespace fileaccess }; // end class TaskHandling - typedef std::hash_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; + typedef std::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap; private: diff --git a/main/ucb/source/ucp/file/shell.hxx b/main/ucb/source/ucp/file/shell.hxx index af72dfacf09..e04d124f72a 100644 --- a/main/ucb/source/ucp/file/shell.hxx +++ b/main/ucb/source/ucp/file/shell.hxx @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -138,7 +138,7 @@ namespace fileaccess { } }; - typedef std::hash_set< MyProperty,hMyProperty,eMyProperty > PropertySet; + typedef std::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet; typedef std::list< Notifier* > NotifierList; @@ -159,7 +159,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA; }; - typedef std::hash_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; + typedef std::unordered_map< UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap; public: diff --git a/main/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/main/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index e4cdd111662..70d1af14f03 100644 --- a/main/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/main/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -24,7 +24,7 @@ #ifndef _HIERARCHYPROVIDER_HXX #define _HIERARCHYPROVIDER_HXX -#include +#include #include #include @@ -84,7 +84,7 @@ struct hashString } }; -typedef std::hash_map +typedef std::unordered_map < rtl::OUString, // servcie specifier ConfigProviderMapEntry, diff --git a/main/ucb/source/ucp/package/pkgprovider.cxx b/main/ucb/source/ucp/package/pkgprovider.cxx index f5a7c627594..bf00f61d530 100644 --- a/main/ucb/source/ucp/package/pkgprovider.cxx +++ b/main/ucb/source/ucp/package/pkgprovider.cxx @@ -30,7 +30,7 @@ *************************************************************************/ -#include +#include #include #include #include @@ -109,7 +109,7 @@ struct hashString } }; -typedef std::hash_map +typedef std::unordered_map < rtl::OUString, Package*, diff --git a/main/ucb/source/ucp/webdav/ContentProperties.hxx b/main/ucb/source/ucp/webdav/ContentProperties.hxx index 89c7c90a80e..e53621abc39 100644 --- a/main/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/main/ucb/source/ucp/webdav/ContentProperties.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -84,7 +84,7 @@ public: }; -typedef std::hash_map +typedef std::unordered_map < rtl::OUString, PropertyValue, diff --git a/main/ucb/source/ucp/webdav/CurlSession.cxx b/main/ucb/source/ucp/webdav/CurlSession.cxx index 647edce5770..77a52671c2c 100644 --- a/main/ucb/source/ucp/webdav/CurlSession.cxx +++ b/main/ucb/source/ucp/webdav/CurlSession.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_webdav.hxx" -#include +#include #include #include #include diff --git a/main/ucb/source/ucp/webdav/PropertyMap.hxx b/main/ucb/source/ucp/webdav/PropertyMap.hxx index 7f3f78a6d88..d1ef58ac09a 100644 --- a/main/ucb/source/ucp/webdav/PropertyMap.hxx +++ b/main/ucb/source/ucp/webdav/PropertyMap.hxx @@ -24,7 +24,7 @@ #ifndef _WEBDAV_UCP_PROPERTYMAP_HXX #define _WEBDAV_UCP_PROPERTYMAP_HXX -#include +#include #include namespace http_dav_ucp { @@ -48,7 +48,7 @@ struct hashPropertyName } }; -typedef std::hash_set +typedef std::unordered_set < ::com::sun::star::beans::Property, hashPropertyName, diff --git a/main/ucb/source/ucp/webdav/webdavresponseparser.cxx b/main/ucb/source/ucp/webdav/webdavresponseparser.cxx index f9850a06c78..058bfb474cf 100644 --- a/main/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/main/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// @@ -74,7 +74,7 @@ namespace } // end of anonymous namespace ////////////////////////////////////////////////////////////////////////////// -// WebDAVName enum and StringToEnum converter using hash_map +// WebDAVName enum and StringToEnum converter using unordered_map namespace { @@ -112,7 +112,7 @@ namespace WebDAVName StrToWebDAVName(const rtl::OUString& rStr) { - typedef std::hash_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; + typedef std::unordered_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; typedef std::pair< rtl::OUString, WebDAVName > WebDAVNameValueType; static WebDAVNameMapper aWebDAVNameMapperList; diff --git a/main/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/main/ucb/workben/cachemap/cachemapobjectcontainer2.hxx index 4d21a68e676..433224dde80 100644 --- a/main/ucb/workben/cachemap/cachemapobjectcontainer2.hxx +++ b/main/ucb/workben/cachemap/cachemapobjectcontainer2.hxx @@ -30,7 +30,7 @@ #include "sal/types.h" #ifndef INCLUDED_HASH_MAP -#include +#include #define INCLUDED_HASH_MAP #endif @@ -52,7 +52,7 @@ public: rtl::Reference< Object2 > get(rtl::OUString const & rKey); private: - typedef std::hash_map< rtl::OUString, + typedef std::unordered_map< rtl::OUString, com::sun::star::uno::WeakReference< Object2 >, rtl::OUStringHash > Map; diff --git a/main/ucbhelper/source/provider/contenthelper.cxx b/main/ucbhelper/source/provider/contenthelper.cxx index 1998d42b47a..df6fd1ed835 100644 --- a/main/ucbhelper/source/provider/contenthelper.cxx +++ b/main/ucbhelper/source/provider/contenthelper.cxx @@ -29,7 +29,7 @@ *************************************************************************/ -#include +#include #include #include #include @@ -97,7 +97,7 @@ struct hashPtr } }; -typedef std::hash_map +typedef std::unordered_map < XPropertiesChangeListenerPtr, PropertyEventSequence*, diff --git a/main/ucbhelper/source/provider/providerhelper.cxx b/main/ucbhelper/source/provider/providerhelper.cxx index 1826460c9c0..cd8d011d786 100644 --- a/main/ucbhelper/source/provider/providerhelper.cxx +++ b/main/ucbhelper/source/provider/providerhelper.cxx @@ -30,7 +30,7 @@ *************************************************************************/ -#include +#include #include #include #include @@ -72,7 +72,7 @@ struct hashString } }; -typedef std::hash_map +typedef std::unordered_map < rtl::OUString, uno::WeakReference< ucb::XContent >, diff --git a/main/unodevtools/inc/unodevtools/typemanager.hxx b/main/unodevtools/inc/unodevtools/typemanager.hxx index 0f06ae97718..3dfd4215efd 100644 --- a/main/unodevtools/inc/unodevtools/typemanager.hxx +++ b/main/unodevtools/inc/unodevtools/typemanager.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include class RegistryKey; @@ -44,7 +44,7 @@ typedef ::std::__hash_map__ NewAlloc > T2TypeClassMap; #else -typedef ::std::hash_map +typedef ::std::unordered_map < ::rtl::OString, // Typename RTTypeClass, // TypeClass diff --git a/main/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/main/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 3a8e7c73d11..84482848640 100644 --- a/main/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/main/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -34,7 +34,7 @@ using namespace ::codemaker::cpp; namespace skeletonmaker { namespace cpp { void generateIncludes(std::ostream & o, - const std::hash_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& /*properties*/, OString propertyhelper, bool serviceobject, bool supportxcomponent) @@ -60,7 +60,7 @@ void generateIncludes(std::ostream & o, o << "#include \"cppuhelper/propertysetmixin.hxx\"\n"; } - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "#include \"" @@ -143,7 +143,7 @@ OString generateCompHelperDeclaration(std::ostream & o, void generateCompHelperDefinition(std::ostream & o, const OString & implname, const OString & classname, - const std::hash_set< OString, OStringHash >& services) + const std::unordered_set< OString, OStringHash >& services) { OString nm; short nbrackets = generateNamespace(o, implname, true, nm); @@ -156,7 +156,7 @@ void generateCompHelperDefinition(std::ostream & o, "_getSupportedServiceNames()\n{\n css::uno::Sequence< " << "::rtl::OUString >" << " s(" << services.size() << ");\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + std::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); short i=0; while (iter != services.end()) { @@ -499,7 +499,7 @@ void generateXDispatchProvider(std::ostream& o, void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& interfaces) + const std::unordered_set< OString, OStringHash >& interfaces) { o << classname << "::" << classname << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n" @@ -619,10 +619,10 @@ OString generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, OString const & classname, - std::hash_set< OString, OStringHash > const & interfaces, + std::unordered_set< OString, OStringHash > const & interfaces, AttributeInfo const & properties, AttributeInfo const & attributes, - std::hash_set< OString, OStringHash > const & propinterfaces, + std::unordered_set< OString, OStringHash > const & propinterfaces, OString const & propertyhelper, bool supportxcomponent) { OStringBuffer parentname(64); @@ -641,7 +641,7 @@ OString generateClassDefinition(std::ostream& o, o << " public ::cppu::WeakImplHelper" << interfaces.size() << "<"; } - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { @@ -681,7 +681,7 @@ OString generateClassDefinition(std::ostream& o, OStringBuffer buffer(256); buffer.append(parentname); buffer.append("< "); - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { @@ -699,7 +699,7 @@ OString generateClassDefinition(std::ostream& o, << parent << "::release(); }\n\n"; } - std::hash_set< OString, OStringHash >::const_iterator it = + std::unordered_set< OString, OStringHash >::const_iterator it = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (it != interfaces.end()) @@ -716,9 +716,9 @@ OString generateClassDefinition(std::ostream& o, << " virtual ~" << classname << "() {}\n\n"; if (options.componenttype == 2) { - o << " typedef std::hash_map< ::sal_Int32, rtl::OUString, " + o << " typedef std::unordered_map< ::sal_Int32, rtl::OUString, " "std::hash<::sal_Int32> > ParamMap;\n" - " typedef std::hash_map< rtl::OUString, ParamMap, " + " typedef std::unordered_map< rtl::OUString, ParamMap, " "rtl::OUStringHash > FunctionMap;\n\n" " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & " "funcName, const ::rtl::OUString & paramName, const char * propName" @@ -793,7 +793,7 @@ OString generateClassDefinition(std::ostream& o, << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n"; if (supportxcomponent) { o << " ::cppu::WeakComponentImplHelper" << interfaces.size() << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); @@ -880,13 +880,13 @@ void generateXServiceInfoBodies(std::ostream& o, void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - std::hash_set< OString, OStringHash > const & interfaces, + std::unordered_set< OString, OStringHash > const & interfaces, OString const & classname, OString const & comphelpernamespace, OString const & propertyhelper) { OString name(classname.concat("::")); - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { @@ -905,7 +905,7 @@ void generateMethodBodies(std::ostream& o, void generateQueryInterface(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& interfaces, OString const & parentname, OString const & classname, OString const & propertyhelper) @@ -923,7 +923,7 @@ void generateQueryInterface(std::ostream& o, o << "css::uno::Any a("; o << parentname << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { @@ -963,11 +963,11 @@ void generateSkeleton(ProgramOptions const & options, return; } - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + std::unordered_set< OString, OStringHash > interfaces; + std::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + std::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; @@ -1096,11 +1096,11 @@ void generateCalcAddin(ProgramOptions const & options, TypeManager const & manager, std::vector< OString > const & types) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + std::unordered_set< OString, OStringHash > interfaces; + std::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + std::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; @@ -1120,7 +1120,7 @@ void generateCalcAddin(ProgramOptions const & options, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter2 = services.begin(); + std::unordered_set< OString, OStringHash >::const_iterator iter2 = services.begin(); sAddinService = (*iter2).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter2)).replace('/', '.'); @@ -1187,7 +1187,7 @@ void generateCalcAddin(ProgramOptions const & options, "#include \"com/sun/star/container/XNameAccess.hpp\"\n" "#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"\n\n" "#include \"rtl/ustrbuf.hxx\"\n\n" - "#include \n" + "#include \n" "#include \n"; // namespace diff --git a/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx index e3e5fb48e02..a8fb87ada3c 100644 --- a/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/main/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -41,7 +41,7 @@ void generatePackage(std::ostream & o, const OString & implname) } void generateImports(std::ostream & o, ProgramOptions const & options, - const std::hash_set< OString, OStringHash >& /*interfaces*/, + const std::unordered_set< OString, OStringHash >& /*interfaces*/, const OString & propertyhelper, bool serviceobject, bool supportxcomponent) { @@ -75,7 +75,7 @@ void generateImports(std::ostream & o, ProgramOptions const & options, } -// std::hash_set< OString, OStringHash >::const_iterator iter = +// std::unordered_set< OString, OStringHash >::const_iterator iter = // interfaces.begin(); // while (iter != interfaces.end()) // { @@ -519,10 +519,10 @@ void generateXDispatchProviderBodies(std::ostream& o, ProgramOptions const & opt void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& interfaces, const OString& indentation, bool usepropertymixin) { - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { @@ -591,8 +591,8 @@ static const char* propcomment= void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces) + const std::unordered_set< OString, OStringHash >& services, + const std::unordered_set< OString, OStringHash >& interfaces) { o << " private com.sun.star.lang.Locale m_locale = " "new com.sun.star.lang.Locale();\n"; @@ -606,7 +606,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + std::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); OString sAddinService = (*iter).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter)).replace('/', '.'); @@ -737,8 +737,8 @@ void generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& services, + const std::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& properties, const AttributeInfo& attributes, const OString& propertyhelper, bool supportxcomponent) @@ -755,7 +755,7 @@ void generateClassDefinition(std::ostream& o, o << "WeakBase\n"; } o << " implements "; - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << (*iter); @@ -782,7 +782,7 @@ void generateClassDefinition(std::ostream& o, if (!services.empty()) { o << " private static final String[] m_serviceNames = {\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); while (iter != services.end()) { o << " \"" << (*iter).replace('/','.') << "\""; @@ -859,11 +859,11 @@ void generateSkeleton(ProgramOptions const & options, std::vector< OString > const & types, OString const & /*delegate*/) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + std::unordered_set< OString, OStringHash > interfaces; + std::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + std::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; diff --git a/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx index 9740a306251..9047916e4cc 100644 --- a/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -144,7 +144,7 @@ bool containsAttribute(AttributeInfo& attributes, OString const & attrname) void checkAttributes(TypeManager const & manager, const typereg::Reader& reader, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + std::unordered_set< OString, OStringHash >& propinterfaces) { OString typeName = codemaker::convertString(reader.getTypeName()); if ( typeName.equals("com/sun/star/beans/XPropertySet") || @@ -185,8 +185,8 @@ void checkAttributes(TypeManager const & manager, void checkType(TypeManager const & manager, OString const & type, - std::hash_set< OString, OStringHash >& interfaceTypes, - std::hash_set< OString, OStringHash >& serviceTypes, + std::unordered_set< OString, OStringHash >& interfaceTypes, + std::unordered_set< OString, OStringHash >& serviceTypes, AttributeInfo& properties) { @@ -279,8 +279,8 @@ void checkType(TypeManager const & manager, } void checkDefaultInterfaces( - std::hash_set< OString, OStringHash >& interfaces, - const std::hash_set< OString, OStringHash >& services, + std::unordered_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& services, const OString & propertyhelper) { if ( services.empty() ) { @@ -329,13 +329,13 @@ bool checkServiceProperties(TypeManager const & manager, OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const std::unordered_set< OString, OStringHash >& services, + const std::unordered_set< OString, OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + std::unordered_set< OString, OStringHash >& propinterfaces) { - std::hash_set< OString, OStringHash >::const_iterator iter; - std::hash_set< OString, OStringHash >::const_iterator end; + std::unordered_set< OString, OStringHash >::const_iterator iter; + std::unordered_set< OString, OStringHash >::const_iterator end; if ( !services.empty() ) { iter = services.begin(); @@ -417,12 +417,12 @@ bool checkXComponentSupport(TypeManager const & manager, // if XComponent is directly specified, return true and remove it from the // supported interfaces list bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< OString, OStringHash >& interfaces) + std::unordered_set< OString, OStringHash >& interfaces) { if ( interfaces.empty() ) return false; - std::hash_set< OString, OStringHash >::const_iterator iter = + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { if ( (*iter).equals("com.sun.star.lang.XComponent") ) { @@ -689,11 +689,11 @@ void generateFunctionParamterMap(std::ostream& o, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces) + const std::unordered_set< OString, OStringHash >& interfaces) { ::codemaker::GeneratedTypeSet generated; bool bFirst = true; - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + std::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { typereg::Reader reader(manager.getTypeReader((*iter).replace('.','/'))); if (!reader.isValid()) { diff --git a/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx index e696300e13c..5684a21db90 100644 --- a/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx +++ b/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx @@ -29,7 +29,7 @@ #include "codemaker/unotype.hxx" #include -#include +#include #include inline std::ostream& operator<<( std::ostream& s, const rtl::OString r) { return (s << r.getStr()); } @@ -108,21 +108,21 @@ codemaker::UnoType::Sort decomposeResolveAndCheck( void checkType(TypeManager const & manager, rtl::OString const & type, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaceTypes, - std::hash_set< rtl::OString, rtl::OStringHash >& serviceTypes, + std::unordered_set< rtl::OString, rtl::OStringHash >& interfaceTypes, + std::unordered_set< rtl::OString, rtl::OStringHash >& serviceTypes, AttributeInfo& properties); void checkDefaultInterfaces( - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, + std::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, + const std::unordered_set< rtl::OString, rtl::OStringHash >& services, const rtl::OString & propertyhelper); rtl::OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, - const std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, + const std::unordered_set< rtl::OString, rtl::OStringHash >& services, + const std::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< rtl::OString, rtl::OStringHash >& propinterfaces); + std::unordered_set< rtl::OString, rtl::OStringHash >& propinterfaces); /** checks whether the return and parameters types are valid and allowed @@ -148,7 +148,7 @@ void checkAddInTypes(TypeManager const & manager, @return true if XComponent have to be supported */ bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces); + std::unordered_set< rtl::OString, rtl::OStringHash >& interfaces); sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, @@ -158,7 +158,7 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); + const std::unordered_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); } diff --git a/main/unotools/inc/unotools/atom.hxx b/main/unotools/inc/unotools/atom.hxx index 742f6c55979..71901936d02 100644 --- a/main/unotools/inc/unotools/atom.hxx +++ b/main/unotools/inc/unotools/atom.hxx @@ -28,7 +28,7 @@ #include #include -#include +#include #ifndef __SGI_STL_LIST #include #endif @@ -47,8 +47,8 @@ namespace utl { class AtomProvider { int m_nAtoms; - ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > > m_aStringMap; - ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap; + ::std::unordered_map< int, ::rtl::OUString, ::std::hash< int > > m_aStringMap; + ::std::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap; public: AtomProvider(); ~AtomProvider(); @@ -69,7 +69,7 @@ namespace utl { class UNOTOOLS_DLLPUBLIC MultiAtomProvider { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > > m_aAtomLists; + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > > m_aAtomLists; public: MultiAtomProvider(); ~MultiAtomProvider(); diff --git a/main/unotools/inc/unotools/eventcfg.hxx b/main/unotools/inc/unotools/eventcfg.hxx index e4011a8a3c3..1c07be17635 100644 --- a/main/unotools/inc/unotools/eventcfg.hxx +++ b/main/unotools/inc/unotools/eventcfg.hxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #define STR_EVENT_STARTAPP 0 @@ -62,7 +62,7 @@ #define STR_EVENT_MODECHANGED 26 #define STR_EVENT_STORAGECHANGED 27 -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash; +typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash; typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; typedef ::std::vector< ::rtl::OUString > SupportedEventsVector; diff --git a/main/unotools/inc/unotools/fontcfg.hxx b/main/unotools/inc/unotools/fontcfg.hxx index 476e209fcfe..4e3f60d1b9f 100644 --- a/main/unotools/inc/unotools/fontcfg.hxx +++ b/main/unotools/inc/unotools/fontcfg.hxx @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include namespace com { @@ -39,7 +39,7 @@ namespace sun { namespace star { namespace lang { -// equality operator needed for hash_map; +// equality operator needed for unordered_map; // (-> why does this need to be in the namespace of Locale ? g++ fails to compile else) inline bool operator==( const com::sun::star::lang::Locale& rLeft, const com::sun::star::lang::Locale& rRight ) { @@ -81,7 +81,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; - std::hash_map< com::sun::star::lang::Locale, + std::unordered_map< com::sun::star::lang::Locale, LocaleAccess, utl::LocaleHash > m_aConfig; @@ -187,8 +187,8 @@ private: LocaleSubst() : bConfigRead( false ) {} }; - std::hash_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst; - typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash; + std::unordered_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst; + typedef std::unordered_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; diff --git a/main/unotools/source/config/cmdoptions.cxx b/main/unotools/source/config/cmdoptions.cxx index 92d7be73999..a111a5c9e26 100644 --- a/main/unotools/source/config/cmdoptions.cxx +++ b/main/unotools/source/config/cmdoptions.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include //_________________________________________________________________________________________________________________ // namespaces @@ -138,7 +138,7 @@ class SvtCmdOptions } private: - class CommandHashMap : public ::std::hash_map< ::rtl::OUString , + class CommandHashMap : public ::std::unordered_map< ::rtl::OUString , sal_Int32 , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > @@ -287,7 +287,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() sal_Int32 nItem = 0 ; OUString sCmd ; - // Set size of hash_map reach a used size of approx. 60% + // Set size of unordered_map reach a used size of approx. 60% m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 ); // Get names/values for disabled commands. @@ -338,7 +338,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) sal_Int32 nItem = 0 ; OUString sCmd ; - // Set size of hash_map reach a used size of approx. 60% + // Set size of unordered_map reach a used size of approx. 60% m_aDisabledCommands.Clear(); m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 ); diff --git a/main/unotools/source/config/eventcfg.cxx b/main/unotools/source/config/eventcfg.cxx index 2249fcd9891..98a48f746f2 100644 --- a/main/unotools/source/config/eventcfg.cxx +++ b/main/unotools/source/config/eventcfg.cxx @@ -34,7 +34,7 @@ #include #ifndef __SGI_STL_HASH_MAP -#include +#include #endif #include #include diff --git a/main/unotools/source/config/extendedsecurityoptions.cxx b/main/unotools/source/config/extendedsecurityoptions.cxx index bb6af7eb85d..2baae25c67b 100644 --- a/main/unotools/source/config/extendedsecurityoptions.cxx +++ b/main/unotools/source/config/extendedsecurityoptions.cxx @@ -40,7 +40,7 @@ #include -#include +#include #include #include "itemholder1.hxx" @@ -81,7 +81,7 @@ struct OUStringHashCode } }; -class ExtensionHashMap : public ::std::hash_map< ::rtl::OUString, +class ExtensionHashMap : public ::std::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/main/unotools/source/config/fontcfg.cxx b/main/unotools/source/config/fontcfg.cxx index 0492673c114..7d0bd7cfdfe 100644 --- a/main/unotools/source/config/fontcfg.cxx +++ b/main/unotools/source/config/fontcfg.cxx @@ -187,7 +187,7 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr { OUString aRet; - std::hash_map< Locale, LocaleAccess, LocaleHash >::const_iterator it = + std::unordered_map< Locale, LocaleAccess, LocaleHash >::const_iterator it = m_aConfig.find( rLocale ); if( it != m_aConfig.end() ) { @@ -1090,7 +1090,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale& rLocale ) const { - std::hash_map< Locale, LocaleSubst, LocaleHash >::const_iterator it = + std::unordered_map< Locale, LocaleSubst, LocaleHash >::const_iterator it = m_aSubst.find( rLocale ); if( it != m_aSubst.end() ) { @@ -1190,7 +1190,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const String& rFontNam while( aLocale.Language.getLength() ) { - std::hash_map< Locale, LocaleSubst, LocaleHash >::const_iterator lang = m_aSubst.find( aLocale ); + std::unordered_map< Locale, LocaleSubst, LocaleHash >::const_iterator lang = m_aSubst.find( aLocale ); if( lang != m_aSubst.end() ) { if( ! lang->second.bConfigRead ) diff --git a/main/unotools/source/config/optionsdlg.cxx b/main/unotools/source/config/optionsdlg.cxx index 51bf02fa969..fd2ba45cf7e 100644 --- a/main/unotools/source/config/optionsdlg.cxx +++ b/main/unotools/source/config/optionsdlg.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include "itemholder1.hxx" using namespace utl; @@ -61,7 +61,7 @@ class SvtOptionsDlgOptions_Impl : public utl::ConfigItem } }; - typedef std::hash_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList; + typedef std::unordered_map< OUString, sal_Bool, OUStringHashCode, ::std::equal_to< OUString > > OptionNodeList; OUString m_sPathDelimiter; OptionNodeList m_aOptionNodeList; diff --git a/main/unotools/source/config/pathoptions.cxx b/main/unotools/source/config/pathoptions.cxx index 4cef919d0bf..629007eaf53 100644 --- a/main/unotools/source/config/pathoptions.cxx +++ b/main/unotools/source/config/pathoptions.cxx @@ -55,7 +55,7 @@ #include #include -#include +#include using namespace osl; using namespace utl; @@ -106,19 +106,19 @@ enum VarNameProperty VAR_NEEDS_FILEURL }; -class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class NameToHandleMap : public ::std::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() { NameToHandleMap().swap( *this ); } }; -class EnumToHandleMap : public ::std::hash_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > > +class EnumToHandleMap : public ::std::unordered_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > > { public: inline void free() { EnumToHandleMap().swap( *this ); } }; -class VarNameToEnumMap : public ::std::hash_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > > +class VarNameToEnumMap : public ::std::unordered_map< OUString, VarNameProperty, OUStringHashCode, ::std::equal_to< OUString > > { public: inline void free() { VarNameToEnumMap().swap( *this ); } diff --git a/main/unotools/source/config/viewoptions.cxx b/main/unotools/source/config/viewoptions.cxx index 0e4b89158bb..4c36790661a 100644 --- a/main/unotools/source/config/viewoptions.cxx +++ b/main/unotools/source/config/viewoptions.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -268,7 +268,7 @@ struct IMPL_TStringHashCode } }; -typedef ::std::hash_map< ::rtl::OUString , +typedef ::std::unordered_map< ::rtl::OUString , IMPL_TViewData , IMPL_TStringHashCode , ::std::equal_to< ::rtl::OUString > > IMPL_TViewHash; diff --git a/main/unotools/source/misc/atom.cxx b/main/unotools/source/misc/atom.cxx index 5b8e1090aba..b5f787268ee 100644 --- a/main/unotools/source/misc/atom.cxx +++ b/main/unotools/source/misc/atom.cxx @@ -42,7 +42,7 @@ AtomProvider::~AtomProvider() int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) { - ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString ); + ::std::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString ); if( it != m_aAtomMap.end() ) return it->second; if( ! bCreate ) @@ -56,7 +56,7 @@ int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms ) { atoms.clear(); - ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin(); + ::std::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin(); ::utl::AtomDescription aDesc; while( it != m_aAtomMap.end() ) @@ -72,7 +72,7 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a { atoms.clear(); - ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin(); + ::std::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin(); ::utl::AtomDescription aDesc; while( it != m_aAtomMap.end() ) @@ -90,7 +90,7 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a const ::rtl::OUString& AtomProvider::getString( int nAtom ) const { static ::rtl::OUString aEmpty; - ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); + ::std::unordered_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -116,14 +116,14 @@ MultiAtomProvider::MultiAtomProvider() MultiAtomProvider::~MultiAtomProvider() { - for( ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) + for( ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) delete it->second; } sal_Bool MultiAtomProvider::insertAtomClass( int atomClass ) { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it = + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return sal_False; @@ -133,7 +133,7 @@ sal_Bool MultiAtomProvider::insertAtomClass( int atomClass ) int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate ) { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::iterator it = + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getAtom( rString, bCreate ); @@ -149,7 +149,7 @@ int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, s int MultiAtomProvider::getLastAtom( int atomClass ) const { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); return it != m_aAtomLists.end() ? it->second->getLastAtom() : INVALID_ATOM; @@ -157,7 +157,7 @@ int MultiAtomProvider::getLastAtom( int atomClass ) const void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl::AtomDescription >& atoms ) { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) it->second->getRecent( atom, atoms ); @@ -167,7 +167,7 @@ void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl:: const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getString( atom ); @@ -178,13 +178,13 @@ const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) c sal_Bool MultiAtomProvider::hasAtom( int atomClass, int atom ) const { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); return it != m_aAtomLists.end() ? it->second->hasAtom( atom ) : sal_False; } void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescription >& atoms) const { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) it->second->getAll( atoms ); @@ -194,7 +194,7 @@ void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescrip void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUString& description ) { - ::std::hash_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::std::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it == m_aAtomLists.end() ) m_aAtomLists[ atomClass ] = new AtomProvider(); m_aAtomLists[ atomClass ]->overrideAtom( atom, description ); diff --git a/main/unotools/source/misc/fontdefs.cxx b/main/unotools/source/misc/fontdefs.cxx index 546ec324707..b5660dbda2e 100644 --- a/main/unotools/source/misc/fontdefs.cxx +++ b/main/unotools/source/misc/fontdefs.cxx @@ -25,7 +25,7 @@ #include "precompiled_unotools.hxx" #include #include -#include +#include struct ImplLocalizedFontName { @@ -408,7 +408,7 @@ void GetEnglishSearchFontName( String& rName ) // translate normalized localized name to its normalized English ASCII name if( bNeedTranslation ) { - typedef std::hash_map FontNameDictionary; + typedef std::unordered_map FontNameDictionary; static FontNameDictionary aDictionary( sizeof(aImplLocalizedNamesList) / sizeof(*aImplLocalizedNamesList) ); // the font name dictionary needs to be initialized once if( aDictionary.empty() ) diff --git a/main/unoxml/source/dom/node.hxx b/main/unoxml/source/dom/node.hxx index f3fcaad23c9..e0d4b94a482 100644 --- a/main/unoxml/source/dom/node.hxx +++ b/main/unoxml/source/dom/node.hxx @@ -24,7 +24,7 @@ #ifndef DOM_NODE_HXX #define DOM_NODE_HXX -#include +#include #include @@ -85,7 +85,7 @@ namespace DOM }; typedef std::vector< std::vector > NamespaceVectorType; - typedef std::hash_map< OUString, + typedef std::unordered_map< OUString, sal_Int32, rtl::OUStringHash > NamespaceMapType; diff --git a/main/uui/source/iahndl.hxx b/main/uui/source/iahndl.hxx index 27a05cad587..e3f42c9f8e9 100644 --- a/main/uui/source/iahndl.hxx +++ b/main/uui/source/iahndl.hxx @@ -64,7 +64,7 @@ namespace com { namespace sun { namespace star { } } } } -#include +#include class Window; @@ -84,7 +84,7 @@ typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations; -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > StringHashMap; +typedef ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > StringHashMap; //============================================================================ class UUIInteractionHelper diff --git a/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx index 3ec345860d8..ac0c93d0f27 100644 --- a/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx +++ b/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx @@ -33,7 +33,7 @@ #import #include -#include +#include #include #include @@ -134,7 +134,7 @@ private: private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; - typedef std::hash_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes; + typedef std::unordered_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes; }; diff --git a/main/vcl/aqua/source/gdi/atsfonts.cxx b/main/vcl/aqua/source/gdi/atsfonts.cxx index bf36e526544..7c160e8252c 100644 --- a/main/vcl/aqua/source/gdi/atsfonts.cxx +++ b/main/vcl/aqua/source/gdi/atsfonts.cxx @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "salgdi.h" @@ -67,7 +67,7 @@ class AtsFontList virtual ImplMacFontData* GetFontDataFromId( sal_IntPtr nFontId ) const; private: - typedef std::hash_map AtsFontContainer; + typedef std::unordered_map AtsFontContainer; AtsFontContainer maFontContainer; void InitGlyphFallbacks( void ); diff --git a/main/vcl/aqua/source/gdi/atslayout.hxx b/main/vcl/aqua/source/gdi/atslayout.hxx index 982ce37a947..c7ec15c027b 100644 --- a/main/vcl/aqua/source/gdi/atslayout.hxx +++ b/main/vcl/aqua/source/gdi/atslayout.hxx @@ -49,7 +49,7 @@ public: ATSUFontFallbacks maFontFallbacks; private: - typedef std::hash_map MacFontContainer; + typedef std::unordered_map MacFontContainer; MacFontContainer maFontContainer; void InitGlyphFallbacks(); diff --git a/main/vcl/aqua/source/gdi/ctfonts.cxx b/main/vcl/aqua/source/gdi/ctfonts.cxx index 302b2cd93c1..69cafeab54b 100644 --- a/main/vcl/aqua/source/gdi/ctfonts.cxx +++ b/main/vcl/aqua/source/gdi/ctfonts.cxx @@ -73,7 +73,7 @@ class CTFontList CTFontCollectionRef mpCTFontCollection; CFArrayRef mpCTFontArray; - typedef std::hash_map CTFontContainer; + typedef std::unordered_map CTFontContainer; CTFontContainer maFontContainer; }; diff --git a/main/vcl/inc/aqua/saldata.hxx b/main/vcl/inc/aqua/saldata.hxx index 8cf1c5f246b..8d13a86898f 100644 --- a/main/vcl/inc/aqua/saldata.hxx +++ b/main/vcl/inc/aqua/saldata.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -84,7 +84,7 @@ struct SalData SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list maFrames; // list of all frames - std::hash_set maFrameCheck; // for fast check of frame existence + std::unordered_set maFrameCheck; // for fast check of frame existence std::list maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev diff --git a/main/vcl/inc/cupsmgr.hxx b/main/vcl/inc/cupsmgr.hxx index 80b00ec13c7..4eb2b72a732 100644 --- a/main/vcl/inc/cupsmgr.hxx +++ b/main/vcl/inc/cupsmgr.hxx @@ -44,13 +44,13 @@ struct FPtrHash class CUPSManager : public PrinterInfoManager { CUPSWrapper* m_pCUPSWrapper; - std::hash_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles; + std::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles; int m_nDests; void* m_pDests; bool m_bNewDests; - std::hash_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap; + std::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap; - std::hash_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts; + std::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts; rtl::OString m_aUser; // this is a security risk, but the CUPS API demands diff --git a/main/vcl/inc/fontcache.hxx b/main/vcl/inc/fontcache.hxx index e719f7dd58c..7960807ec78 100644 --- a/main/vcl/inc/fontcache.hxx +++ b/main/vcl/inc/fontcache.hxx @@ -29,7 +29,7 @@ #include "tools/string.hxx" -#include +#include namespace psp { @@ -42,7 +42,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontCacheEntry m_aEntry; }; - typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap; + typedef std::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap; struct FontDir { sal_Int64 m_nTimestamp; @@ -53,7 +53,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {} }; - typedef std::hash_map< int, FontDir > FontCacheData; + typedef std::unordered_map< int, FontDir > FontCacheData; FontCacheData m_aCache; String m_aCacheFile; bool m_bDoFlush; diff --git a/main/vcl/inc/glyphcache.hxx b/main/vcl/inc/glyphcache.hxx index d816d98d77b..6c9fae9509c 100644 --- a/main/vcl/inc/glyphcache.hxx +++ b/main/vcl/inc/glyphcache.hxx @@ -38,8 +38,8 @@ struct ImplKernPairData; class ImplFontOptions; #include -#include -#include +#include +#include namespace basegfx { class B2DPolyPolygon; } @@ -92,7 +92,7 @@ private: // the FontList key's mpFontData member is reinterpreted as integer font id struct IFSD_Equal{ bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; }; struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; }; - typedef ::std::hash_map FontList; + typedef ::std::unordered_map FontList; FontList maFontList; sal_uLong mnMaxSize; // max overall cache size in bytes mutable sal_uLong mnBytesUsed; @@ -221,7 +221,7 @@ protected: virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; } private: - typedef ::std::hash_map GlyphList; + typedef ::std::unordered_map GlyphList; mutable GlyphList maGlyphList; const ImplFontSelectData maFontSelData; @@ -367,7 +367,7 @@ protected: { return (rA.mnChar1 == rB.mnChar1) && (rA.mnChar2 == rB.mnChar2); } }; struct PairHash{ int operator()(const ImplKernPairData& rA) const { return (rA.mnChar1) * 256 ^ rA.mnChar2; } }; - typedef std::hash_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs; + typedef std::unordered_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs; mutable UnicodeKernPairs maUnicodeKernPairs; }; diff --git a/main/vcl/inc/graphite_cache.hxx b/main/vcl/inc/graphite_cache.hxx index d2b90d05930..08ece14dd53 100644 --- a/main/vcl/inc/graphite_cache.hxx +++ b/main/vcl/inc/graphite_cache.hxx @@ -32,7 +32,7 @@ #define GRCACHE_REUSE_VECTORS 1 -#include +#include class TextSourceAdaptor; /** @@ -91,8 +91,8 @@ private: friend class GraphiteSegmentCache; }; -typedef std::hash_map > GraphiteSegMap; -typedef std::hash_multimap GraphiteRopeMap; +typedef std::unordered_map > GraphiteSegMap; +typedef std::unordered_multimap GraphiteRopeMap; typedef std::pair GrRMEntry; /** @@ -225,7 +225,7 @@ private: const xub_Unicode * m_prevKey; }; -typedef std::hash_map > GraphiteCacheMap; +typedef std::unordered_map > GraphiteCacheMap; /** * GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache diff --git a/main/vcl/inc/impimagetree.hxx b/main/vcl/inc/impimagetree.hxx index 8f16e41cea1..c59644b864f 100644 --- a/main/vcl/inc/impimagetree.hxx +++ b/main/vcl/inc/impimagetree.hxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include "boost/noncopyable.hpp" #include "com/sun/star/uno/Reference.hxx" @@ -67,9 +67,9 @@ private: com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > > > Zips; - typedef std::hash_map< + typedef std::unordered_map< rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache; - typedef std::hash_map< + typedef std::unordered_map< rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; rtl::OUString m_style; diff --git a/main/vcl/inc/os2/salgdi.h b/main/vcl/inc/os2/salgdi.h index 2786d5e6f4d..a7bbcd21658 100644 --- a/main/vcl/inc/os2/salgdi.h +++ b/main/vcl/inc/os2/salgdi.h @@ -29,7 +29,7 @@ #include #include -#include +#include class ImplOs2FontEntry; @@ -105,7 +105,7 @@ class ImplOs2FontData : public ImplFontData #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set IntHashSet; + typedef std::unordered_set IntHashSet; mutable IntHashSet maGsubTable; mutable bool mbGsubRead; public: diff --git a/main/vcl/inc/outfont.hxx b/main/vcl/inc/outfont.hxx index feb6f953423..74727ec9a45 100644 --- a/main/vcl/inc/outfont.hxx +++ b/main/vcl/inc/outfont.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include class ImplDevFontListData; class ImplGetDevFontList; @@ -188,7 +188,7 @@ private: mutable bool mbMatchData; // true if matching attributes are initialized bool mbMapNames; // true if MapNames are available - typedef std::hash_map DevFontList; + typedef std::unordered_map DevFontList; DevFontList maDevFontList; ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution @@ -347,7 +347,7 @@ private: // TODO: at least the ones which just differ in orientation, stretching or height typedef ::std::pair GFBCacheKey; struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; }; - typedef ::std::hash_map UnicodeFallbackList; + typedef ::std::unordered_map UnicodeFallbackList; UnicodeFallbackList* mpUnicodeFallbackList; }; diff --git a/main/vcl/inc/printergfx.hxx b/main/vcl/inc/printergfx.hxx index 15e3c84527f..8c4d750fbc0 100644 --- a/main/vcl/inc/printergfx.hxx +++ b/main/vcl/inc/printergfx.hxx @@ -30,7 +30,7 @@ #include "tools/gen.hxx" #include -#include +#include namespace psp { @@ -248,7 +248,7 @@ private: /* font / font substitution */ friend class Font3; - const ::std::hash_map< fontID, fontID >* mpFontSubstitutes; + const ::std::unordered_map< fontID, fontID >* mpFontSubstitutes; int getCharWidth (sal_Bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox); fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char, diff --git a/main/vcl/inc/svdata.hxx b/main/vcl/inc/svdata.hxx index 35405df590b..cd48b8db0af 100644 --- a/main/vcl/inc/svdata.hxx +++ b/main/vcl/inc/svdata.hxx @@ -46,7 +46,7 @@ #include "com/sun/star/uno/Reference.hxx" -#include +#include namespace com { namespace sun { @@ -373,7 +373,7 @@ struct ImplSVData com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; - std::hash_map< int, rtl::OUString >* mpPaperNames; + std::unordered_map< int, rtl::OUString >* mpPaperNames; }; void ImplInitSVData(); diff --git a/main/vcl/inc/unx/saldisp.hxx b/main/vcl/inc/unx/saldisp.hxx index 0d6915f49c6..d16f2cf2cd5 100644 --- a/main/vcl/inc/unx/saldisp.hxx +++ b/main/vcl/inc/unx/saldisp.hxx @@ -42,7 +42,7 @@ class SalXLib; #endif #include #include -#include +#include #include #include @@ -285,7 +285,7 @@ public: RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {} }; - typedef std::hash_map RenderEntryMap; + typedef std::unordered_map RenderEntryMap; struct ScreenData { diff --git a/main/vcl/inc/vcl/configsettings.hxx b/main/vcl/inc/vcl/configsettings.hxx index 6d5feb6c222..2ca16eddb26 100644 --- a/main/vcl/inc/vcl/configsettings.hxx +++ b/main/vcl/inc/vcl/configsettings.hxx @@ -28,14 +28,14 @@ #include #include -#include +#include //........................................................................ namespace vcl { //........................................................................ - typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap; + typedef std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; //==================================================================== @@ -44,7 +44,7 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { - std::hash_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings; + std::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings; virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); diff --git a/main/vcl/inc/vcl/fontmanager.hxx b/main/vcl/inc/vcl/fontmanager.hxx index ffbd5206b02..0bc19f84a59 100644 --- a/main/vcl/inc/vcl/fontmanager.hxx +++ b/main/vcl/inc/vcl/fontmanager.hxx @@ -24,7 +24,7 @@ #ifndef _PSPRINT_FONTMANAGER_HXX_ #define _PSPRINT_FONTMANAGER_HXX_ -#include +#include #include #include #include @@ -239,7 +239,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager // upper byte contains: 0 for horizontal metric // 1 for vertical metric // highest byte: 0 for now - std::hash_map< int, CharacterMetric > m_aMetrics; + std::unordered_map< int, CharacterMetric > m_aMetrics; // contains the unicode blocks for which metrics were queried // this implies that metrics should be queried in terms of // unicode blocks. here a unicode block is identified @@ -254,7 +254,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager bool m_bKernPairsQueried; std::list< KernPair > m_aXKernPairs; std::list< KernPair > m_aYKernPairs; - std::hash_map< sal_Unicode, bool > m_bVerticalSubstitutions; + std::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions; PrintFontMetrics() : m_bKernPairsQueried( false ) {} @@ -368,8 +368,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static rtl::OString s_aEmptyOString; fontID m_nNextFontID; - std::hash_map< fontID, PrintFont* > m_aFonts; - std::hash_map< int, family::type > m_aFamilyTypes; + std::unordered_map< fontID, PrintFont* > m_aFonts; + std::unordered_map< int, family::type > m_aFamilyTypes; std::list< rtl::OUString > m_aPrinterDrivers; std::list< rtl::OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; @@ -377,20 +377,20 @@ class VCL_PLUGIN_PUBLIC PrintFontManager m_aXLFD_Aliases; utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID - std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash > + std::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash > m_aFontFileToFontID; - std::hash_map< rtl::OString, int, rtl::OStringHash > + std::unordered_map< rtl::OString, int, rtl::OStringHash > m_aDirToAtom; - std::hash_map< int, rtl::OString > m_aAtomToDir; + std::unordered_map< int, rtl::OString > m_aAtomToDir; int m_nNextDirAtom; - std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash > + std::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash > m_aAdobenameToUnicode; - std::hash_multimap< sal_Unicode, rtl::OString > + std::unordered_multimap< sal_Unicode, rtl::OString > m_aUnicodeToAdobename; - std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; - std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; + std::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; + std::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; mutable FontCache* m_pFontCache; bool m_bFontconfigSuccess; @@ -415,7 +415,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager PrintFont* getFont( fontID nID ) const { - std::hash_map< fontID, PrintFont* >::const_iterator it; + std::unordered_map< fontID, PrintFont* >::const_iterator it; it = m_aFonts.find( nID ); return it == m_aFonts.end() ? NULL : it->second; } @@ -435,7 +435,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager false else (e.g. no libfontconfig found) */ bool initFontconfig(); - int countFontconfigFonts( std::hash_map& o_rVisitedPaths ); + int countFontconfigFonts( std::unordered_map& o_rVisitedPaths ); /* deinitialize fontconfig */ void deinitFontconfig(); @@ -615,15 +615,15 @@ public: // helper for type 1 fonts std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; - std::pair< std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator, - std::hash_multimap< sal_Unicode, sal_uInt8 >::const_iterator > + std::pair< std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator, + std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator > getAdobeCodeFromUnicode( sal_Unicode aChar ) const { return m_aUnicodeToAdobecode.equal_range( aChar ); } std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const; - std::pair< std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator, - std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator > + std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, + std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > getUnicodeFromAdobeCode( sal_uInt8 aChar ) const { return m_aAdobecodeToUnicode.equal_range( aChar ); diff --git a/main/vcl/inc/vcl/lazydelete.hxx b/main/vcl/inc/vcl/lazydelete.hxx index 7e83c65e504..932558eec9a 100644 --- a/main/vcl/inc/vcl/lazydelete.hxx +++ b/main/vcl/inc/vcl/lazydelete.hxx @@ -27,7 +27,7 @@ #include "dllapi.h" #include -#include +#include #include #if OSL_DEBUG_LEVEL > 2 @@ -120,7 +120,7 @@ namespace vcl }; std::vector< DeleteObjectEntry > m_aObjects; - typedef std::hash_map< sal_IntPtr, unsigned int > PtrToIndexMap; + typedef std::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap; PtrToIndexMap m_aPtrToIndex; /** strict weak ordering function to bring objects to be destroyed lazily diff --git a/main/vcl/inc/vcl/ppdparser.hxx b/main/vcl/inc/vcl/ppdparser.hxx index 3745ccf0770..0fc89173f12 100644 --- a/main/vcl/inc/vcl/ppdparser.hxx +++ b/main/vcl/inc/vcl/ppdparser.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include "tools/string.hxx" #include "tools/stream.hxx" @@ -60,7 +60,7 @@ class VCL_DLLPUBLIC PPDKey { friend class PPDParser; - typedef ::std::hash_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type; + typedef ::std::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type; typedef ::std::vector< PPDValue* > value_type; String m_aKey; @@ -123,7 +123,7 @@ class VCL_DLLPUBLIC PPDParser friend class PPDContext; friend class CUPSManager; - typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; + typedef ::std::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; typedef ::std::vector< PPDKey* > value_type; void insertKey( const String& rKey, PPDKey* pKey ); @@ -140,7 +140,7 @@ public: private: static ::std::list< PPDParser* > aAllParsers; - static ::std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* + static ::std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; hash_type m_aKeys; @@ -296,7 +296,7 @@ public: class VCL_DLLPUBLIC PPDContext { - typedef ::std::hash_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; + typedef ::std::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; hash_type m_aCurrentValues; const PPDParser* m_pParser; diff --git a/main/vcl/inc/vcl/print.hxx b/main/vcl/inc/vcl/print.hxx index 5c930a25a33..0e6d4c3d413 100644 --- a/main/vcl/inc/vcl/print.hxx +++ b/main/vcl/inc/vcl/print.hxx @@ -38,7 +38,7 @@ #include "com/sun/star/view/PrintableState.hpp" #include -#include +#include #include struct SalPrinterInfoQueue; @@ -552,7 +552,7 @@ public: class VCL_DLLPUBLIC PrinterOptionsHelper { protected: - std::hash_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap; + std::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties; public: diff --git a/main/vcl/inc/vcl/printerinfomanager.hxx b/main/vcl/inc/vcl/printerinfomanager.hxx index fe782707c08..6c445dcce86 100644 --- a/main/vcl/inc/vcl/printerinfomanager.hxx +++ b/main/vcl/inc/vcl/printerinfomanager.hxx @@ -24,7 +24,7 @@ #ifndef _PSPRINT_PRINTERINFOMANAGER_HXX_ #define _PSPRINT_PRINTERINFOMANAGER_HXX_ -#include +#include #include #include "vcl/dllapi.h" @@ -65,9 +65,9 @@ struct PrinterInfo : JobData // this vector is currently implicitly given by the adobe // standard encoding bool m_bPerformFontSubstitution; - std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > + std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > m_aFontSubstitutes; - std::hash_map< fontID, fontID > + std::unordered_map< fontID, fontID > m_aFontSubstitutions; PrinterInfo() : @@ -117,7 +117,7 @@ protected: PrinterInfo m_aInfo; }; - std::hash_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters; + std::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters; PrinterInfo m_aGlobalDefaults; std::list< WatchFile > m_aWatchFiles; rtl::OUString m_aDefaultPrinter; @@ -140,7 +140,7 @@ protected: virtual void initialize(); // fill in font substitutions - // the resulting hash_map maps from source to target font ids + // the resulting unordered_map maps from source to target font ids void fillFontSubstitutions( PrinterInfo& rInfo ) const; // fill default paper if not configured in config file diff --git a/main/vcl/inc/win/salgdi.h b/main/vcl/inc/win/salgdi.h index 6dcbcd9a00a..b24b145d015 100644 --- a/main/vcl/inc/win/salgdi.h +++ b/main/vcl/inc/win/salgdi.h @@ -30,7 +30,7 @@ #include #include "boost/scoped_ptr.hpp" -#include +#include class ImplFontSelectData; class ImplWinFontEntry; @@ -113,7 +113,7 @@ class ImplWinFontData : public ImplFontData #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set UcsHashSet; + typedef std::unordered_set UcsHashSet; mutable UcsHashSet maGsubTable; mutable bool mbGsubRead; public: diff --git a/main/vcl/os2/source/gdi/os2layout.cxx b/main/vcl/os2/source/gdi/os2layout.cxx index dcd1f1bb152..0ccd8e68658 100644 --- a/main/vcl/os2/source/gdi/os2layout.cxx +++ b/main/vcl/os2/source/gdi/os2layout.cxx @@ -52,8 +52,8 @@ #include #endif // GCP_KERN_HACK -#include -typedef std::hash_map IntMap; +#include +typedef std::unordered_map IntMap; #define DROPPED_OUTGLYPH 0xFFFF diff --git a/main/vcl/source/control/tabctrl.cxx b/main/vcl/source/control/tabctrl.cxx index e783afc8479..c3c3be781fb 100644 --- a/main/vcl/source/control/tabctrl.cxx +++ b/main/vcl/source/control/tabctrl.cxx @@ -39,7 +39,7 @@ #include "svdata.hxx" #include "window.h" -#include +#include #include // ======================================================================= @@ -69,8 +69,8 @@ struct ImplTabItem struct ImplTabCtrlData { - std::hash_map< int, int > maLayoutPageIdToLine; - std::hash_map< int, int > maLayoutLineToPageId; + std::unordered_map< int, int > maLayoutPageIdToLine; + std::unordered_map< int, int > maLayoutLineToPageId; std::vector< Rectangle > maTabRectangles; Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; @@ -2074,7 +2074,7 @@ Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) cons if( HasLayoutData() ) { - std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); + std::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPageId ); if( it != mpTabCtrlData->maLayoutPageIdToLine.end() ) { Pair aPair = mpControlData->mpLayoutData->GetLineStartEnd( it->second ); @@ -2139,7 +2139,7 @@ Rectangle TabControl::GetTabPageBounds( sal_uInt16 nPage ) const if( HasLayoutData() ) { - std::hash_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage ); + std::unordered_map< int, int >::const_iterator it = mpTabCtrlData->maLayoutPageIdToLine.find( (int)nPage ); if( it != mpTabCtrlData->maLayoutPageIdToLine.end() ) { if( it->second >= 0 && it->second < static_cast(mpTabCtrlData->maTabRectangles.size()) ) diff --git a/main/vcl/source/gdi/configsettings.cxx b/main/vcl/source/gdi/configsettings.cxx index 3bc12cc65c2..2665ad75bba 100644 --- a/main/vcl/source/gdi/configsettings.cxx +++ b/main/vcl/source/gdi/configsettings.cxx @@ -86,7 +86,7 @@ void SettingsConfigItem::Commit() if( ! IsValidConfigMgr() ) return; - std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; + std::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -178,7 +178,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::std::hash_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + ::std::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() ) { static OUString aEmpty; diff --git a/main/vcl/source/gdi/impimagetree.cxx b/main/vcl/source/gdi/impimagetree.cxx index 7a84c0ada38..7199fe01a4e 100644 --- a/main/vcl/source/gdi/impimagetree.cxx +++ b/main/vcl/source/gdi/impimagetree.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/io/XInputStream.hpp" #include "com/sun/star/lang/Locale.hpp" diff --git a/main/vcl/source/gdi/pdfwriter_impl.cxx b/main/vcl/source/gdi/pdfwriter_impl.cxx index 2690c156346..cad3523dd29 100644 --- a/main/vcl/source/gdi/pdfwriter_impl.cxx +++ b/main/vcl/source/gdi/pdfwriter_impl.cxx @@ -708,7 +708,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // find or create a hierarchical field // first find the fully qualified name up to this field aDomain = aFullName.copy( 0, nTokenIndex-1 ); - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + std::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -769,7 +769,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( aDomain.getLength() ) { - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + std::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it != m_aFieldNameMap.end() ) { OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" ); @@ -796,11 +796,11 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr if( ! m_aContext.AllowDuplicateFieldNames ) { - std::hash_map::iterator it = m_aFieldNameMap.find( aFullName ); + std::unordered_map::iterator it = m_aFieldNameMap.find( aFullName ); if( it != m_aFieldNameMap.end() ) // not unique { - std::hash_map< OString, sal_Int32, OStringHash >::const_iterator check_it; + std::unordered_map< OString, sal_Int32, OStringHash >::const_iterator check_it; OString aTry; sal_Int32 nTry = 2; do @@ -2872,7 +2872,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) if( ! m_aRoleMap.empty() ) { aLine.append( "/RoleMap<<" ); - for( std::hash_map::const_iterator + for( std::unordered_map::const_iterator it = m_aRoleMap.begin(); it != m_aRoleMap.end(); ++it ) { aLine.append( '/' ); @@ -6672,7 +6672,7 @@ void PDFWriterImpl::sortWidgets() { // sort widget annotations on each page as per their // TabOrder attribute - std::hash_map< sal_Int32, AnnotSortContainer > sorted; + std::unordered_map< sal_Int32, AnnotSortContainer > sorted; int nWidgets = m_aWidgets.size(); for( int nW = 0; nW < nWidgets; nW++ ) { @@ -6692,7 +6692,7 @@ void PDFWriterImpl::sortWidgets() } } } - for( std::hash_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it ) + for( std::unordered_map< sal_Int32, AnnotSortContainer >::iterator it = sorted.begin(); it != sorted.end(); ++it ) { // append entries for non widget annotations PDFPage& rPage = m_aPages[ it->first ]; @@ -11827,7 +11827,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() { PDFWidget& rGroupWidget = m_aWidgets[ group->second ]; // check whether all kids have a unique OnValue - std::hash_map< OUString, sal_Int32, OUStringHash > aOnValues; + std::unordered_map< OUString, sal_Int32, OUStringHash > aOnValues; int nChildren = rGroupWidget.m_aKidsIndex.size(); bool bIsUnique = true; for( int nKid = 0; nKid < nChildren && bIsUnique; nKid++ ) diff --git a/main/vcl/source/gdi/pdfwriter_impl.hxx b/main/vcl/source/gdi/pdfwriter_impl.hxx index 84859c7e529..17bd892d70c 100644 --- a/main/vcl/source/gdi/pdfwriter_impl.hxx +++ b/main/vcl/source/gdi/pdfwriter_impl.hxx @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include @@ -436,8 +436,8 @@ public: {} }; - typedef std::hash_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; - typedef std::hash_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; + typedef std::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; + typedef std::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { @@ -644,7 +644,7 @@ private: bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > + std::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -654,8 +654,8 @@ private: std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; /* used to store control id during beginControlAppearance/endControlAppearance */ sal_Int32 m_nCurrentControl; - /* hash_map for field names, used to ensure unique field names */ - std::hash_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; + /* unordered_map for field names, used to ensure unique field names */ + std::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; /* contains Bitmaps for gradient functions until they are written * to the file stream */ diff --git a/main/vcl/source/gdi/print.cxx b/main/vcl/source/gdi/print.cxx index f24e2f03b7e..09b98b644f3 100644 --- a/main/vcl/source/gdi/print.cxx +++ b/main/vcl/source/gdi/print.cxx @@ -335,7 +335,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = + std::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -360,7 +360,7 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - std::hash_map::iterator it = + std::unordered_map::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; @@ -1295,7 +1295,7 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mpPaperNames ) { - pSVData->mpPaperNames = new std::hash_map< int, rtl::OUString >(); + pSVData->mpPaperNames = new std::unordered_map< int, rtl::OUString >(); if( ImplGetResMgr() ) { ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) ); @@ -1315,7 +1315,7 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) } } - std::hash_map::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); + std::unordered_map::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); return (it != pSVData->mpPaperNames->end()) ? it->second : rtl::OUString(); } diff --git a/main/vcl/source/gdi/print3.cxx b/main/vcl/source/gdi/print3.cxx index 87df96d93d1..629bb9725c4 100644 --- a/main/vcl/source/gdi/print3.cxx +++ b/main/vcl/source/gdi/print3.cxx @@ -46,8 +46,8 @@ #include "com/sun/star/awt/Size.hpp" #include "comphelper/processfactory.hxx" -#include -#include +#include +#include using namespace com::sun::star; using namespace com::sun::star::uno; @@ -145,9 +145,9 @@ class vcl::ImplPrinterControllerData ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; - typedef std::hash_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; - typedef std::hash_map< rtl::OUString, Sequence< sal_Bool >, rtl::OUStringHash > ChoiceDisableMap; + typedef std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; + typedef std::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; + typedef std::unordered_map< rtl::OUString, Sequence< sal_Bool >, rtl::OUStringHash > ChoiceDisableMap; boost::shared_ptr mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -1287,7 +1287,7 @@ bool PrinterController::getReversePrint() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - std::hash_set< rtl::OUString, rtl::OUStringHash > aMergeSet; + std::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet; size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; for( int i = 0; i < i_rMergeList.getLength(); i++ ) aMergeSet.insert( i_rMergeList[i].Name ); @@ -1336,14 +1336,14 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } @@ -1373,7 +1373,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa void PrinterController::setValue( const beans::PropertyValue& i_rValue ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1452,7 +1452,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i_bEnable ) { - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( it != mpImplData->maPropertyToIndex.end() ) { @@ -1470,7 +1470,7 @@ void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const { bool bEnabled = false; - std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = + std::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1700,7 +1700,7 @@ sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, s Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const { Any aRet; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; @@ -1715,7 +1715,7 @@ void PrinterOptionsHelper::setValue( const rtl::OUString& i_rPropertyName, const bool PrinterOptionsHelper::hasProperty( const rtl::OUString& i_rPropertyName ) const { Any aRet; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + std::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); return it != m_aPropertyMap.end(); } @@ -1755,7 +1755,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = + std::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { diff --git a/main/vcl/source/glyphs/gcach_ftyp.cxx b/main/vcl/source/glyphs/gcach_ftyp.cxx index 1928270cb79..6cac6473607 100644 --- a/main/vcl/source/glyphs/gcach_ftyp.cxx +++ b/main/vcl/source/glyphs/gcach_ftyp.cxx @@ -131,7 +131,7 @@ FT_Error (*pFTEmbolden)(FT_GlyphSlot); FT_Error (*pFTOblique)(FT_GlyphSlot); static bool bEnableSizeFT = false; -typedef ::std::hash_map< const char*, FtFontFile*, rtl::CStringHash, rtl::CStringEqual> FontFileList; +typedef ::std::unordered_map< const char*, FtFontFile*, rtl::CStringHash, rtl::CStringEqual> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- @@ -2062,7 +2062,7 @@ sal_uLong FreetypeServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) con // prepare glyphindex to character mapping // TODO: this is needed to support VCL's existing kerning infrastructure, // eliminate it up by redesigning kerning infrastructure to work with glyph indizes - typedef std::hash_multimap Cmap; + typedef std::unordered_multimap Cmap; Cmap aCmap; for( sal_Unicode aChar = 0x0020; aChar < 0xFFFE; ++aChar ) { diff --git a/main/vcl/source/glyphs/gcach_ftyp.hxx b/main/vcl/source/glyphs/gcach_ftyp.hxx index 877bd8d07c0..916d69ff2ab 100644 --- a/main/vcl/source/glyphs/gcach_ftyp.hxx +++ b/main/vcl/source/glyphs/gcach_ftyp.hxx @@ -110,8 +110,8 @@ private: const ImplFontCharMap* mpFontCharMap; // cache unicode->glyphid mapping because looking it up is expensive - // TODO: change to hash_multimap when a use case requires a m:n mapping - typedef ::std::hash_map Int2IntMap; + // TODO: change to unordered_multimap when a use case requires a m:n mapping + typedef ::std::unordered_map Int2IntMap; mutable Int2IntMap* mpChar2Glyph; mutable Int2IntMap* mpGlyph2Char; void InitHashes() const; @@ -157,7 +157,7 @@ public: FreetypeServerFont* CreateFont( const ImplFontSelectData& ); private: - typedef ::std::hash_map FontList; + typedef ::std::unordered_map FontList; FontList maFontList; sal_IntPtr mnMaxFontId; @@ -224,7 +224,7 @@ private: bool mbArtBold; bool mbUseGamma; - typedef ::std::hash_map GlyphSubstitution; + typedef ::std::unordered_map GlyphSubstitution; GlyphSubstitution maGlyphSubstitution; rtl_UnicodeToTextConverter maRecodeConverter; diff --git a/main/vcl/source/glyphs/graphite_adaptors.cxx b/main/vcl/source/glyphs/graphite_adaptors.cxx index 53a2c09fad1..a9c43dbc04e 100644 --- a/main/vcl/source/glyphs/graphite_adaptors.cxx +++ b/main/vcl/source/glyphs/graphite_adaptors.cxx @@ -57,7 +57,7 @@ namespace inline float from_hinted(const int x) { return static_cast(x + 32) / 64.0; } - typedef std::hash_map SilfMap; + typedef std::unordered_map SilfMap; SilfMap sSilfMap; } extern FT_Error (*pFTEmbolden)(FT_GlyphSlot); diff --git a/main/vcl/source/helper/canvastools.cxx b/main/vcl/source/helper/canvastools.cxx index 8dd14ebbbeb..fb613bf4d8f 100644 --- a/main/vcl/source/helper/canvastools.cxx +++ b/main/vcl/source/helper/canvastools.cxx @@ -67,7 +67,7 @@ #include #include -#include +#include using namespace ::com::sun::star; @@ -182,8 +182,8 @@ namespace vcl const uno::Sequence< sal_Int8 > getTunnelIdentifier( TunnelIdentifierType eType ) { - static std::hash_map< int, uno::Sequence< sal_Int8 > > aIds; - std::hash_map< int, uno::Sequence< sal_Int8 > >::iterator it = + static std::unordered_map< int, uno::Sequence< sal_Int8 > > aIds; + std::unordered_map< int, uno::Sequence< sal_Int8 > >::iterator it = aIds.find( eType ); if( it == aIds.end() ) { diff --git a/main/vcl/unx/generic/dtrans/X11_selection.cxx b/main/vcl/unx/generic/dtrans/X11_selection.cxx index 117e1eff773..8901571ec62 100644 --- a/main/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/main/vcl/unx/generic/dtrans/X11_selection.cxx @@ -207,9 +207,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) // ------------------------------------------------------------------------ -::std::hash_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() +::std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { - static ::std::hash_map< OUString, SelectionManager*, OUStringHash > aInstances; + static ::std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } @@ -466,7 +466,7 @@ SelectionManager::~SelectionManager() { MutexGuard aGuard( *Mutex::getGlobalMutex() ); - ::std::hash_map< OUString, SelectionManager*, OUStringHash >::iterator it; + ::std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) if( it->second == this ) { @@ -531,7 +531,7 @@ SelectionManager::~SelectionManager() SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { - ::std::hash_map< Atom, Selection* >::iterator it = + ::std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } @@ -698,7 +698,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 ); SelectionManager* pInstance = NULL; - ::std::hash_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); + ::std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName ); if( it != getInstances().end() ) pInstance = it->second; else pInstance = getInstances()[ aDisplayName ] = new SelectionManager(); @@ -712,7 +712,7 @@ const OUString& SelectionManager::getString( Atom aAtom ) { MutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, OUString >::const_iterator it; + ::std::unordered_map< Atom, OUString >::const_iterator it; if( ( it = m_aAtomToString.find( aAtom ) ) == m_aAtomToString.end() ) { static OUString aEmpty; @@ -733,7 +733,7 @@ Atom SelectionManager::getAtom( const OUString& rString ) { MutexGuard aGuard(m_aMutex); - ::std::hash_map< OUString, Atom, OUStringHash >::const_iterator it; + ::std::unordered_map< OUString, Atom, OUStringHash >::const_iterator it; if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() ) { static Atom nNoDisplayAtoms = 1; @@ -892,7 +892,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { ResettableMutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, Selection* >::iterator it; + ::std::unordered_map< Atom, Selection* >::iterator it; bool bSuccess = false; #if OSL_DEBUG_LEVEL > 1 @@ -1033,7 +1033,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp int nFormat; bool bSuccess = false; - ::std::hash_map< Atom, Selection* >::iterator it; + ::std::unordered_map< Atom, Selection* >::iterator it; { MutexGuard aGuard(m_aMutex); @@ -1242,7 +1242,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { - ::std::hash_map< Atom, Selection* >::iterator it; + ::std::unordered_map< Atom, Selection* >::iterator it; { MutexGuard aGuard(m_aMutex); @@ -1448,7 +1448,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { - std::hash_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); + std::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); if( it == m_aSelections.end() ) return NULL; if( ! it->second->m_pPixmap ) @@ -1570,10 +1570,10 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "using INCR protocol\n" ); - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); + std::unordered_map< XLIB_Window, std::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); if( win_it != m_aIncrementals.end() ) { - std::hash_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); + std::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); if( inc_it != win_it->second.end() ) { const IncrementalTransfer& rInc = inc_it->second; @@ -1844,7 +1844,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) #endif bool bHandled = false; - ::std::hash_map< Atom, Selection* >::iterator it = + ::std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.atom ); if( it != m_aSelections.end() && rNotify.state == PropertyNewValue && @@ -1969,13 +1969,13 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) // feed incrementals if( rNotify.state == PropertyDelete ) { - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it; + std::unordered_map< XLIB_Window, std::unordered_map< Atom, IncrementalTransfer > >::iterator it; it = m_aIncrementals.find( rNotify.window ); if( it != m_aIncrementals.end() ) { bHandled = true; int nCurrentTime = time( NULL ); - std::hash_map< Atom, IncrementalTransfer >::iterator inc_it; + std::unordered_map< Atom, IncrementalTransfer >::iterator inc_it; // throw out aborted transfers std::list< Atom > aTimeouts; for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it ) @@ -2073,7 +2073,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) if( rNotify.requestor != m_aWindow && rNotify.requestor != m_aCurrentDropWindow ) fprintf( stderr, "Warning: selection notify for unknown window 0x%lx\n", rNotify.requestor ); #endif - ::std::hash_map< Atom, Selection* >::iterator it = + ::std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( rNotify.selection ); if ( (rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow) && @@ -2156,7 +2156,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) bool bHandled = false; - ::std::hash_map< XLIB_Window, DropTargetEntry >::iterator it = + ::std::unordered_map< XLIB_Window, DropTargetEntry >::iterator it = m_aDropTargets.find( aTarget ); #if OSL_DEBUG_LEVEL > 1 @@ -2532,7 +2532,7 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) if( m_bDropSent ) return; - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { @@ -2595,7 +2595,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) bool bHandled = false; // for shortcut - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); #if OSL_DEBUG_LEVEL > 1 switch( rMessage.type ) @@ -3096,7 +3096,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) dsde.DropAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; dsde.UserAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; if( aNewCurrentWindow != m_aDropWindow ) { #if OSL_DEBUG_LEVEL > 1 @@ -3251,7 +3251,7 @@ void SelectionManager::startDrag( int root_x(0), root_y(0), win_x, win_y; unsigned int mask(0); - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; it = m_aDropTargets.begin(); while( it != m_aDropTargets.end() ) { @@ -3655,7 +3655,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) ); #endif SelectionAdaptor* pAdaptor = getAdaptor( rEvent.xselectionclear.selection ); - std::hash_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); + std::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) ); if( it != m_aSelections.end() ) it->second->m_bOwner = false; aGuard.clear(); @@ -3783,7 +3783,7 @@ void SelectionManager::run( void* pThis ) ClearableMutexGuard aGuard(This->m_aMutex); std::list< std::pair< SelectionAdaptor*, css::uno::Reference< XInterface > > > aChangeList; - for( std::hash_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) + for( std::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) { if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner ) { @@ -3932,7 +3932,7 @@ void SelectionManager::deregisterHandler( Atom selection ) { MutexGuard aGuard(m_aMutex); - ::std::hash_map< Atom, Selection* >::iterator it = + ::std::unordered_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); if( it != m_aSelections.end() ) { @@ -3961,7 +3961,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar MutexGuard aGuard(m_aMutex); // sanity check - ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( aWindow ); if( it != m_aDropTargets.end() ) OSL_ASSERT( "attempt to register window as drop target twice" ); @@ -4008,7 +4008,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() ) { // abort drag - std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = + std::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { diff --git a/main/vcl/unx/generic/dtrans/X11_selection.hxx b/main/vcl/unx/generic/dtrans/X11_selection.hxx index a9deff9dc87..6105b2281ca 100644 --- a/main/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/main/vcl/unx/generic/dtrans/X11_selection.hxx @@ -38,7 +38,7 @@ #include #endif -#include +#include #include #include "tools/prex.h" @@ -156,7 +156,7 @@ namespace x11 { >, public SelectionAdaptor { - static ::std::hash_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); + static ::std::unordered_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -326,7 +326,7 @@ namespace x11 { // drag and drop int m_nCurrentProtocolVersion; - ::std::hash_map< XLIB_Window, DropTargetEntry > + ::std::unordered_map< XLIB_Window, DropTargetEntry > m_aDropTargets; // some special atoms that are needed often @@ -356,16 +356,16 @@ namespace x11 { Atom m_nXdndActionPrivate; // caching for atoms - ::std::hash_map< Atom, ::rtl::OUString > + ::std::unordered_map< Atom, ::rtl::OUString > m_aAtomToString; - ::std::hash_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > + ::std::unordered_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > m_aStringToAtom; // the registered selections - ::std::hash_map< Atom, Selection* > + ::std::unordered_map< Atom, Selection* > m_aSelections; // IncrementalTransfers in progress - std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > > + std::unordered_map< XLIB_Window, std::unordered_map< Atom, IncrementalTransfer > > m_aIncrementals; // do not use X11 multithreading capabilities diff --git a/main/vcl/unx/generic/dtrans/X11_service.cxx b/main/vcl/unx/generic/dtrans/X11_service.cxx index 8a0d8656efd..4a9b21cf0ca 100644 --- a/main/vcl/unx/generic/dtrans/X11_service.cxx +++ b/main/vcl/unx/generic/dtrans/X11_service.cxx @@ -71,7 +71,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { - static std::hash_map< OUString, ::std::hash_map< Atom, css::uno::Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; + static std::unordered_map< OUString, ::std::unordered_map< Atom, css::uno::Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; OUString aDisplayName; Atom nSelection; @@ -107,8 +107,8 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc nSelection = rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ); } - ::std::hash_map< Atom, css::uno::Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] ); - ::std::hash_map< Atom, css::uno::Reference< XClipboard > >::iterator it = rMap.find( nSelection ); + ::std::unordered_map< Atom, css::uno::Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] ); + ::std::unordered_map< Atom, css::uno::Reference< XClipboard > >::iterator it = rMap.find( nSelection ); if( it != rMap.end() ) return it->second; diff --git a/main/vcl/unx/generic/fontmanager/fontconfig.cxx b/main/vcl/unx/generic/fontmanager/fontconfig.cxx index 961b3c9c399..89769ee3cca 100644 --- a/main/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/main/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -255,8 +255,8 @@ class FontCfgWrapper public: // TODO: cleanup FcResult FamilyFromPattern(FcPattern* pPattern, FcChar8 **family); - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; + std::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; + std::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; }; oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol ) @@ -699,7 +699,7 @@ namespace } } -int PrintFontManager::countFontconfigFonts( std::hash_map& o_rVisitedPaths ) +int PrintFontManager::countFontconfigFonts( std::unordered_map& o_rVisitedPaths ) { int nFonts = 0; @@ -1064,7 +1064,7 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, if( eFileRes == FcResultMatch ) { OString sFamily((sal_Char*)family); - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); + std::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); @@ -1124,7 +1124,7 @@ bool PrintFontManager::getFontOptions( OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + std::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( sFamily.getLength() ) @@ -1265,7 +1265,7 @@ bool PrintFontManager::initFontconfig() return false; } -int PrintFontManager::countFontconfigFonts( std::hash_map& ) +int PrintFontManager::countFontconfigFonts( std::unordered_map& ) { return 0; } diff --git a/main/vcl/unx/generic/fontmanager/fontmanager.cxx b/main/vcl/unx/generic/fontmanager/fontmanager.cxx index 6e944aa8acf..b8dfe8196fe 100644 --- a/main/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/main/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -67,7 +67,7 @@ #include "sal/alloca.h" #include -#include +#include #include #include "adobeenc.tab" // get encoding table for AFM metrics @@ -485,8 +485,8 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr if( pImplTTFont->nkern && pImplTTFont->kerntype == KT_MICROSOFT ) { // create a glyph -> character mapping - ::std::hash_map< sal_uInt16, sal_Unicode > aGlyphMap; - ::std::hash_map< sal_uInt16, sal_Unicode >::iterator left, right; + ::std::unordered_map< sal_uInt16, sal_Unicode > aGlyphMap; + ::std::unordered_map< sal_uInt16, sal_Unicode >::iterator left, right; for( i = 21; i < 0xfffd; i++ ) { sal_uInt16 nGlyph = MapChar( pTTFont, (sal_Unicode)i, 0 ); // kerning for horz only @@ -585,8 +585,8 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr if( pImplTTFont->nkern && pImplTTFont->kerntype == KT_APPLE_NEW ) { // create a glyph -> character mapping - ::std::hash_map< sal_uInt16, sal_Unicode > aGlyphMap; - ::std::hash_map< sal_uInt16, sal_Unicode >::iterator left, right; + ::std::unordered_map< sal_uInt16, sal_Unicode > aGlyphMap; + ::std::unordered_map< sal_uInt16, sal_Unicode >::iterator left, right; for( i = 21; i < 0xfffd; i++ ) { sal_uInt16 nGlyph = MapChar( pTTFont, (sal_Unicode)i, 0 ); // kerning for horz only @@ -729,7 +729,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr */ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyName ) { - static std::hash_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); + static std::unordered_map< OUString, OUString, OUStringHash > aPSNameToFamily( 16 ); if( aPSNameToFamily.empty() ) // initialization { aPSNameToFamily[ OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica-Narrow" ) ) ] = @@ -741,7 +741,7 @@ static bool familyNameOverride( const OUString& i_rPSname, OUString& o_rFamilyNa aPSNameToFamily[ OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica-Narrow-Oblique" ) ) ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Helvetica Narrow" ) ); } - std::hash_map::const_iterator it = + std::unordered_map::const_iterator it = aPSNameToFamily.find( i_rPSname ); bool bReplaced = (it != aPSNameToFamily.end() ); if( bReplaced ) @@ -1081,8 +1081,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult } else if( pChar->code != -1 ) { - ::std::pair< ::std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator, - ::std::hash_multimap< sal_uInt8, sal_Unicode >::const_iterator > + ::std::pair< ::std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, + ::std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > aCodes = rManager.getUnicodeFromAdobeCode( pChar->code ); while( aCodes.first != aCodes.second ) { @@ -1189,12 +1189,12 @@ PrintFontManager::PrintFontManager() : { for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ ) { - m_aUnicodeToAdobename.insert( ::std::hash_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( ::std::hash_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobename.insert( ::std::unordered_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); + m_aAdobenameToUnicode.insert( ::std::unordered_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); if( aAdobeCodes[i].aAdobeStandardCode ) { - m_aUnicodeToAdobecode.insert( ::std::hash_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); - m_aAdobecodeToUnicode.insert( ::std::hash_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobecode.insert( ::std::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); + m_aAdobecodeToUnicode.insert( ::std::unordered_multimap< sal_uInt8, sal_Unicode >::value_type( aAdobeCodes[i].aAdobeStandardCode, aAdobeCodes[i].aUnicode ) ); } #if 0 m_aUnicodeToAdobename[ aAdobeCodes[i].aUnicode ] = aAdobeCodes[i].pAdobename; @@ -1213,7 +1213,7 @@ PrintFontManager::PrintFontManager() : PrintFontManager::~PrintFontManager() { deinitFontconfig(); - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; delete m_pAtoms; if( m_pFontCache ) @@ -1224,7 +1224,7 @@ PrintFontManager::~PrintFontManager() const OString& PrintFontManager::getDirectory( int nAtom ) const { - ::std::hash_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); + ::std::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); return it != m_aAtomToDir.end() ? it->second : s_aEmptyOString; } @@ -1233,7 +1233,7 @@ const OString& PrintFontManager::getDirectory( int nAtom ) const int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate ) { int nAtom = 0; - ::std::hash_map< OString, int, OStringHash >::const_iterator it + ::std::unordered_map< OString, int, OStringHash >::const_iterator it ( m_aDirToAtom.find( rDirectory ) ); if( it != m_aDirToAtom.end() ) nAtom = it->second; @@ -1417,7 +1417,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co fontID PrintFontManager::findFontBuiltinID( int nPSNameAtom ) const { fontID nID = 0; - ::std::hash_map< fontID, PrintFont* >::const_iterator it; + ::std::unordered_map< fontID, PrintFont* >::const_iterator it; for( it = m_aFonts.begin(); nID == 0 && it != m_aFonts.end(); ++it ) { if( it->second->m_eType == fonttype::Builtin && @@ -1433,12 +1433,12 @@ fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile ) { fontID nID = 0; - ::std::hash_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); + ::std::unordered_map< OString, ::std::set< fontID >, OStringHash >::const_iterator set_it = m_aFontFileToFontID.find( rFontFile ); if( set_it != m_aFontFileToFontID.end() ) { for( ::std::set< fontID >::const_iterator font_it = set_it->second.begin(); font_it != set_it->second.end() && ! nID; ++font_it ) { - ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); + ::std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.find( *font_it ); if( it != m_aFonts.end() ) { switch( it->second->m_eType ) @@ -2100,7 +2100,7 @@ void PrintFontManager::initialize() // initialize may be called twice in the future { - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; m_nNextFontID = 1; m_aFonts.clear(); @@ -2152,7 +2152,7 @@ void PrintFontManager::initialize() } // protect against duplicate paths - std::hash_map< OString, int, OStringHash > visited_dirs; + std::unordered_map< OString, int, OStringHash > visited_dirs; // now that all global and local font dirs are known to fontconfig // check that there are fonts actually managed by fontconfig @@ -2218,7 +2218,7 @@ void PrintFontManager::initialize() if( pDIR ) { // read fonts.dir if possible - ::std::hash_map< OString, ::std::list, OStringHash > aFontsDir; + ::std::unordered_map< OString, ::std::list, OStringHash > aFontsDir; int nDirID = getDirectoryAtom( aPath, true ); // #i38367# no fonts.dir in our own directories anymore std::list< int >::const_iterator priv_dir; @@ -2266,7 +2266,7 @@ void PrintFontManager::initialize() if( findFontFileID( nDirID, aFileName ) == 0 ) { ::std::list aXLFDs; - ::std::hash_map< OString, ::std::list, OStringHash >::const_iterator it = + ::std::unordered_map< OString, ::std::list, OStringHash >::const_iterator it = aFontsDir.find( aFileName ); if( it != aFontsDir.end() ) aXLFDs = (*it).second; @@ -2397,10 +2397,10 @@ void PrintFontManager::initialize() #endif // part three - fill in family styles - ::std::hash_map< fontID, PrintFont* >::iterator font_it; + ::std::unordered_map< fontID, PrintFont* >::iterator font_it; for (font_it = m_aFonts.begin(); font_it != m_aFonts.end(); ++font_it) { - ::std::hash_map< int, family::type >::const_iterator it = + ::std::unordered_map< int, family::type >::const_iterator it = m_aFamilyTypes.find( font_it->second->m_nFamilyName ); if (it != m_aFamilyTypes.end()) continue; @@ -2498,7 +2498,7 @@ namespace { void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDParser* pParser, bool bUseOverrideMetrics ) { rFontIDs.clear(); - std::hash_map< fontID, PrintFont* >::const_iterator it; + std::unordered_map< fontID, PrintFont* >::const_iterator it; /* * Note: there are two easy steps making this faster: @@ -2520,7 +2520,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa if( pParser ) { std::set aBuiltinPSNames; - std::hash_set< BuiltinFontIdentifier, + std::unordered_set< BuiltinFontIdentifier, BuiltinFontIdentifierHash > aBuiltinFonts; @@ -2531,7 +2531,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa for( std::vector::const_iterator over = m_aOverrideFonts.begin(); over != m_aOverrideFonts.end(); ++over ) { - std::hash_map::const_iterator font_it = m_aFonts.find( *over ); + std::unordered_map::const_iterator font_it = m_aFonts.find( *over ); DBG_ASSERT( font_it != m_aFonts.end(), "override to nonexistant font" ); if( font_it != m_aFonts.end() ) aOverridePSNames[ font_it->second->m_nPSName ] = *over; @@ -2621,7 +2621,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs, const PPDPa void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const { - ::std::hash_map< int, family::type >::const_iterator style_it = + ::std::unordered_map< int, family::type >::const_iterator style_it = m_aFamilyTypes.find( pFont->m_nFamilyName ); rInfo.m_eType = pFont->m_eType; rInfo.m_aFamilyName = m_pAtoms->getString( ATOM_FAMILYNAME, pFont->m_nFamilyName ); @@ -2838,7 +2838,7 @@ family::type PrintFontManager::getFontFamilyType( fontID nFontID ) const if( !pFont ) return family::Unknown; - ::std::hash_map< int, family::type >::const_iterator it = + ::std::unordered_map< int, family::type >::const_iterator it = m_aFamilyTypes.find( pFont->m_nFamilyName ); return (it != m_aFamilyTypes.end()) ? it->second : family::Unknown; } @@ -2892,7 +2892,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const if( pFont && pFont->m_eType == fonttype::Type1 ) { Type1FontFile* pPSFont = static_cast< Type1FontFile* >(pFont); - ::std::hash_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); + ::std::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pPSFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pPSFont->m_aFontFile; @@ -2900,7 +2900,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const else if( pFont && pFont->m_eType == fonttype::TrueType ) { TrueTypeFontFile* pTTFont = static_cast< TrueTypeFontFile* >(pFont); - ::std::hash_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); + ::std::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find( pTTFont->m_nDirectory ); aPath = it->second; aPath += "/"; aPath += pTTFont->m_aFontFile; @@ -3014,7 +3014,7 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, if( ! pFont->m_pMetrics || ! ( pFont->m_pMetrics->m_aPages[ code >> 11 ] & ( 1 << ( ( code >> 8 ) & 7 ) ) ) ) pFont->queryMetricPage( code >> 8, m_pAtoms ); - ::std::hash_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); + ::std::unordered_map< sal_Unicode, bool >::const_iterator it = pFont->m_pMetrics->m_bVerticalSubstitutions.find( code ); pHasSubst[i] = it != pFont->m_pMetrics->m_bVerticalSubstitutions.end(); } } @@ -3119,7 +3119,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i { int effectiveCode = pString[i]; effectiveCode |= bVertical ? 1 << 16 : 0; - ::std::hash_map< int, CharacterMetric >::const_iterator it = + ::std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -3164,7 +3164,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal { int effectiveCode = code; effectiveCode |= bVertical ? 1 << 16 : 0; - ::std::hash_map< int, CharacterMetric >::const_iterator it = + ::std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.find( effectiveCode ); // if no vertical metrics are available assume rotated horizontal metrics if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) ) @@ -3323,7 +3323,7 @@ int PrintFontManager::importFonts( const ::std::list< OString >& rFiles, bool bL { // remove all fonts for the same file // discarding their font ids - ::std::hash_map< fontID, PrintFont* >::iterator current, next; + ::std::unordered_map< fontID, PrintFont* >::iterator current, next; current = m_aFonts.begin(); OString aFileName( OUStringToOString( aTo.GetName(), aEncoding ) ); while( current != m_aFonts.end() ) @@ -3479,7 +3479,7 @@ bool PrintFontManager::getFileDuplicates( fontID nFont, ::std::list< fontID >& r if( ! aFile.getLength() ) return false; - for( ::std::hash_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) + for( ::std::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) { if( nFont != it->first ) { @@ -3502,7 +3502,7 @@ bool PrintFontManager::removeFonts( const ::std::list< fontID >& rFonts ) ::std::list< fontID > aDuplicates; for( ::std::list< fontID >::const_iterator it = rFonts.begin(); it != rFonts.end(); ++it ) { - ::std::hash_map< fontID, PrintFont* >::const_iterator haveFont = m_aFonts.find( *it ); + ::std::unordered_map< fontID, PrintFont* >::const_iterator haveFont = m_aFonts.find( *it ); if( haveFont == m_aFonts.end() ) continue; @@ -3838,7 +3838,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, rUnicodeEnc.clear(); rWidths.clear(); rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() ); - for( std::hash_map< int, CharacterMetric >::const_iterator it = + for( std::unordered_map< int, CharacterMetric >::const_iterator it = pFont->m_pMetrics->m_aMetrics.begin(); it != pFont->m_pMetrics->m_aMetrics.end(); ++it ) { @@ -3875,8 +3875,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { - std::pair< std::hash_multimap< sal_Unicode, rtl::OString >::const_iterator, - std::hash_multimap< sal_Unicode, rtl::OString >::const_iterator > range + std::pair< std::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator, + std::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator > range = m_aUnicodeToAdobename.equal_range( aChar ); std::list< OString > aRet; @@ -3896,8 +3896,8 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha // ------------------------------------------------------------------------- std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const rtl::OString& rName ) const { - std::pair< std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, - std::hash_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range + std::pair< std::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, + std::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range = m_aAdobenameToUnicode.equal_range( rName ); std::list< sal_Unicode > aRet; diff --git a/main/vcl/unx/generic/gdi/pspgraphics.cxx b/main/vcl/unx/generic/gdi/pspgraphics.cxx index 73d3b0d24c3..ef5ac9260a5 100644 --- a/main/vcl/unx/generic/gdi/pspgraphics.cxx +++ b/main/vcl/unx/generic/gdi/pspgraphics.cxx @@ -908,7 +908,7 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) pOutDev->ImplAddDevFontSubstitute( it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } diff --git a/main/vcl/unx/generic/gdi/salgdi3.cxx b/main/vcl/unx/generic/gdi/salgdi3.cxx index 6b5364841eb..ac5b78e40cd 100644 --- a/main/vcl/unx/generic/gdi/salgdi3.cxx +++ b/main/vcl/unx/generic/gdi/salgdi3.cxx @@ -71,7 +71,7 @@ #include "outdev.h" -#include +#include #ifdef ENABLE_GRAPHITE #include diff --git a/main/vcl/unx/generic/gdi/salprnpsp.cxx b/main/vcl/unx/generic/gdi/salprnpsp.cxx index 7e94cfc3894..5fe957a549f 100644 --- a/main/vcl/unx/generic/gdi/salprnpsp.cxx +++ b/main/vcl/unx/generic/gdi/salprnpsp.cxx @@ -395,7 +395,7 @@ SalInfoPrinter* X11SalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) @@ -632,7 +632,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) { // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) @@ -990,7 +990,7 @@ sal_Bool PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; @@ -1020,7 +1020,7 @@ sal_Bool PspSalPrinter::StartJob( // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) diff --git a/main/vcl/unx/generic/printer/cupsmgr.cxx b/main/vcl/unx/generic/printer/cupsmgr.cxx index c528f5af101..b62f7790331 100644 --- a/main/vcl/unx/generic/printer/cupsmgr.cxx +++ b/main/vcl/unx/generic/printer/cupsmgr.cxx @@ -582,7 +582,7 @@ void CUPSManager::initialize() // behaviour aPrinter.m_aInfo.m_pParser = NULL; aPrinter.m_aInfo.m_aContext.setParser( NULL ); - std::hash_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); + std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName ); if( c_it != m_aDefaultContexts.end() ) { aPrinter.m_aInfo.m_pParser = c_it->second.getParser(); @@ -600,7 +600,7 @@ void CUPSManager::initialize() // remove everything that is not a CUPS printer and not // a special purpose printer (PDF, Fax) std::list< OUString > aRemovePrinters; - for( std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); + for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() ) @@ -687,7 +687,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) { if( m_nDests && m_pDests && ! isCUPSDisabled() ) { - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( aPrinter ); if( dest_it != m_aCUPSDestMap.end() ) { @@ -783,13 +783,13 @@ void CUPSManager::setupJobContextData( ) { #ifdef ENABLE_CUPS - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rData.m_aPrinterName ); if( dest_it == m_aCUPSDestMap.end() ) return PrinterInfoManager::setupJobContextData( rData ); - std::hash_map< OUString, Printer, OUStringHash >::iterator p_it = + std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it = m_aPrinters.find( rData.m_aPrinterName ); if( p_it == m_aPrinters.end() ) // huh ? { @@ -911,7 +911,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit osl::MutexGuard aGuard( m_aCUPSMutex ); - std::hash_map< OUString, int, OUStringHash >::iterator dest_it = + std::unordered_map< OUString, int, OUStringHash >::iterator dest_it = m_aCUPSDestMap.find( rPrintername ); if( dest_it == m_aCUPSDestMap.end() ) { @@ -920,7 +920,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit } #ifdef ENABLE_CUPS - std::hash_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); + std::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile ); if( it != m_aSpoolFiles.end() ) { fclose( pFile ); @@ -1047,7 +1047,7 @@ bool CUPSManager::setDefaultPrinter( const OUString& rName ) { bool bSuccess = false; #ifdef ENABLE_CUPS - std::hash_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( rName ); if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() ) { @@ -1073,10 +1073,10 @@ bool CUPSManager::writePrinterConfig() bool bDestModified = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - for( std::hash_map< OUString, Printer, OUStringHash >::iterator prt = + for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt = m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt ) { - std::hash_map< OUString, int, OUStringHash >::iterator nit = + std::unordered_map< OUString, int, OUStringHash >::iterator nit = m_aCUPSDestMap.find( prt->first ); if( nit == m_aCUPSDestMap.end() ) continue; diff --git a/main/vcl/unx/generic/printer/ppdparser.cxx b/main/vcl/unx/generic/printer/ppdparser.cxx index 9db26c99eb3..868e03f3b34 100644 --- a/main/vcl/unx/generic/printer/ppdparser.cxx +++ b/main/vcl/unx/generic/printer/ppdparser.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include "vcl/ppdparser.hxx" #include "vcl/strhelper.hxx" @@ -73,8 +73,8 @@ namespace psp } }; - typedef std::hash_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; - typedef std::hash_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; + typedef std::unordered_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; + typedef std::unordered_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; key_translation_map m_aTranslations; public: @@ -253,7 +253,7 @@ using namespace rtl; #endif std::list< PPDParser* > PPDParser::aAllParsers; -std::hash_map< OUString, OUString, OUStringHash >* PPDParser::pAllPPDFiles = NULL; +std::unordered_map< OUString, OUString, OUStringHash >* PPDParser::pAllPPDFiles = NULL; class PPDDecompressStream { @@ -455,7 +455,7 @@ void PPDParser::initPPDFiles() if( pAllPPDFiles ) return; - pAllPPDFiles = new std::hash_map< OUString, OUString, OUStringHash >(); + pAllPPDFiles = new std::unordered_map< OUString, OUString, OUStringHash >(); // check installation directories std::list< OUString > aPathList; @@ -495,7 +495,7 @@ void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool initPPDFiles(); o_rDrivers.clear(); - std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; + std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = pAllPPDFiles->begin(); it != pAllPPDFiles->end(); ++it ) o_rDrivers.push_back( it->first ); } @@ -507,7 +507,7 @@ String PPDParser::getPPDFile( const String& rFile ) PPDDecompressStream aStream( aPPD.PathToFileName() ); if( ! aStream.IsOpen() ) { - std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; + std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; bool bRetry = true; do diff --git a/main/vcl/unx/generic/printer/printerinfomanager.cxx b/main/vcl/unx/generic/printer/printerinfomanager.cxx index 4566e83c4ee..676ce07d694 100644 --- a/main/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/main/vcl/unx/generic/printer/printerinfomanager.cxx @@ -52,7 +52,7 @@ // the group of the global defaults #define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__" -#include +#include using namespace psp; using namespace rtl; @@ -547,7 +547,7 @@ void PrinterInfoManager::initialize() FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile ); aPrinter.m_bModified = false; aPrinter.m_aGroup = aConfig.GetGroupName( nGroup ); - std::hash_map< OUString, Printer, OUStringHash >::const_iterator find_it = + std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it = m_aPrinters.find( aPrinterName ); if( find_it != m_aPrinters.end() ) { @@ -626,7 +626,7 @@ void PrinterInfoManager::initialize() void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const { - ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it; + ::std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; rList.clear(); for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) rList.push_back( it->first ); @@ -637,7 +637,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; - ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); + ::std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistent printers" ); @@ -648,7 +648,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); + ::std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" ); @@ -679,9 +679,9 @@ static bool checkWriteability( const OUString& rUniPath ) bool PrinterInfoManager::writePrinterConfig() { // find at least one writeable config - ::std::hash_map< OUString, Config*, OUStringHash > files; - ::std::hash_map< OUString, int, OUStringHash > rofiles; - ::std::hash_map< OUString, Config*, OUStringHash >::iterator file_it; + ::std::unordered_map< OUString, Config*, OUStringHash > files; + ::std::unordered_map< OUString, int, OUStringHash > rofiles; + ::std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it; for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit ) { @@ -699,7 +699,7 @@ bool PrinterInfoManager::writePrinterConfig() pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP ); pGlobal->WriteKey( "DisableCUPS", m_bDisableCUPS ? "true" : "false" ); - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it; + ::std::unordered_map< OUString, Printer, OUStringHash >::iterator it; for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) { if( ! it->second.m_bModified ) @@ -802,7 +802,7 @@ bool PrinterInfoManager::writePrinterConfig() // write font substitution table pConfig->WriteKey( "PerformFontSubstitution", it->second.m_aInfo.m_bPerformFontSubstitution ? "true" : "false" ); - for( ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); + for( ::std::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst ) { ByteString aKey( "SubstFont_" ); @@ -882,7 +882,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { bool bSuccess = true; - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + ::std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { if( it->second.m_aFile.getLength() ) @@ -936,7 +936,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; - ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); + ::std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName ); if( it != m_aPrinters.end() ) { bSuccess = true; @@ -967,7 +967,7 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const return; ::std::list< FastPrintFontInfo > aFonts; - ::std::hash_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts; + ::std::unordered_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts; rFontManager.getFontListWithFastInfo( aFonts, rInfo.m_pParser ); // get builtin fonts @@ -977,8 +977,8 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const aPrinterFonts[ it->m_aFamilyName.toAsciiLowerCase() ].push_back( *it ); // map lower case, so build a local copy of the font substitutions - ::std::hash_map< OUString, OUString, OUStringHash > aSubstitutions; - ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator subst; + ::std::unordered_map< OUString, OUString, OUStringHash > aSubstitutions; + ::std::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst; for( subst = rInfo.m_aFontSubstitutes.begin(); subst != rInfo.m_aFontSubstitutes.end(); ++subst ) { OUString aFamily( subst->first.toAsciiLowerCase() ); @@ -1119,7 +1119,7 @@ int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStri void PrinterInfoManager::setupJobContextData( JobData& rData ) { - std::hash_map< OUString, Printer, OUStringHash >::iterator it = + std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rData.m_aPrinterName ); if( it != m_aPrinters.end() ) { @@ -1233,8 +1233,8 @@ static void lpgetSysQueueTokenHandler( const SystemCommandParameters* ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::hash_set< OUString, OUStringHash > aUniqueSet; - std::hash_set< OUString, OUStringHash > aOnlySet; + std::unordered_set< OUString, OUStringHash > aUniqueSet; + std::unordered_set< OUString, OUStringHash > aOnlySet; aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) ); aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) ); @@ -1330,7 +1330,7 @@ static void standardSysQueueTokenHandler( const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - std::hash_set< OUString, OUStringHash > aUniqueSet; + std::unordered_set< OUString, OUStringHash > aUniqueSet; rtl::OString aForeToken( i_pParms->pForeToken ); rtl::OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing diff --git a/main/vcl/unx/generic/printergfx/common_gfx.cxx b/main/vcl/unx/generic/printergfx/common_gfx.cxx index c7bc333ac38..e69f05c72cc 100644 --- a/main/vcl/unx/generic/printergfx/common_gfx.cxx +++ b/main/vcl/unx/generic/printergfx/common_gfx.cxx @@ -67,9 +67,9 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) rPrinterJob.GetScale (mfScaleX, mfScaleY); const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) ); if( mpFontSubstitutes ) - delete const_cast< ::std::hash_map* >(mpFontSubstitutes); + delete const_cast< ::std::unordered_map* >(mpFontSubstitutes); if( rInfo.m_bPerformFontSubstitution ) - mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); + mpFontSubstitutes = new ::std::unordered_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); else mpFontSubstitutes = NULL; mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; @@ -91,9 +91,9 @@ PrinterGfx::Init (const JobData& rData) mfScaleY = (double)72.0 / (double)mnDpi; const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) ); if( mpFontSubstitutes ) - delete const_cast< ::std::hash_map* >(mpFontSubstitutes); + delete const_cast< ::std::unordered_map* >(mpFontSubstitutes); if( rInfo.m_bPerformFontSubstitution ) - mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); + mpFontSubstitutes = new ::std::unordered_map< fontID, fontID >( rInfo.m_aFontSubstitutions ); else mpFontSubstitutes = NULL; mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; @@ -147,7 +147,7 @@ PrinterGfx::~PrinterGfx() * Alas, this is not always done real time. So we keep a local copy of * the font substitutes now in case of bad timing. */ - delete const_cast< ::std::hash_map* >(mpFontSubstitutes); + delete const_cast< ::std::unordered_map* >(mpFontSubstitutes); } void diff --git a/main/vcl/unx/generic/printergfx/glyphset.hxx b/main/vcl/unx/generic/printergfx/glyphset.hxx index f9d990e63ed..3b5f223038a 100644 --- a/main/vcl/unx/generic/printergfx/glyphset.hxx +++ b/main/vcl/unx/generic/printergfx/glyphset.hxx @@ -33,7 +33,7 @@ #include "tools/gen.hxx" #include -#include +#include namespace psp { @@ -51,9 +51,9 @@ private: rtl_TextEncoding mnBaseEncoding; bool mbUseFontEncoding; - typedef std::hash_map< sal_Unicode, sal_uInt8 > char_map_t; + typedef std::unordered_map< sal_Unicode, sal_uInt8 > char_map_t; typedef std::list< char_map_t > char_list_t; - typedef std::hash_map< sal_GlyphId, sal_uInt8 > glyph_map_t; + typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; typedef std::list< glyph_map_t > glyph_list_t; char_list_t maCharList; diff --git a/main/vcl/unx/generic/printergfx/text_gfx.cxx b/main/vcl/unx/generic/printergfx/text_gfx.cxx index ea72d8028bf..dd09e2d42f0 100644 --- a/main/vcl/unx/generic/printergfx/text_gfx.cxx +++ b/main/vcl/unx/generic/printergfx/text_gfx.cxx @@ -698,7 +698,7 @@ PrinterGfx::getFontSubstitute () const { if( mpFontSubstitutes ) { - ::std::hash_map< fontID, fontID >::const_iterator it = + ::std::unordered_map< fontID, fontID >::const_iterator it = mpFontSubstitutes->find( mnFontID ); if( it != mpFontSubstitutes->end() ) return it->second; @@ -742,7 +742,7 @@ const ::std::list< KernPair >& PrinterGfx::getKernPairs( bool bVertical ) const fontID nFont = mnFontID; if( mpFontSubstitutes ) { - ::std::hash_map< fontID, fontID >::const_iterator it = + ::std::unordered_map< fontID, fontID >::const_iterator it = mpFontSubstitutes->find( mnFontID ); if( it != mpFontSubstitutes->end() ) nFont = it->second; diff --git a/main/vcl/unx/gtk/a11y/atkeditabletext.cxx b/main/vcl/unx/gtk/a11y/atkeditabletext.cxx index 773d325f507..ab8fa0a968d 100644 --- a/main/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/main/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -31,7 +31,7 @@ #include // #include -// #include +// #include #include #include diff --git a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index e5dd8a36c04..5f7f6f94b63 100644 --- a/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/main/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include typedef struct _cairo_font_options cairo_font_options_t; @@ -145,7 +145,7 @@ struct NWFWidgetData // Keep a hash table of Widgets->default flags so that we can // easily and quickly reset each to a default state before using // them -static std::hash_map gWidgetDefaultFlags; +static std::unordered_map gWidgetDefaultFlags; static std::vector gWidgetData; static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 }; diff --git a/main/vcl/unx/headless/svpelement.cxx b/main/vcl/unx/headless/svpelement.cxx index 37ef5708366..391f7922285 100644 --- a/main/vcl/unx/headless/svpelement.cxx +++ b/main/vcl/unx/headless/svpelement.cxx @@ -38,7 +38,7 @@ #include "svpframe.hxx" #include -#include +#include #include #include @@ -169,14 +169,14 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket ) rtl::OString aCommand( aBuf.makeStringAndClear() ); if( aCommand.compareTo( "list", 4 ) == 0 ) { - std::hash_map< rtl::OString, std::list, rtl::OStringHash > aMap; + std::unordered_map< rtl::OString, std::list, rtl::OStringHash > aMap; for( std::list< SvpElement* >::const_iterator it = m_aElements.begin(); it != m_aElements.end(); ++it ) { std::list& rList = aMap[matchType(*it)]; rList.push_back( *it ); } - for( std::hash_map< rtl::OString, std::list, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); + for( std::unordered_map< rtl::OString, std::list, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); hash_it != aMap.end(); ++hash_it ) { aAnswer.append( "ElementType: " ); diff --git a/main/vcl/unx/headless/svpprn.cxx b/main/vcl/unx/headless/svpprn.cxx index bde5848d33f..b4b681e8be0 100644 --- a/main/vcl/unx/headless/svpprn.cxx +++ b/main/vcl/unx/headless/svpprn.cxx @@ -332,7 +332,7 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) { @@ -536,7 +536,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) { @@ -878,7 +878,7 @@ sal_Bool PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::std::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; @@ -908,7 +908,7 @@ sal_Bool PspSalPrinter::StartJob( // set/clear backwards compatibility flag bool bStrictSO52Compatibility = false; - std::hash_map::const_iterator compat_it = + std::unordered_map::const_iterator compat_it = pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictSO52Compatibility" ) ) ); if( compat_it != pJobSetup->maValueMap.end() ) { diff --git a/main/vcl/unx/headless/svppspgraphics.cxx b/main/vcl/unx/headless/svppspgraphics.cxx index b9f160ea470..b1854ab002a 100644 --- a/main/vcl/unx/headless/svppspgraphics.cxx +++ b/main/vcl/unx/headless/svppspgraphics.cxx @@ -817,7 +817,7 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( std::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) AddDevFontSubstitute( pOutDev, it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } diff --git a/main/vcl/win/source/app/salinfo.cxx b/main/vcl/win/source/app/salinfo.cxx index 7d8122e7063..6cf255c68e8 100644 --- a/main/vcl/win/source/app/salinfo.cxx +++ b/main/vcl/win/source/app/salinfo.cxx @@ -39,7 +39,7 @@ #include "svdata.hxx" -#include +#include SalSystem* WinSalInstance::CreateSalSystem() { @@ -139,7 +139,7 @@ bool WinSalSystem::initMonitors() DISPLAY_DEVICEW aDev; aDev.cb = sizeof( aDev ); DWORD nDevice = 0; - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; + std::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) @@ -165,7 +165,7 @@ bool WinSalSystem::initMonitors() EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast(this) ); // append monitor numbers to name strings - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); + std::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); unsigned int nMonitors = m_aMonitors.size(); for( unsigned int i = 0; i < nMonitors; i++ ) { diff --git a/main/vcl/win/source/gdi/winlayout.cxx b/main/vcl/win/source/gdi/winlayout.cxx index 5073fb8364a..cfd495bd78b 100644 --- a/main/vcl/win/source/gdi/winlayout.cxx +++ b/main/vcl/win/source/gdi/winlayout.cxx @@ -58,10 +58,10 @@ #include #endif // USE_UNISCRIBE -#include +#include #include -typedef std::hash_map IntMap; +typedef std::unordered_map IntMap; typedef std::set IntSet; // Graphite headers diff --git a/main/winaccessibility/source/service/msaaservice_impl.cxx b/main/winaccessibility/source/service/msaaservice_impl.cxx index ea3fb5fd8ac..974dee9eb78 100644 --- a/main/winaccessibility/source/service/msaaservice_impl.cxx +++ b/main/winaccessibility/source/service/msaaservice_impl.cxx @@ -236,7 +236,7 @@ MSAAServiceImpl::~MSAAServiceImpl() // As all folders and streams contain references to their parents, // we must remove these references so that they will be deleted when - // the hash_map of the root folder is cleared, releasing all subfolders + // the unordered_map of the root folder is cleared, releasing all subfolders // and substreams which in turn release theirs, etc. When xRootFolder is // released when this destructor completes, the folder tree should be // deleted fully (and automagically). diff --git a/main/writerfilter/inc/resourcemodel/TagLogger.hxx b/main/writerfilter/inc/resourcemodel/TagLogger.hxx index ec08ffb9186..edc4987c05f 100644 --- a/main/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/main/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/main/writerfilter/inc/resourcemodel/XPathLogger.hxx b/main/writerfilter/inc/resourcemodel/XPathLogger.hxx index 8aa0cea5014..54d81590924 100644 --- a/main/writerfilter/inc/resourcemodel/XPathLogger.hxx +++ b/main/writerfilter/inc/resourcemodel/XPathLogger.hxx @@ -23,7 +23,7 @@ #ifndef INCLUDED_XPATH_LOGGER_HXX #define INCLUDED_XPATH_LOGGER_HXX -#include +#include #include #include #include @@ -32,14 +32,14 @@ namespace writerfilter { -using ::std::hash_map; +using ::std::unordered_map; using ::std::stack; using ::std::string; using ::std::vector; class WRITERFILTER_DLLPUBLIC XPathLogger { - typedef hash_map TokenMap_t; + typedef unordered_map TokenMap_t; typedef boost::shared_ptr TokenMapPointer_t; TokenMapPointer_t mp_tokenMap; diff --git a/main/writerfilter/qa/cppunittests/qname/testQName.cxx b/main/writerfilter/qa/cppunittests/qname/testQName.cxx index dd1b3ad812c..d84b3ca61c1 100644 --- a/main/writerfilter/qa/cppunittests/qname/testQName.cxx +++ b/main/writerfilter/qa/cppunittests/qname/testQName.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 9b5cbe36aad..d8d8eb315f1 100644 --- a/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/main/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include diff --git a/main/writerfilter/source/dmapper/PropertyIds.hxx b/main/writerfilter/source/dmapper/PropertyIds.hxx index 1b5ee3679e3..d4a0dc3d17f 100644 --- a/main/writerfilter/source/dmapper/PropertyIds.hxx +++ b/main/writerfilter/source/dmapper/PropertyIds.hxx @@ -23,7 +23,7 @@ #ifndef INCLUDED_DMAPPER_PROPERTYIDS_HXX #define INCLUDED_DMAPPER_PROPERTYIDS_HXX -#include +#include #include #include #include @@ -314,7 +314,7 @@ public: class PropertySequence { - typedef ::std::hash_map Map_t; + typedef ::std::unordered_map Map_t; Map_t m_indexMap; uno::Sequencem_sequence; PropertyNameSupplier & m_rPropNameSupplier; diff --git a/main/writerfilter/source/doctok/WW8BinTableImpl.hxx b/main/writerfilter/source/doctok/WW8BinTableImpl.hxx index 7957a2b5848..022b078f2b5 100644 --- a/main/writerfilter/source/doctok/WW8BinTableImpl.hxx +++ b/main/writerfilter/source/doctok/WW8BinTableImpl.hxx @@ -28,7 +28,7 @@ #include #include -#include +#include namespace writerfilter { namespace doctok @@ -69,7 +69,7 @@ class WW8BinTableImpl : public WW8BinTable { /// PLCF containing the numbers of the FKPs of the binary table PLCF mData; - mutable hash_map mPageMap; + mutable unordered_map mPageMap; public: WW8BinTableImpl(WW8Stream & rStream, sal_uInt32 nOffset, diff --git a/main/writerfilter/source/doctok/WW8CpAndFc.hxx b/main/writerfilter/source/doctok/WW8CpAndFc.hxx index 719393a40a7..b16b38ec421 100644 --- a/main/writerfilter/source/doctok/WW8CpAndFc.hxx +++ b/main/writerfilter/source/doctok/WW8CpAndFc.hxx @@ -29,7 +29,7 @@ #include #endif #include -#include +#include #include namespace writerfilter { @@ -348,7 +348,7 @@ struct CpAndFcHash } }; -typedef hash_map Cp2FcHashMap_t; +typedef unordered_map Cp2FcHashMap_t; } // namespace doctok } // namespace writerfilter diff --git a/main/writerfilter/source/doctok/WW8DocumentImpl.hxx b/main/writerfilter/source/doctok/WW8DocumentImpl.hxx index d60263a51ef..88f701356a8 100644 --- a/main/writerfilter/source/doctok/WW8DocumentImpl.hxx +++ b/main/writerfilter/source/doctok/WW8DocumentImpl.hxx @@ -164,7 +164,7 @@ public: class ShapeHelper { public: - typedef hash_map Map_t; + typedef unordered_map Map_t; private: WW8DocumentImpl * mpDoc; @@ -189,7 +189,7 @@ public: class FieldHelper { public: - typedef hash_map Map_t; private: @@ -215,7 +215,7 @@ public: class BreakHelper { public: - typedef hash_map Map_t; private: WW8DocumentImpl * mpDoc; diff --git a/main/writerfilter/source/ooxml/OOXMLFactory.hxx b/main/writerfilter/source/ooxml/OOXMLFactory.hxx index 3924d208c6d..0beab812c0a 100644 --- a/main/writerfilter/source/ooxml/OOXMLFactory.hxx +++ b/main/writerfilter/source/ooxml/OOXMLFactory.hxx @@ -24,7 +24,7 @@ #ifndef INCLUDED_OOXML_FACTORY_HXX #define INCLUDED_OOXML_FACTORY_HXX -#include +#include #include #ifndef INCLUDED_WW8_RESOURCE_MODEL_HXX @@ -74,13 +74,13 @@ struct AttributeInfo AttributeInfo(); }; -typedef hash_map AttributeToResourceMap; +typedef unordered_map AttributeToResourceMap; typedef boost::shared_ptr AttributeToResourceMapPointer; -typedef hash_map AttributesMap; +typedef unordered_map AttributesMap; -typedef hash_map ListValueMap; +typedef unordered_map ListValueMap; typedef boost::shared_ptr ListValueMapPointer; -typedef hash_map ListValuesMap; +typedef unordered_map ListValuesMap; struct CreateElement { @@ -91,15 +91,15 @@ struct CreateElement CreateElement(); }; -typedef hash_map CreateElementMap; +typedef unordered_map CreateElementMap; typedef boost::shared_ptr CreateElementMapPointer; -typedef hash_map CreateElementsMap; -typedef hash_map IdToStringMap; +typedef unordered_map CreateElementsMap; +typedef unordered_map IdToStringMap; typedef boost::shared_ptr IdToStringMapPointer; -typedef hash_map TokenToIdMap; +typedef unordered_map TokenToIdMap; typedef boost::shared_ptr TokenToIdMapPointer; -typedef hash_map TokenToIdsMap; +typedef unordered_map TokenToIdsMap; class OOXMLFactory_ns { public: diff --git a/main/writerfilter/source/resourcemodel/TagLogger.cxx b/main/writerfilter/source/resourcemodel/TagLogger.cxx index 64d4c8098c4..5f54e7c45f4 100644 --- a/main/writerfilter/source/resourcemodel/TagLogger.cxx +++ b/main/writerfilter/source/resourcemodel/TagLogger.cxx @@ -295,7 +295,7 @@ ostream & XMLTag::output(ostream & o, const string & sIndent) const return o; } -typedef hash_map< const char*, TagLogger::Pointer_t, rtl::CStringHash, rtl::CStringEqual> TagLoggerHashMap_t; +typedef unordered_map< const char*, TagLogger::Pointer_t, rtl::CStringHash, rtl::CStringEqual> TagLoggerHashMap_t; static TagLoggerHashMap_t * tagLoggers = NULL; TagLogger::TagLogger() diff --git a/main/writerfilter/source/resourcemodel/WW8Analyzer.hxx b/main/writerfilter/source/resourcemodel/WW8Analyzer.hxx index beaa7e88aff..21006a2534a 100644 --- a/main/writerfilter/source/resourcemodel/WW8Analyzer.hxx +++ b/main/writerfilter/source/resourcemodel/WW8Analyzer.hxx @@ -26,7 +26,7 @@ #include -#include +#include #include namespace writerfilter @@ -43,7 +43,7 @@ class WW8Analyzer : public Properties, public Table, { typedef map SprmMap; - typedef hash_set, eqSalUInt32> IdSet; + typedef unordered_set, eqSalUInt32> IdSet; typedef map AttributeMap; mutable SprmMap mSprmMap; diff --git a/main/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/main/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx index ef6ff393e1f..f70642a5607 100644 --- a/main/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx +++ b/main/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/main/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/main/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx index f9e8ddd6dae..da72626b364 100644 --- a/main/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx +++ b/main/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx index d9b67b3252b..8d1127cfcdc 100644 --- a/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx +++ b/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx index 73c1e37bef2..0a110aa4607 100644 --- a/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx +++ b/main/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx index 7b9204b97ce..a5eb2d3ce0e 100644 --- a/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx +++ b/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ struct ScannerTestServiceHelper } }; -typedef ::std::hash_set< ::rtl::OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap; +typedef ::std::unordered_set< ::rtl::OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap; class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler { diff --git a/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx index 19c46c74f9c..244f56cdcab 100644 --- a/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx +++ b/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/main/xmlhelp/source/cxxhelp/provider/databases.hxx b/main/xmlhelp/source/cxxhelp/provider/databases.hxx index 007c9e9ac02..ae6a2f50759 100644 --- a/main/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/main/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -32,8 +32,8 @@ #include #define INCLUDED_STL_VECTOR #endif -#include -#include +#include +#include #include #include #include @@ -328,20 +328,20 @@ namespace chelp { std::vector< rtl::OUString > m_avModules; - typedef std::hash_map< rtl::OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable; + typedef std::unordered_map< rtl::OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable; DatabasesTable m_aDatabases; // Language and module dependent databases - typedef std::hash_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; + typedef std::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; LangSetTable m_aLangSet; // Mapping to of lang-country to lang - typedef std::hash_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable; + typedef std::unordered_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable; ModInfoTable m_aModInfo; // Module information - typedef std::hash_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable; + typedef std::unordered_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable; KeywordInfoTable m_aKeywordInfo; // Module information typedef - std::hash_map< + std::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >, ha, @@ -349,7 +349,7 @@ namespace chelp { ZipFileTable m_aZipFileTable; // No closing of an once opened jarfile typedef - std::hash_map< + std::unordered_map< rtl::OUString, ::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >, ha, @@ -374,7 +374,7 @@ namespace chelp { }; typedef - std::hash_set< + std::unordered_set< rtl::OString, ostring_ha, ostring_eq > EmptyActiveTextSet; @@ -400,7 +400,7 @@ namespace chelp { }; // Hashtable to cache extension help status - typedef std::hash_map + typedef std::unordered_map < ::rtl::OUString, bool, diff --git a/main/xmlhelp/source/cxxhelp/provider/db.hxx b/main/xmlhelp/source/cxxhelp/provider/db.hxx index 82f01ae86e3..edbd5f048dc 100644 --- a/main/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/main/xmlhelp/source/cxxhelp/provider/db.hxx @@ -25,7 +25,7 @@ #include "com/sun/star/ucb/XSimpleFileAccess.hpp" -#include +#include #include namespace helpdatafileproxy { @@ -78,8 +78,8 @@ namespace helpdatafileproxy { { return rName.hashCode(); } }; - typedef std::hash_map< rtl::OString,std::pair,ha,eq > StringToValPosMap; - typedef std::hash_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap; + typedef std::unordered_map< rtl::OString,std::pair,ha,eq > StringToValPosMap; + typedef std::unordered_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap; class Hdf : hdf_internal::Noncopyable { diff --git a/main/xmloff/inc/StyleMap.hxx b/main/xmloff/inc/StyleMap.hxx index 61ddf897013..f01d5ef7c4c 100644 --- a/main/xmloff/inc/StyleMap.hxx +++ b/main/xmloff/inc/StyleMap.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include struct StyleNameKey_Impl { @@ -68,7 +68,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::std::hash_map< StyleNameKey_Impl, ::rtl::OUString, + public ::std::unordered_map< StyleNameKey_Impl, ::rtl::OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/main/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/main/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx index 072ddeb93cc..5432dd8c4e1 100644 --- a/main/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx +++ b/main/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx @@ -26,10 +26,10 @@ #include -#include +#include #include -typedef std::hash_map +typedef std::unordered_map < PropertySetInfoKey, sal_Bool, diff --git a/main/xmloff/inc/xmloff/nmspmap.hxx b/main/xmloff/inc/xmloff/nmspmap.hxx index e99c04857a7..71007ace275 100644 --- a/main/xmloff/inc/xmloff/nmspmap.hxx +++ b/main/xmloff/inc/xmloff/nmspmap.hxx @@ -28,7 +28,7 @@ #include "xmloff/dllapi.h" #include "sal/types.h" #include -#include +#include #ifndef __SGI_STL_MAP #include #endif @@ -88,8 +88,8 @@ struct QNamePairEq } }; -typedef ::std::hash_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; -typedef ::std::hash_map < ::rtl::OUString, ::vos::ORef , rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; +typedef ::std::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache; +typedef ::std::unordered_map < ::rtl::OUString, ::vos::ORef , rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; typedef ::std::map < sal_uInt16, ::vos::ORef < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap diff --git a/main/xmloff/inc/xmloff/prstylei.hxx b/main/xmloff/inc/xmloff/prstylei.hxx index a8fa72a5bc0..61722404d6e 100644 --- a/main/xmloff/inc/xmloff/prstylei.hxx +++ b/main/xmloff/inc/xmloff/prstylei.hxx @@ -30,7 +30,7 @@ #include //UUUU -#include +#include struct XMLPropertyState; class SvXMLStylesContext; @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { } } } //UUUU -typedef std::hash_set< rtl::OUString, rtl::OUStringHash > OldFillStyleDefinitionSet; +typedef std::unordered_set< rtl::OUString, rtl::OUStringHash > OldFillStyleDefinitionSet; class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext { diff --git a/main/xmloff/source/core/nmspmap.cxx b/main/xmloff/source/core/nmspmap.cxx index c45fbfd32a0..13607aebbeb 100644 --- a/main/xmloff/source/core/nmspmap.cxx +++ b/main/xmloff/source/core/nmspmap.cxx @@ -40,7 +40,7 @@ using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our - * data...by prefix and by key. We use an STL hash_map for fast prefix + * data...by prefix and by key. We use an STL unordered_map for fast prefix * searching and an STL map for fast key searching. * * The references to an 'Index' refer to an earlier implementation of the diff --git a/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx index 64ceed80437..20bad2174ac 100644 --- a/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/main/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -25,12 +25,12 @@ #include "precompiled_xmloff.hxx" #include "EnhancedCustomShapeToken.hxx" #include -#include +#include #include namespace xmloff { namespace EnhancedCustomShapeToken { -typedef std::hash_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; +typedef std::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; static TypeNameHashMap* pHashMap = NULL; static ::osl::Mutex& getHashMapMutex() { diff --git a/main/xmloff/source/draw/ximpcustomshape.cxx b/main/xmloff/source/draw/ximpcustomshape.cxx index 364a2dd8eb9..3104de34b2b 100644 --- a/main/xmloff/source/draw/ximpcustomshape.cxx +++ b/main/xmloff/source/draw/ximpcustomshape.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -1186,7 +1186,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef std::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from rtl::OUString to index */ diff --git a/main/xmloff/source/forms/property_meta_data.cxx b/main/xmloff/source/forms/property_meta_data.cxx index 613bb7103d4..127b04b9fc7 100644 --- a/main/xmloff/source/forms/property_meta_data.cxx +++ b/main/xmloff/source/forms/property_meta_data.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include //...................................................................................................................... namespace xmloff { namespace metadata @@ -80,7 +80,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 ::std::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() @@ -121,7 +121,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::std::hash_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; + typedef ::std::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() @@ -152,7 +152,7 @@ namespace xmloff { namespace metadata }; //.............................................................................................................. - typedef ::std::hash_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; + typedef ::std::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; //.............................................................................................................. const AttributeGroups& lcl_getAttributeGroups() @@ -173,7 +173,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::std::hash_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; + typedef ::std::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; //.............................................................................................................. const AttributesWithoutGroup& lcl_getAttributesWithoutGroups() diff --git a/main/xmloff/source/style/xmlexppr.cxx b/main/xmloff/source/style/xmlexppr.cxx index 3988debcd1a..bf8527bced4 100644 --- a/main/xmloff/source/style/xmlexppr.cxx +++ b/main/xmloff/source/style/xmlexppr.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -269,7 +269,7 @@ class FilterPropertiesInfo_Impl // ---------------------------------------------------------------------------- -typedef std::hash_map +typedef std::unordered_map < PropertySetInfoKey, FilterPropertiesInfo_Impl *, diff --git a/main/xmloff/source/text/txtparae.cxx b/main/xmloff/source/text/txtparae.cxx index ce66c28143c..cfcc4a6900b 100644 --- a/main/xmloff/source/text/txtparae.cxx +++ b/main/xmloff/source/text/txtparae.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -211,7 +211,7 @@ namespace }; private: - typedef hash_map< + typedef unordered_map< Reference, TextContentSet, FrameRefHash> framebound_map_t; diff --git a/main/xmloff/source/transform/EventOASISTContext.cxx b/main/xmloff/source/transform/EventOASISTContext.cxx index 788b0096908..5c08954d0a4 100644 --- a/main/xmloff/source/transform/EventOASISTContext.cxx +++ b/main/xmloff/source/transform/EventOASISTContext.cxx @@ -41,7 +41,7 @@ #include #endif -#include +#include using ::rtl::OUString; @@ -50,7 +50,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::std::hash_map< NameKey_Impl, ::rtl::OUString, + public ::std::unordered_map< NameKey_Impl, ::rtl::OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/main/xmloff/source/transform/EventOOoTContext.cxx b/main/xmloff/source/transform/EventOOoTContext.cxx index 107a8cbe16d..66daab39399 100644 --- a/main/xmloff/source/transform/EventOOoTContext.cxx +++ b/main/xmloff/source/transform/EventOOoTContext.cxx @@ -38,7 +38,7 @@ #include #include -#include +#include using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -47,7 +47,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::std::hash_map< ::rtl::OUString, NameKey_Impl, + public ::std::unordered_map< ::rtl::OUString, NameKey_Impl, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/main/xmloff/source/transform/TransformerActions.hxx b/main/xmloff/source/transform/TransformerActions.hxx index 57a89daf679..398d586ade4 100644 --- a/main/xmloff/source/transform/TransformerActions.hxx +++ b/main/xmloff/source/transform/TransformerActions.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include "TransformerActionInit.hxx" #include "TransformerAction.hxx" @@ -144,7 +144,7 @@ struct TransformerAction_Impl // ----------------------------------------------------------------------------- class XMLTransformerActions : - public ::std::hash_map< NameKey_Impl, TransformerAction_Impl, + public ::std::unordered_map< NameKey_Impl, TransformerAction_Impl, NameHash_Impl, NameHash_Impl > { public: diff --git a/main/xmloff/source/transform/TransformerTokenMap.hxx b/main/xmloff/source/transform/TransformerTokenMap.hxx index 7e6ac450788..375e72c7915 100644 --- a/main/xmloff/source/transform/TransformerTokenMap.hxx +++ b/main/xmloff/source/transform/TransformerTokenMap.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX #include "TransformerTokenMap.hxx" @@ -35,7 +35,7 @@ class XMLTransformerTokenMap : - public ::std::hash_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, + public ::std::unordered_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, ::rtl::OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/main/xmlscript/source/xml_helper/xml_impctx.cxx b/main/xmlscript/source/xml_helper/xml_impctx.cxx index 2055cae8e3d..f8eabefd6e0 100644 --- a/main/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/main/xmlscript/source/xml_helper/xml_impctx.cxx @@ -38,7 +38,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include -#include +#include #include @@ -66,8 +66,8 @@ OUString getImplementationName_DocumentHandlerImpl() "com.sun.star.comp.xml.input.SaxDocumentHandler") ); } -typedef ::std::hash_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; -typedef ::std::hash_map< sal_Int32, OUString > t_Long2OUStringMap; +typedef ::std::unordered_map< OUString, sal_Int32, OUStringHash > t_OUString2LongMap; +typedef ::std::unordered_map< sal_Int32, OUString > t_Long2OUStringMap; struct PrefixEntry { @@ -77,7 +77,7 @@ struct PrefixEntry { m_Uids.reserve( 4 ); } }; -typedef ::std::hash_map< +typedef ::std::unordered_map< OUString, PrefixEntry *, OUStringHash > t_OUString2PrefixMap; struct ElementEntry