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

[Julien Nabet]

 idl/source/objects/module.cxx               |   10 +++-------
 reportdesign/source/ui/report/dlgedfunc.cxx |    3 +--
 sc/source/ui/miscdlgs/datastreamdlg.cxx     |    1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 97599c406ec289c8a876bf9a834bf61a4e80b7ee
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:27:54 2013 +0100

    cppcheck: fix 2 consecutive breaks
    
    Change-Id: If67b90bc56695a6aaf6d152d4a70dc68126596a6

diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 8a3bee5..8f8aee9 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -140,7 +140,6 @@ void DataStreamDlg::Init( const DataStream& rStrm )
         case DataStream::MOVE_DOWN:
             m_pRBDataDown->Check();
         break;
-        break;
         case DataStream::RANGE_DOWN:
             m_pRBRangeDown->Check();
         break;
commit c959586c09e6269ac8ff44de917e4a900e895728
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:23:23 2013 +0100

    cppcheck: fix Same expression on both sides of '||' + simplify a bit
    
    Change-Id: I7903c4af5263f93dc4d311b73cb21e144a63d8d9

diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index b78de74..19c380b 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -151,26 +151,22 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                          sal_uInt16 nTab )
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
-    if( !aTypeLibFile.getString().isEmpty() || !aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
+    if( !aHelpFileName.getString().isEmpty() || !aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
     {
+        WriteTab( rOutStm, nTab );
         if( !aHelpFileName.getString().isEmpty() )
         {
-            WriteTab( rOutStm, nTab );
             aHelpFileName.WriteSvIdl( SvHash_HelpFile(), rOutStm, nTab +1 );
-            rOutStm << ';' << endl;
         }
         if( !aSlotIdFile.getString().isEmpty() )
         {
-            WriteTab( rOutStm, nTab );
             aSlotIdFile.WriteSvIdl( SvHash_SlotIdFile(), rOutStm, nTab +1 );
-            rOutStm << ';' << endl;
         }
         if( !aTypeLibFile.getString().isEmpty() )
         {
-            WriteTab( rOutStm, nTab );
             aTypeLibFile.WriteSvIdl( SvHash_TypeLibFile(), rOutStm, nTab +1 );
-            rOutStm << ';' << endl;
         }
+        rOutStm << ';' << endl;
     }
 }
 
commit 4148ba7075159c9966b83594e51deb9c9759d722
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Dec 27 14:19:22 2013 +0100

    cppcheck: fix reassigned value
    
    Change-Id: Iee162175b692d82679132ce32d026cb3b3bfa77e

diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 28a12df..ef5a8f6 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -503,9 +503,8 @@ void DlgEdFunc::unColorizeOverlappedObj()
 // -----------------------------------------------------------------------------
 bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt)
 {
-    bool bOverlapping = false;
     SdrViewEvent aVEvt;
-    bOverlapping = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt) != SDRHIT_NONE;
+    bool bOverlapping = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt) != SDRHIT_NONE;
     if (bOverlapping && aVEvt.pObj)
     {
         colorizeOverlappedObject(aVEvt.pObj);