diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-01-17 11:01:13 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-17 11:16:47 +0000 |
commit | 8634c127d488a5aa8e994664b9ebc80860055fbf (patch) | |
tree | e6f16bfafb3191c5936f75410e5dde903f46fed4 /sc/inc | |
parent | 0deae796266da18442aaaec7759e8c64c65632ef (diff) |
convert pivot table subtotals data field dialog to .ui
Change-Id: I4ac7fb3a13cdc03d3c75cdd730bf39a7d814de99
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/helpids.h | 1 | ||||
-rw-r--r-- | sc/inc/sc.hrc | 1 | ||||
-rw-r--r-- | sc/inc/scabstdlg.hxx | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 2e0cf5ed5542..f9fd155b586a 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -53,7 +53,6 @@ // Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- #define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" #define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" -#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" #define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 97630f8d8419..9c51d903c7c5 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1017,7 +1017,6 @@ #define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33) #define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34) #define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35) -#define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38) #define RID_SCDLG_NEWSCENARIO (SC_DIALOGS_START + 39) #define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 9b63ee015264..068e54405758 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -421,7 +421,7 @@ public: const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) = 0; - virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, int nId, + virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, |