[Libreoffice-commits] core.git: 6 commits - sc/qa svtools/source sw/source

[Caolán McNamara]

 sc/qa/unit/ucalc.cxx             |    4 ++--
 svtools/source/misc/imap2.cxx    |    2 +-
 sw/source/core/doc/gctable.cxx   |    2 ++
 sw/source/core/doc/tblcpy.cxx    |    2 ++
 sw/source/core/docnode/ndtbl.cxx |    2 ++
 sw/source/core/frmedt/tblsel.cxx |    2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 597e198022c1e1393b78f346aa7eb00b521065ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:53:00 2013 +0100

    CID#1078656 Read has a break, but Write doesn't
    
    Change-Id: I54675b0c9683afb25fb9eaeb3def1e43c77fb053

diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 79eddbb..747ef4c 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -146,7 +146,7 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseU
 {
     switch( nFormat )
     {
-        case( IMAP_FORMAT_BIN ) : Write( rOStm, rBaseURL );
+        case( IMAP_FORMAT_BIN ) : Write( rOStm, rBaseURL ); break;
         case( IMAP_FORMAT_CERN ) : ImpWriteCERN( rOStm, rBaseURL ); break;
         case( IMAP_FORMAT_NCSA ) : ImpWriteNCSA( rOStm, rBaseURL ); break;
 
commit beb43ed0942dcd5f14d3d49b407878866e3d248d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:50:20 2013 +0100

    CID#1078699 keep coverity and nesting test happy
    
    Change-Id: Ifa2c2e7a26c3c6844774edb1a3245c8da1f20e33

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 8ee0749..aab34be 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1427,8 +1427,10 @@ static bool lcl_CheckCol( _FndBox const& rFndBox, bool* pPara )
             *pPara = false;
         }
         else
+        {
             BOOST_FOREACH( _FndLine const& rFndLine, rFndBox.GetLines() )
                 lcl_CheckRow( rFndLine, pPara );
+        }
     }
     // is box protected ??
     else if (rFndBox.GetBox()->GetFrmFmt()->GetProtect().IsCntntProtected())
commit c75670498b113dcd01adf64266a86575fcbb877b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:49:30 2013 +0100

    CID#1078700 keep coverity and nesting test happy
    
    Change-Id: I313e76a480cd734d1e950e811bb02dd1280a143c

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index a223284..b3f5912 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1493,8 +1493,10 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
 
     // Delete the Box's Lines
     if( !pBox->GetTabLines().empty() )
+    {
         BOOST_FOREACH( SwTableLine* pLine, pBox->GetTabLines() )
             lcl_DelLine( pLine, pDelPara );
+    }
     else
     {
         SwDoc* pDoc = pDelPara->rNds.GetDoc();
commit f713b7271a5e5dbf5baa3203ade8a87fb2681977
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:47:59 2013 +0100

    CID#1078701 keep coverity and nesting test happy
    
    Change-Id: I6a33fd22604bc91a901268501588928de643f16e

diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 55a4b3b..0ca5838 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -1029,8 +1029,10 @@ static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara );
 static void _FndCntntBox( const SwTableBox* pBox, SwSelBoxes* pPara )
 {
     if( !pBox->GetTabLines().empty() )
+    {
         BOOST_FOREACH( const SwTableLine* pLine, pBox->GetTabLines() )
             _FndCntntLine( pLine, pPara );
+    }
     else
         pPara->insert( (SwTableBox*)pBox );
 }
commit 8a55429fe99336922e2e4c530dc2139f435c6bb9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 13:47:21 2013 +0100

    CID#1078702 keep coverity and nesting test happy
    
    Change-Id: I9408cbf16493f0287b7f123694eafc56e1afd556

diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 8225fd2..4a04e85 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -85,8 +85,10 @@ static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPa
 {
     const SwTableLines& rLines = pBox->GetTabLines();
     if( !rLines.empty() )
+    {
         BOOST_FOREACH( const SwTableLine* pLine, rLines )
             lcl_GCBorder_GetLastBox_L( pLine, pPara );
+    }
     else
         pPara->push_back( (SwTableBox*)pBox );
 }
commit 4fb7331d83b73b975e730f534562252c7ace8937
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 7 12:56:05 2013 +0100

    CID#708773 silence coverity side-effect in assert
    
    Change-Id: I7045932e57c7f4e8cdef73fc37ff8de9e7ae9c58

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index eb61b90..1a2bf71 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1183,9 +1183,9 @@ void Test::testCellBroadcaster()
     // Ensure that the formula cells show correct values, and the referenced
     // cells have broadcasters.
     val = 0.0;
-    for (SCROW i = 0; i < 20; ++i)
+    for (SCROW i = 0; i < 20; ++i, ++val)
     {
-        CPPUNIT_ASSERT_EQUAL(val++, m_pDoc->GetValue(ScAddress(1,i,0)));
+        CPPUNIT_ASSERT_EQUAL(val, m_pDoc->GetValue(ScAddress(1,i,0)));
         pBC = m_pDoc->GetBroadcaster(ScAddress(0,i,0));
         CPPUNIT_ASSERT_MESSAGE("Broadcast should exist here.", pBC);
     }