diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 14:56:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 16:36:01 +0000 |
| commit | 6283d3d4c3019c3435a7465ad7b072f83b0e7cc9 (patch) | |
| tree | 5a14eab9a30b4e8abf9f033857200f88648667d4 | |
| parent | ce7a7c63eaf14e586bf48e4c35b50acf382c6de2 (diff) | |
in passing RegisterChildWindow already never used its pStr arg
Change-Id: I506581507f078a87088c85867724f1c446ea76d5
| -rw-r--r-- | include/sfx2/objface.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/objface.cxx | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 728e31b5ae6b..32e009039728 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -72,8 +72,8 @@ public: void RegisterObjectBar(sal_uInt16, const ResId&); void RegisterObjectBar(sal_uInt16, const ResId&, sal_uInt32 nFeature); - void RegisterChildWindow( sal_uInt16, bool bContext = false, const OUString* pST=0 ); - void RegisterChildWindow( sal_uInt16, bool bContext, sal_uInt32 nFeature, const OUString* pST=0 ); + void RegisterChildWindow(sal_uInt16, bool bContext = false); + void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature); void RegisterStatusBar( const ResId& ); const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 3a6cff319946..00309db6532c 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -449,13 +449,12 @@ sal_uInt16 SfxInterface::GetObjectBarCount() const return pImpData->aObjectBars.size(); } - -void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, const OUString* pChildWinName) +void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext) { - RegisterChildWindow( nId, bContext, 0UL, pChildWinName ); + RegisterChildWindow(nId, bContext, 0UL); } -void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature, const OUString*) +void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature) { SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), true, nFeature); pUI->bContext = bContext; |