Kaydet (Commit) 5ea0d6b1 authored tarafından Caolán McNamara's avatar Caolán McNamara

these ResIds are used solely for their number by now

so cut out the middle-man ResId

Change-Id: Ic83db355cc1a0c7dc70958bca79b466baadaedd0
üst faba0876
...@@ -40,7 +40,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell) ...@@ -40,7 +40,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
void basctl_DocShell::InitInterface_Impl() void basctl_DocShell::InitInterface_Impl()
{ {
GetStaticInterface()->RegisterStatusBar(IDEResId(SID_BASICIDE_STATUSBAR)); GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR);
} }
DocShell::DocShell() DocShell::DocShell()
......
...@@ -70,7 +70,7 @@ public: ...@@ -70,7 +70,7 @@ public:
void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId, sal_uInt32 nFeature); void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId, sal_uInt32 nFeature);
void RegisterChildWindow(sal_uInt16, bool bContext = false); void RegisterChildWindow(sal_uInt16, bool bContext = false);
void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature); void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature);
void RegisterStatusBar( const ResId& ); void RegisterStatusBar(sal_uInt32 nResId);
sal_uInt32 GetObjectBarId(sal_uInt16 nNo) const; sal_uInt32 GetObjectBarId(sal_uInt16 nNo) const;
sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const; sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const;
...@@ -83,7 +83,7 @@ public: ...@@ -83,7 +83,7 @@ public:
void RegisterPopupMenu( const OUString& ); void RegisterPopupMenu( const OUString& );
const ResId& GetPopupMenuResId() const; const ResId& GetPopupMenuResId() const;
const OUString& GetPopupMenuName() const; const OUString& GetPopupMenuName() const;
const ResId& GetStatusBarResId() const; sal_uInt32 GetStatusBarId() const;
void Register( SfxModule* ); void Register( SfxModule* );
......
...@@ -126,7 +126,7 @@ void ScModule::InitInterface_Impl() ...@@ -126,7 +126,7 @@ void ScModule::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
RID_OBJECTBAR_APP); RID_OBJECTBAR_APP);
GetStaticInterface()->RegisterStatusBar(ScResId(SCCFG_STATUSBAR)); GetStaticInterface()->RegisterStatusBar(SCCFG_STATUSBAR);
} }
ScModule::ScModule( SfxObjectFactory* pFact ) : ScModule::ScModule( SfxObjectFactory* pFact ) :
......
...@@ -62,7 +62,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule) ...@@ -62,7 +62,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule)
void SdModule::InitInterface_Impl() void SdModule::InitInterface_Impl()
{ {
GetStaticInterface()->RegisterStatusBar(SdResId(RID_DRAW_STATUSBAR)); GetStaticInterface()->RegisterStatusBar(RID_DRAW_STATUSBAR);
} }
// Ctor // Ctor
......
...@@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell) ...@@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell)
void SfxApplication::InitInterface_Impl() void SfxApplication::InitInterface_Impl()
{ {
GetStaticInterface()->RegisterStatusBar(SfxResId(SFX_ITEMTYPE_STATBAR)); GetStaticInterface()->RegisterStatusBar(SFX_ITEMTYPE_STATBAR);
GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0);
GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1);
......
...@@ -1368,7 +1368,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne ...@@ -1368,7 +1368,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
if ( bIsMDIApp || bIsIPOwner ) if ( bIsMDIApp || bIsIPOwner )
{ {
sal_uInt32 nId = pIFace->GetStatusBarResId().GetId(); sal_uInt32 nId = pIFace->GetStatusBarId();
if ( nId ) if ( nId )
{ {
nStatBarId = nId; nStatBarId = nId;
......
...@@ -78,14 +78,14 @@ struct SfxInterface_Impl ...@@ -78,14 +78,14 @@ struct SfxInterface_Impl
SfxObjectUIArr_Impl aObjectBars; // registered ObjectBars SfxObjectUIArr_Impl aObjectBars; // registered ObjectBars
SfxObjectUIArr_Impl aChildWindows; // registered ChildWindows SfxObjectUIArr_Impl aChildWindows; // registered ChildWindows
OUString aPopupName; // registered PopupMenu OUString aPopupName; // registered PopupMenu
ResId aStatBarRes; // registered StatusBar sal_uInt32 nStatBarResId; // registered StatusBar
SfxModule* pModule; SfxModule* pModule;
bool bRegistered; bool bRegistered;
SfxInterface_Impl() : SfxInterface_Impl()
aStatBarRes(nullptr, *SfxApplication::GetSfxResManager()) : nStatBarResId(0)
, pModule(nullptr) , pModule(nullptr)
, bRegistered(false) , bRegistered(false)
{ {
} }
...@@ -444,9 +444,9 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 ...@@ -444,9 +444,9 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32
pImpData->aChildWindows.push_back(pUI); 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 sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
...@@ -502,12 +502,12 @@ const OUString& SfxInterface::GetPopupMenuName() const ...@@ -502,12 +502,12 @@ const OUString& SfxInterface::GetPopupMenuName() const
return pImpData->aPopupName; return pImpData->aPopupName;
} }
const ResId& SfxInterface::GetStatusBarResId() const sal_uInt32 SfxInterface::GetStatusBarId() const
{ {
if (pImpData->aStatBarRes.GetId() == 0 && pGenoType) if (pImpData->nStatBarResId == 0 && pGenoType)
return pGenoType->GetStatusBarResId(); return pGenoType->GetStatusBarId();
else else
return pImpData->aStatBarRes; return pImpData->nStatBarResId;
} }
sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
......
...@@ -155,7 +155,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule) ...@@ -155,7 +155,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule)
void SmModule::InitInterface_Impl() void SmModule::InitInterface_Impl()
{ {
GetStaticInterface()->RegisterStatusBar(SmResId(RID_STATUSBAR)); GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR);
} }
SmModule::SmModule(SfxObjectFactory* pObjFact) : SmModule::SmModule(SfxObjectFactory* pObjFact) :
......
...@@ -141,7 +141,7 @@ SFX_IMPL_INTERFACE(SwModule, SfxModule) ...@@ -141,7 +141,7 @@ SFX_IMPL_INTERFACE(SwModule, SfxModule)
void SwModule::InitInterface_Impl() void SwModule::InitInterface_Impl()
{ {
GetStaticInterface()->RegisterStatusBar(SW_RES(CFG_STATUSBAR)); GetStaticInterface()->RegisterStatusBar(CFG_STATUSBAR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
RID_MODULE_TOOLBOX); RID_MODULE_TOOLBOX);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment