summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-06-01 05:41:51 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-06-11 08:01:22 +0200
commitf76aa6633452b1bc82d6742986b86f7045c3a7a0 (patch)
tree2d590799fe20328bc6d8a6eaf97d65d10d043542 /sc/inc
parent17675467b695967bcb02356be617448949ee60a5 (diff)
first part for new conditional format dialog
Change-Id: I97d025e468d6c90cdb780c3654706df20300429a
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/sc.hrc1
-rw-r--r--sc/inc/scabstdlg.hxx7
-rw-r--r--sc/inc/sccommands.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 5ab3de4b091c..2d2c3f975666 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -376,7 +376,6 @@
#define FID_TABLE_SHOW (FORMAT_MENU_START + 10)
#define SID_COLORSCALE (FORMAT_MENU_START + 11)
#define SID_DATABAR (FORMAT_MENU_START + 12)
-#define FID_CONDITIONAL_FORMAT (FORMAT_MENU_START + 13)
#define SID_SCSTYLES (FORMAT_MENU_START + 14)
#define FID_MERGE_ON (FORMAT_MENU_START + 15)
#define FID_MERGE_OFF (FORMAT_MENU_START + 16)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0904646e816d..f91be6650197 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -85,6 +85,10 @@ public:
virtual sal_Bool IsRow() = 0;
};
+class AbstractScCondFormatDlg : public VclAbstractDialog
+{
+};
+
class AbstractScDataBarSettingsDlg : public VclAbstractDialog
{
};
@@ -352,6 +356,9 @@ public:
sal_Bool bColDefault = sal_True ) = 0;
virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg
+ virtual AbstractScCondFormatDlg* CreateScCondFormatDlg (Window* pParent, ScDocument* pDoc, ScConditionalFormat* pFormat,
+ const ScRangeList& rList, int nId ) = 0; //add for ScCondFormatDlg
+
virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent ,int nId ) = 0; //add for ScDataBarSettingsDlg
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 450f57f6ae5c..4ffa9909e78b 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -71,7 +71,6 @@
#define CMD_SID_RANGE_COL ".uno:Column"
#define CMD_FID_COL_WIDTH ".uno:ColumnWidth"
#define CMD_FID_CHG_COMMENT ".uno:CommentChange"
-#define CMD_FID_CONDITIONAL_FORMAT ".uno:ConditionalFormat"
#define CMD_SID_OPENDLG_CONDFRMT ".uno:ConditionalFormatDialog"
#define CMD_SID_CONSOLIDATE ".uno:ConsolidateExec"
#define CMD_FID_USE_NAME ".uno:CreateNames"