cppcheck:variableScope

Change-Id: I037feb335499629300309851dcda3bb661f03d4f
Reviewed-on: https://gerrit.libreoffice.org/19316
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 22 insertions, 36 deletions

diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 6f9cb4058204..f78ed7f72dab 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -82,21 +82,8 @@ void RscTypCont::Init()
     RscTop   *  pClassKeyCode;
     RscTop   *  pLangClassKeyCode;
     RscTop   *  pClassAccelItem;
-    RscTop   *  pClassAccel;
-    RscTop   *  pClassMenuItem;
-    RscTop   *  pClassMenu;
-    RscTop   *  pClassSplitWindow;
-    RscTop   *  pClassSpinButton;
     RscTop   *  pClassSpinField;
-    RscTop   *  pClassNumericField;
-    RscTop   *  pClassMetricField;
-    RscTop   *  pClassDockingWindow;
-    RscTop   *  pClassToolBoxItem;
-    RscTop   *  pClassToolBox;
-    RscTop   *  pClassFixedLine;
-    RscTop *    pClassSfxStyleFamilyItem;
-    RscTop *    pClassSfxTemplateDialog;
-    RscTop *    pClassSfxSlotInfo;
+    RscTop   *  pClassAccel;
 
     Atom        nId;
 
@@ -393,11 +380,11 @@ void RscTypCont::Init()
     pClassAccelItem->SetVariable( nId, pClassAccel, NULL, VAR_SVDYNAMIC,
                                ACCELITEM_ACCEL );
 
-    pClassMenuItem = InitClassMenuItem( pClassMgr, pClassBitmap,
+    RscTop* pClassMenuItem = InitClassMenuItem( pClassMgr, pClassBitmap,
                                         pLangClassKeyCode );
     pRoot->Insert( pClassMenuItem );
 
-    pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem );
+    RscTop* pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem );
     pRoot->Insert( pClassMenu );
 
     // pClassMenu is only completely defined here
@@ -406,12 +393,12 @@ void RscTypCont::Init()
                                  RSC_MENUITEM_MENU );
 }
 {
-    pClassSplitWindow = InitClassSplitWindow( pClassWindow );
+    RscTop* pClassSplitWindow = InitClassSplitWindow( pClassWindow );
     pRoot->Insert( pClassSplitWindow );
 
     // initialize class
     nId = pHS->getID( "SpinButton" );
-    pClassSpinButton = new RscClass( nId, RSC_SPINBUTTON, pClassControl );
+    RscTop*  pClassSpinButton = new RscClass( nId, RSC_SPINBUTTON, pClassControl );
     pClassSpinButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
     aNmTb.Put( nId, CLASSNAME, pClassSpinButton );
     {
@@ -434,38 +421,37 @@ void RscTypCont::Init()
 }
 {
     { // hand-made multiple inheritance
-    RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
-    aBaseLst.push_back( pClassTmp );
+        RscTop* pClassTmp = InitClassNumericFormatter( pClassSpinField );
+        aBaseLst.push_back( pClassTmp );
 
-    pClassNumericField = InitClassNumericField( pClassTmp );
-    pRoot->Insert( pClassNumericField );
+        RscTop* pClassNumericField = InitClassNumericField( pClassTmp );
+        pRoot->Insert( pClassNumericField );
     }
     { // hand-made multiple inheritance
-    RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
-    aBaseLst.push_back( pClassTmp );
-    pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
-    aBaseLst.push_back( pClassTmp );
+        RscTop* pClassTmp = InitClassNumericFormatter( pClassSpinField );
+        aBaseLst.push_back( pClassTmp );
+        pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
+        aBaseLst.push_back( pClassTmp );
 
-    pClassMetricField = InitClassMetricField( pClassTmp );
-    pRoot->Insert( pClassMetricField );
+        RscTop* pClassMetricField = InitClassMetricField( pClassTmp );
+        pRoot->Insert( pClassMetricField );
     }
 }
 {
-    pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
+    RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
     pRoot->Insert( pClassDockingWindow );
 
-    pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap,
+    RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap,
                                               pClassImage, pTriState );
     pRoot->Insert( pClassToolBoxItem );
 
-    pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem,
+    RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem,
                                       pClassImageList );
     pRoot->Insert( pClassToolBox );
 
     // initialize class
     nId = pHS->getID( "FixedLine" );
-    pClassFixedLine =
-          new RscClass( nId, RSC_FIXEDLINE, pClassControl );
+    RscTop* pClassFixedLine = new RscClass( nId, RSC_FIXEDLINE, pClassControl );
     pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
 
     INS_WINBIT(pClassFixedLine,Vert)
@@ -473,17 +459,17 @@ void RscTypCont::Init()
     aNmTb.Put( nId, CLASSNAME, pClassFixedLine );
     pRoot->Insert( pClassFixedLine );
 
-    pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
+    RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
                                                    pClassBitmap,
                                                    pClassImage,
                                                    pLangStringLongTupelList );
     pRoot->Insert( pClassSfxStyleFamilyItem );
 
-    pClassSfxTemplateDialog = InitClassSfxTemplateDialog( pClassMgr,
+    RscTop* pClassSfxTemplateDialog = InitClassSfxTemplateDialog( pClassMgr,
                                                   pClassSfxStyleFamilyItem );
     pRoot->Insert( pClassSfxTemplateDialog );
 
-    pClassSfxSlotInfo = InitClassSfxSlotInfo( pClassMgr );
+    RscTop* pClassSfxSlotInfo = InitClassSfxSlotInfo( pClassMgr );
     pRoot->Insert( pClassSfxSlotInfo );
 }