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

Michael Weghorn m.weghorn at posteo.de
Sat Aug 22 23:03:59 PDT 2015


 sc/source/ui/navipi/content.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 90b086e480a83c62edafaf13bdf4a02079a7860c
Author: Michael Weghorn <m.weghorn at posteo.de>
Date:   Sat Aug 22 14:31:09 2015 +0200

    tdf#39440 reduce variable scope, adapt indentation
    
    This addresses a cppcheck "variableScope" warning and adapts the
    indentation of some code lines according to the surrounding code.
    
    Change-Id: I76eca59a808740ab0366dd41c889a6ef19a2436d
    Reviewed-on: https://gerrit.libreoffice.org/17923
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 5dd7d76..204e312 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -154,7 +154,6 @@ void ScContentTree::dispose()
 // helper function for  GetEntryAltText and GetEntryLongDescription
 OUString ScContentTree::getAltLongDescText( SvTreeListEntry* pEntry, bool isAltText) const
 {
-    SdrObject* pFound = NULL;
 
     sal_uInt16 nType;
     sal_uLong nChild;
@@ -165,6 +164,7 @@ OUString ScContentTree::getAltLongDescText( SvTreeListEntry* pEntry, bool isAltT
     case SC_CONTENT_GRAPHIC:
     case SC_CONTENT_DRAWING:
         {
+            SdrObject* pFound = NULL;
             ScDocument* pDoc = ( const_cast< ScContentTree* >(this) )->GetSourceDocument();
             SdrIterMode eIter = ( nType == SC_CONTENT_DRAWING ) ? IM_FLAT : IM_DEEPNOGROUPS;
             ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
@@ -192,13 +192,13 @@ OUString ScContentTree::getAltLongDescText( SvTreeListEntry* pEntry, bool isAltT
                     }
                 }
             }
-             if( pFound )
-             {
+            if( pFound )
+            {
                 if( isAltText )
                     return pFound->GetTitle();
                 else
                     return pFound->GetDescription();
-             }
+            }
         }
         break;
     }


More information about the Libreoffice-commits mailing list