[Libreoffice-commits] .: binfilter/bf_sw
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Sun Sep 18 13:29:41 PDT 2011
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 10 +++++-----
binfilter/bf_sw/source/core/inc/frmtool.hxx | 2 +-
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 2 +-
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 2 +-
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 4 ----
5 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 9636dc9259c154a1f38070831b18354b34b874a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Sep 18 22:29:33 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 363feba..24f8f5e 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -426,7 +426,7 @@ namespace binfilter {
/*N*/ SwRect aOldRect( *pOldBoundRect );
/*N*/ if( aOldRect.HasArea() )
/*N*/ Notify_Background( pThis->GetMaster(),pPage, aOldRect,
-/*N*/ PREP_FLY_LEAVE,TRUE);
+/*N*/ PREP_FLY_LEAVE);
/*N*/ }
/*N*/ SwRect aRect( pThis->GetMaster()->GetBoundRect() );
/*N*/ if( aRect.HasArea() )
@@ -434,7 +434,7 @@ namespace binfilter {
/*N*/ SwPageFrm *pPg = pThis->FindPage( aRect );
/*N*/ if( pPg )
/*N*/ Notify_Background( pThis->GetMaster(), pPg, aRect,
-/*N*/ PREP_FLY_ARRIVE, TRUE );
+/*N*/ PREP_FLY_ARRIVE );
/*N*/ }
/*N*/ ClrContourCache( pThis->GetMaster() );
/*N*/
@@ -459,7 +459,7 @@ namespace binfilter {
/*N*/ aOldRect.Pos() += pDrawVirtObj->GetOffset();
/*N*/ if( aOldRect.HasArea() )
/*N*/ Notify_Background( pDrawVirtObj ,pPage2,
-/*N*/ aOldRect, PREP_FLY_LEAVE,TRUE);
+/*N*/ aOldRect, PREP_FLY_LEAVE);
/*N*/ }
/*N*/ SwRect aRect( pDrawVirtObj->GetBoundRect() );
/*N*/ if( aRect.HasArea() )
@@ -471,7 +471,7 @@ namespace binfilter {
/*N*/ pPg = (SwPageFrm*)::binfilter::FindPage( aRect, pPg );
/*N*/ if( pPg )
/*N*/ Notify_Background( pDrawVirtObj, pPg, aRect,
-/*N*/ PREP_FLY_ARRIVE, TRUE );
+/*N*/ PREP_FLY_ARRIVE );
/*N*/ }
/*N*/ ClrContourCache( pDrawVirtObj );
/*N*/ }
@@ -629,7 +629,7 @@ namespace binfilter {
/*N*/ }
/*N*/ ConnectToLayout( pAnch );
/*N*/ if( pPg && aOldRect.HasArea() )
-/*N*/ Notify_Background(GetMaster(),pPg,aOldRect,PREP_FLY_LEAVE,TRUE);
+/*N*/ Notify_Background(GetMaster(),pPg,aOldRect,PREP_FLY_LEAVE);
/*N*/ lcl_Notify( this, NULL );
/*N*/
/*N*/ // #86973#
diff --git a/binfilter/bf_sw/source/core/inc/frmtool.hxx b/binfilter/bf_sw/source/core/inc/frmtool.hxx
index c8c71d3..68892b9 100644
--- a/binfilter/bf_sw/source/core/inc/frmtool.hxx
+++ b/binfilter/bf_sw/source/core/inc/frmtool.hxx
@@ -114,7 +114,7 @@ void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld );
void Notify_Background( SdrObject *pObj, SwPageFrm *pPage, const SwRect& rRect,
- const PrepareHint eHint, const BOOL bInva );
+ const PrepareHint eHint );
const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index 091b17a..e2f59c1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -105,7 +105,7 @@ namespace binfilter {
/*N*/ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPage1,
/*N*/ const SwRect& rRect, PrepareHint eHint )
/*N*/ {
-/*N*/ ::binfilter::Notify_Background( GetVirtDrawObj(), pPage1, rRect, eHint, TRUE );
+/*N*/ ::binfilter::Notify_Background( GetVirtDrawObj(), pPage1, rRect, eHint );
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index 600b621..87a046c 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -2335,7 +2335,7 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm )
/*N*/ }
/*N*/ void Notify_Background( SdrObject *pObj, SwPageFrm *pPage, const SwRect& rRect,
-/*N*/ const PrepareHint eHint, const BOOL bInva )
+/*N*/ const PrepareHint eHint )
/*N*/ {
/*N*/
/*N*/ //Wenn der Frm gerade erstmalig sinnvoll positioniert wurde, braucht der
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index 4cc0e00..9ce35ff 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -1160,8 +1160,6 @@ namespace binfilter {
/*N*/ // #i9040# - adjust variable name.
/*N*/ const SwTwips nWishedTableWidth = CalcRel( rSz, TRUE );
/*M*/
-/*M*/ BOOL bCheckBrowseWidth = FALSE;
-/*M*/
/*N*/ // #i9040# - insert new variables for left/right spacing.
/*N*/ SwTwips nLeftSpacing = 0;
/*N*/ SwTwips nRightSpacing = 0;
@@ -1248,7 +1246,6 @@ namespace binfilter {
/*N*/ //Nur die fuer die Umrandung benoetigten Freiraeume
/*N*/ //werden beruecksichtigt.
/*N*/ //Die Attributwerte von LRSpace werden bewusst missachtet!
-/*N*/ bCheckBrowseWidth = TRUE;
/*N*/ nLeftSpacing = nLeftLine + nLeftOffset;
/*N*/ nRightSpacing = nRightLine + nRightOffset;
/*N*/ break;
@@ -1285,7 +1282,6 @@ namespace binfilter {
/*N*/ {
/*N*/ //Linker Rand und die Breite zaehlen (Word-Spezialitaet)
/*N*/ // #i9040# - no width alignment in online mode.
-/*N*/ //bCheckBrowseWidth = TRUE;
/*N*/ nLeftSpacing = pAttrs->CalcLeft( this );
/*N*/ if( nLeftOffset )
/*N*/ {
More information about the Libreoffice-commits
mailing list