[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sc

[Caolán McNamara]

 binfilter/bf_forms/source/component/forms_FormComponent.cxx    |   26 +++++-----
 binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx |   10 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit e79cfd87946fa89e2a70ecaed66f66d6874ee4b7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 30 17:02:23 2010 +0000

    WaE: throw out some more warnings

diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index 84ee6f5..08b39fd 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -444,9 +444,9 @@ OControlModel::OControlModel(
             const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator)
     :OComponentHelper(m_aMutex)
     ,OPropertySetAggregationHelper(OComponentHelper::rBHelper)
+    ,m_xServiceFactory(_rxFactory)
     ,m_nTabIndex(FRM_DEFAULT_TABINDEX)
     ,m_nClassId(FormComponentType::CONTROL)
-    ,m_xServiceFactory(_rxFactory)
 {
     DBG_CTOR(OControlModel, NULL);
     if (_rUnoControlModelTypeName.getLength())	// the is a model we have to aggregate
@@ -473,9 +473,9 @@ OControlModel::OControlModel(
 OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference< XMultiServiceFactory>& _rxFactory, const sal_Bool _bSetDelegator )
     :OComponentHelper( m_aMutex )
     ,OPropertySetAggregationHelper( OComponentHelper::rBHelper )
+    ,m_xServiceFactory( _rxFactory )
     ,m_nTabIndex( FRM_DEFAULT_TABINDEX )
     ,m_nClassId( FormComponentType::CONTROL )
-    ,m_xServiceFactory( _rxFactory )
 {
     DBG_CTOR( OControlModel, NULL );
     DBG_ASSERT( _pOriginal, "OControlModel::OControlModel: invalid original!" );
@@ -876,12 +876,12 @@ OBoundControlModel::OBoundControlModel(
     :OControlModel(_rxFactory, _rUnoControlModelTypeName, _rDefault, _bSetDelegator)
     ,m_aUpdateListeners(m_aMutex)
     ,m_aResetListeners(m_aMutex)
+    ,m_aLabelServiceName(FRM_SUN_COMPONENT_FIXEDTEXT)
     ,m_bLoaded(sal_False)
     ,m_bRequired(sal_False)
     ,m_bCommitable(_bCommitable)
-    ,m_aLabelServiceName(FRM_SUN_COMPONENT_FIXEDTEXT)
-    ,m_bResetting(sal_False)
     ,m_bForwardValueChanges(sal_True)
+    ,m_bResetting(sal_False)
 {
     DBG_CTOR(frm_OBoundControlModel, NULL);
 }
@@ -896,8 +896,8 @@ OBoundControlModel::OBoundControlModel(
     ,m_bLoaded( sal_False )
     ,m_bRequired( sal_False )
     ,m_bCommitable( _bCommitable )
-    ,m_bResetting( sal_False )
     ,m_bForwardValueChanges( sal_True )
+    ,m_bResetting( sal_False )
 {
     DBG_CTOR(frm_OBoundControlModel, NULL);
 
@@ -1105,7 +1105,7 @@ void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStr
     OControlModel::read(_rxInStream);
 
     osl::MutexGuard aGuard(m_aMutex);
-    UINT16 nVersion = _rxInStream->readShort();
+    /*UINT16 nVersion =*/ _rxInStream->readShort();
     ::comphelper::operator>>( _rxInStream, m_aControlSource);
 }
 
@@ -1225,8 +1225,8 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
                     // found my root
                     break;
 
-                Reference<XChild> xAsChild(xMyTopLevel, UNO_QUERY);
-                xMyTopLevel = xAsChild.is() ? xAsChild->getParent() : InterfaceRef();
+                Reference<XChild> xLclAsChild(xMyTopLevel, UNO_QUERY);
+                xMyTopLevel = xLclAsChild.is() ? xLclAsChild->getParent() : InterfaceRef();
             }
             InterfaceRef xNewTopLevel = xAsChild->getParent();
             while (xNewTopLevel.is())
@@ -1235,8 +1235,8 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
                 if (!xAsForm.is())
                     break;
 
-                Reference<XChild> xAsChild(xNewTopLevel, UNO_QUERY);
-                xNewTopLevel = xAsChild.is() ? xAsChild->getParent() : InterfaceRef();
+                Reference<XChild> xLclAsChild(xNewTopLevel, UNO_QUERY);
+                xNewTopLevel = xLclAsChild.is() ? xLclAsChild->getParent() : InterfaceRef();
             }
             if (xNewTopLevel != xMyTopLevel)
             {
@@ -1313,9 +1313,9 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
 
     if (bSucceed)
     {
-        cppu::OInterfaceIteratorHelper aIter(m_aUpdateListeners);
-        while (aIter.hasMoreElements())
-            ((XUpdateListener*)aIter.next())->updated(aEvt);
+        cppu::OInterfaceIteratorHelper aLclIter(m_aUpdateListeners);
+        while (aLclIter.hasMoreElements())
+            ((XUpdateListener*)aLclIter.next())->updated(aEvt);
     }
 
     return bSucceed;
commit 7c4525eadd15592e130dd779161e42402e823021
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 29 21:07:17 2010 +0000

    cppcheck: prefer prefix variants

diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
index 54c13a0..75c499d 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
@@ -249,7 +249,7 @@ void ScMyStyleRanges::InsertColRow(const ScRange& rRange, const sal_Int16 nDx, c
         while (aItr != pCurrencyList->end())
         {
             aItr->xRanges->UpdateReference(aRefMode, pDoc, rRange, nDx, nDy, nDz);
-            aItr++;
+            ++aItr;
         }
     }
 }
@@ -306,7 +306,7 @@ void ScMyStyleRanges::SetStylesToRanges(const ::rtl::OUString* pStyleName, ScXML
         while (aItr != pCurrencyList->end())
         {
             SetStylesToRanges(aItr->xRanges, pStyleName, util::NumberFormat::CURRENCY, &aItr->sCurrency, rImport);
-            aItr++;
+            ++aItr;
         }
     }
 }
@@ -539,7 +539,7 @@ void ScMyStylesImportHelper::InsertRow(const sal_Int32 nRow, const sal_Int32 nTa
     while (aItr != aCellStyles.end())
     {
         aItr->xRanges->InsertRow(nRow, nTab, pDoc);
-        aItr++;
+        ++aItr;
     }
     rImport.UnlockSolarMutex();
 }
@@ -551,7 +551,7 @@ void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32 nTa
     while (aItr != aCellStyles.end())
     {
         aItr->xRanges->InsertCol(nCol, nTab, pDoc);
-        aItr++;
+        ++aItr;
     }
     rImport.UnlockSolarMutex();
 }
@@ -572,7 +572,7 @@ void ScMyStylesImportHelper::SetStylesToRanges()
     while (aItr != aCellStyles.end())
     {
         aItr->xRanges->SetStylesToRanges(&aItr->sStyleName, rImport);
-        aItr++;
+        ++aItr;
     }
     aCellStyles.clear();
     aColDefaultStyles.clear();