fdo#39440 reduce scope of local variables

This addresses some cppcheck warnings.

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

forms/source/component/Grid.cxx

@@ -780,11 +780,10 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
     // 2. Columns
     sal_Int32 nLen = getCount();
     _rxOutStream->writeLong(nLen);
-    OGridColumn* pCol;
     for (sal_Int32 i = 0; i < nLen; i++)
     {
         // first the service name for the unerlying model
-        pCol = getColumnImplementation(m_aItems[i]);
+        OGridColumn* pCol = getColumnImplementation(m_aItems[i]);
         DBG_ASSERT(pCol != NULL, "OGridControlModel::write : such items should never reach it into my container !");
         _rxOutStream << pCol->getModelName();
         // then the object itself

forms/source/runtime/formoperations.cxx

@@ -1040,11 +1040,11 @@ namespace frm
 
         if ( m_xCursor.is() && ( m_xCursor == _rEvent.Source ) )
         {
-            bool bIs = false;
             if  ( ( _rEvent.PropertyName == PROPERTY_ISMODIFIED )
                || ( _rEvent.PropertyName == PROPERTY_ISNEW )
                 )
             {
+                bool bIs = false;
                 if ( ( _rEvent.NewValue >>= bIs ) && !bIs )
                     m_bActiveControlModified = false;
             }

forms/source/xforms/xpathlib/xpathlib.cxx

@@ -153,10 +153,9 @@ void xforms_minFunction(xmlXPathParserContextPtr ctxt, int nargs)
     xmlNodeSetPtr pNodeSet = xmlXPathPopNodeSet(ctxt);
     if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
     double nMinimum = 0;
-    double nNumber = 0;
     for (int i = 0; i <  xmlXPathNodeSetGetLength(pNodeSet); i++)
     {
-        nNumber = xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
+        double nNumber = xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
         if (xmlXPathIsNaN(nNumber))
         {
             xmlXPathReturnNumber(ctxt, xmlXPathNAN);
@@ -176,10 +175,9 @@ void xforms_maxFunction(xmlXPathParserContextPtr ctxt, int nargs)
     xmlNodeSetPtr pNodeSet = xmlXPathPopNodeSet(ctxt);
     if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
     double nMaximum = 0;
-    double nNumber = 0;
     for (int i = 0; i <  xmlXPathNodeSetGetLength(pNodeSet); i++)
     {
-        nNumber = xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
+        double nNumber = xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pNodeSet, i));
         if (xmlXPathIsNaN(nNumber))
         {
             xmlXPathReturnNumber(ctxt, xmlXPathNAN);
@@ -197,11 +195,10 @@ void xforms_countNonEmptyFunction(xmlXPathParserContextPtr ctxt, int nargs)
     if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
     xmlNodeSetPtr pNodeSet = xmlXPathPopNodeSet(ctxt);
     if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
-    xmlChar *aString;
     sal_Int32 nNotEmpty = 0;
     for (int i = 0; i <  xmlXPathNodeSetGetLength(pNodeSet); i++)
     {
-        aString = xmlXPathCastNodeToString(xmlXPathNodeSetItem(pNodeSet, i));
+        const xmlChar *aString = xmlXPathCastNodeToString(xmlXPathNodeSetItem(pNodeSet, i));
         if (*aString != 0) nNotEmpty++;
     }
     xmlXPathReturnNumber(ctxt, nNotEmpty);

formula/source/ui/dlg/FormulaHelper.cxx

@@ -203,10 +203,10 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
     sal_Int32  nFStart = FUNC_NOTFOUND;
     sal_Int32  nParPos = nStart;
 
-    bool bRepeat, bFound;
+    bool bRepeat;
     do
     {
-        bFound  = false;
+        bool bFound  = false;
         bRepeat = false;
 
         if ( bBack )

formula/source/ui/dlg/formula.cxx

@@ -471,7 +471,6 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
     const sal_Unicode sep = m_pHelper->getFunctionManager()->getSingleToken(IFunctionManager::eSep);
 
     sal_Int32 nFuncPos = SAL_MAX_INT32;
-    bool  bFlag = false;
     OUString  aFormString = m_aFormulaHelper.GetCharClass()->uppercase(pMEdit->GetText());
 
     const uno::Reference< sheet::XFormulaParser > xParser(m_pHelper->getFormulaParser());
@@ -481,6 +480,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
     const sheet::FormulaToken* pEnd = pIter + m_aTokenList.getLength();
     try
     {
+        bool  bFlag = false;
         sal_Int32 nTokPos = 1;
         sal_Int32 nOldTokPos = 1;
         sal_Int32 nPrevFuncPos = 1;
@@ -834,12 +834,11 @@ void FormulaDlg_Impl::FillControls(bool &rbNext, bool &rbPrev)
 
     DeleteArgs();
     const IFunctionDescription* pOldFuncDesc = pFuncDesc;
-    bool bTestFlag = false;
 
     if ( m_aFormulaHelper.GetNextFunc( aFormula, false,
                                      nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) )
     {
-        bTestFlag = (pOldFuncDesc != pFuncDesc);
+        const bool bTestFlag = (pOldFuncDesc != pFuncDesc);
         if(bTestFlag)
         {
             m_pFtHeadLine->Hide();

fpicker/source/win32/filepicker/dibpreview.cxx

@@ -213,26 +213,20 @@ HWND SAL_CALL CDIBPreview::getWindowHandle() const
 
 void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
 {
-    BITMAPFILEHEADER*  pbmfh;
-    BITMAPINFO      *  pbmi;
-    sal_uInt8            *  pBits;
-    int                cxDib;
-    int                cyDib;
-
     osl::MutexGuard aGuard(m_PaintLock);
 
     try
     {
-        pbmfh = reinterpret_cast<BITMAPFILEHEADER*>(m_Image.getArray());
+        BITMAPFILEHEADER* pbmfh = reinterpret_cast<BITMAPFILEHEADER*>(m_Image.getArray());
 
         if ( !IsBadReadPtr( pbmfh, sizeof(BITMAPFILEHEADER)) &&
              (pbmfh->bfType == ('B' | ('M' << 8))) )
         {
-            pbmi  = reinterpret_cast<BITMAPINFO*>((pbmfh + 1));
-            pBits = reinterpret_cast<sal_uInt8*>(((DWORD_PTR)pbmfh) + pbmfh->bfOffBits);
+            BITMAPINFO * pbmi  = reinterpret_cast<BITMAPINFO*>((pbmfh + 1));
+            sal_uInt8 * pBits = reinterpret_cast<sal_uInt8*>(((DWORD_PTR)pbmfh) + pbmfh->bfOffBits);
 
-            cxDib =      pbmi->bmiHeader.biWidth;
-            cyDib = abs (pbmi->bmiHeader.biHeight);
+            int cxDib = pbmi->bmiHeader.biWidth;
+            int cyDib = abs (pbmi->bmiHeader.biHeight);
 
             SetStretchBltMode(hDC, COLORONCOLOR);