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

diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 53e1027f488d..7603efb463a2 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -28,7 +28,7 @@
 #include <swtypes.hxx>
 #include "drawfont.hxx"
 #include <editeng/borderline.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
 #include <o3tl/enumarray.hxx>
 
 class SfxItemSet;
@@ -140,10 +140,10 @@ class SwFont
     Color       m_aOverColor;     // color of the overlining
 
     // character borders
-    o3tl::optional<editeng::SvxBorderLine>     m_aTopBorder;
-    o3tl::optional<editeng::SvxBorderLine>     m_aBottomBorder;
-    o3tl::optional<editeng::SvxBorderLine>     m_aRightBorder;
-    o3tl::optional<editeng::SvxBorderLine>     m_aLeftBorder;
+    std::optional<editeng::SvxBorderLine>     m_aTopBorder;
+    std::optional<editeng::SvxBorderLine>     m_aBottomBorder;
+    std::optional<editeng::SvxBorderLine>     m_aRightBorder;
+    std::optional<editeng::SvxBorderLine>     m_aLeftBorder;
 
     // border distance
     sal_uInt16 m_nTopBorderDist;
@@ -336,19 +336,19 @@ public:
     void SetRightBorder( const editeng::SvxBorderLine* pRightBorder );
     void SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder );
 
-    const o3tl::optional<editeng::SvxBorderLine>& GetTopBorder() const { return m_aTopBorder; }
-    const o3tl::optional<editeng::SvxBorderLine>& GetBottomBorder() const { return m_aBottomBorder; }
-    const o3tl::optional<editeng::SvxBorderLine>& GetRightBorder() const { return m_aRightBorder; }
-    const o3tl::optional<editeng::SvxBorderLine>& GetLeftBorder() const { return m_aLeftBorder; }
+    const std::optional<editeng::SvxBorderLine>& GetTopBorder() const { return m_aTopBorder; }
+    const std::optional<editeng::SvxBorderLine>& GetBottomBorder() const { return m_aBottomBorder; }
+    const std::optional<editeng::SvxBorderLine>& GetRightBorder() const { return m_aRightBorder; }
+    const std::optional<editeng::SvxBorderLine>& GetLeftBorder() const { return m_aLeftBorder; }
 
     // Get absolute border correspond to the layout verticality and orientation.
-    const o3tl::optional<editeng::SvxBorderLine>&
+    const std::optional<editeng::SvxBorderLine>&
     GetAbsTopBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const;
-    const o3tl::optional<editeng::SvxBorderLine>&
+    const std::optional<editeng::SvxBorderLine>&
     GetAbsBottomBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const;
-    const o3tl::optional<editeng::SvxBorderLine>&
+    const std::optional<editeng::SvxBorderLine>&
     GetAbsRightBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const;
-    const o3tl::optional<editeng::SvxBorderLine>&
+    const std::optional<editeng::SvxBorderLine>&
     GetAbsLeftBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const;
 
     void SetTopBorderDist( const sal_uInt16 nTopDist );