summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-07 03:22:22 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-09 06:33:16 +0200
commita1e53f7d14948c714382ae0961303b963bddc1e8 (patch)
tree7c1ebaaecbc866781eb4a15a1ff48255e8f50796 /sc/source/ui/inc
parentffadab26d62a24f3a142c497669db5a933ba1251 (diff)
make the different options to cal the dialog work again
Change-Id: I947a4cac8f0417737bb8833eab54c67e57c8293e
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/condformatdlg.hxx5
-rw-r--r--sc/source/ui/inc/reffact.hxx4
2 files changed, 8 insertions, 1 deletions
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 8fbf5b11c9b7..529cd149ab32 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -205,10 +205,14 @@ private:
ScAddress maPos;
ScDocument* mpDoc;
+ condformat::dialog::ScCondFormatDialogType meType;
+
DECL_LINK( EdRangeModifyHdl, Edit* );
DECL_LINK( OkBtnHdl, void* );
DECL_LINK( CancelBtnHdl, void* );
+ virtual sal_Bool Close();
+
public:
ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pSW, Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat,
const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType);
@@ -218,6 +222,7 @@ public:
virtual void SetReference(const ScRange&, ScDocument*);
virtual void SetActive();
+ virtual sal_Bool IsTableLocked() const { return sal_True; }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 2a454c257133..e906e8c6cb4b 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -45,7 +45,9 @@
DECL_WRAPPER_WITHID(ScNameDlgWrapper)
DECL_WRAPPER_WITHID(ScNameDefDlgWrapper)
-DECL_WRAPPER_WITHID(ScCondFormatDlgWrapper)
+DECL_WRAPPER_WITHID(ScCondFormatConditionDlgWrapper)
+DECL_WRAPPER_WITHID(ScCondFormatColorScaleDlgWrapper)
+DECL_WRAPPER_WITHID(ScCondFormatDataBarDlgWrapper)
DECL_WRAPPER_WITHID(ScSolverDlgWrapper)
DECL_WRAPPER_WITHID(ScOptSolverDlgWrapper)
DECL_WRAPPER_WITHID(ScPivotLayoutWrapper)