Skip to content

C
core
Kaydet (Commit) 8378d3a7 authored tarafından Julien Nabet's avatar Julien Nabet
Dosyalara gözat
Seçenekler

cppcheck: Reduce scope 

Change-Id: I341c2b7112f32a0ab0e1a6dfac0ab4679310202c
üst 75761f0f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sfx2/source/toolbox/tbxitem.cxx
Dosyayı görüntüle @ 8378d3a7
...@@ -313,7 +313,6 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn ...@@ -313,7 +313,6 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
SfxToolBoxControl *pCtrl;
SfxApplication *pApp = SFX_APP(); SfxApplication *pApp = SFX_APP();
SfxSlotPool *pSlotPool; SfxSlotPool *pSlotPool;
...@@ -324,6 +323,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn ...@@ -324,6 +323,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
TypeId aSlotType = pSlotPool->GetSlotType( nSlotId ); TypeId aSlotType = pSlotPool->GetSlotType( nSlotId );
if ( aSlotType ) if ( aSlotType )
{ {
SfxToolBoxControl *pCtrl;
if ( pMod ) if ( pMod )
{ {
SfxTbxCtrlFactArr_Impl *pFactories = pMod->GetTbxCtrlFactories_Impl(); SfxTbxCtrlFactArr_Impl *pFactories = pMod->GetTbxCtrlFactories_Impl();
...@@ -841,7 +841,6 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar ...@@ -841,7 +841,6 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar
} }
pImpl->mxUIElement = xUIElement; pImpl->mxUIElement = xUIElement;
Window* pParentTbxWindow( pImpl->pBox );
Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
ToolBox* pToolBar( 0 ); ToolBox* pToolBar( 0 );
if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX )
...@@ -849,6 +848,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar ...@@ -849,6 +848,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar
if ( pToolBar ) if ( pToolBar )
{ {
Window* pParentTbxWindow( pImpl->pBox );
pToolBar->SetParent( pParentTbxWindow ); pToolBar->SetParent( pParentTbxWindow );
::Size aSize = getPersistentFloatingSize( xFrame, rSubToolBarResName ); ::Size aSize = getPersistentFloatingSize( xFrame, rSubToolBarResName );
if ( aSize.Width() == 0 || aSize.Height() == 0 ) if ( aSize.Width() == 0 || aSize.Height() == 0 )
......
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