[PATCH 1/2] fix debug build

[Cédric Bosdonnat]

---
 sw/source/core/layout/tabfrm.cxx       |    2 +-
 sw/source/core/undo/SwUndoPageDesc.cxx |   16 ----------------
 2 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 93cbfc3..aaa73ca 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1568,7 +1568,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
                     }
 
 #if OSL_DEBUG_LEVEL > 1
-                    OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" )
+                    OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" );
 #endif
                 }
             }
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index c8f9b0c..7b0eb6a 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -64,10 +64,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
         SwFrmFmt* pHeaderFmt = rHead.GetHeaderFmt();
         if( pHeaderFmt )
         {
-            nHeaderCount = pHeaderFmt->GetClientCount();
-            {
-                int nHeaderCount = 0;
-            }
             const SwFmtCntnt* pCntnt = &pHeaderFmt->GetCntnt();
             if( pCntnt->GetCntntIdx() )
                 nHeaderMaster = pCntnt->GetCntntIdx()->GetIndex();
@@ -77,10 +73,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
         SwFrmFmt* pLeftHeaderFmt = rLeftHead.GetHeaderFmt();
         if( pLeftHeaderFmt )
         {
-            nLeftHeaderCount = pLeftHeaderFmt->GetClientCount();
-            {
-                int nLeftHeaderCount = 0;
-            }
             const SwFmtCntnt* pLeftCntnt = &pLeftHeaderFmt->GetCntnt();
             if( pLeftCntnt->GetCntntIdx() )
                 nHeaderLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
@@ -93,10 +85,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
         SwFrmFmt* pFooterFmt = rFoot.GetFooterFmt();
         if( pFooterFmt )
         {
-            nFooterCount = pFooterFmt->GetClientCount();
-            {
-                int nFooterCount = 0;
-            }
             const SwFmtCntnt* pCntnt = &pFooterFmt->GetCntnt();
             if( pCntnt->GetCntntIdx() )
                 nFooterMaster = pCntnt->GetCntntIdx()->GetIndex();
@@ -106,10 +94,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
         SwFrmFmt* pLeftFooterFmt = rLeftFoot.GetFooterFmt();
         if( pLeftFooterFmt )
         {
-            nLeftFooterCount = pLeftFooterFmt->GetClientCount();
-            {
-                int nLeftFooterCount = 0;
-            }
             const SwFmtCntnt* pLeftCntnt = &pLeftFooterFmt->GetCntnt();
             if( pLeftCntnt->GetCntntIdx() )
                 nFooterLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
-- 
1.7.3.4


--=-h/zu4QwmWqRBLTwO1jWi
Content-Disposition: attachment;
	filename*0=0002-fdo-36826-draw-background-before-borders-or-borders-.pat;
	filename*1=ch
Content-Type: text/x-patch;
	name="0002-fdo-36826-draw-background-before-borders-or-borders-.patch";
	charset="UTF-8"
Content-Transfer-Encoding: 7bit