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

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d55217c708b5..31b83a855dea 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -14,7 +14,7 @@
 #include <queue>
 #include <tuple>
 #include <vector>
-#include <o3tl/optional.hxx>
+#include <optional>
 
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <oox/mathml/importutils.hxx>
@@ -275,7 +275,7 @@ private:
     sal_Int32 m_nTop = 0;
     sal_Int32 m_nRight = 0;
     sal_Int32 m_nBottom = 0;
-    o3tl::optional<sal_Int32> m_oZ; ///< Z-Order of the shape.
+    std::optional<sal_Int32> m_oZ; ///< Z-Order of the shape.
     sal_Int16 m_nHoriOrientRelation
         = 0; ///< Horizontal text::RelOrientation for drawinglayer shapes.
     sal_Int16 m_nVertOrientRelation = 0; ///< Vertical text::RelOrientation for drawinglayer shapes.
@@ -381,7 +381,7 @@ private:
     sal_Int32 m_nHoriPadding, m_nVertPadding;
     sal_Int32 m_nHoriAlign, m_nHoriAnchor, m_nVertAlign, m_nVertAnchor;
     Id m_nHRule;
-    o3tl::optional<Id> m_oWrap;
+    std::optional<Id> m_oWrap;
 
 public:
     explicit RTFFrame(RTFParserState* pParserState);
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b0bd39d79830..d32e29fcd167 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -371,14 +371,14 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
     uno::Any aLineWidth = uno::makeAny(sal_Int32(26));
     sal_Int16 eWritingMode = text::WritingMode2::LR_TB;
     // Groupshape support
-    o3tl::optional<sal_Int32> oGroupLeft;
-    o3tl::optional<sal_Int32> oGroupTop;
-    o3tl::optional<sal_Int32> oGroupRight;
-    o3tl::optional<sal_Int32> oGroupBottom;
-    o3tl::optional<sal_Int32> oRelLeft;
-    o3tl::optional<sal_Int32> oRelTop;
-    o3tl::optional<sal_Int32> oRelRight;
-    o3tl::optional<sal_Int32> oRelBottom;
+    std::optional<sal_Int32> oGroupLeft;
+    std::optional<sal_Int32> oGroupTop;
+    std::optional<sal_Int32> oGroupRight;
+    std::optional<sal_Int32> oGroupBottom;
+    std::optional<sal_Int32> oRelLeft;
+    std::optional<sal_Int32> oRelTop;
+    std::optional<sal_Int32> oRelRight;
+    std::optional<sal_Int32> oRelBottom;
 
     // Importing these are not trivial, let the VML import do the hard work.
     oox::vml::FillModel aFillModel; // Gradient.
@@ -386,8 +386,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
 
     bool bOpaque = true;
 
-    o3tl::optional<sal_Int16> oRelativeWidth;
-    o3tl::optional<sal_Int16> oRelativeHeight;
+    std::optional<sal_Int16> oRelativeWidth;
+    std::optional<sal_Int16> oRelativeHeight;
     sal_Int16 nRelativeWidthRelation = text::RelOrientation::PAGE_FRAME;
     sal_Int16 nRelativeHeightRelation = text::RelOrientation::PAGE_FRAME;
     boost::logic::tribool obRelFlipV(boost::logic::indeterminate);
@@ -725,7 +725,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             sal_Int16 nPercentage = rtl::math::round(rProperty.second.toDouble() / 10);
             if (nPercentage)
             {
-                o3tl::optional<sal_Int16>& rPercentage
+                std::optional<sal_Int16>& rPercentage
                     = rProperty.first == "pctHoriz" ? oRelativeWidth : oRelativeHeight;
                 rPercentage = nPercentage;
             }