summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/registry/configuration/dp_configuration.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/deployment/registry/configuration/dp_configuration.cxx')
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 68f11e41ea3b..ca11affbca7c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -130,7 +130,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
Reference<XCommandEnvironment> const & xCmdEnv );
#endif
void addDataToDb(OUString const & url, ConfigurationBackendDb::Data const & data);
- ::o3tl::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url);
+ ::std::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url);
void revokeEntryFromDb(OUString const & url);
bool hasActiveEntry(OUString const & url);
bool activateEntry(OUString const & url);
@@ -240,10 +240,10 @@ void BackendImpl::addDataToDb(
m_backendDb->addEntry(url, data);
}
-::o3tl::optional<ConfigurationBackendDb::Data> BackendImpl::readDataFromDb(
+::std::optional<ConfigurationBackendDb::Data> BackendImpl::readDataFromDb(
OUString const & url)
{
- ::o3tl::optional<ConfigurationBackendDb::Data> data;
+ ::std::optional<ConfigurationBackendDb::Data> data;
if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
@@ -488,7 +488,7 @@ bool BackendImpl::removeFromConfigmgrIni(
//url to the file in the user installation (e.g. $BUNDLED_EXTENSIONS_USER)
//However, m_url (getURL()) contains the URL for the file in the actual
//extension installation.
- ::o3tl::optional<ConfigurationBackendDb::Data> data = readDataFromDb(url_);
+ ::std::optional<ConfigurationBackendDb::Data> data = readDataFromDb(url_);
if (data)
i = std::find(rSet.begin(), rSet.end(), data->iniEntry);
}
@@ -680,7 +680,7 @@ void BackendImpl::PackageImpl::processPackage_(
{
if (getMyBackend()->activateEntry(getURL()))
{
- ::o3tl::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+ ::std::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
OSL_ASSERT(data);
that->addToConfigmgrIni( m_isSchema, false, data->iniEntry, xCmdEnv );
}
@@ -772,7 +772,7 @@ void BackendImpl::PackageImpl::processPackage_(
}
}
#endif
- ::o3tl::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+ ::std::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
//If an xcu file was life deployed then always a data entry is written.
//If the xcu file was already in the configmr.ini then there is also
//a data entry