diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 07:26:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 14:50:28 +0100 |
commit | 9ad252b2e79576119c2d733a1a45fdd9e9f83140 (patch) | |
tree | 87fee16145d457b6799a05c389d85270476f7f35 /sc/inc/dptabsrc.hxx | |
parent | 3aca35f1505fa552eaa316a2d47a60ef52646525 (diff) |
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 "<"/">" 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>
Diffstat (limited to 'sc/inc/dptabsrc.hxx')
-rw-r--r-- | sc/inc/dptabsrc.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index a6ddf33e5c12..d0f23365fdc6 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -48,7 +48,7 @@ #include <unordered_map> #include <unordered_set> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> namespace com { namespace sun { namespace star { namespace sheet { @@ -109,7 +109,7 @@ private: bool bResultOverflow; bool bPageFiltered; // set if page field filters have been applied to cache table - o3tl::optional<OUString> mpGrandTotalName; + std::optional<OUString> mpGrandTotalName; void CreateRes_Impl(); void FillMemberResults(); @@ -144,7 +144,7 @@ public: ScDPTableData* GetData() { return pData; } const ScDPTableData* GetData() const { return pData; } - const o3tl::optional<OUString> & + const std::optional<OUString> & GetGrandTotalName() const; css::sheet::DataPilotFieldOrientation @@ -268,8 +268,8 @@ class ScDPDimension : public cppu::WeakImplHelper< rtl::Reference<ScDPHierarchies> mxHierarchies; ScGeneralFunction nFunction; OUString aName; // if empty, take from source - o3tl::optional<OUString> mpLayoutName; - o3tl::optional<OUString> mpSubtotalName; + std::optional<OUString> mpLayoutName; + std::optional<OUString> mpSubtotalName; long nSourceDim; // >=0 if dup'ed css::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" @@ -291,8 +291,8 @@ public: ScDPDimension* CreateCloneObject(); ScDPHierarchies* GetHierarchiesObject(); - const o3tl::optional<OUString> & GetLayoutName() const; - const o3tl::optional<OUString> & GetSubtotalName() const; + const std::optional<OUString> & GetLayoutName() const; + const std::optional<OUString> & GetSubtotalName() const; // XNamed virtual OUString SAL_CALL getName() override; @@ -604,7 +604,7 @@ private: long const nLev; SCROW const mnDataId; - o3tl::optional<OUString> mpLayoutName; + std::optional<OUString> mpLayoutName; sal_Int32 nPosition; // manual sorting bool bVisible; @@ -622,7 +622,7 @@ public: SCROW GetItemDataId() const { return mnDataId; } bool IsNamedItem(SCROW nIndex) const; - const o3tl::optional<OUString> & GetLayoutName() const; + const std::optional<OUString> & GetLayoutName() const; long GetDim() const { return nDim;} sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order |