Kaydet (Commit) 22cc0d39 authored tarafından Caolán McNamara's avatar Caolán McNamara

so nothing consumes SfxObjectBars_Impl's name

Change-Id: I7bd8c0078656bc6fb9d144db8c65dfb8ca304b22
üst e2e26d21
...@@ -89,7 +89,6 @@ struct SfxObjectBars_Impl ...@@ -89,7 +89,6 @@ struct SfxObjectBars_Impl
{ {
sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox
sal_uInt16 nMode; // special visibility flags sal_uInt16 nMode; // special visibility flags
OUString aName;
SfxInterface* pIFace; SfxInterface* pIFace;
SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {} SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {}
...@@ -1330,11 +1329,6 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne ...@@ -1330,11 +1329,6 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos & SFX_POSITION_MASK]; SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos & SFX_POSITION_MASK];
rBar.nMode = nPos; rBar.nMode = nPos;
rBar.nResId = pIFace->GetObjectBarResId(nNo).GetId(); rBar.nResId = pIFace->GetObjectBarResId(nNo).GetId();
const OUString *pName = pIFace->GetObjectBarName(nNo);
if ( pName )
rBar.aName = *pName;
else
rBar.aName = "";
rBar.pIFace = pIFace; rBar.pIFace = pIFace;
if ( bUIActive || bIsActive ) if ( bUIActive || bIsActive )
......
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