summaryrefslogtreecommitdiffstats
path: root/sc/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-19 08:55:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-19 11:31:09 +0000
commit6f754f4bd7223155591cfa9df05973db5116be81 (patch)
treea77aa298378f29e80b5e65f272c7bd3579d43730 /sc/inc
parentuse proper LanguageTag fallback instead of dumb startsWith(), fdo#68714 (diff)
downloadcore-6f754f4bd7223155591cfa9df05973db5116be81.tar.gz
core-6f754f4bd7223155591cfa9df05973db5116be81.zip
convert subtotals dialog to .ui
Change-Id: Icab4e598c5355a1e971fdaa5a0a4d0d72c703021
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/sc.hrc2
-rw-r--r--sc/inc/scabstdlg.hxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a1de7167949f..dafcf69268f2 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1004,7 +1004,7 @@
#define RID_SCDLG_NAMES (SC_DIALOGS_START + 22)
#define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23)
#define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26)
-#define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27)
+
#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
#define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31)
#define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index cdd08eb4cef7..84146181b299 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -492,8 +492,7 @@ public:
int nId) = 0;
virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent,
- const SfxItemSet* pArgSet,
- int nId) = 0;
+ const SfxItemSet* pArgSet ) = 0;
virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell, int nId ) = 0;