diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-05 18:49:26 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-06 01:00:47 +0100 |
commit | 7685200dc1f5c6408cda8c89eedf275ca05708fd (patch) | |
tree | 1a0a04d4debcb79ca0a540af78b65f5df56d6841 /extensions | |
parent | 37823fe2b4474eca6e8a775668af6bca21e2af55 (diff) |
move components to boost unordered containers
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/framectr.cxx | 4 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.cxx | 8 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.hxx | 6 | ||||
-rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 26 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 4 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.hxx | 6 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrcommontypes.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.hxx | 8 |
11 files changed, 37 insertions, 37 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index bf80e3df093f..9fa7ead8b73b 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -61,7 +61,7 @@ #include <vcl/edit.hxx> #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace osl; using namespace cppu; @@ -110,7 +110,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::std::hash_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; SV_IMPL_PTRARR( BibStatusDispatchArr, BibStatusDispatchPtr ); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 5696375a5971..8b9ea5e50886 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -91,16 +91,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<sal_uInt32, sal_uInt32> AdapterToWrapperMap; +boost::unordered_map<sal_uInt32, sal_uInt32> 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<sal_uInt32,sal_uInt32> WrapperToAdapterMap; +boost::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap; -hash_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; +boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; /***************************************************************************** class implementation IUnknownWrapper_Impl @@ -127,7 +127,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() #endif // remove entries in global maps - typedef hash_map<sal_uInt32, sal_uInt32>::iterator _IT; + typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT; _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot); if( it != WrapperToAdapterMap.end()) { diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 733d25f1d78b..ecfed6825814 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -43,7 +43,7 @@ #endif #include <atlbase.h> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <tools/postsys.h> #ifdef _MSC_VER @@ -76,9 +76,9 @@ namespace ole_adapter -typedef hash_map<OUString, pair<DISPID, unsigned short>, hashOUString_Impl, equalOUString_Impl> DispIdMap; +typedef boost::unordered_map<OUString, pair<DISPID, unsigned short>, hashOUString_Impl, equalOUString_Impl> DispIdMap; -typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_Impl> TLBFuncIndexMap; +typedef boost::unordered_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_Impl> 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/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 1ce9f3c9ae0b..b6ac7f1caff0 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -41,7 +41,7 @@ #include "ole2uno.hxx" #include "unotypewrapper.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> // for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved. typedef unsigned char BYTE; @@ -72,17 +72,17 @@ using namespace com::sun::star::bridge::oleautomation; using namespace boost; namespace ole_adapter { -extern hash_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; -extern hash_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap; -typedef hash_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap; -typedef hash_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap; +extern boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; +extern boost::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap; +typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap; +typedef boost::unordered_map<sal_uInt32, sal_uInt32>::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<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com; +extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::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 @@ -90,9 +90,9 @@ typedef hash_map<sal_uInt32, WeakReference<XInterface> >::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 IDispach of the first mapped instance // must be returned. -extern hash_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno; +extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno; #ifdef __MINGW32__ inline void reduceRange( Any& any); #endif @@ -1420,7 +1420,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT else { Reference<XInterface> xIntComWrapper = xInt; - typedef hash_map<sal_uInt32,sal_uInt32>::iterator _IT; + typedef boost::unordered_map<sal_uInt32,sal_uInt32>::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() ) @@ -1910,7 +1910,7 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty // in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO // object is a wrapped COM object. In that case we extract the original COM object rather than // creating a wrapper around the UNO object. - typedef hash_map<sal_uInt32,sal_uInt32>::value_type VALUE; + typedef boost::unordered_map<sal_uInt32,sal_uInt32>::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/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 744e756ed4e2..622ddf5894fa 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -35,7 +35,7 @@ #include <olectl.h> #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <tools/postsys.h> @@ -85,7 +85,7 @@ extern "C" const GUID IID_IDispatchEx; namespace ole_adapter { -hash_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; +boost::unordered_map<sal_uInt32, WeakReference<XInterface> > 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/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index 6bbf95ebdbb6..dbbe3d832498 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -86,7 +86,7 @@ struct MemberInfo OUString name; }; -typedef hash_map +typedef boost::unordered_map < OUString, DISPID, @@ -94,7 +94,7 @@ typedef hash_map equalOUString_Impl > NameToIdMap; -typedef hash_map +typedef boost::unordered_map < OUString, sal_Bool, @@ -102,7 +102,7 @@ typedef hash_map equalOUString_Impl > BadNameMap; -typedef hash_map +typedef boost::unordered_map < DISPID, MemberInfo diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index d038f58c626d..3f6e4c995e52 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -45,7 +45,7 @@ #include <set> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> //............................................................................ @@ -76,7 +76,7 @@ namespace pcr { } }; - typedef ::std::hash_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; + typedef ::boost::unordered_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; typedef ::std::vector< ListBoxLines::iterator > OrderedListBoxLines; //======================================================================== diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5f1df02469e1..3b2629b4c23f 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -354,7 +354,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::std::hash_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 4ea10e0e6463..721ca8a0edac 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -79,7 +79,7 @@ namespace pcr sal_Int32 _nUniqueBrowseId ); }; - typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; //==================================================================== //= EventHandler diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 434f395af4e5..7cec06d7e10c 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -34,14 +34,14 @@ /** === end UNO includes === **/ #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> //........................................................................ namespace pcr { //........................................................................ - typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > PropertyMap; //........................................................................ diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e7c02599a723..70bcba95ad90 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -68,7 +68,7 @@ #include <comphelper/broadcasthelper.hxx> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <memory> @@ -137,9 +137,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 ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerRepository; - typedef ::std::hash_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -157,7 +157,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 ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; |