[Libreoffice-commits] core.git: sd/source svx/source

Julien Nabet serval2412 at yahoo.fr
Sat Nov 16 04:18:55 PST 2013


 sd/source/ui/view/drviewsa.cxx |    3 +--
 svx/source/svdraw/svddrgmt.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 49ca17de76ba4a6396b9207a82d460cbae7c6d53
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Nov 16 13:17:09 2013 +0100

    cppcheck: reduce scope
    
    Change-Id: Ifa54cc132f0c6591c57639f85e789b08a60b7f4b

diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index a836a22..0d48e74 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -733,7 +733,6 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
         {
             SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
             SdrLayerID nLayer = 0, nOldLayer = 0;
-            SdrLayer*  pLayer = NULL;
             SdrObject* pObj = NULL;
             const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
             sal_uLong nMarkCount = rMarkList.GetMarkCount();
@@ -759,7 +758,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
             // Append the layer name to the current page number.
             if( bOneLayer && nMarkCount )
             {
-                pLayer = rLayerAdmin.GetLayerPerID( nLayer );
+                SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer );
                 if( pLayer )
                 {
                     aOUString += " (" ;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 73d13ea..5a6cba4 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1777,7 +1777,6 @@ SdrDragResize::SdrDragResize(SdrDragView& rNewView)
 void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
 {
     ImpTakeDescriptionStr(STR_DragMethResize, rStr);
-    bool bEqual(aXFact == aYFact);
     Fraction aFact1(1,1);
     Point aStart(DragStat().GetStart());
     Point aRef(DragStat().GetRef1());
@@ -1800,6 +1799,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
 
         rStr += " (";
 
+        bool bEqual(aXFact == aYFact);
         if(bX)
         {
             if(!bEqual)


More information about the Libreoffice-commits mailing list