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

[Jochen Nitschke]

 cui/source/customize/cfg.cxx              |    4 ++--
 sd/source/filter/eppt/pptexanimations.cxx |    3 +--
 sw/source/core/text/itratr.cxx            |    3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0c363500584194f75dfa7f229ee932a759a95bbe
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun May 7 23:18:14 2017 +0200

    cppcheck nitpicks variableScope and redundantAssignment
    
    Change-Id: I1399e066a96bbd9a3b59e2670a75b0022c882a1d
    Reviewed-on: https://gerrit.libreoffice.org/37354
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 046b244b2106..5122f35908ee 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -996,7 +996,6 @@ bool SaveInData::LoadSubMenus(
         if ( bItem )
         {
             bool bIsUserDefined = true;
-            bool bUseDefaultLabel = false;
 
             if ( nType == css::ui::ItemType::DEFAULT )
             {
@@ -1011,6 +1010,7 @@ bool SaveInData::LoadSubMenus(
                     bIsUserDefined = true;
                 }
 
+                bool bUseDefaultLabel = false;
                 // If custom label not set retrieve it from the command
                 // to info service
                 if ( aLabel.isEmpty() )
@@ -4290,7 +4290,6 @@ void ToolbarSaveInData::LoadToolbar(
         if ( bItem )
         {
             bool bIsUserDefined = true;
-            bool bUseDefaultLabel = false;
 
             if ( nType == css::ui::ItemType::DEFAULT )
             {
@@ -4305,6 +4304,7 @@ void ToolbarSaveInData::LoadToolbar(
                     bIsUserDefined = true;
                 }
 
+                bool bUseDefaultLabel = false;
                 // If custom label not set retrieve it from the command
                 // to info service
                 if ( aLabel.isEmpty() )
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 58fd59517518..8e854220919f 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -491,12 +491,11 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
     bool bTakeBackInteractiveSequenceTimingForChild = false;
     sal_Int16 nFillDefault = GetFillMode( xNode, nFDef );
 
-    bool bSkipChildren = false;
-
     Reference< XAnimationNode > xAudioNode;
     static sal_uInt32 nAudioGroup;
 
     {
+        bool bSkipChildren = false;
         EscherExContainer aContainer( rStrm, nContainerRecType, nInstance );
         switch( xNode->getType() )
         {
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 1c8ef5182e9b..a4fde667652f 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -359,11 +359,10 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
     while( nIdx < nEnd )
     {
         sal_Int32 nStop = nIdx;
-        bool bClear = false;
         LanguageType eLang = pFnt->GetLanguage();
         assert(g_pBreakIt && g_pBreakIt->GetBreakIter().is());
 
-        bClear = CH_BLANK == rText[ nStop ];
+        bool bClear = CH_BLANK == rText[ nStop ];
         Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary( rText, nIdx,
                          g_pBreakIt->GetLocale( eLang ),
                          WordType::DICTIONARY_WORD, true ) );