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>

4 files changed, 27 insertions, 27 deletions

diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index 89802e9ec200..eeaff7c4b835 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -27,7 +27,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 #include <libxml/parser.h>
-#include <o3tl/optional.hxx>
+#include <optional>
 
 struct JavaInfo;
 
@@ -159,28 +159,28 @@ private:
         If /java/enabled@xsi:nil == true then the value will be uninitialized
         after a call to load().
     */
-    o3tl::optional<sal_Bool> m_enabled;
+    std::optional<sal_Bool> m_enabled;
 
     /** User configurable option. /java/userClassPath
         If /java/userClassPath@xsi:nil == true then the value is uninitialized
         after a call to load().
     */
-    o3tl::optional< OUString> m_userClassPath;
+    std::optional< OUString> m_userClassPath;
     /** User configurable option.  /java/javaInfo
         If /java/javaInfo@xsi:nil == true then the value is uninitialized
         after a call to load.
      */
-    o3tl::optional<CNodeJavaInfo> m_javaInfo;
+    std::optional<CNodeJavaInfo> m_javaInfo;
     /** User configurable option. /java/vmParameters
         If /java/vmParameters@xsi:nil == true then the value is uninitialized
         after a call to load.
     */
-    o3tl::optional< ::std::vector< OUString> > m_vmParameters;
+    std::optional< ::std::vector< OUString> > m_vmParameters;
     /** User configurable option. /java/jreLocations
         If /java/jreLocaltions@xsi:nil == true then the value is uninitialized
         after a call to load.
     */
-    o3tl::optional< ::std::vector< OUString> > m_JRELocations;
+    std::optional< ::std::vector< OUString> > m_JRELocations;
 
 public:
 
@@ -225,22 +225,22 @@ public:
 
     /** returns the value of the element /java/enabled
      */
-    const o3tl::optional<sal_Bool> & getEnabled() const { return m_enabled;}
+    const std::optional<sal_Bool> & getEnabled() const { return m_enabled;}
     /** returns the value of the element /java/userClassPath.
      */
-    const o3tl::optional< OUString> & getUserClassPath() const { return m_userClassPath;}
+    const std::optional< OUString> & getUserClassPath() const { return m_userClassPath;}
 
     /** returns the value of the element /java/javaInfo.
      */
-    const o3tl::optional<CNodeJavaInfo> & getJavaInfo() const { return m_javaInfo;}
+    const std::optional<CNodeJavaInfo> & getJavaInfo() const { return m_javaInfo;}
 
     /** returns the parameters from the element /java/vmParameters/param.
      */
-    const o3tl::optional< ::std::vector< OUString> > & getVmParameters() const { return m_vmParameters;}
+    const std::optional< ::std::vector< OUString> > & getVmParameters() const { return m_vmParameters;}
 
     /** returns the parameters from the element /java/jreLocations/location.
      */
