diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2024-11-25 19:42:55 +0530 |
|---|---|---|
| committer | Pranam Lashkari <lpranam@collabora.com> | 2024-12-03 16:08:04 +0100 |
| commit | 36108acc124efd73a5e69f5780e8e8220cf0875c (patch) | |
| tree | d83a3a6f6cf44fa175c28c7e7d4e7fedc03ff931 /sc/source/ui/inc | |
| parent | dcf48b9d2dab74412b024ec1a3c12a6348f0c5f1 (diff) | |
Revert "sc: now conditions can be edited from easy conditional format dialog"
This reverts commit 8115c82f1f7f2621e2d99c93e1a3b2196279602a.
Change-Id: Ie3f389561ee8f734ac76b3dec352382281f91c30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177284
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177335
Tested-by: Pranam Lashkari <lpranam@collabora.com>
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/condformateasydlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/condformatmgr.hxx | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/ui/inc/condformateasydlg.hxx b/sc/source/ui/inc/condformateasydlg.hxx index 6dfa19c37752..e2824539fd5f 100644 --- a/sc/source/ui/inc/condformateasydlg.hxx +++ b/sc/source/ui/inc/condformateasydlg.hxx @@ -46,8 +46,6 @@ private: bool mbIsManaged; OUString msFormula; ScAddress maPosition; - sal_Int32 mnFormatKey; - sal_Int32 mnEntryIndex; SvxFontPrevWindow maWdPreview; std::unique_ptr<weld::Entry> mxNumberEntry; diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 301f74499063..09b6c571e562 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -32,9 +32,7 @@ public: void DeleteSelection(); ScConditionalFormat* GetSelection(); - const ScFormatEntry* GetSelectedEntry() const; - sal_Int32 GetSelectedFormatKey() const; - sal_Int32 GetSelectedEntryIndex() const; + const ScFormatEntry* GetSelectedEntry(); }; class ScCondFormatManagerDlg : public weld::GenericDialogController @@ -48,7 +46,8 @@ public: bool CondFormatsChanged() const; void SetModified(); - void ShowEasyConditionalDialog(bool isEdit = false); + ScConditionalFormat* GetCondFormatSelected(); + void ShowEasyConditionalDialog(); private: bool m_bModified; |