[Libreoffice-commits] .: 5 commits - sw/source

[Caolán McNamara]

 sw/source/core/layout/findfrm.cxx   |    4 ++--
 sw/source/core/layout/wsfrm.cxx     |    4 ++--
 sw/source/filter/html/htmltab.cxx   |    2 --
 sw/source/filter/ww8/wrtw8nds.cxx   |    2 +-
 sw/source/filter/ww8/ww8toolbar.cxx |    2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 61607212749b04c80ae309aaa168780448a1afad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 16:09:55 2010 +0000

    WaE, fix debug=t warning

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 5b67414..7332d9c 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -132,7 +132,7 @@ bool CTBWrapper::Read( SvStream* pS )
         // Strange error condition, shouldn't happen ( but does in at least
         // one test document ) In the case where it happens the TBC &
         // TBCHeader records seem blank??? ( and incorrect )
-        OSL_ENSURE( pS->Tell() == nExpectedPos, "### Error: Expected pos not equal to actual pos after reading rtbdc");
+        OSL_ENSURE( static_cast< long >(pS->Tell()) == nExpectedPos, "### Error: Expected pos not equal to actual pos after reading rtbdc");
         OSL_TRACE("\tPos now is 0x%x should be 0x%x", pS->Tell(), nExpectedPos );
         // seek to correct position after rtbdc
         pS->Seek( nExpectedPos );
commit e5a4cbbcedb57fcb048b01ecfeafe28efb5c98b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 16:05:31 2010 +0000

    WaE, fix debug=t warning

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 2517d93..bc1ea39 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -662,8 +662,8 @@ void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
 void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
 {
     OSL_ENSURE( pParent, "Kein Parent fuer Insert." );
-    OSL_ENSURE( (!pBehind || (pBehind && ( pParent == pBehind->GetUpper())
-            || ( pParent->IsSctFrm() && pBehind->GetUpper()->IsColBodyFrm() ) ) ),
+    OSL_ENSURE( (!pBehind || ( (pBehind && (pParent == pBehind->GetUpper()))
+            || ((pParent->IsSctFrm() && pBehind->GetUpper()->IsColBodyFrm())) ) ),
             "Framebaum inkonsistent." );
     if( pSct )
     {
commit 3488272f64048ee19d3405460cbeb2698c356336
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 16:00:18 2010 +0000

    WaE, fix debug=t warning

diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 34a7159..4ec4b8d 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1666,8 +1666,8 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
         return *this;
 
     OSL_ENSURE( pTableFrm &&
-            (  bStart && GetTabBox()->getRowSpan() < 1 ||
-              !bStart && GetLayoutRowSpan() > 1 ),
+            (  (bStart && GetTabBox()->getRowSpan() < 1) ||
+              (!bStart && GetLayoutRowSpan() > 1) ),
             "SwCellFrm::FindStartRowSpanCell: No rowspan, no table, no cookies" );
 
     if ( pTableFrm )
commit 99aebc31dbaa2857466bd06554a96a769f3c67bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 12:13:31 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d64a810..94f044e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2358,7 +2358,7 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn
         {
         }
 
-        aIt++;
+        ++aIt;
     }
 }
 //---------------------------------------------------------------------------
commit 57e9e4e5d9ed2f5f2a3056662b2960b117d96754
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 11:48:04 2010 +0000

    cppcheck: unused variable

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index e4c00d3..5b752d4 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4992,7 +4992,6 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
             bDone = sal_True;
             break;
         default:
-            int nNxtToken = nToken;
             if( pPendStack )
             {
                 SwPendingStack* pTmp = pPendStack->pNext;
@@ -5000,7 +4999,6 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
                 pPendStack = pTmp;
 
                 OSL_ENSURE( !pTmp, "weiter kann es nicht gehen!" );
-                nNxtToken = 0;	// neu lesen
             }
 
             if( IsParserWorking() )