-    const o3tl::optional< ::std::vector< OUString> > & getJRELocations() const { return m_JRELocations;}
+    const std::optional< ::std::vector< OUString> > & getJRELocations() const { return m_JRELocations;}
 };
 
 /** merges the settings for shared, user and installation during construction.
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index 07ea10a67ad1..a729f6ad52e4 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -21,7 +21,7 @@
 
 #include <sal/config.h>
 
-#include <o3tl/optional.hxx>
+#include <optional>
 
 #include <rtl/ustring.hxx>
 #include "libxmlutil.hxx"
@@ -40,7 +40,7 @@ class VendorSettings
 public:
     VendorSettings();
 
-    o3tl::optional<VersionInfo> getVersionInformation(const OUString & sVendor) const;
+    std::optional<VersionInfo> getVersionInformation(const OUString & sVendor) const;
 };
 
 /* The class offers functions to retrieve verified bootstrap parameters.
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 807a65a3a154..5f7ff045b302 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -34,7 +34,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-#include <o3tl/optional.hxx>
+#include <optional>
 #include <string.h>
 
 // For backwards compatibility, the nFeatures and nRequirements flag words are
@@ -236,9 +236,9 @@ void NodeJava::load()
                 CXmlCharPtr sEnabled( xmlNodeListGetString(
                     docUser, cur->children, 1));
                 if (xmlStrcmp(sEnabled, reinterpret_cast<xmlChar const *>("true")) == 0)
-                    m_enabled = o3tl::optional<sal_Bool>(true);
+                    m_enabled = std::optional<sal_Bool>(true);
                 else if (xmlStrcmp(sEnabled, reinterpret_cast<xmlChar const *>("false")) == 0)
-                    m_enabled = o3tl::optional<sal_Bool>(false);
+                    m_enabled = std::optional<sal_Bool>(false);
             }
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("userClassPath")) == 0)
@@ -251,7 +251,7 @@ void NodeJava::load()
             {
                 CXmlCharPtr sUser(xmlNodeListGetString(
                     docUser, cur->children, 1));
-                m_userClassPath = o3tl::optional<OUString>(OUString(sUser));
+                m_userClassPath = std::optional<OUString>(OUString(sUser));
             }
         }
         else if (xmlStrcmp(cur->name, reinterpret_cast<xmlChar const *>("javaInfo")) == 0)
@@ -264,7 +264,7 @@ void NodeJava::load()
             if (xmlStrcmp(sNil, reinterpret_cast<xmlChar const *>("false")) == 0)
             {
                 if (! m_javaInfo)
-                    m_javaInfo = o3tl::optional<CNodeJavaInfo>(CNodeJavaInfo());
+                    m_javaInfo = std::optional<CNodeJavaInfo>(CNodeJavaInfo());
                 m_javaInfo->loadFromNode(docUser, cur);
             }
         }
@@ -277,7 +277,7 @@ void NodeJava::load()
             if (xmlStrcmp(sNil, reinterpret_cast<xmlChar const *>("false")) == 0)
             {
                 if ( ! m_vmParameters)
-                    m_vmParameters = o3tl::optional<std::vector<OUString> >(
+                    m_vmParameters = std::optional<std::vector<OUString> >(
                         std::vector<OUString> ());
 
                 xmlNode * pOpt = cur->children;
@@ -302,7 +302,7 @@ void NodeJava::load()
             if (xmlStrcmp(sNil, reinterpret_cast<xmlChar const *>("false")) == 0)
             {
                 if (! m_JRELocations)
-                    m_JRELocations = o3tl::optional<std::vector<OUString> >(
+                    m_JRELocations = std::optional<std::vector<OUString> >(
                         std::vector<OUString>());
 
                 xmlNode * pLoc = cur->children;
@@ -418,7 +418,7 @@ void NodeJava::write() const
                      reinterpret_cast<xmlChar const *>("nil"),
                      reinterpret_cast<xmlChar const *>("false"));
 
-        if (m_enabled == o3tl::optional<sal_Bool>(true))
+        if (m_enabled == std::optional<sal_Bool>(true))
             xmlNodeSetContent(nodeEnabled,reinterpret_cast<xmlChar const *>("true"));
         else
             xmlNodeSetContent(nodeEnabled,reinterpret_cast<xmlChar const *>("false"));
@@ -531,19 +531,19 @@ void NodeJava::write() const
 
 void NodeJava::setEnabled(bool bEnabled)
 {
-    m_enabled =  o3tl::optional<sal_Bool>(bEnabled);
+    m_enabled =  std::optional<sal_Bool>(bEnabled);
 }
 
 
 void NodeJava::setUserClassPath(const OUString & sClassPath)
 {
-    m_userClassPath = o3tl::optional<OUString>(sClassPath);
+    m_userClassPath = std::optional<OUString>(sClassPath);
 }
 
 void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)
 {
     if (!m_javaInfo)
-        m_javaInfo = o3tl::optional<CNodeJavaInfo>(CNodeJavaInfo());
+        m_javaInfo = std::optional<CNodeJavaInfo>(CNodeJavaInfo());
     m_javaInfo->bAutoSelect = bAutoSelect;
     m_javaInfo->bNil = false;
 
@@ -571,13 +571,13 @@ void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)
 
 void NodeJava::setVmParameters(std::vector<OUString> const & arOptions)
 {
-    m_vmParameters = o3tl::optional<std::vector<OUString> >(arOptions);
+    m_vmParameters = std::optional<std::vector<OUString> >(arOptions);
 }
 
 void NodeJava::addJRELocation(OUString const & sLocation)
 {
     if (!m_JRELocations)
-        m_JRELocations = o3tl::optional<std::vector<OUString> >(
+        m_JRELocations = std::optional<std::vector<OUString> >(
             std::vector<OUString> ());
      //only add the path if not already present
     std::vector<OUString>::const_iterator it =
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index df00365fd4c7..a064b93f80be 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -113,7 +113,7 @@ VendorSettings::VendorSettings():
     }
 }
 
-o3tl::optional<VersionInfo> VendorSettings::getVersionInformation(const OUString & sVendor) const
+std::optional<VersionInfo> VendorSettings::getVersionInformation(const OUString & sVendor) const
 {
     OSL_ASSERT(!sVendor.isEmpty());
     OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);