diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 15:22:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 15:26:42 +0000 |
| commit | 5ea0d6b10dc641fe36f0ada2c182f4482554f461 (patch) | |
| tree | 433222a53e3029d7777a02cc1b5aadc594929a9c /sfx2 | |
| parent | faba0876638582b8b3d7ece80ca2ae170d03f4bb (diff) | |
these ResIds are used solely for their number by now
so cut out the middle-man ResId
Change-Id: Ic83db355cc1a0c7dc70958bca79b466baadaedd0
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/objface.cxx | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 3721838847c1..3e3b419f9a85 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell) void SfxApplication::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(SfxResId(SFX_ITEMTYPE_STATBAR)); + GetStaticInterface()->RegisterStatusBar(SFX_ITEMTYPE_STATBAR); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 576a2b915a2b..7851e1f0dfbb 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1368,7 +1368,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( bIsMDIApp || bIsIPOwner ) { - sal_uInt32 nId = pIFace->GetStatusBarResId().GetId(); + sal_uInt32 nId = pIFace->GetStatusBarId(); if ( nId ) { nStatBarId = nId; diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index b180f4010009..49535d3cde6d 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -78,14 +78,14 @@ struct SfxInterface_Impl SfxObjectUIArr_Impl aObjectBars; // registered ObjectBars SfxObjectUIArr_Impl aChildWindows; // registered ChildWindows OUString aPopupName; // registered PopupMenu - ResId aStatBarRes; // registered StatusBar + sal_uInt32 nStatBarResId; // registered StatusBar SfxModule* pModule; bool bRegistered; - SfxInterface_Impl() : - aStatBarRes(nullptr, *SfxApplication::GetSfxResManager()) - , pModule(nullptr) - , bRegistered(false) + SfxInterface_Impl() + : nStatBarResId(0) + , pModule(nullptr) + , bRegistered(false) { } @@ -444,9 +444,9 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 pImpData->aChildWindows.push_back(pUI); } -void SfxInterface::RegisterStatusBar(const ResId& rResId) +void SfxInterface::RegisterStatusBar(sal_uInt32 nResId) { - pImpData->aStatBarRes = rResId; + pImpData->nStatBarResId = nResId; } sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const @@ -502,12 +502,12 @@ const OUString& SfxInterface::GetPopupMenuName() const return pImpData->aPopupName; } -const ResId& SfxInterface::GetStatusBarResId() const +sal_uInt32 SfxInterface::GetStatusBarId() const { - if (pImpData->aStatBarRes.GetId() == 0 && pGenoType) - return pGenoType->GetStatusBarResId(); + if (pImpData->nStatBarResId == 0 && pGenoType) + return pGenoType->GetStatusBarId(); else - return pImpData->aStatBarRes; + return pImpData->nStatBarResId; } sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const |