diff options
Diffstat (limited to 'desktop/source/deployment/registry/configuration')
3 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index b1b0e08cdcc4..1dd47424491d 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -62,7 +62,7 @@ namespace backend { namespace configuration { namespace { -typedef ::std::list<OUString> t_stringlist; +typedef std::list<OUString> t_stringlist; class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend @@ -116,7 +116,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend #if HAVE_FEATURE_EXTENSIONS // for backwards compatibility - nil if no (compatible) back-compat db present - ::std::unique_ptr<PersistentMap> m_registeredPackages; + std::unique_ptr<PersistentMap> m_registeredPackages; #endif virtual void SAL_CALL disposing() override; @@ -214,13 +214,13 @@ BackendImpl::BackendImpl( //are still registers. Only after revoking and restarting OOo the folders //can be removed. This works now, because the extension manager is a singleton //and the backends are only create once per process. - ::std::list<OUString> folders = m_backendDb->getAllDataUrls(); + std::list<OUString> folders = m_backendDb->getAllDataUrls(); deleteUnusedFolders(OUString(), folders); configmgrini_verify_init( xCmdEnv ); #if HAVE_FEATURE_EXTENSIONS - ::std::unique_ptr<PersistentMap> pMap; + std::unique_ptr<PersistentMap> pMap; OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) ); // Don't create it if it doesn't exist already @@ -474,7 +474,7 @@ void BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & const ::osl::MutexGuard guard( getMutex() ); configmgrini_verify_init( xCmdEnv ); t_stringlist & rSet = getFiles(isSchema); - if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) { + if (std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) { rSet.push_front( rcterm ); // prepend to list, thus overriding // write immediately: m_configmgrini_modified = true; diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index a77fef4fbb3a..54c6f150fba8 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -127,11 +127,11 @@ ConfigurationBackendDb::getEntry(OUString const & url) } } -::std::list<OUString> ConfigurationBackendDb::getAllDataUrls() +std::list<OUString> ConfigurationBackendDb::getAllDataUrls() { try { - ::std::list<OUString> listRet; + std::list<OUString> listRet; Reference<css::xml::dom::XDocument> doc = getDocument(); Reference<css::xml::dom::XNode> root = doc->getFirstChild(); diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 88dd77640d9d..c09bff58512c 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -70,7 +70,7 @@ public: void addEntry(OUString const & url, Data const & data); ::boost::optional<Data> getEntry(OUString const & url); - ::std::list< OUString> getAllDataUrls(); + std::list< OUString> getAllDataUrls(); }; |