summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/registry/help
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/deployment/registry/help')
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx10
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx6
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx4
3 files changed, 10 insertions, 10 deletions
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 013c0648a49e..27cf615eb41b 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/deployment/ExtensionRemovedException.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
-#include <o3tl/optional.hxx>
+#include <optional>
using namespace ::dp_misc;
using namespace ::com::sun::star;
@@ -95,7 +95,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
void implCollectXhpFiles( const OUString& aDir,
std::vector< OUString >& o_rXhpFileVector );
- ::o3tl::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url);
+ ::std::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url);
bool hasActiveEntry(OUString const & url);
bool activateEntry(OUString const & url);
@@ -200,10 +200,10 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
static_cast<sal_Int16>(-1) );
}
-::o3tl::optional<HelpBackendDb::Data> BackendImpl::readDataFromDb(
+::std::optional<HelpBackendDb::Data> BackendImpl::readDataFromDb(
OUString const & url)
{
- ::o3tl::optional<HelpBackendDb::Data> data;
+ ::std::optional<HelpBackendDb::Data> data;
if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
@@ -333,7 +333,7 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
- ::o3tl::optional<HelpBackendDb::Data> data =
+ ::std::optional<HelpBackendDb::Data> data =
getMyBackend()->readDataFromDb(getURL());
if (data && getMyBackend()->hasActiveEntry(getURL()))
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index cd8f65b749c0..73b7279d13de 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -87,7 +87,7 @@ void HelpBackendDb::addEntry(OUString const & url, Data const & data)
}
-::o3tl::optional<HelpBackendDb::Data>
+::std::optional<HelpBackendDb::Data>
HelpBackendDb::getEntry(OUString const & url)
{
try
@@ -100,9 +100,9 @@ HelpBackendDb::getEntry(OUString const & url)
}
else
{
- return ::o3tl::optional<Data>();
+ return ::std::optional<Data>();
}
- return ::o3tl::optional<Data>(retData);
+ return ::std::optional<Data>(retData);
}
catch ( const css::deployment::DeploymentException& )
{
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 1a9eabc861aa..1f072f7429df 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_HELP_DP_HELPBACKENDDB_HXX
#include <rtl/ustring.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <dp_backenddb.hxx>
namespace com { namespace sun { namespace star {
@@ -64,7 +64,7 @@ public:
void addEntry(OUString const & url, Data const & data);
- ::o3tl::optional<Data> getEntry(OUString const & url);
+ ::std::optional<Data> getEntry(OUString const & url);
//must also return the data urls for entries with @active="false". That is,
//those are currently revoked.
std::vector< OUString> getAllDataUrls();