summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--include/sfx2/objface.hxx4
-rw-r--r--sc/source/ui/app/scmod.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx2
-rw-r--r--sfx2/source/appl/appmisc.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/control/objface.cxx22
-rw-r--r--starmath/source/smmod.cxx2
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
9 files changed, 20 insertions, 20 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index d98569719749..004d02aa2096 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -40,7 +40,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
void basctl_DocShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterStatusBar(IDEResId(SID_BASICIDE_STATUSBAR));
+ GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR);
}
DocShell::DocShell()
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 7ca1b97d4c89..a6999076e269 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -70,7 +70,7 @@ public:
void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId, sal_uInt32 nFeature);
void RegisterChildWindow(sal_uInt16, bool bContext = false);
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_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const;
@@ -83,7 +83,7 @@ public:
void RegisterPopupMenu( const OUString& );
const ResId& GetPopupMenuResId() const;
const OUString& GetPopupMenuName() const;
- const ResId& GetStatusBarResId() const;
+ sal_uInt32 GetStatusBarId() const;
void Register( SfxModule* );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 4d7e2d5105f9..f9afa31e9ddf 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -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,
RID_OBJECTBAR_APP);
- GetStaticInterface()->RegisterStatusBar(ScResId(SCCFG_STATUSBAR));
+ GetStaticInterface()->RegisterStatusBar(SCCFG_STATUSBAR);
}
ScModule::ScModule( SfxObjectFactory* pFact ) :
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index add56e7f777b..59f62db036d0 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -62,7 +62,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule)
void SdModule::InitInterface_Impl()
{
- GetStaticInterface()->RegisterStatusBar(SdResId(RID_DRAW_STATUSBAR));
+ GetStaticInterface()->RegisterStatusBar(RID_DRAW_STATUSBAR);
}
// Ctor
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
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 403597daf23e..f44151cb7919 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -155,7 +155,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule)
void SmModule::InitInterface_Impl()
{
- GetStaticInterface()->RegisterStatusBar(SmResId(RID_STATUSBAR));
+ GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR);
}
SmModule::SmModule(SfxObjectFactory* pObjFact) :
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 127fea2ebb58..a2fa67c7486b 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -141,7 +141,7 @@ SFX_IMPL_INTERFACE(SwModule, SfxModule)
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,
RID_MODULE_TOOLBOX);
generated by cgit (git 2.34.1) at 2024-06-30 16:15:52 +0000