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>

2 files changed, 8 insertions, 8 deletions

diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 48feab870805..2af6fdfa4682 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -28,7 +28,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include <o3tl/optional.hxx>
+#include <optional>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/stl_types.hxx>
@@ -226,9 +226,9 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
                     pClientDataBuffer;
     sal_uInt32      nClientDataLen;
     sal_uInt32      nXAlign;
-    o3tl::optional<sal_uInt32> nXRelTo;
+    std::optional<sal_uInt32> nXRelTo;
     sal_uInt32      nYAlign;
-    o3tl::optional<sal_uInt32> nYRelTo;
+    std::optional<sal_uInt32> nYRelTo;
     sal_uInt32      nLayoutInTableCell;
     ShapeFlag       nFlags;
     sal_Int32       nDxTextLeft;    ///< distance of text box from surrounding shape
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index ec50015bb191..9ee6944f1138 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -25,7 +25,7 @@
 #include <memory>
 #include <vector>
 
-#include <o3tl/optional.hxx>
+#include <optional>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <editeng/eeitem.hxx>
@@ -491,7 +491,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry
     sal_uInt16          nTextRangeEnd;
     std::unique_ptr<SvxFieldItem> xField1;
     std::unique_ptr<SvxFieldItem> xField2;
-    o3tl::optional<OUString> xString;
+    std::optional<OUString> xString;
 
     PPTFieldEntry()
         : nPos(0)
@@ -813,7 +813,7 @@ class PPTNumberFormatCreator
                     sal_uInt32 nLevel,
                     TSS_Type nInstance,
                     TSS_Type nInstanceInSheet,
-                    o3tl::optional< sal_Int16 >& rStartNumbering,
+                    std::optional< sal_Int16 >& rStartNumbering,
                     sal_uInt32 nFontHeight,
                     PPTParagraphObj const * pPara
                 );
@@ -841,7 +841,7 @@ public:
                     SvxNumberFormat& rNumberFormat,
                     PPTParagraphObj* pPara,
                     TSS_Type nInstanceInSheet,
-                    o3tl::optional< sal_Int16 >& rStartNumbering
+                    std::optional< sal_Int16 >& rStartNumbering
                 );
 };
 
@@ -1177,7 +1177,7 @@ public:
     void                    AppendPortion( PPTPortionObj& rPortion );
     void                    ApplyTo(
                                 SfxItemSet& rSet,
-                                o3tl::optional< sal_Int16 >& rStartNumbering,
+                                std::optional< sal_Int16 >& rStartNumbering,
                                 SdrPowerPointImport const & rManager,
                                 TSS_Type nInstanceInSheet
                             );