diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-16 12:15:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-16 15:56:59 +0000 |
| commit | 7a16e77fa2f83df365390b8b71a71f29e0753a25 (patch) | |
| tree | 2ea09147a858682f7ad631ec73ba55a1f1603e3f /sc | |
| parent | ec67a31b56c990733e8eaaa89a354082e900c0e1 (diff) | |
replace switching off RID_SCPAGE_DEFAULTS with direct RID_SC_TP_DEFAULTS
Change-Id: Ie451c6f63d729af85334cabbe2469a44f431f3d3
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/sc.hrc | 5 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index eba9af3709fb..3738577aae3d 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1238,10 +1238,7 @@ // data Form #define SID_DATA_FORM (SC_DIALOGS_START + 168) // menu (in Data menu) -// init option page -#define RID_SCPAGE_DEFAULTS (SC_DIALOGS_START + 170) - -#define SC_DIALOGS_END (RID_SCPAGE_DEFAULTS + 1) +#define SC_DIALOGS_END (SID_DATA_FORM + 1) #define RID_GLOBSTR_OFFSET SC_DIALOGS_END diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 22add43fe710..b5342bcbc51b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2121,7 +2121,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent } case RID_SC_TP_DEFAULTS: { - ::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SCPAGE_DEFAULTS); + ::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_DEFAULTS); if (ScTpDefaultsOptionsCreate) pRet = (*ScTpDefaultsOptionsCreate)(pParent, &rSet); break; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 082d82a61a36..88825d7fbe8f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -970,7 +970,7 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI return ScTpFormulaOptions::Create; case SID_SC_TP_COMPATIBILITY: return ScTpCompatOptions::Create; - case RID_SCPAGE_DEFAULTS: + case RID_SC_TP_DEFAULTS: return ScTpDefaultsOptions::Create; case RID_SCPAGE_PRINT : return ScTpPrintOptions::Create; |