diff options
Diffstat (limited to 'sc/inc/dpsave.hxx')
-rw-r--r-- | sc/inc/dpsave.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index e7c9d0b8462c..f8aa2d100b23 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -32,7 +32,7 @@ #include <unordered_map> #include <unordered_set> -#include <o3tl/optional.hxx> +#include <optional> namespace com { namespace sun { namespace star { namespace sheet { class XDimensionsSupplier; @@ -52,7 +52,7 @@ class ScDPSaveMember { private: OUString aName; - o3tl::optional<OUString> mpLayoutName; // custom name to be displayed in the table. + std::optional<OUString> mpLayoutName; // custom name to be displayed in the table. sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; @@ -79,7 +79,7 @@ public: void SetName( const OUString& rNew ); // used if the source member was renamed (groups) SC_DLLPUBLIC void SetLayoutName( const OUString& rName ); - SC_DLLPUBLIC const o3tl::optional<OUString> & GetLayoutName() const; + SC_DLLPUBLIC const std::optional<OUString> & GetLayoutName() const; void RemoveLayoutName(); void WriteToSource( const css::uno::Reference<css::uno::XInterface>& xMember, @@ -94,8 +94,8 @@ class SC_DLLPUBLIC ScDPSaveDimension { private: OUString aName; - o3tl::optional<OUString> mpLayoutName; - o3tl::optional<OUString> mpSubtotalName; + std::optional<OUString> mpLayoutName; + std::optional<OUString> mpSubtotalName; bool bIsDataLayout; bool bDupFlag; css::sheet::DataPilotFieldOrientation nOrientation; @@ -170,10 +170,10 @@ public: { return nUsedHierarchy; } void SetLayoutName(const OUString& rName); - const o3tl::optional<OUString> & GetLayoutName() const; + const std::optional<OUString> & GetLayoutName() const; void RemoveLayoutName(); void SetSubtotalName(const OUString& rName); - const o3tl::optional<OUString> & GetSubtotalName() const; + const std::optional<OUString> & GetSubtotalName() const; void RemoveSubtotalName(); bool IsMemberNameInUse(const OUString& rName) const; @@ -252,7 +252,7 @@ private: * created. */ bool mbDimensionMembersBuilt; - o3tl::optional<OUString> mpGrandTotalName; + std::optional<OUString> mpGrandTotalName; mutable std::unique_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree. public: @@ -265,7 +265,7 @@ public: bool operator== ( const ScDPSaveData& r ) const; SC_DLLPUBLIC void SetGrandTotalName(const OUString& rName); - SC_DLLPUBLIC const o3tl::optional<OUString> & GetGrandTotalName() const; + SC_DLLPUBLIC const std::optional<OUString> & GetGrandTotalName() const; const DimsType& GetDimensions() const { return m_DimList; } |