summaryrefslogtreecommitdiff
path: root/sw/source/core/layout
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r--sw/source/core/layout/flowfrm.cxx5
-rw-r--r--sw/source/core/layout/paintfrm.cxx36
-rw-r--r--sw/source/core/layout/tabfrm.cxx30
-rw-r--r--sw/source/core/layout/wsfrm.cxx3
4 files changed, 0 insertions, 74 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 90d96d47eb9f..8dc16dbd6f3a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1926,11 +1926,6 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
( rThis.GetUpper()->IsInTab() &&
rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
0 != const_cast<SwFrm&>(rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
-/*
- &&
- // NEW TABLES
- // Have a look at our main competitor: We don't move inside row span cells:
- ( !rThis.GetUpper()->IsCellFrm() || !rThis.GetUpper()->IsLeaveUpperAllowed() ) )*/
{
bNoFwd = FALSE;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f4888e812df7..b65c455949bc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1524,16 +1524,6 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
pRetoucheFly = 0;
}
-// --> OD 2008-05-16 #i84659# - no longer needed
-//inline BOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect )
-//{
-// //Wenn der Frm vollstaendig rechts neben bzw. unter dem
-// //Rect sitzt ist's genug mit Painten.
-// return rFrmRect.Top() > rRect.Bottom();
-// // PAGES01 || (rFrmRect.Left() > rRect.Right()) );
-//}
-// <--
-
//---------------- Ausgabe fuer das BrushItem ----------------
/** lcl_DrawGraphicBackgrd - local help method to draw a background for a graphic
@@ -2807,8 +2797,6 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
// --> OD 2008-10-07 #i92745#
// Extend check on certain states of the 'current' <ViewShell> instance to
// all existing <ViewShell> instances.
-// if ( !pSh->IsInEndAction() && !pSh->IsPaintInProgress() &&
-// (!pSh->Imp()->IsAction() || !pSh->Imp()->GetLayAction().IsActionInProgress() ) )
bool bPerformLayoutAction( true );
{
ViewShell* pTmpViewShell = pSh;
@@ -3571,7 +3559,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// --> OD 2007-12-13 #i80822#
// suppress painting of background in printing area for
// non-transparent graphics.
-// if ( bPaintMarginOnly )
if ( bPaintMarginOnly ||
( pNoTxt && !bIsGraphicTransparent ) )
// <--
@@ -3589,7 +3576,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// used in <SwNoTxtFrm::Paint(..)> to set the clip region
// for painting the graphic/OLE. Thus, the clip region is
// also applied for the PDF export.
-// if ( !pOut->GetConnectMetaFile() || pOut->GetOutDevType() == OUTDEV_PRINTER )
ViewShell *pSh = GetShell();
if ( !pOut->GetConnectMetaFile() || !pSh->GetWin() )
// <--
@@ -4707,9 +4693,6 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
{
const SwFrm* pDirRefFrm = IsCellFrm() ? FindTabFrm() : this;
SWRECTFN( pDirRefFrm )
- // OD 19.05.2003 #109667# - use new method <lcl_PaintLeftRightLine(..)>
- //::lcl_PaintLeftLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
- //::lcl_PaintRightLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) )
@@ -4722,14 +4705,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForTopBorderAttrs );
const SwBorderAttrs &rTopAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rTopAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rTopAttrs, fnRect );
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
}
}
@@ -4743,14 +4722,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForBottomBorderAttrs );
const SwBorderAttrs &rBottomAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rBottomAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rBottomAttrs, fnRect);
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect);
}
}
@@ -5232,17 +5207,6 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect,
}
}
-// ----------------------------------------------------------------------
-//
-// const SwPageFrm::mnBorderPxWidth, const SwPageFrm::mnShadowPxWidth
-// SwPageFrm::GetBorderRect (..), SwPageFrm::GetRightShadowRect(..),
-// SwPageFrm::GetBottomShadowRect(..),
-// SwPageFrm::PaintBorderAndShadow(..),
-// SwPageFrm::GetBorderAndShadowBoundRect(..)
-//
-// OD 12.02.2003 for #i9719# and #105645#
-// ----------------------------------------------------------------------
-
const sal_Int8 SwPageFrm::mnBorderPxWidth = 1;
const sal_Int8 SwPageFrm::mnShadowPxWidth = 2;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 58bbe938c9e2..115219ebfbad 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2065,7 +2065,6 @@ void SwTabFrm::MakeAll()
delete pAccess;
bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrm( *this ), FALSE );
-// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE );
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
pAttrs = pAccess->Get();
}
@@ -2137,15 +2136,6 @@ void SwTabFrm::MakeAll()
// Thus, find next content, table or section
// and, if a section is found, get its first
// content.
-// SwFrm *pNxt = FindNextCnt();
-// if( pNxt && pNxt->IsInTab() )
-// pNxt = pNxt->FindTabFrm();
-// if ( pNxt )
-// {
-// pNxt->Calc();
-// if ( !GetNext() )
-// bValidPos = FALSE;
-// }
if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() )
{
bValidPos = FALSE;
@@ -2756,19 +2746,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
// E.g., it could happen, that the fly frame is still registered
// at the page frame, the table is on, but it's anchor character
// text frame has already changed its page.
- //if ( WEIT_WECH != (pFly->Frm().*fnRect->fnGetTop)() &&
- // pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) &&
- // // OD 25.02.2003 #i9040# - use '<=' instead of '<'
- // (*fnRect->fnYDiff)(
- // (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetBottom)(),
- // (Frm().*fnRect->fnGetTop)() ) <= 0 &&
- // !IsAnLower( pFly ) && !pFly->IsAnLower( this ) &&
- // ( !pMyFly || pMyFly->IsAnLower( pFly ) ) &&
- // pPage->GetPhyPageNum() >=
- // pFly->GetAnchorFrm()->FindPageFrm()->GetPhyPageNum() &&
- // // anchor should be in same page body/header/footer
- // ( pFly->GetAnchorFrm()->FindFooterOrHeader() ==
- // FindFooterOrHeader() ) )
const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm();
bool bConsiderFly =
// --> OD 2005-04-06 #i46807# - do not consider invalid
@@ -3041,11 +3018,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
// OD 10.03.2003 #i9040# - consider right line attribute.
nRightSpacing = Max( nRightSpacing, ( nRightOffset + nRightLine ) );
}
- // OD 10.03.2003 #i9040# - do not hold wished table width.
- /*
- if ( !pAttrs->GetLRSpace().GetRight() )
- nRight = Max( nRight, nMax - (nWish + nLeft + nRight));
- */
}
break;
case text::HoriOrientation::LEFT_AND_WIDTH:
@@ -3249,8 +3221,6 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
{
SwPageFrm *pPage = FindPageFrm();
InvalidatePage( pPage );
-// if ( nInvFlags & 0x01 )
-// SetCompletePaint();
if ( nInvFlags & 0x02 )
_InvalidatePrt();
if ( nInvFlags & 0x40 )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 6ca710d39ea2..6a2baac78f25 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#include <hints.hxx>
#include <tools/pstm.hxx>
@@ -1015,7 +1014,6 @@ void SwCntntFrm::Cut()
{
// --> OD 2006-09-25 #b6448963#
// prevent delete of <ColLocked> footnote frame
-// if( pUp->IsFtnFrm() )
if ( pUp->IsFtnFrm() && !pUp->IsColLocked())
// <--
{
@@ -1031,7 +1029,6 @@ void SwCntntFrm::Cut()
else
{
// --> OD 2006-09-25 #b6448963#
-// if ( pSct->IsColLocked() || !pSct->IsInFtn() )
if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
// <--