diff options
Diffstat (limited to 'desktop/source/deployment')
9 files changed, 22 insertions, 25 deletions
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index dcbc4d10c80b..9a86fffcffc9 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -22,12 +22,12 @@ #include <rtl/ustring.hxx> #include <osl/file.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace dp_misc { -typedef ::boost::unordered_map< +typedef std::unordered_map< OString, OString, OStringHash > t_string2string_map; // Class to read obsolete registered extensions diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index 42f6b4122bc7..d19337f856dc 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -32,7 +32,6 @@ #include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustring.hxx> -#include <boost/unordered_map.hpp> #include "dp_identifier.hxx" #include "dp_activepackages.hxx" diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 72dab66b9231..4643794625e3 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -54,7 +54,6 @@ #include <boost/bind.hpp> #include <list> -#include <boost/unordered_map.hpp> #include <algorithm> #include <set> diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index f905c2550812..32856ca68f2e 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -31,13 +31,13 @@ #include <com/sun/star/deployment/XPackageManager.hpp> #include <osl/mutex.hxx> #include <list> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace dp_manager { -typedef ::boost::unordered_map< +typedef std::unordered_map< OUString, - ::std::vector<css::uno::Reference<css::deployment::XPackage> >, + std::vector<css::uno::Reference<css::deployment::XPackage> >, OUStringHash > id2extensions; class ExtensionManager : private ::dp_misc::MutexHolder, diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 91c39755f4f2..49238f948209 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -23,8 +23,7 @@ #include <cppuhelper/compbase1.hxx> #include <comphelper/servicedecl.hxx> #include <com/sun/star/deployment/thePackageManagerFactory.hpp> -#include <boost/unordered_map.hpp> - +#include <unordered_map> using namespace ::dp_misc; using namespace ::com::sun::star; @@ -46,7 +45,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference<deployment::XPackageManager> m_xBundledMgr; Reference<deployment::XPackageManager> m_xTmpMgr; Reference<deployment::XPackageManager> m_xBakMgr; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, WeakReference<deployment::XPackageManager>, OUStringHash > t_string2weakref; t_string2weakref m_managers; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 4b69637413b0..5a3cce31349f 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -42,11 +42,11 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/util/theMacroExpander.hpp> +#include <algorithm> #include <list> -#include <boost/unordered_map.hpp> -#include <vector> #include <memory> -#include <algorithm> +#include <unordered_map> +#include <vector> #include "dp_compbackenddb.hxx" using namespace ::dp_misc; @@ -265,8 +265,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool m_unorc_modified; bool bSwitchedRdbFiles; - typedef ::boost::unordered_map< OUString, Reference<XInterface>, - OUStringHash > t_string2object; + typedef std::unordered_map< OUString, Reference<XInterface>, + OUStringHash > t_string2object; t_string2object m_backendObjects; // PackageRegistryBackend diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index a5d364da63e1..b603682865a7 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -42,9 +42,9 @@ #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/deployment/PackageRegistryBackend.hpp> -#include <boost/unordered_map.hpp> #include <set> -#include <boost/unordered_set.hpp> +#include <unordered_map> +#include <unordered_set> using namespace ::dp_misc; using namespace ::com::sun::star; @@ -72,13 +72,13 @@ class PackageRegistryImpl : private MutexHolder, public t_helper return str1.equalsIgnoreAsciiCase( str2 ); } }; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, Reference<deployment::XPackageRegistry>, ci_string_hash, ci_string_equals > t_string2registry; - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, OUString, ci_string_hash, ci_string_equals > t_string2string; - typedef ::std::set< + typedef std::set< Reference<deployment::XPackageRegistry> > t_registryset; t_string2registry m_mediaType2backend; @@ -189,7 +189,7 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::boost::unordered_set<OUString, OUStringHash> t_stringset; + typedef std::unordered_set<OUString, OUStringHash> t_stringset; t_stringset ambiguousFilters; const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 034ccb2bb3e8..cdc61649a374 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -73,8 +73,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend }; friend class ExecutablePackageImpl; - typedef ::boost::unordered_map< OUString, Reference<XInterface>, - OUStringHash > t_string2object; + typedef std::unordered_map< OUString, Reference<XInterface>, + OUStringHash > t_string2object; // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 99ae4f41d716..e5ee57c2a1be 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -33,8 +33,8 @@ #include <com/sun/star/deployment/XPackageRegistry.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include "dp_registry.hrc" namespace dp_registry @@ -277,7 +277,7 @@ class PackageRegistryBackend // XPackageManager::getDeployedPackages is called often. This results in a lot //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. - typedef ::boost::unordered_map< + typedef std::unordered_map< OUString, css::uno::Reference<css::deployment::XPackage>, OUStringHash > t_string2ref; t_string2ref m_bound; |