[Libreoffice-commits] core.git: 2 commits - rsc/source sc/source

[Julien Nabet]

 rsc/source/res/rscclass.cxx    |    2 +-
 sc/source/ui/view/tabview2.cxx |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c3aad7456adb8a24e2350c9b50778adefb2d1444
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Feb 13 18:44:30 2013 +0100

    Fix Variable 'bMark' assigned a value never used
    
    See http://nabble.documentfoundation.org/Cppcheck-bMark-is-assigned-a-value-never-used-sc-module-td4037118.html
    
    Change-Id: Ib2c39c3d38d3a34336e9af0e8389c9ab2f8d5df0

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 59eec9b..888e27c 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -952,9 +952,8 @@ void ScTabView::PaintBlock( bool bReset )
 {
     ScMarkData& rMark = aViewData.GetMarkData();
     SCTAB nTab = aViewData.GetTabNo();
-    bool bMark = rMark.IsMarked();
     bool bMulti = rMark.IsMultiMarked();
-    if (bMark || bMulti)
+    if (rMark.IsMarked() || bMulti)
     {
         ScRange aMarkRange;
         HideAllCursors();
@@ -966,8 +965,6 @@ void ScTabView::PaintBlock( bool bReset )
             rMark.GetMultiMarkArea(aMarkRange);
             rMark.MarkToSimple();
             rMark.SetMarking(bFlag);
-
-            bMark = rMark.IsMarked();
         }
         else
             rMark.GetMarkArea(aMarkRange);
commit e25cdb40dff8615b5881750e197715c17a55df58
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Feb 13 18:08:36 2013 +0100

    Reduce scope
    
    Change-Id: I8e62de343021942fd80ed6846bfa5c0b0ee4a347

diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 648989a..ec2fb11 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -205,7 +205,6 @@ RSCINST RscClass::Create
 )
 {
     sal_uInt32  i;
-    CLASS_DATA  * ppData;
     RSCINST aInst;
     RSCINST aMemInst, aDfltI;
 
@@ -234,6 +233,7 @@ RSCINST RscClass::Create
         if( (VAR_POINTER & pVarTypeList[ i ].nVarType)
           && !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
         {
+            CLASS_DATA  * ppData;
             if( VAR_EXTENDABLE & pVarTypeList[ i ].nVarType )
             {
                 RSCINST * pInstance = (RSCINST *)