diff options
Diffstat (limited to 'include/unotools')
| -rw-r--r-- | include/unotools/atom.hxx | 12 | ||||
| -rw-r--r-- | include/unotools/eventcfg.hxx | 8 | ||||
| -rw-r--r-- | include/unotools/fontcfg.hxx | 10 | ||||
| -rw-r--r-- | include/unotools/mediadescriptor.hxx | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index 871085199881..96f1574ecae1 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -22,11 +22,11 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> #include <osl/mutex.hxx> +#include <com/sun/star/util/XAtomServer.hpp> #include <cppuhelper/implbase1.hxx> - -#include <boost/unordered_map.hpp> +#include <boost/functional/hash.hpp> #include <list> -#include <com/sun/star/util/XAtomServer.hpp> +#include <unordered_map> #define INVALID_ATOM 0 @@ -41,8 +41,8 @@ namespace utl { class AtomProvider { int m_nAtoms; - ::boost::unordered_map< int, OUString, ::boost::hash< int > > m_aStringMap; - ::boost::unordered_map< OUString, int, OUStringHash > m_aAtomMap; + std::unordered_map< int, OUString, ::boost::hash< int > > m_aStringMap; + std::unordered_map< OUString, int, OUStringHash > m_aAtomMap; public: AtomProvider(); ~AtomProvider(); @@ -53,7 +53,7 @@ namespace utl { class UNOTOOLS_DLLPUBLIC MultiAtomProvider { - ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; + std::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; public: MultiAtomProvider(); ~MultiAtomProvider(); diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 347cc67a1fea..7185aef49695 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase2.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include <vector> #define STR_EVENT_STARTAPP 0 @@ -58,9 +58,9 @@ #define STR_EVENT_MODECHANGED 26 #define STR_EVENT_STORAGECHANGED 27 -typedef ::boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > EventBindingHash; -typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; -typedef ::std::vector< OUString > SupportedEventsVector; +typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > EventBindingHash; +typedef std::vector< css::uno::WeakReference< css::frame::XFrame > > FrameVector; +typedef std::vector< OUString > SupportedEventsVector; class GlobalEventConfig_Impl : public utl::ConfigItem { diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 6b843a13fde5..37bf896837ae 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -27,8 +27,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> #include <vector> namespace utl @@ -50,7 +50,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; - boost::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig; + std::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig; OUString tryLocale( const OUString& rBcp47, const OUString& rType ) const; @@ -153,8 +153,8 @@ private: LocaleSubst() : bConfigRead( false ) {} }; - boost::unordered_map< OUString, LocaleSubst, OUStringHash > m_aSubst; - typedef boost::unordered_set< OUString, OUStringHash > UniqueSubstHash; + std::unordered_map< OUString, LocaleSubst, OUStringHash > m_aSubst; + typedef std::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 35f839c1da10..e88b20d1f8fc 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -39,7 +39,7 @@ namespace utl { /** @short can be used to work with a ::com::sun::star::document::MediaDescriptor struct. - @descr It wraps a ::boost::unordered_map around the Sequence< css::beans::PropertyValue >, which + @descr It wraps a 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. |