diff options
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 |