fdo#39440 reduce scope of local variables

This addresses some cppcheck warnings.

Change-Id: Ib16e4ecc0e0c43b2c1fb527eb0668a960ae9756e
Reviewed-on: https://gerrit.libreoffice.org/13513
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 11 insertions, 20 deletions

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 492f6f7c9a68..7411c55b89da 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -103,9 +103,7 @@ bool HelpParser::CreatePO(
         return false;
     }
 
-    XMLHashMap*  aXMLStrHM   = file->GetStrings();
-    LangHashMap* pElem;
-    XMLElement*  pXMLElement  = NULL;
+    XMLHashMap* aXMLStrHM = file->GetStrings();
 
     std::vector<OString> order = file->getOrder();
     std::vector<OString>::iterator pos;
@@ -114,9 +112,9 @@ bool HelpParser::CreatePO(
     for( pos = order.begin(); pos != order.end() ; ++pos )
     {
         posm = aXMLStrHM->find( *pos );
-        pElem = posm->second;
+        LangHashMap* pElem = posm->second;
 
-        pXMLElement = (*pElem)[ "en-US" ];
+        XMLElement* pXMLElement = (*pElem)[ "en-US" ];
 
         if( pXMLElement != NULL )
         {
@@ -167,8 +165,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile
 {
     file->Extract();
 
-       XMLHashMap*   aXMLStrHM     = file->GetStrings();
-    LangHashMap*  aLangHM;
+    XMLHashMap* aXMLStrHM = file->GetStrings();
     static  ResData pResData("","");
     pResData.sResTyp   = "help";
 
@@ -179,7 +176,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile
     for( pos = order.begin(); pos != order.end() ; ++pos ) // Merge every l10n related string in the same order as export
     {
         posm = aXMLStrHM->find( *pos );
-        aLangHM = posm->second;
+        LangHashMap*  aLangHM = posm->second;
 #if OSL_DEBUG_LEVEL > 2
         printf("*********************DUMPING HASHMAP***************************************");
         Dump(aXMLStrHM);
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 2c376cf8c675..6b2a30425848 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -89,10 +89,9 @@ XMLParentNode::XMLParentNode( const XMLParentNode& rObj)
     if( rObj.m_pChildList )
     {
         m_pChildList=new XMLChildNodeList();
-        XMLChildNode* pNode = NULL;
         for ( size_t i = 0; i < rObj.m_pChildList->size(); i++ )
         {
-            pNode = (*rObj.m_pChildList)[ i ];
+            XMLChildNode* pNode = (*rObj.m_pChildList)[ i ];
             if( pNode != NULL)
             {
                 switch(pNode->GetNodeType())
@@ -529,12 +528,11 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
         {
             case XML_NODE_TYPE_FILE:
             {
-                XMLParentNode* pElement;
                 if( GetChildList())
                 {
                     for ( size_t i = 0; i < GetChildList()->size(); i++ )
                     {
-                        pElement = static_cast<XMLParentNode*>((*GetChildList())[ i ]);
+                        XMLParentNode* pElement = static_cast<XMLParentNode*>((*GetChildList())[ i ]);
                         if( pElement->GetNodeType() ==  XML_NODE_TYPE_ELEMENT ) CheckExportStatus( pElement );//, i);
                     }
                 }
@@ -660,18 +658,16 @@ void XMLElement::ChangeLanguageTag( const OString &rValue )
                 (*m_pAttributes)[ i ]->setValue(rValue);
         }
     }
-    XMLChildNode* pNode  = NULL;
-    XMLElement*   pElem  = NULL;
     XMLChildNodeList* pCList = GetChildList();
 
     if( pCList )
     {
         for ( size_t i = 0; i < pCList->size(); i++ )
         {
-            pNode = (*pCList)[ i ];
+            XMLChildNode* pNode = (*pCList)[ i ];
             if( pNode && pNode->GetNodeType() == XML_NODE_TYPE_ELEMENT )
             {
-                pElem = static_cast< XMLElement* >(pNode);
+                XMLElement* pElem = static_cast< XMLElement* >(pNode);
                 pElem->ChangeLanguageTag( rValue );
                 pElem->SetLanguageId(rValue);
                 pElem  = NULL;
@@ -712,10 +708,9 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement
             {
                 if ( pElement->GetChildList())
                 {
-                    XMLChildNode* pTmp = 0;
                     for ( size_t k = 0; k < pElement->GetChildList()->size(); k++ )
                     {
-                        pTmp = (*pElement->GetChildList())[ k ];
+                        XMLChildNode* pTmp = (*pElement->GetChildList())[ k ];
                         Print( pTmp, rBuffer , false);
                     }
                 }
@@ -751,10 +746,9 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement
                         else
                         {
                             rBuffer.append( ">" );
-                            XMLChildNode* pTmp = 0;
                             for ( size_t k = 0; k < pElement->GetChildList()->size(); k++ )
                             {
-                                pTmp = (*pElement->GetChildList())[ k ];
+                                XMLChildNode* pTmp = (*pElement->GetChildList())[ k ];
                                 Print( pTmp, rBuffer , false);
                             }
                             rBuffer.append( "</" + pElement->GetName() + ">" );