summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/app.hxx4
-rw-r--r--desktop/inc/pch/precompiled_deployment.hxx2
-rw-r--r--desktop/inc/pch/precompiled_deploymentgui.hxx2
-rw-r--r--desktop/inc/pch/precompiled_sofficeapp.hxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 2bd3051bed26..1dc5f8a790ab 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DESKTOP_INC_APP_HXX
#define INCLUDED_DESKTOP_INC_APP_HXX
-#include <o3tl/optional.hxx>
+#include <optional>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
@@ -173,7 +173,7 @@ class Desktop final : public Application
};
OUString GetURL_Impl(
- const OUString& rName, o3tl::optional< OUString > const & cwdUrl );
+ const OUString& rName, std::optional< OUString > const & cwdUrl );
OUString ReplaceStringHookProc(const OUString& rStr);
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx
index f8753b4e6dfd..f14c28ee7bc5 100644
--- a/desktop/inc/pch/precompiled_deployment.hxx
+++ b/desktop/inc/pch/precompiled_deployment.hxx
@@ -72,7 +72,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <svl/inettype.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 4ee2eea8a0ad..c55a81a717c1 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -84,7 +84,7 @@
#include <cppu/unotype.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <o3tl/typed_flags_set.hxx>
#include <salhelper/thread.hxx>
#include <tools/gen.hxx>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index 20f0f17391da..79d8eed69b9a 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -150,7 +150,7 @@
#include <cppuhelper/implbase_ex_pre.hxx>
#include <i18nlangtag/lang.h>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>