diff options
Diffstat (limited to 'sc/inc/document.hxx')
-rw-r--r-- | sc/inc/document.hxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 678652e47fe7..7908be80dcc7 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -225,20 +225,6 @@ struct ScSheetLimits; struct ScDataAreaExtras; enum class ScConditionMode; -struct ScConditionEasyDialogData -{ - ScConditionMode* Mode = nullptr; - bool IsManaged : 1 = false; - - ScConditionEasyDialogData(ScConditionMode* mode, bool isManaged) - : Mode(mode) - , IsManaged(isManaged) - { - } - - ScConditionEasyDialogData() {} -}; - namespace sc { typedef std::map<OUString, BitmapEx> IconSetBitmapMap; @@ -479,7 +465,7 @@ private: std::unique_ptr<ScExtDocOptions> pExtDocOptions; // for import etc. std::unique_ptr<ScClipOptions> mpClipOptions; // clipboard options std::unique_ptr<ScConsolidateParam> pConsolidateDlgData; - ScConditionEasyDialogData pConditionalFormatDialogData; + std::unique_ptr<ScConditionMode> pConditionalFormatDialogMode; std::unique_ptr<ScAutoNameCache> pAutoNameCache; // for automatic name lookup during CompileXML @@ -727,10 +713,10 @@ public: void SetConsolidateDlgData( std::unique_ptr<ScConsolidateParam> pData ); const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData.get(); } - void SetEasyConditionalFormatDialogData(const ScConditionEasyDialogData& data); - const ScConditionEasyDialogData & GetEasyConditionalFormatDialogData() const + void SetEasyConditionalFormatDialogData(std::unique_ptr<ScConditionMode> pMode); + const ScConditionMode* GetEasyConditionalFormatDialogData() const { - return pConditionalFormatDialogData; + return pConditionalFormatDialogMode.get(); } void Clear( bool bFromDestructor = false ); |