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, 7 insertions, 7 deletions

diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 683c6f1901e3..4c8f696d2c3c 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -54,7 +54,7 @@
 #include <memory>
 #include <vector>
 
-#include <o3tl/optional.hxx>
+#include <optional>
 
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
@@ -784,15 +784,15 @@ protected:
 private:
     void    impl_notifyItemListEvent_nolck(
                 const sal_Int32 i_nItemPosition,
-                const ::o3tl::optional< OUString >& i_rItemText,
-                const ::o3tl::optional< OUString >& i_rItemImageURL,
+                const ::std::optional< OUString >& i_rItemText,
+                const ::std::optional< OUString >& i_rItemImageURL,
                 void ( SAL_CALL css::awt::XItemListListener::*NotificationMethod )( const css::awt::ItemListEvent& )
             );
 
     void    impl_handleInsert(
                 const sal_Int32 i_nItemPosition,
-                const ::o3tl::optional< OUString >& i_rItemText,
-                const ::o3tl::optional< OUString >& i_rItemImageURL,
+                const ::std::optional< OUString >& i_rItemText,
+                const ::std::optional< OUString >& i_rItemImageURL,
                 ::osl::ClearableMutexGuard& i_rClearBeforeNotify
             );
 
@@ -803,8 +803,8 @@ private:
 
     void    impl_handleModify(
                 const sal_Int32 i_nItemPosition,
-                const ::o3tl::optional< OUString >& i_rItemText,
-                const ::o3tl::optional< OUString >& i_rItemImageURL,
+                const ::std::optional< OUString >& i_rItemText,
+                const ::std::optional< OUString >& i_rItemImageURL,
                 ::osl::ClearableMutexGuard& i_rClearBeforeNotify
             );