diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 14:41:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 16:36:00 +0000 |
| commit | e2e26d21f2c16904228748407414c1c6a4b5dbe7 (patch) | |
| tree | f99e3d9cf81ac29872afed9eab5d439b5e6d51b8 /sfx2 | |
| parent | 5a1ff4db38588bcf222cea24050c64d41b53635a (diff) | |
nothing is then consuming the SetObjectBar_Impl pName arg
Change-Id: Ib45f28cae69983848a0fa524bed747512dcab1c0
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 50a6f76bab9a..6a9a71668540 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1134,8 +1134,8 @@ void SfxWorkWindow::ResetObjectBars_Impl() aChildWins[n]->nId = 0; } -void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, - SfxInterface* pIFace, const OUString *pName) +void SfxWorkWindow::SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId, + SfxInterface* pIFace) { DBG_ASSERT( (nPos & SFX_POSITION_MASK) < SFX_OBJECTBAR_MAX, "object bar position overflow" ); @@ -1143,7 +1143,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK; if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) ) { - pParent->SetObjectBar_Impl( nPos, nResId, pIFace, pName ); + pParent->SetObjectBar_Impl(nPos, nResId, pIFace); return; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index d2f286b81dd1..d722dfddb7d6 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1339,8 +1339,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( bUIActive || bIsActive ) { - pWorkWin->SetObjectBar_Impl( - nPos, rBar.nResId, rBar.pIFace, &rBar.aName ); + pWorkWin->SetObjectBar_Impl(nPos, rBar.nResId, rBar.pIFace); } if ( !bVisible ) @@ -1403,8 +1402,8 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne { SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos]; rBar = rFixed; - pWorkWin->SetObjectBar_Impl( rFixed.nMode, - rFixed.nResId, rFixed.pIFace, &rFixed.aName ); + pWorkWin->SetObjectBar_Impl(rFixed.nMode, + rFixed.nResId, rFixed.pIFace); } } diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 8f902b161d1d..f9bde5b23605 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -290,8 +290,8 @@ public: // Methods for Objectbars virtual void UpdateObjectBars_Impl(); void ResetObjectBars_Impl(); - void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, - SfxInterface *pIFace, const OUString* pName=0 ); + void SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId, + SfxInterface *pIFace); bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; bool IsVisible_Impl(); void MakeVisible_Impl( bool ); |