Drop o3tl::optional wrapper

...now that macOS builds are guaranteed to have std::optional since
358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to
Xcode 11.3 and macOS 10.14.4".

The change is done mostly mechanically with

> for i in $(git grep -Fl optional); do
>  sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \
>   -e 's/\<o3tl::optional\>/std::optional/g' \
>   -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i"
> done
> for i in $(git grep -Flw o3tl::nullopt); do
>  sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i"
> done

(though that causes some of the resulting

#include <optional>

to appear at different places relative to other includes than if they had been
added manually), plus a few manual modifications:

* adapt bin/find-unneeded-includes
* adapt desktop/IwyuFilter_desktop.yaml
* remove include/o3tl/optional.hxx
* quote resulting "<"/">" as "&lt;"/"&gt;" in officecfg/registry/cppheader.xsl
* and then solenv/clang-format/reformat-formatted-files

Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index d3ebc7a48719..2ffeff608143 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -19,7 +19,7 @@
 
 #include <sheetevents.hxx>
 #include <com/sun/star/script/vba/VBAEventId.hpp>
-#include <o3tl/optional.hxx>
+#include <optional>
 
 OUString ScSheetEvents::GetEventName(ScSheetEventId nEvent)
 {
@@ -88,7 +88,7 @@ ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther)
         Clear();
         if (rOther.mpScriptNames)
         {
-            mpScriptNames.reset( new o3tl::optional<OUString>[COUNT] );
+            mpScriptNames.reset( new std::optional<OUString>[COUNT] );
             for (sal_Int32 nEvent=0; nEvent<COUNT; ++nEvent)
                 mpScriptNames[nEvent] = rOther.mpScriptNames[nEvent];
         }
@@ -100,7 +100,7 @@ const OUString* ScSheetEvents::GetScript(ScSheetEventId nEvent) const
 {
     if (mpScriptNames)
     {
-        o3tl::optional<OUString> const & r = mpScriptNames[static_cast<int>(nEvent)];
+        std::optional<OUString> const & r = mpScriptNames[static_cast<int>(nEvent)];
         if (r)
             return &*r;
     }
@@ -112,7 +112,7 @@ void ScSheetEvents::SetScript(ScSheetEventId eEvent, const OUString* pNew)
     int nEvent = static_cast<int>(eEvent);
     if (!mpScriptNames)
     {
-        mpScriptNames.reset( new o3tl::optional<OUString>[COUNT] );
+        mpScriptNames.reset( new std::optional<OUString>[COUNT] );
     }
     if (pNew)
         mpScriptNames[nEvent] = *pNew;