[Libreoffice-commits] core.git: 5 commits - sw/source
Philipp Riemer
ruderphilipp at gmail.com
Sat Feb 15 21:23:48 CET 2014
sw/source/core/layout/anchoreddrawobject.cxx | 21 -
sw/source/core/layout/anchoredobject.cxx | 32 --
sw/source/core/layout/atrfrm.cxx | 57 ---
sw/source/core/layout/calcmove.cxx | 101 +-----
sw/source/core/layout/colfrm.cxx | 38 --
sw/source/core/layout/dbg_lay.cxx | 77 +----
sw/source/core/layout/findfrm.cxx | 148 ++--------
sw/source/core/layout/flowfrm.cxx | 195 +------------
sw/source/core/layout/fly.cxx | 200 -------------
sw/source/core/layout/flycnt.cxx | 70 +---
sw/source/core/layout/flyincnt.cxx | 68 ----
sw/source/core/layout/flylay.cxx | 86 -----
sw/source/core/layout/flypos.cxx | 1
sw/source/core/layout/frmtool.cxx | 121 --------
sw/source/core/layout/ftnfrm.cxx | 352 +-----------------------
sw/source/core/layout/hffrm.cxx | 28 -
sw/source/core/layout/layact.cxx | 155 ++--------
sw/source/core/layout/laycache.cxx | 46 ---
sw/source/core/layout/layhelp.hxx | 38 +-
sw/source/core/layout/layouter.cxx | 10
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 2
sw/source/core/layout/newfrm.cxx | 41 --
sw/source/core/layout/objectformatter.cxx | 6
sw/source/core/layout/objectformatterlayfrm.cxx | 3
sw/source/core/layout/objectformatterlayfrm.hxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 5
sw/source/core/layout/objectformattertxtfrm.hxx | 2
sw/source/core/layout/pagechg.cxx | 157 ----------
sw/source/core/layout/pagedesc.cxx | 96 ------
sw/source/core/layout/paintfrm.cxx | 244 ++--------------
sw/source/core/layout/sectfrm.cxx | 177 ++----------
sw/source/core/layout/softpagebreak.cxx | 1
sw/source/core/layout/sortedobjs.cxx | 3
sw/source/core/layout/ssfrm.cxx | 63 ----
sw/source/core/layout/swselectionlist.cxx | 1
sw/source/core/layout/tabfrm.cxx | 305 --------------------
sw/source/core/layout/unusedf.cxx | 3
sw/source/core/layout/virtoutp.cxx | 17 -
sw/source/core/layout/virtoutp.hxx | 6
sw/source/core/layout/wsfrm.cxx | 122 --------
40 files changed, 398 insertions(+), 2702 deletions(-)
New commits:
commit 9df6f4b717d95deb78ee22286fd2ad15c236de10
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Feb 15 21:19:56 2014 +0100
fixed indentation for consistent code layout in sw/source/core/layout/
Change-Id: Iec2ad7d542a107458ab20144e53639997d9e54e6
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 2d39c35..e218012 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -204,8 +204,8 @@ void SwFlyFrm::InsertCnt()
}
}
- void SwFlyFrm::InsertColumns()
- {
+void SwFlyFrm::InsertColumns()
+{
// #i97379#
// Check, if column are allowed.
// Columns are not allowed for fly frames, which represent graphics or embedded objects.
@@ -227,7 +227,7 @@ void SwFlyFrm::InsertCnt()
const SwFmtCol aOld; // ChgColumns() also needs an old value passed
ChgColumns( aOld, rCol );
}
- }
+}
SwFlyFrm::~SwFlyFrm()
{
@@ -562,7 +562,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
SwRootFrm* pLayout = pMaster->getRootFrm();
if( pLayout && pLayout->IsAnyShellAccessible() )
pSh->Imp()->InvalidateAccessibleRelationSet( pMaster, pFollow );
-}
+ }
}
SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index efa9e89..ebb624d 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -47,7 +47,7 @@ void SwMovedFwdFrmsByObjPos::Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos,
void SwMovedFwdFrmsByObjPos::Remove( const SwTxtFrm& _rTxtFrm )
{
maMovedFwdFrms.erase( _rTxtFrm.GetTxtNode() );
-};
+}
bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm,
sal_uInt32& _ornToPageNum ) const
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index c3a2766..de825ec 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4630,8 +4630,7 @@ static double lcl_GetExtent( const SvxBorderLine* pSideLine, const SvxBorderLine
return nExtent;
}
-static void
-lcl_MakeBorderLine(SwRect const& rRect,
+static void lcl_MakeBorderLine(SwRect const& rRect,
bool const isVerticalInModel,
bool const isLeftOrTopBorderInModel,
bool const isVertical,
commit c0377a78d27489db1f905b8c77be955cf0bdd7a3
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Feb 15 21:19:00 2014 +0100
deleted code that was commented out in sw/source/core/layout/
Change-Id: Idd251a1b82dd8795b7c0087e1e4b9aeed53b2d82
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index 6abe433..806f1e0 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -642,9 +642,6 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
}
if ( !mbObjRectWithSpacesValid )
{
- // --> #i70122# - correction:
- // use bounding rectangle of anchored objects.
-// maObjRectWithSpaces = GetObjRect();
maObjRectWithSpaces = GetObjBoundRect();
const SwFrmFmt& rFmt = GetFrmFmt();
const SvxULSpaceItem& rUL = rFmt.GetULSpace();
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 250251b..1c33f6d 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -132,7 +132,6 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
// Begin with start node of page header/footer to assure that
// complete content is checked for cursors and the complete content
// is deleted on below made method call <pDoc->DeleteSection(pNode)>
-// SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 );
SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 0 );
// If there is a Crsr registered in one of the nodes, we need to call the
// ParkCrsr in an (arbitrary) shell.
@@ -2381,15 +2380,6 @@ void SwTextGridItem::Init()
bDisplayGrid = 1;
nBaseWidth = 210;
bSnapToChars = 1;
-
- //default grid type is line only in CJK env
- //disable this function due to type area change
- //if grid type change.
- //if(SvtCJKOptions().IsAsianTypographyEnabled())
- //{
- // bDisplayGrid = 0;
- // eGridType = GRID_LINES_ONLY;
- //}
}
}
@@ -2437,10 +2427,7 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
pF->RegisterToFormat( *pFmt );
}
- // MIB 24.3.98: We always have to call Modify of the baseclass, for example
- // because of RESET_FMTWRITTEN.
-// if ( GetDepends() )
- SwFmt::Modify( pOld, pNew );
+ SwFmt::Modify( pOld, pNew );
if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
{ // invalidate cached uno object
@@ -2758,9 +2745,6 @@ void SwFlyFrmFmt::MakeFrms()
if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
{
- // #i105535#
- // fallback to anchor type at-paragraph, if no fly frame is found.
-// pFrm = pFrm->FindFlyFrm();
SwFrm* pFlyFrm = pFrm->FindFlyFrm();
if ( pFlyFrm )
{
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 56544c5..2d39c35 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1268,13 +1268,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
nRemaining += ((SwSectionFrm*)pFrm)->Undersize();
pFrm = pFrm->GetNext();
}
- // #130878#
- // Do not keep old height, if content has no height.
- // The old height could be wrong due to wrong layout cache
- // and isn't corrected in the further formatting, because
- // the fly frame doesn't become invalid anymore.
-// if( !nRemaining )
-// nRemaining = nOldHeight - nUL;
}
if ( GetDrawObjs() )
{
@@ -1387,7 +1380,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
// problems in method <SwCntntFrm::_WouldFit(..)>,
// which assumes that the follows are formatted.
// Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>.
-//void CalcCntnt( SwLayoutFrm *pLay, sal_Bool bNoColl )
void CalcCntnt( SwLayoutFrm *pLay,
bool bNoColl,
bool bNoCalcFollow )
@@ -1698,7 +1690,6 @@ void CalcCntnt( SwLayoutFrm *pLay,
}
// OD 2004-03-23 #i26791#
-//void SwFlyFrm::MakeFlyPos()
void SwFlyFrm::MakeObjPos()
{
if ( !mbValidPos )
@@ -1943,10 +1934,6 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
SwFrmFmt *pFmt = GetFmt();
SwFmtFrmSize aSz( pFmt->GetFrmSize() );
aSz.SetWidth( aAdjustedNewSize.Width() );
- // #i53298# - no tolerance any more.
- // If it reveals that the tolerance is still needed, then suppress a
- // <SetAttr> call, if <aSz> equals the current <SwFmtFrmSize> attribute.
-// if ( Abs(aAdjustedNewSize.Height() - aSz.GetHeight()) > 1 )
aSz.SetHeight( aAdjustedNewSize.Height() );
// uebers Doc fuers Undo!
pFmt->GetDoc()->SetAttr( aSz, *pFmt );
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 43af0aa..fea3a7b 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -236,8 +236,6 @@ void SwFlyInCntFrm::MakeAll()
if ( !mbValidPos )
{
- // OD 2004-03-23 #i26791#
- //MakeFlyPos();
MakeObjPos();
}
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 0309f7c..952232b 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1928,7 +1928,6 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
}
// correction: do not retrieve left margin for numbering in R2L-layout
-// if ( pCaller->IsTxtFrm() )
if ( pCaller->IsTxtFrm() && !pCaller->IsRightToLeft() )
{
nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum();
@@ -2973,18 +2972,6 @@ void Notify_Background( const SdrObject* pObj,
}
pCnt = pCnt->GetNextCntntFrm();
}
-// #108745# Sorry, but this causes nothing but trouble. I remove these lines
-// taking the risk that the footer frame will have a wrong height
-// if( pPage->Lower() )
-// {
-// SwFrm* pFrm = pPage->Lower();
-// while( pFrm->GetNext() )
-// pFrm = pFrm->GetNext();
-// if( pFrm->IsFooterFrm() &&
-// ( ( pFrm->Frm().IsOver( pObj->GetBoundRect() ) ||
-// pFrm->Frm().IsOver( rRect ) ) ) )
-// pFrm->InvalidateSize();
-// }
// #128702# - make code robust
if ( pPage && pPage->GetSortedObjs() )
{
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 9197609..e3f4a0b 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -1588,8 +1588,6 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
pNew->ColLock();
pNew->KeepLockPosOfLowerObjs();
// #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// SwLayNotify* pFtnFrmNotitfy = new SwLayNotify( pNew );
SwCntntFrm *pCnt = pNew->ContainsCntnt();
while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
{
@@ -1617,9 +1615,6 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
pNew->UnlockPosOfLowerObjs();
pNew->Calc();
// #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// pNew->UnlockPosOfLowerObjs();
-// delete pFtnFrmNotitfy;
if ( !bOldFtnFrmLocked && !pNew->GetLower() &&
!pNew->IsColLocked() && !pNew->IsBackMoveLocked() )
{
@@ -1987,8 +1982,6 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
// lower objects during format of footnote content.
pFtn->KeepLockPosOfLowerObjs();
// #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// SwLayNotify aFtnFrmNotitfy( pFtn );
while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
{
@@ -2035,14 +2028,7 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
// enable lock of lower object position before format of footnote frame.
pFtn->UnlockPosOfLowerObjs();
pFtn->Calc();
-// pFtn->UnlockPosOfLowerObjs();
}
- // #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// else
-// {
-// aFtnFrmNotitfy.FrmDeleted();
-// }
}
}
else
@@ -2076,8 +2062,6 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
// lower objects during format of footnote content.
pNextFtn->KeepLockPosOfLowerObjs();
// #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// SwLayNotify aFtnFrmNotitfy( pNextFtn );
while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr )
{
@@ -2115,7 +2099,6 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
// enable lock of lower object position before format of footnote frame.
pNextFtn->UnlockPosOfLowerObjs();
pNextFtn->Calc();
-// pNextFtn->UnlockPosOfLowerObjs();
}
}
}
@@ -2197,9 +2180,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
// #i49383# - disable unlock of position of
// lower objects during format of footnote and footnote content.
SwFtnFrm* pLastFtnFrm( 0L );
- // #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// SwLayNotify* pFtnFrmNotify( 0L );
// footnote frame needs to be locked, if <bLock> isn't set.
bool bUnlockLastFtnFrm( false );
do
@@ -2226,9 +2206,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
// enable lock of lower object position before format of footnote frame.
pLastFtnFrm->UnlockPosOfLowerObjs();
pLastFtnFrm->Calc();
-// pLastFtnFrm->UnlockPosOfLowerObjs();
- // no extra notify for footnote frame
-// delete pFtnFrmNotify;
if ( !bLock && bUnlockLastFtnFrm &&
!pLastFtnFrm->GetLower() &&
!pLastFtnFrm->IsColLocked() &&
@@ -2246,9 +2223,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
}
pFtnFrm->KeepLockPosOfLowerObjs();
pLastFtnFrm = pFtnFrm;
- // #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// pFtnFrmNotify = new SwLayNotify( pLastFtnFrm );
}
// OD 30.10.2002 #97265# - invalidate position of footnote
// frame, if it's below its footnote container, in order to
@@ -2289,10 +2263,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
OSL_ENSURE( pLastFtnFrm == pFtnFrm,
"<SwFtnBossFrm::RearrangeFtns(..)> - <pLastFtnFrm> != <pFtnFrm>" );
pLastFtnFrm = 0L;
- // #i57914# - adjust fix #i49383#
- // no extra notify for footnote frame
-// pFtnFrmNotify->FrmDeleted();
-// delete pFtnFrmNotify;
pFtnFrm->Cut();
delete pFtnFrm;
}
@@ -2367,9 +2337,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
// enable lock of lower object position before format of footnote frame.
pLastFtnFrm->UnlockPosOfLowerObjs();
pLastFtnFrm->Calc();
-// pLastFtnFrm->UnlockPosOfLowerObjs();
- // no extra notify for footnote frame
-// delete pFtnFrmNotify;
if ( !bLock && bUnlockLastFtnFrm &&
!pLastFtnFrm->GetLower() &&
!pLastFtnFrm->IsColLocked() &&
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 2c2520b..64367c6 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2261,8 +2261,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
if ( bCrsrShell )
((SwCrsrShell*)pSh)->SttCrsrMove();
-// else
-// pSh->StartAction();
// If there are accrued paints, it's best to simply invalidate
// the whole window. Otherwise there would arise paint problems whose
@@ -2283,8 +2281,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
// If the Crsr was visible, we need to make it visible again.
// Otherwise, EndCrsrMove with sal_True for IdleEnd
((SwCrsrShell*)pSh)->EndCrsrMove( sal_True^aBools[nBoolIdx] );
-// else
-// pSh->EndAction();
if( bUnlock )
{
if( bCrsrShell )
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 787b759..2b20ac5 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -812,8 +812,6 @@ inline void SetLastPage( SwPageFrm *pPage )
void SwPageFrm::Cut()
{
- //AdjustRootSize( CHG_CUTPAGE, 0 );
-
SwViewShell *pSh = getRootFrm()->GetCurrShell();
if ( !IsEmptyPage() )
{
@@ -2276,8 +2274,6 @@ bool SwRootFrm::IsLeftToRightViewLayout() const
// Layout direction determined by layout direction of the first page.
// #i88036#
// Only ask a non-empty page frame for its layout direction
-// const SwPageFrm* pPage = dynamic_cast<const SwPageFrm*>(Lower());
-// return !pPage->IsRightToLeft() && !pPage->IsVertical();
const SwPageFrm& rPage =
dynamic_cast<const SwPageFrm*>(Lower())->GetFormatPage();
return !rPage.IsRightToLeft() && !rPage.IsVertical();
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 0396891..c3a2766 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4405,15 +4405,6 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& rOutRect,
{
SwRect &rOut = aRegion[i];
aOut = rOut;
- // OD 30.09.2002 #103636# - no SwAlign of shadow rectangle
- // no alignment necessary, because (1) <rRect> is already aligned
- // and because (2) paint of border and background will occur later.
- // Thus, (1) assures that no conflicts with neighbour object will occur
- // and (2) assures that border and background is not affected by the
- // shadow paint.
- /*
- ::SwAlignRect( aOut, pGlobalShell );
- */
if ( rRect.IsOver( aOut ) && aOut.Height() > 0 && aOut.Width() > 0 )
{
aOut._Intersection( rRect );
@@ -6437,9 +6428,6 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const
if ( IS_SUBS || IS_SUBS_TABLE || IS_SUBS_SECTION || IS_SUBS_FLYS )
{
SwRect aRect( rRect );
- // OD 18.02.2003 #104989# - Not necessary and incorrect alignment of
- // the output rectangle.
- //::SwAlignRect( aRect, pGlobalShell );
if ( aRect.HasArea() )
{
//During paint using the root, the array is controlled from there.
@@ -7232,7 +7220,6 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
if( pSection && ( TOX_HEADER_SECTION == pSection->GetType() ||
TOX_CONTENT_SECTION == pSection->GetType() ) &&
(rBack.GetColor() == COL_TRANSPARENT) &&
- ///rBack.GetColor().GetTransparency() &&
rBack.GetGraphicPos() == GPOS_NONE &&
!pOpt->IsPagePreview() &&
!pOpt->IsReadonly() &&
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 2aeb593..10cf5de 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -410,8 +410,6 @@ sal_Bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
return sal_False;
SwSectionFmt *pTmp = (SwSectionFmt*)GetFmt();
-// if( !pTmp->GetSect().GetValue() )
-// return sal_False;
const SwFrmFmt *pOtherFmt = ((SwSectionFrm*)pFrm)->GetFmt();
do
@@ -1058,7 +1056,6 @@ void SwSectionFrm::SimpleFormat()
{
if ( IsJoinLocked() || IsColLocked() )
return;
- // OSL_ENSURE( pFollow, "SimpleFormat: Follow required" );
LockJoin();
SWRECTFN( this )
if( GetPrev() || GetUpper() )
@@ -1454,10 +1451,6 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
if( GetUpper()->IsInTab() || FindFooterOrHeader() )
return 0;
-// Why GetUpper()? This crashes sometimes, because in
-// FlyAtCnt::MakeFlyPos there is an Orient of the SectionFrm and on this a
-// GetLeaf is called
-// SwSectionFrm *pSect = GetUpper()->FindSctFrm();
SwSectionFrm *pSect = FindSctFrm();
bool bWrongPage = false;
OSL_ENSURE( pSect, "GetNextSctLeaf: Missing SectionFrm" );
diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx
index fb31df7..e69e773 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -274,7 +274,6 @@ sal_uInt32 SwSortedObjs::ListPosOf( const SwAnchoredObject& _rAnchoredObj ) cons
if ( aIter != maSortedObjLst.end() )
{
// #i51941#
-// nRetLstPos = aIter - maSortedObjLst.begin();
std::vector< SwAnchoredObject* >::difference_type nPos =
aIter - maSortedObjLst.begin();
nRetLstPos = sal_uInt32( nPos );
commit 94018529211c725bc782c92307fa59cdaa8b7bb1
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Feb 15 21:14:03 2014 +0100
fix comment (referenced class was renamed)
Change-Id: I7537061da3f4110d5f472719065f54d714604fa8
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index d3792c8..250251b 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1787,7 +1787,7 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-// class SwNoReadOnly
+// class SwFmtEditInReadonly
SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const
{
commit feb2b95e70ad66b4c83c9f9318a14677d2191ec9
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Feb 15 21:11:43 2014 +0100
(un)doxygen-ize comments in sw/source/core/layout/
Change-Id: Ia7bcbb6e16e78e2fe9d14cd11052293baebca3d2
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 6f84098..dd54649 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -32,8 +32,8 @@
using namespace ::com::sun::star;
-// helper class for correct notification due to the positioning of
-// the anchored drawing object
+/// helper class for correct notification due to the positioning of
+/// the anchored drawing object
class SwPosNotify
{
private:
@@ -120,7 +120,7 @@ Point SwPosNotify::LastObjPos() const
}
// #i32795#
-// helper class for oscillation control on object positioning
+/// helper class for oscillation control on object positioning
class SwObjPosOscillationControl
{
private:
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 7ee281d..d3792c8 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2453,7 +2453,7 @@ void SwFrmFmt::RegisterToFormat( SwFmt& rFmt )
rFmt.Add( this );
}
-//Deletes all Frms which are registered in aDepend.
+/// Delete all Frms that are registered in aDepend.
void SwFrmFmt::DelFrms()
{
SwIterator<SwFrm,SwFmt> aIter( *this );
@@ -2648,8 +2648,8 @@ SwFlyFrmFmt::~SwFlyFrmFmt()
} while( 0 != ( pC = a2ndIter.Next() ));
}
-//Creates the Frms if the format describes a paragraph-bound frame.
-//MA: 1994-02-14, creates the Frms also for frames anchored at page.
+/// Creates the Frms if the format describes a paragraph-bound frame.
+/// MA: 1994-02-14: creates the Frms also for frames anchored at page.
void SwFlyFrmFmt::MakeFrms()
{
// is there a layout?
@@ -2945,9 +2945,9 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const
{
bool bReturn = false;
- /// NOTE: If background color is "no fill"/"auto fill" (COL_TRANSPARENT)
- /// and there is no background graphic, it "inherites" the background
- /// from its anchor.
+ // NOTE: If background color is "no fill"/"auto fill" (COL_TRANSPARENT)
+ // and there is no background graphic, it "inherites" the background
+ // from its anchor.
if ( (GetBackground().GetColor().GetTransparency() != 0) &&
(GetBackground().GetColor() != COL_TRANSPARENT)
)
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index a09eedc..c7373f7 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1739,8 +1739,8 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
pFrm->mbValidPrtArea = bOldPrt;
}
-// This routine checks whether there are no other FtnBosses
-// between the pFrm's FtnBoss and the pNxt's FtnBoss.
+/// This routine checks whether there are no other FtnBosses
+/// between the pFrm's FtnBoss and the pNxt's FtnBoss.
static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
{
OSL_ENSURE( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" );
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index a584a18..43af0aa 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -191,9 +191,9 @@ const Point SwFlyInCntFrm::GetRelPos() const
return GetCurrRelPos();
}
+/// @see SwRowFrm::RegistFlys()
void SwFlyInCntFrm::RegistFlys()
{
- // vgl. SwRowFrm::RegistFlys()
SwPageFrm *pPage = FindPageFrm();
OSL_ENSURE( pPage, "Register Flys without pages?" );
::RegistFlys( pPage, this );
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 6dc23a5..9197609 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -142,8 +142,8 @@ SwFtnContFrm::SwFtnContFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
mnType = FRMC_FTNCONT;
}
-// lcl_Undersize(..) klappert einen SwFrm und dessen Inneres ab
-// und liefert die Summe aller TxtFrm-Vergroesserungswuensche
+/// lcl_Undersize(..) klappert einen SwFrm und dessen Inneres ab
+/// und liefert die Summe aller TxtFrm-Vergroesserungswuensche
static long lcl_Undersize( const SwFrm* pFrm )
{
long nRet = 0;
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index afbec87..2c2520b 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -206,10 +206,10 @@ sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *p
}
}
- /// OD 19.08.2002 #99657#
- /// Fly frame without a lower have to be subtracted from paint region.
- /// For checking, if fly frame contains transparent graphic or
- /// has surrounded contour, assure that fly frame has a lower
+ // OD 19.08.2002 #99657#
+ // Fly frame without a lower have to be subtracted from paint region.
+ // For checking, if fly frame contains transparent graphic or
+ // has surrounded contour, assure that fly frame has a lower
if ( pFly->Lower() &&
pFly->Lower()->IsNoTxtFrm() &&
( ((SwNoTxtFrm*)pFly->Lower())->IsTransparent() ||
@@ -219,9 +219,9 @@ sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *p
continue;
}
- /// OD 19.08.2002 #99657#
- /// Region of a fly frame with transparent background or a transparent
- /// shadow have not to be subtracted from paint region
+ // OD 19.08.2002 #99657#
+ // Region of a fly frame with transparent background or a transparent
+ // shadow have not to be subtracted from paint region
if ( pFly->IsBackgroundTransparent() ||
pFly->IsShadowTransparent() )
{
@@ -1045,11 +1045,11 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
{
if ( bBrowse )
{
- /// OD 15.10.2002 #103517# - format complete page
- /// Thus, loop on all lowers of the page <prPage>, instead of only
- /// format its first lower.
- /// NOTE: In online layout (bBrowse == true) a page can contain
- /// a header frame and/or a footer frame beside the body frame.
+ // OD 15.10.2002 #103517# - format complete page
+ // Thus, loop on all lowers of the page <prPage>, instead of only
+ // format its first lower.
+ // NOTE: In online layout (bBrowse == true) a page can contain
+ // a header frame and/or a footer frame beside the body frame.
prPage->Calc();
SwFrm* pPageLowerFrm = prPage->Lower();
while ( pPageLowerFrm )
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 38a03e5..810e30a 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -127,13 +127,13 @@ public:
bool CheckInsertPage();
- // Look for fresh text frames at this (new) page and set them to the right
- // position, if they are in the fly cache.
+ /// Look for fresh text frames at this (new) page and set them to the right
+ /// position, if they are in the fly cache.
void CheckFlyCache( SwPageFrm* pPage )
{ if( pImpl && nFlyIdx < pImpl->GetFlyCount() ) _CheckFlyCache( pPage ); }
- // Look for this text frame and set it to the right position,
- // if it's in the fly cache.
+ /// Look for this text frame and set it to the right position,
+ /// if it's in the fly cache.
static bool CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly );
};
@@ -174,35 +174,35 @@ private:
public:
SwLayCacheIoImpl( SvStream& rStrm, bool bWrtMd );
- // Get input or output stream
+ /// Get input or output stream
SvStream& GetStream() const { return *pStream; }
- // Open a record of type "nType"
+ /// Open a record of type "nType"
bool OpenRec( sal_uInt8 nType );
- // Close a record of type "nType". This skips any unread data that
- // remains in the record.
+ /// Close a record of type "nType". This skips any unread data that
+ /// remains in the record.
bool CloseRec( sal_uInt8 nType );
- // Return the number of bytes contained in the current record that
- // haven't been read by now.
+ /// Return the number of bytes contained in the current record that
+ /// haven't been read by now.
sal_uInt32 BytesLeft();
- // Return the current record's type
+ /// Return the current record's type
sal_uInt8 Peek();
- // Skip the current record
+ /// Skip the current record
void SkipRec();
- // Open a flag record for reading. The uppermost four bits are flags,
- // while the lowermost are the flag record's size. Flag records cannot
- // be nested.
+ /// Open a flag record for reading. The uppermost four bits are flags,
+ /// while the lowermost are the flag record's size. Flag records cannot
+ /// be nested.
sal_uInt8 OpenFlagRec();
- // Open flag record for writing;
+ /// Open flag record for writing;
void OpenFlagRec( sal_uInt8 nFlags, sal_uInt8 nLen );
- // Close a flag record. Any bytes left are skipped.
+ /// Close a flag record. Any bytes left are skipped.
void CloseFlagRec();
bool HasError() const { return bError; }
@@ -215,8 +215,8 @@ public:
class SwFlyCache : public SwRect // position and size
{
public:
- sal_uLong nOrdNum; // Id to recognize text frames
- sal_uInt16 nPageNum; // page number
+ sal_uLong nOrdNum; ///< Id to recognize text frames
+ sal_uInt16 nPageNum; ///< page number
SwFlyCache( sal_uInt16 nP, sal_uLong nO, long nXL, long nYL, long nWL, long nHL ) :
SwRect( nXL, nYL, nWL, nHL ), nOrdNum( nO ), nPageNum( nP ){}
};
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e622f7b..0396891 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7220,15 +7220,15 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
if( pFrm->IsSctFrm() )
{
const SwSection* pSection = ((SwSectionFrm*)pFrm)->GetSection();
- /// OD 20.08.2002 #99657# #GetTransChg#
- /// Note: If frame <pFrm> is a section of the index and
- /// it its background color is "no fill"/"auto fill" and
- /// it has no background graphic and
- /// we are not in the page preview and
- /// we are not in read-only mode and
- /// option "index shadings" is set and
- /// the output is not the printer
- /// then set <rpCol> to the color of the index shading
+ // OD 20.08.2002 #99657# #GetTransChg#
+ // Note: If frame <pFrm> is a section of the index and
+ // it its background color is "no fill"/"auto fill" and
+ // it has no background graphic and
+ // we are not in the page preview and
+ // we are not in read-only mode and
+ // option "index shadings" is set and
+ // the output is not the printer
+ // then set <rpCol> to the color of the index shading
if( pSection && ( TOX_HEADER_SECTION == pSection->GetType() ||
TOX_CONTENT_SECTION == pSection->GetType() ) &&
(rBack.GetColor() == COL_TRANSPARENT) &&
@@ -7246,15 +7246,15 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
}
}
- /// OD 20.08.2002 #99657#
- /// determine, if background draw of frame <pFrm> considers transparency
- /// --> Status Quo: background transparency have to be
- /// considered for fly frames
+ // OD 20.08.2002 #99657#
+ // determine, if background draw of frame <pFrm> considers transparency
+ // --> Status Quo: background transparency have to be
+ // considered for fly frames
const sal_Bool bConsiderBackgroundTransparency = pFrm->IsFlyFrm();
- /// OD 20.08.2002 #99657#
- /// add condition:
- /// If <bConsiderBackgroundTransparency> is set - see above -,
- /// return brush of frame <pFrm>, if its color is *not* "no fill"/"auto fill"
+ // OD 20.08.2002 #99657#
+ // add condition:
+ // If <bConsiderBackgroundTransparency> is set - see above -,
+ // return brush of frame <pFrm>, if its color is *not* "no fill"/"auto fill"
if ( !rBack.GetColor().GetTransparency() ||
rBack.GetGraphicPos() != GPOS_NONE ||
rpCol ||
@@ -7285,14 +7285,13 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
}
if ( bLowerMode )
- /// Do not try to get background brush from parent (anchor/upper)
+ // Do not try to get background brush from parent (anchor/upper)
return sal_False;
- /// get parent frame - anchor or upper - for next loop
+ // get parent frame - anchor or upper - for next loop
if ( pFrm->IsFlyFrm() )
- /// OD 20.08.2002 - use "static_cast" instead of "old C-cast"
+ // OD 20.08.2002 - use "static_cast" instead of "old C-cast"
pFrm = (static_cast<const SwFlyFrm*>(pFrm))->GetAnchorFrm();
- ///pFrm = ((SwFlyFrm*)pFrm)->GetAnchor();
else
pFrm = pFrm->GetUpper();
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index c4f20ea..2aeb593 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1868,9 +1868,8 @@ static SwTwips lcl_DeadLine( const SwFrm* pFrm )
return pUp ? (pUp->*fnRect->fnGetPrtBottom)() :
(pFrm->Frm().*fnRect->fnGetBottom)();
}
-// SwSectionFrm::Growable(..) checks whether the SectionFrm is still able to
-// grow, as case may be the environment has to be asked
+/// checks whether the SectionFrm is still able to grow, as case may be the environment has to be asked
sal_Bool SwSectionFrm::Growable() const
{
SWRECTFN( this )
commit 0ffc090d80707017f5f590c43be6c25184298a93
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Feb 15 21:05:14 2014 +0100
fdo#62475 - remove visual noise
- remove "borders"
- move method explanations if misplaced
- rewrite for Doxygen if needed
- "shrink" multiple blank lines
Change-Id: Ia4678b7f2456de70eb307e9c0d80c4ecd068048b
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index f88690b..6f84098 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -32,10 +32,8 @@
using namespace ::com::sun::star;
-// ============================================================================
// helper class for correct notification due to the positioning of
// the anchored drawing object
-// ============================================================================
class SwPosNotify
{
private:
@@ -121,10 +119,8 @@ Point SwPosNotify::LastObjPos() const
return maOldObjRect.Pos();
}
-// ============================================================================
// #i32795#
// helper class for oscillation control on object positioning
-// ============================================================================
class SwObjPosOscillationControl
{
private:
@@ -192,9 +188,8 @@ bool SwObjPosOscillationControl::OscillationDetected()
return bOscillationDetected;
}
-// ============================================================================
-// implementation of class <SwAnchoredDrawObject>
-// ============================================================================
+// class <SwAnchoredDrawObject>
+
TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject);
SwAnchoredDrawObject::SwAnchoredDrawObject() :
@@ -247,10 +242,6 @@ bool SwAnchoredDrawObject::IsOutsidePage() const
return bOutsidePage;
}
-// =============================================================================
-// #i26791# - implementation of pure virtual method declared in
-// base class <SwAnchoredObject>
-// =============================================================================
void SwAnchoredDrawObject::MakeObjPos()
{
if ( IsPositioningInProgress() )
@@ -848,6 +839,4 @@ void SwAnchoredDrawObject::RegisterAtCorrectPage()
}
}
-// =============================================================================
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index e111823..6abe433 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -30,14 +30,11 @@
// --> #i35911#
#include <layouter.hxx>
-
using namespace ::com::sun::star;
-
-// ============================================================================
// --> #i28701# -
// implementation of helper class <SwObjPositioningInProgress>
-// ============================================================================
+
SwObjPositioningInProgress::SwObjPositioningInProgress( SdrObject& _rSdrObj ) :
mpAnchoredObj( 0L ),
// --> #i52904#
@@ -67,7 +64,7 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress()
}
}
-// ============================================================================
+// SwAnchoredObject
TYPEINIT0(SwAnchoredObject);
@@ -112,9 +109,6 @@ SwAnchoredObject::~SwAnchoredObject()
ClearVertPosOrientFrm();
}
-// =============================================================================
-// accessors for member <mpDrawObj>
-// =============================================================================
void SwAnchoredObject::SetDrawObj( SdrObject& _rDrawObj )
{
mpDrawObj = &_rDrawObj;
@@ -130,9 +124,6 @@ SdrObject* SwAnchoredObject::DrawObj()
return mpDrawObj;
}
-// =============================================================================
-// accessors for member <mpAnchorFrm>
-// =============================================================================
const SwFrm* SwAnchoredObject::GetAnchorFrm() const
{
return mpAnchorFrm;
@@ -174,9 +165,6 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos()
return pAnchorFrmContainingAnchPos;
}
-// =============================================================================
-// #i28701# accessors for member <mpPageFrm>
-// =============================================================================
SwPageFrm* SwAnchoredObject::GetPageFrm()
{
return mpPageFrm;
@@ -205,9 +193,6 @@ void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm )
}
}
-// =============================================================================
-// accessors for member <maLastCharRect>
-// =============================================================================
const SwRect& SwAnchoredObject::GetLastCharRect() const
{
return maLastCharRect;
@@ -232,9 +217,7 @@ void SwAnchoredObject::ResetLastCharRectHeight()
{
maLastCharRect.Height( 0 );
}
-// =============================================================================
-// accessors for member <mpVertPosOrientFrm>
-// =============================================================================
+
void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFrm )
{
ClearVertPosOrientFrm();
@@ -248,9 +231,6 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr
RegisterAtCorrectPage();
}
-// =============================================================================
-// accessors for member <mnLastTopOfLine>
-// =============================================================================
SwTwips SwAnchoredObject::GetLastTopOfLine() const
{
return mnLastTopOfLine;
@@ -554,9 +534,6 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOfOtherObjs() const
return bRet;
}
-// =============================================================================
-// --> #i28701# - accessors to booleans for layout process
-// =============================================================================
bool SwAnchoredObject::ConsiderForTextWrap() const
{
if ( ConsiderObjWrapInfluenceOnObjPos() )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 690538b..7ee281d 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1102,7 +1102,6 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-
// class SwFmtSurround
// Partially implemented inline in hxx
@@ -1325,7 +1324,6 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
-
// class SwFmtHoriOrient
// Partially implemented inline in hxx
@@ -1422,8 +1420,6 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-
-
// class SwFmtAnchor
// Partially implemented inline in hxx
@@ -1634,7 +1630,6 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SwFmtURL
// Partially implemented inline in hxx
-
SwFmtURL::SwFmtURL() :
SfxPoolItem( RES_URL ),
pMap( 0 ),
@@ -1792,7 +1787,6 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-
// class SwNoReadOnly
SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const
@@ -1814,7 +1808,6 @@ SfxPoolItem* SwFmtRowSplit::Clone( SfxItemPool* ) const
return new SwFmtRowSplit( GetValue() );
}
-
// class SwFmtNoBalancedColumns
SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* ) const
@@ -1955,7 +1948,6 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-
// class SwFmtFtnAtTxtEnd
SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* ) const
@@ -1976,7 +1968,6 @@ SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const
//class SwFmtChain
-
bool SwFmtChain::operator==( const SfxPoolItem &rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
@@ -2040,9 +2031,6 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
return bRet;
}
-
-
-
//class SwFmtLineNumber
SwFmtLineNumber::SwFmtLineNumber() :
@@ -2118,9 +2106,7 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-/*************************************************************************
- * class SwTextGridItem
- *************************************************************************/
+// class SwTextGridItem
SwTextGridItem::SwTextGridItem()
: SfxPoolItem( RES_TEXTGRID ), aColor( COL_LIGHTGRAY ), nLines( 20 ),
@@ -2406,6 +2392,7 @@ void SwTextGridItem::Init()
//}
}
}
+
// class SwHeaderAndFooterEatSpacingItem
SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
@@ -2413,7 +2400,6 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
}
-
// class SwFrmFmt
// Partially implemented inline in hxx
@@ -2468,7 +2454,6 @@ void SwFrmFmt::RegisterToFormat( SwFmt& rFmt )
}
//Deletes all Frms which are registered in aDepend.
-
void SwFrmFmt::DelFrms()
{
SwIterator<SwFrm,SwFmt> aIter( *this );
@@ -2485,8 +2470,6 @@ void SwFrmFmt::MakeFrms()
OSL_ENSURE( !this, "Sorry not implemented." );
}
-
-
SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
const sal_Bool bCalcFrm ) const
{
@@ -2561,7 +2544,6 @@ SdrObject* SwFrmFmt::FindRealSdrObject()
return FindSdrObject();
}
-
sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
{
//Also linking from inside to outside or from outside to inside is not
@@ -2668,7 +2650,6 @@ SwFlyFrmFmt::~SwFlyFrmFmt()
//Creates the Frms if the format describes a paragraph-bound frame.
//MA: 1994-02-14, creates the Frms also for frames anchored at page.
-
void SwFlyFrmFmt::MakeFrms()
{
// is there a layout?
@@ -2861,7 +2842,6 @@ SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const sal_Bo
}
}
-
bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
{
bool bRet = true;
@@ -3077,6 +3057,7 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
mrFlyFrmFmt.MakeFrms();
}
}
+
// class SwDrawFrmFmt
// Partially implemented inline in hxx
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index fed1316..a09eedc 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -42,19 +42,9 @@
// #i36347#
#include <flyfrms.hxx>
-//------------------------------------------------------------------------
-// Move methods
-//------------------------------------------------------------------------
-
-/*************************************************************************
-|*
-|* SwCntntFrm::ShouldBwdMoved()
-|*
-|* Description Return value tells whether the Frm should be moved.
-|*
-|*************************************************************************/
-
+// Move methods
+/// Return value tells whether the Frm should be moved.
sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool & )
{
if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove()))
@@ -213,27 +203,8 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
return sal_False;
}
-//------------------------------------------------------------------------
-// Calc methods
-//------------------------------------------------------------------------
-
-/*************************************************************************
-|*
-|* SwFrm::Prepare()
-|*
-|* Description: Prepares the Frm for "formatting" (MakeAll()).
-|* This method serves to save stack space: To calculate the position
-|* of the Frm we have to make sure that the positions of Upper and Prev
-|* respectively are valid. This may require a recursive call (a loop
-|* would be quite expensive, as it's not required very often).
-|* Every call of MakeAll requires around 500 bytes on the stack - you
-|* easily see where this leads. _Prepare requires only a little bit of
-|* stack space, so the recursive call should not be a problem here.
-|* Another advantage is that one nice day, _Prepare and with it
-|* the formatting of predecessors could be avoided. Then it could
-|* probably be possible to jump "quickly" to the document's end.
-|*
-|*************************************************************************/
+// Calc methods
+
// Two little friendships form a secret society
inline void PrepareLock( SwFlowFrm *pTab )
{
@@ -256,6 +227,23 @@ static bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm )
!( rFrm.IsTabFrm() && rFrm.GetUpper()->IsInTab() );
}
+/** Prepares the Frame for "formatting" (MakeAll()).
+ *
+ * This method serves to save stack space: To calculate the position of the Frm
+ * we have to make sure that the positions of Upper and Prev respectively are
+ * valid. This may require a recursive call (a loop would be quite expensive,
+ * as it's not required very often).
+ *
+ * Every call of MakeAll requires around 500 bytes on the stack - you easily
+ * see where this leads to. This method requires only a little bit of stack
+ * space, so the recursive call should not be a problem here.
+ *
+ * Another advantage is that one nice day, this method and with it the
+ * formatting of predecessors could be avoided. Then it could probably be
+ * possible to jump "quickly" to the document's end.
+ *
+ * @see MakeAll()
+ */
void SwFrm::PrepareMake()
{
StackHack aHack;
@@ -382,8 +370,6 @@ void SwFrm::OptPrepareMake()
}
}
-
-
void SwFrm::PrepareCrsr()
{
StackHack aHack;
@@ -461,12 +447,6 @@ void SwFrm::PrepareCrsr()
Calc();
}
-/*************************************************************************
-|*
-|* SwFrm::MakePos()
-|*
-|*************************************************************************/
-
// Here we return GetPrev(); however we will ignore empty SectionFrms
static SwFrm* lcl_Prev( SwFrm* pFrm, bool bSectPrv = true )
{
@@ -631,11 +611,6 @@ void SwFrm::MakePos()
}
}
-/*************************************************************************
-|*
-|* SwPageFrm::MakeAll()
-|*
-|*************************************************************************/
// #i28701# - new type <SwSortedObjs>
static void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot )
{
@@ -810,13 +785,6 @@ void SwPageFrm::MakeAll()
"Upper (Root) must be wide enough to contain the widest page");
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::MakeAll()
-|*
-|*************************************************************************/
-
-
void SwLayoutFrm::MakeAll()
{
PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
@@ -894,11 +862,6 @@ void SwLayoutFrm::MakeAll()
delete pAccess;
}
-/*************************************************************************
-|*
-|* SwCntntFrm::MakePrtArea()
-|*
-|*************************************************************************/
bool SwTxtNode::IsCollapse() const
{
if (GetDoc()->get( IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA )
@@ -1064,12 +1027,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
return bSizeChgd;
}
-/*************************************************************************
-|*
-|* SwCntntFrm::MakeAll()
-|*
-|*************************************************************************/
-
#define STOP_FLY_FORMAT 10
// - loop prevention
const int cnStopFormat = 15;
@@ -1704,7 +1661,6 @@ void SwCntntFrm::MakeAll()
} //while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
-
// NEW: Looping Louie (Light). Should not be applied in balanced sections.
// Should only be applied if there is no better solution!
LOOPING_LOUIE_LIGHT( bMovedFwd && bMovedBwd && !IsInBalancedSection() &&
@@ -1736,15 +1692,6 @@ void SwCntntFrm::MakeAll()
SetFlyLock( sal_False );
}
-/*************************************************************************
-|*
-|* SwCntntFrm::_WouldFit()
-|*
-|*************************************************************************/
-
-
-
-
void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
{
// fix(25455): Validate, otherwise this leads to a recursion.
@@ -1794,7 +1741,6 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
// This routine checks whether there are no other FtnBosses
// between the pFrm's FtnBoss and the pNxt's FtnBoss.
-
static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
{
OSL_ENSURE( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" );
@@ -1810,7 +1756,6 @@ static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
return ( pFrm && pNxt && pFrm->GetNext() == pNxt );
}
-//
sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
SwLayoutFrm *pNewUpper,
sal_Bool bTstMove,
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 5088bf3..34d8baa 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editeng/ulspitem.hxx>
#include <fmtclds.hxx>
#include <fmtfordr.hxx>
@@ -33,12 +32,6 @@
// ftnfrm.cxx:
void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes );
-
-/*************************************************************************
-|*
-|* SwColumnFrm::SwColumnFrm()
-|*
-|*************************************************************************/
SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
SwFtnBossFrm( pFmt, pSib )
{
@@ -61,12 +54,6 @@ SwColumnFrm::~SwColumnFrm()
}
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::ChgColumns()
-|*
-|*************************************************************************/
-
static void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
{
OSL_ENSURE( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(),
@@ -106,7 +93,6 @@ static SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount )
return 0;
}
-
static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
{
SwDoc *pDoc = pCont->GetFmt()->GetDoc();
@@ -174,14 +160,16 @@ static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
return bRet;
}
-/*--------------------------------------------------
- * ChgColumns() adds or removes columns from a layoutframe.
+/** add or remove columns from a layoutframe.
+ *
* Normally, a layoutframe with a column attribut of 1 or 0 columns contains
* no columnframe. However, a sectionframe with "footnotes at the end" needs
- * a columnframe. If the bChgFtn-flag is set, the columnframe will be inserted
- * or remove, if necessary.
- * --------------------------------------------------*/
-
+ * a columnframe.
+ *
+ * @param rOld
+ * @param rNew
+ * @param bChgFtn if true, the columnframe will be inserted or removed, if necessary.
+ */
void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
const sal_Bool bChgFtn )
{
@@ -292,12 +280,6 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
}
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::AdjustColumns()
-|*
-|*************************************************************************/
-
void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttributes )
{
if( !Lower()->GetNext() )
@@ -446,8 +428,4 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut
}
}
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index f8b52ee..4f46272 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -199,8 +199,7 @@ public:
void ChkStream() { if( !pStream ) NewStream(); }
};
-/* --------------------------------------------------
- * Through the PROTOCOL_ENTER macro a SwEnterLeave object gets created. If the
+/* Through the PROTOCOL_ENTER macro a SwEnterLeave object gets created. If the
* current function should be logged a SwImplEnterLeace object gets created.
* The funny thing here is, that the Ctor of the Impl object is automatically
* called at the beginning of the function and the Dtor is automatically called
@@ -209,7 +208,7 @@ public:
* It's possible to derive from this class, for example to be able to document
* frame resize while leaving a function. To do this, one only needs to add the
* desired SwImplEnterLeave class in SwEnterLeave::Ctor().
- * --------------------------------------------------*/
+ */
class SwImplEnterLeave
{
@@ -341,10 +340,7 @@ SwImplProtocol::~SwImplProtocol()
aVars.clear();
}
-/* --------------------------------------------------
- * SwImplProtocol::CheckLine analyzes a line in the INI file
- * --------------------------------------------------*/
-
+/// analyze a line in the INI file
void SwImplProtocol::CheckLine( OString& rLine )
{
rLine = rLine.toAsciiLowerCase(); // upper/lower case is the same
@@ -444,10 +440,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
while ( nIndex >= 0 );
}
-/* --------------------------------------------------
- * SwImplProtocol::FileInit() reads the file "dbg_lay.ini"
- * in the current directory and evaluates it.
- * --------------------------------------------------*/
+/// read the file "dbg_lay.ini" in the current directory and evaluate it.
void SwImplProtocol::FileInit()
{
OUString aName("dbg_lay.ini");
@@ -476,10 +469,7 @@ void SwImplProtocol::FileInit()
aStream.Close();
}
-/* --------------------------------------------------
- * lcl_Start enables indentation by two spaces during ACT_START and disables
- * it again at ACT_END.
- * --------------------------------------------------*/
+/// enable indentation by two spaces during ACT_START and disable it again at ACT_END.
static void lcl_Start(OStringBuffer& rOut, OStringBuffer& rLay, sal_uLong nAction)
{
if( nAction == ACT_START )
@@ -498,11 +488,8 @@ static void lcl_Start(OStringBuffer& rOut, OStringBuffer& rLay, sal_uLong nActio
}
}
-/* --------------------------------------------------
- * lcl_Flags outputs the ValidSize-, ValidPos- and ValidPrtArea-Flag ("Sz","Ps","PA")
- * of the frame; "+" stands for valid, "-" stands for invalid.
- * --------------------------------------------------*/
-
+/// output the ValidSize-, ValidPos- and ValidPrtArea-Flag ("Sz","Ps","PA")
+/// of the frame; "+" stands for valid, "-" stands for invalid.
static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm)
{
rOut.append(" Sz");
@@ -513,10 +500,7 @@ static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm)
rOut.append(pFrm->GetValidPrtAreaFlag() ? '+' : '-');
}
-/* --------------------------------------------------
- * lcl_FrameType outputs the type of the frame as clear text.
- * --------------------------------------------------*/
-
+/// output the type of the frame as plain text.
static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm )
{
if( pFrm->IsTxtFrm() )
@@ -562,12 +546,12 @@ static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm )
rOut.append("Not impl. ");
}
-/* --------------------------------------------------
- * SwImplProtocol::Record(..) is only called if the PROTOCOL macro finds out,
- * that this function should be recorded ( SwProtocol::nRecord ).
+/**
+ * Is only called if the PROTOCOL macro finds out,
+ * that this function should be recorded ( @see{SwProtocol::nRecord} ).
+ *
* In this method we also check if FrmId and frame type should be logged.
- * --------------------------------------------------*/
-
+ */
void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam )
{
sal_uInt16 nSpecial = 0;
@@ -728,11 +712,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
SwProtocol::SetRecord( 0 ); // => end f logging
}
-/* --------------------------------------------------
- * SwImplProtocol::SectFunc(...) is called from SwImplProtocol::_Record(..)
- * here we handle the output of the SectionFrms.
- * --------------------------------------------------*/
-
+/// Handle the output of the SectionFrms.
void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam)
{
bool bTmp = false;
@@ -760,12 +740,13 @@ void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrm* , sal_uLong nAct
}
}
-/* --------------------------------------------------
- * SwImplProtocol::InsertFrm(..) takes a new FrmId for logging; if pFrmIds==NULL
- * all are going to be logged but as soon as pFrmIds are set through
- * InsertFrm(..) only the added FrmIds are being logged.
- * --------------------------------------------------*/
-
+/**
+ * if pFrmIds==NULL all Frames will be logged. But as soon as pFrmIds are
+ * set, only the added FrmIds are being logged.
+ *
+ * @param nId new FrmId for logging
+ * @return TRUE if newly added, FALSE if FrmId is already under control
+ */
bool SwImplProtocol::InsertFrm( sal_uInt16 nId )
{
if( !pFrmIds )
@@ -776,10 +757,7 @@ bool SwImplProtocol::InsertFrm( sal_uInt16 nId )
return true;
}
-/* --------------------------------------------------
- * SwImplProtocol::DeleteFrm(..) removes a FrmId from the pFrmIds array, so they
- * won't be logged anymore.
- * --------------------------------------------------*/
+/// Removes a FrmId from the pFrmIds array, so that it won't be logged anymore.
bool SwImplProtocol::DeleteFrm( sal_uInt16 nId )
{
if( !pFrmIds )
@@ -789,12 +767,11 @@ bool SwImplProtocol::DeleteFrm( sal_uInt16 nId )
return false;
}
-/* --------------------------------------------------
- * SwEnterLeave::Ctor(..) is called from the (inline-)CTor if the function should
+/* SwEnterLeave::Ctor(..) is called from the (inline-)CTor if the function should
* be logged.
* The task here is to find the right SwImplEnterLeave object based on the
* function; everything else is then done in his Ctor/Dtor.
- * --------------------------------------------------*/
+ */
void SwEnterLeave::Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar )
{
switch( nFunc )
@@ -810,12 +787,10 @@ void SwEnterLeave::Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, voi
pImpl->Enter();
}
-/* --------------------------------------------------
- * SwEnterLeave::Dtor() only calls the Dtor of the SwImplEnterLeave object. It's
+/* SwEnterLeave::Dtor() only calls the Dtor of the SwImplEnterLeave object. It's
* just no inline because we don't want the SwImplEnterLeave definition inside
* dbg_lay.hxx.
- * --------------------------------------------------*/
-
+ */
void SwEnterLeave::Dtor()
{
if( pImpl )
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 32aee61..98b2bad 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -32,13 +32,7 @@
#include <txtfrm.hxx>
#include <switerator.hxx>
-/*************************************************************************
-|*
-|* FindBodyCont, FindLastBodyCntnt()
-|*
-|* Description Searches the first/last CntntFrm in BodyText below the page.
-|*
-|*************************************************************************/
+/// Searches the first CntntFrm in BodyText below the page.
SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
{
SwFrm *pLay = Lower();
@@ -47,6 +41,7 @@ SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
return (SwLayoutFrm*)pLay;
}
+/// Searches the last CntntFrm in BodyText below the page.
SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
{
SwCntntFrm *pRet = FindFirstBodyCntnt();
@@ -58,16 +53,10 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
return pRet;
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::ContainsCntnt
-|*
-|* Description Checks if the frame contains one or more CntntFrm's
-|* anywhere in his subsidiary structure; if so the first found CntntFrm
-|* is returned
-|*
-|*************************************************************************/
-
+/**
+ * Checks if the frame contains one or more CntntFrm's anywhere in his
+ * subsidiary structure; if so the first found CntntFrm is returned.
+ */
const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
{
//Search downwards the layout leaf and if there is no content, jump to the
@@ -109,16 +98,11 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const
return 0;
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::FirstCell
-|*
-|* Description Calls ContainsAny first to reach the innermost cell. From
-|* there we walk back up to the first SwCellFrm. Since we use
-|* SectionFrms ContainsCntnt()->GetUpper() is not enough any
-|* more.
-|*************************************************************************/
-
+/**
+ * Calls ContainsAny first to reach the innermost cell. From there we walk back
+ * up to the first SwCellFrm. Since we use SectionFrms, ContainsCntnt()->GetUpper()
+ * is not enough anymore.
+ */
const SwCellFrm *SwLayoutFrm::FirstCell() const
{
const SwFrm* pCnt = ContainsAny();
@@ -127,17 +111,11 @@ const SwCellFrm *SwLayoutFrm::FirstCell() const
return (const SwCellFrm*)pCnt;
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::ContainsAny
-|*
-|* like ComtainsCntnt, but does not only return CntntFrms but
-|* also sections and tables.
-|*************************************************************************/
-
-// #130797#
-// New parameter <_bInvestigateFtnForSections> controls investigation of
-// content of footnotes for sections.
+/** return CntntFrms, sections, and tables.
+ *
+ * @param _bInvestigateFtnForSections controls investigation of content of footnotes for sections.
+ * @see ContainsCntnt
+ */
const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const
{
//Search downwards the layout leaf and if there is no content, jump to the
@@ -178,12 +156,6 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
return 0;
}
-
-/*************************************************************************
-|*
-|* SwFrm::GetLower()
-|*
-|*************************************************************************/
const SwFrm* SwFrm::GetLower() const
{
return IsLayoutFrm() ? ((SwLayoutFrm*)this)->Lower() : 0;
@@ -194,11 +166,6 @@ SwFrm* SwFrm::GetLower()
return IsLayoutFrm() ? ((SwLayoutFrm*)this)->Lower() : 0;
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::IsAnLower()
-|*
-|*************************************************************************/
sal_Bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
{
const SwFrm *pUp = pAssumed;
@@ -274,9 +241,7 @@ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const
return bReturn;
}
-//
// Local helper functions for GetNextLayoutLeaf
-//
static const SwFrm* lcl_FindLayoutFrame( const SwFrm* pFrm, bool bNext )
{
@@ -299,18 +264,13 @@ static const SwFrm* lcl_GetLower( const SwFrm* pFrm, bool bFwd )
static_cast<const SwLayoutFrm*>(pFrm)->GetLastLower();
}
-/*************************************************************************
-|*
-|* SwFrm::ImplGetNextLayoutLeaf
-|*
-|* Finds the next layout leaf. This is a layout frame, which does not
+/**
+ * Finds the next layout leaf. This is a layout frame, which does not
* have a lower which is a LayoutFrame. That means, pLower can be 0 or a
* content frame.
*
* However, pLower may be a TabFrm
- *
-|*************************************************************************/
-
+ */
const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const
{
const SwFrm *pFrm = this;
@@ -355,22 +315,16 @@ const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const
return pLayoutFrm;
}
-
-
-/*************************************************************************
-|*
-|* SwFrm::ImplGetNextCntntFrm( bool )
-|*
-|* Walk back inside the tree: grab the subordinate Frm if one exists and
-|* the last step was not moving up a level (this would lead to an infinite
-|* up/down loop!). With this we ensure that during walking back we search
-|* through all sub trees. If we walked downwards we have to go to the end
-|* of the chain first because we go backwards from the last Frm inside
-|* another Frm. Walking forward works the same.
-|*************************************************************************/
-
-// Caution: fixes in ImplGetNextCntntFrm() may also need to be applied to the
-// lcl_NextFrm(..) method above
+/**
+ * Walk back inside the tree: grab the subordinate Frm if one exists and the
+ * last step was not moving up a level (this would lead to an infinite up/down
+ * loop!). With this we ensure that during walking back we search through all
+ * sub trees. If we walked downwards we have to go to the end of the chain first
+ * because we go backwards from the last Frm inside another Frm. Walking
+ * forward works the same.
+ *
+ * @warning fixes here may also need to be applied to the @{lcl_NextFrm} method above
+ */
const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const
{
const SwFrm *pFrm = this;
@@ -410,15 +364,6 @@ const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const
return pCntntFrm;
}
-
-
-
-/*************************************************************************
-|*
-|* SwFrm::FindRootFrm(), FindTabFrm(), FindFtnFrm(), FindFlyFrm(),
-|* FindPageFrm(), FindColFrm()
-|*
-|*************************************************************************/
SwPageFrm* SwFrm::FindPageFrm()
{
SwFrm *pRet = this;
@@ -606,11 +551,6 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
return pRet;
}
-/*************************************************************************
-|*
-|* SwFrmFrm::GetAttrSet()
-|*
-|*************************************************************************/
const SwAttrSet* SwFrm::GetAttrSet() const
{
if ( IsCntntFrm() )
@@ -1225,14 +1165,8 @@ void SwFrm::InvalidateNextPrtArea()
}
}
-/*************************************************************************
-|*
-|* lcl_IsInColSect()
-|*
-|* returns true if the frame _directly_ sits in a section with columns
-|* but not if it sits in a table which itself sits in a section with columns.
-|*************************************************************************/
-
+/// @returns true if the frame _directly_ sits in a section with columns
+/// but not if it sits in a table which itself sits in a section with columns.
static bool lcl_IsInColSct( const SwFrm *pUp )
{
bool bRet = false;
@@ -1249,11 +1183,6 @@ static bool lcl_IsInColSct( const SwFrm *pUp )
return false;
}
-/*************************************************************************
-|*
-|* SwFrm::IsMoveable();
-|*
-|*************************************************************************/
/** determine, if frame is moveable in given environment
OD 08.08.2003 #110978#
@@ -1264,7 +1193,6 @@ static bool lcl_IsInColSct( const SwFrm *pUp )
@author OD
*/
-
bool SwFrm::IsMoveable( const SwLayoutFrm* _pLayoutFrm ) const
{
bool bRetVal = false;
@@ -1327,11 +1255,6 @@ bool SwFrm::IsMoveable( const SwLayoutFrm* _pLayoutFrm ) const
return bRetVal;
}
-/*************************************************************************
-|*
-|* SwFrm::SetInfFlags();
-|*
-|*************************************************************************/
void SwFrm::SetInfFlags()
{
if ( !IsFlyFrm() && !GetUpper() ) //not yet pasted, no information available
@@ -1364,13 +1287,11 @@ void SwFrm::SetInfFlags()
} while ( pFrm && !pFrm->IsPageFrm() ); //there is nothing above the page
}
-/*
- * SwFrm::SetDirFlags( sal_Bool )
- * actualizes the vertical or the righttoleft-flags.
+/** Updates the vertical or the righttoleft-flags.
+ *
* If the property is derived, it's from the upper or (for fly frames) from
* the anchor. Otherwise we've to call a virtual method to check the property.
*/
-
void SwFrm::SetDirFlags( sal_Bool bVert )
{
if( bVert )
@@ -1742,9 +1663,6 @@ bool SwFrm::IsInBalancedSection() const
return bRet;
}
-/*
- * SwLayoutFrm::GetLastLower()
- */
const SwFrm* SwLayoutFrm::GetLastLower() const
{
const SwFrm* pRet = Lower();
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index cadb1c2..e946819 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -52,14 +52,6 @@
sal_Bool SwFlowFrm::m_bMoveBwdJump = sal_False;
-
-/*************************************************************************
-|*
-|* SwFlowFrm::SwFlowFrm()
-|*
-|*************************************************************************/
-
-
SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) :
m_rThis( rFrm ),
m_pFollow( 0 ),
@@ -100,13 +92,7 @@ void SwFlowFrm::SetFollow(SwFlowFrm *const pFollow)
}
}
-/*************************************************************************
-|*
-|* SwFlowFrm::IsFollowLocked()
-|* return sal_True if any follow has the JoinLocked flag
-|*
-|*************************************************************************/
-
+/// @return sal_True if any follow has the JoinLocked flag
sal_Bool SwFlowFrm::HasLockedFollow() const
{
const SwFlowFrm* pFrm = GetFollow();
@@ -119,13 +105,6 @@ sal_Bool SwFlowFrm::HasLockedFollow() const
return sal_False;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::IsKeepFwdMoveAllowed()
-|*
-|*************************************************************************/
-
-
sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
{
// If all the predecessors up to the first of the chain have
@@ -147,13 +126,6 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
return bRet;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::CheckKeep()
-|*
-|*************************************************************************/
-
-
void SwFlowFrm::CheckKeep()
{
// Kick off the "last" predecessor with a 'keep' attribute, because
@@ -186,12 +158,6 @@ void SwFlowFrm::CheckKeep()
pPre->InvalidatePos();
}
-/*************************************************************************
-|*
-|* SwFlowFrm::IsKeep()
-|*
-|*************************************************************************/
-
sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const
{
// 1. The keep attribute is ignored inside footnotes
@@ -282,13 +248,6 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
return bKeep;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::BwdMoveNecessary()
-|*
-|*************************************************************************/
-
-
sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect )
{
// The return value helps deciding whether we need to flow back (3),
@@ -395,18 +354,8 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
return nRet;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::CutTree(), PasteTree(), MoveSubTree()
-|*
-|* Description A specialized form of Cut() and Paste(), which
-|* relocates a whole chain (this and the following, in particular).
-|* During this process, only the minimum operations and notifications
-|* are done.
-|*
-|*************************************************************************/
-
-
+/// A specialized form of Cut(), which relocates a whole chain (this and the following,
+/// in particular). During this process, only the minimum operations and notifications are done.
SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
{
// Cut the Start and all the neighbours; they are chained together and
@@ -471,8 +420,8 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
return pLay;
}
-
-
+/// A specialized form of Paste(), which relocates a whole chain (this and the following,
+/// in particular). During this process, only the minimum operations and notifications are done.
sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
SwFrm *pOldParent )
{
@@ -586,8 +535,6 @@ sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibl
return bRet;
}
-
-
void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
{
OSL_ENSURE( pParent, "No parent given." );
@@ -671,13 +618,6 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
m_rThis.GetUpper()->InvalidatePage( pPage );
}
-/*************************************************************************
-|*
-|* SwFlowFrm::IsAnFollow()
-|*
-|*************************************************************************/
-
-
sal_Bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
{
const SwFlowFrm *pFoll = this;
@@ -689,13 +629,6 @@ sal_Bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
return sal_False;
}
-
-/*************************************************************************
-|*
-|* SwFlowFrm::FindMaster()
-|*
-|*************************************************************************/
-
SwTxtFrm* SwCntntFrm::FindMaster() const
{
OSL_ENSURE( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" );
@@ -768,17 +701,10 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
return 0;
}
-/*************************************************************************
-|*
-|* SwFrm::GetLeaf()
-|*
-|* Description Returns the next/previous Layout leaf that's NOT below
-|* this (or even is this itself). Also, that leaf must be in the same
-|* text flow as the pAnch origin frm (Body, Ftn)
-|*
-|*************************************************************************/
-
-
+/**
+ * Returns the next/previous Layout leaf that's NOT below this (or even is this itself).
+ * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Ftn)
+ */
const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd,
const SwFrm *pAnch ) const
{
@@ -806,15 +732,6 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd,
return (const SwLayoutFrm*)pLeaf;
}
-/*************************************************************************
-|*
-|* SwFrm::GetLeaf()
-|*
-|* Description calls Get[Next|Prev]Leaf
-|*
-|*************************************************************************/
-
-
SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd )
{
if ( IsInFtn() )
@@ -856,8 +773,6 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd )
return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage );
}
-
-
sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
{
// Now it's getting a bit complicated:
@@ -927,15 +842,7 @@ sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
}
-/*************************************************************************
-|*
-|* SwFrm::GetNextLeaf()
-|*
-|* Description Returns the next layout leaf in which we can move
-|* the frame.
-|*
-|*************************************************************************/
-
+/// Returns the next layout leaf in which we can move the frame.
SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
{
OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
@@ -1067,15 +974,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
return pLayLeaf;
}
-/*************************************************************************
-|*
-|* SwFrm::GetPrevLeaf()
-|*
-|* Returns the previous layout leaf where we can move the frame.
-|*
-|*************************************************************************/
-
-
+/// Returns the previous layout leaf where we can move the frame.
SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
{
OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
@@ -1109,13 +1008,6 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
return pLayLeaf ? pLayLeaf : pPrevLeaf;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::IsPrevObjMove()
-|*
-|*************************************************************************/
-
-
sal_Bool SwFlowFrm::IsPrevObjMove() const
{
//sal_True The FlowFrm must respect the a border of the predecessor, also needs
@@ -1173,11 +1065,8 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
return sal_False;
}
-/*************************************************************************
-|*
-|* sal_Bool SwFlowFrm::IsPageBreak()
-|*
-|* Description If there's a hard page break before the Frm AND there's a
+/**
+|* If there's a hard page break before the Frm AND there's a
|* predecessor on the same page, sal_True is returned (we need to create a
|* new PageBreak). Otherwise, returns sal_False.
|* If bAct is set to sal_True, this function returns sal_True if
@@ -1190,10 +1079,7 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
|* the FrmFmt contains a PageDesc.
|* The implementation works only on CntntFrms! - the definition
|* of the predecessor is not clear for LayoutFrms.
-|*
-|*************************************************************************/
-
-
+|*/
sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
{
if ( !IsFollow() && m_rThis.IsInDocBody() &&
@@ -1238,10 +1124,7 @@ sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
return sal_False;
}
-/*************************************************************************
-|*
-|* sal_Bool SwFlowFrm::IsColBreak()
-|*
+/**
|* If there's a hard column break before the Frm AND there is
|* a predecessor in the same column, we return sal_True (we need to create
|* a ColBreak). Otherwise, we return sal_False.
@@ -1253,9 +1136,7 @@ sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
|* need to think further.
|* The implementation works only on CntntFrms! - the definition
|* of the predecessor is not clear for LayoutFrms.
-|*
-|*************************************************************************/
-
+|*/
sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
{
if ( !IsFollow() && (m_rThis.IsMoveable() || bAct) )
@@ -1820,16 +1701,7 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
return nAdditionalLowerSpace;
}
-/*************************************************************************
-|*
-|* sal_Bool SwFlowFrm::CheckMoveFwd()
-|*
-|* Description Moves the Frm forward if it seems necessary regarding
-|* the current conditions and attributes.
-|*
-|*************************************************************************/
-
-
+/// Moves the Frm forward if it seems necessary regarding the current conditions and attributes.
sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
{
const SwFrm* pNxt = m_rThis.GetIndNext();
@@ -1914,16 +1786,7 @@ sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
return bMovedFwd;
}
-/*************************************************************************
-|*
-|* sal_Bool SwFlowFrm::MoveFwd()
-|*
-|* Description Return value tells us whether the Frm has changed
-|* the page.
-|*
-|*************************************************************************/
-
-
+/// Return value tells us whether the Frm has changed the page.
sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways )
{
//!!!!MoveFtnCntFwd might need to be updated as well.
@@ -2110,17 +1973,11 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
return bSamePage;
}
-
-/*************************************************************************
-|*
-|* sal_Bool SwFlowFrm::MoveBwd()
-|*
-|* Description Return value tells whether the Frm should change the page.
-|* This should be called by derived classes.
-|* The actual moving must be implemented in the subclasses.
-|*
-|*************************************************************************/
-
+/** Return value tells whether the Frm should change the page.
+ *
+ * @note This should be called by derived classes.
+ * @note The actual moving must be implemented in the subclasses.
+ */
sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
{
SwFlowFrm::SetMoveBwdJump( sal_False );
@@ -2650,12 +2507,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
return pNewUpper != 0;
}
-/*************************************************************************
-|*
-|* SwFlowFrm::CastFlowFrm
-|*
-|*************************************************************************/
-
SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm )
{
if ( pFrm->IsCntntFrm() )
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 48bdefe..56544c5 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -60,15 +60,8 @@
using namespace ::com::sun::star;
-
TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
-/*************************************************************************
-|*
-|* SwFlyFrm::SwFlyFrm()
-|*
-|*************************************************************************/
-
SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
SwLayoutFrm( pFmt, pSib ),
SwAnchoredObject(), // #i26791#
@@ -236,12 +229,6 @@ void SwFlyFrm::InsertCnt()
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::~SwFlyFrm()
-|*
-|*************************************************************************/
-
SwFlyFrm::~SwFlyFrm()
{
// Accessible objects for fly frames will be destroyed in this destructor.
@@ -338,12 +325,6 @@ void SwFlyFrm::DeleteCnt()
InvalidatePage();
}
-/*************************************************************************
-|*
-|* SwFlyFrm::InitDrawObj()
-|*
-|*************************************************************************/
-
sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact )
{
sal_uInt32 nOrdNum( 0L );
@@ -405,8 +386,6 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact )
return pDrawObj;
}
-
-
void SwFlyFrm::InitDrawObj( sal_Bool bNotify )
{
// Find ContactObject from the Format. If there's already one, we just
@@ -436,12 +415,6 @@ void SwFlyFrm::InitDrawObj( sal_Bool bNotify )
NotifyDrawObj();
}
-/*************************************************************************
-|*
-|* SwFlyFrm::FinitDrawObj()
-|*
-|*************************************************************************/
-
void SwFlyFrm::FinitDrawObj()
{
if ( !GetVirtDrawObj() )
@@ -498,12 +471,6 @@ void SwFlyFrm::FinitDrawObj()
delete pMyContact; // Destroys the Master itself
}
-/*************************************************************************
-|*
-|* SwFlyFrm::ChainFrames()
-|*
-|*************************************************************************/
-
void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
{
OSL_ENSURE( pMaster && pFollow, "uncomplete chain" );
@@ -598,12 +565,6 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::FindChainNeighbour()
-|*
-|*************************************************************************/
-
SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
{
// We look for the Fly that's in the same Area.
@@ -650,13 +611,6 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
return pFly;
}
-
-/*************************************************************************
-|*
-|* SwFlyFrm::FindLastLower()
-|*
-|*************************************************************************/
-
SwFrm *SwFlyFrm::FindLastLower()
{
SwFrm *pRet = ContainsAny();
@@ -670,13 +624,6 @@ SwFrm *SwFlyFrm::FindLastLower()
return pRet;
}
-
-/*************************************************************************
-|*
-|* SwFlyFrm::FrmSizeChg()
-|*
-|*************************************************************************/
-
sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
{
sal_Bool bRet = sal_False;
@@ -726,12 +673,6 @@ sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
return bRet;
}
-/*************************************************************************
-|*
-|* SwFlyFrm::Modify()
-|*
-|*************************************************************************/
-
void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
{
sal_uInt8 nInvFlags = 0;
@@ -1106,14 +1047,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::GetInfo()
-|*
-|* Gets information from the Modify
-|*
-*************************************************************************/
-
+/// Gets information from the Modify
bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const
{
if( RES_AUTOFMT_DOCNODE == rInfo.Which() )
@@ -1121,12 +1055,6 @@ bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const
return true; // Continue searching
}
-/*************************************************************************
-|*
-|* SwFlyFrm::_Invalidate()
-|*
-|*************************************************************************/
-
void SwFlyFrm::_Invalidate( SwPageFrm *pPage )
{
InvalidatePage( pPage );
@@ -1157,16 +1085,10 @@ void SwFlyFrm::_Invalidate( SwPageFrm *pPage )
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::ChgRelPos()
-|*
-|* Change the relative position
-|* The position will be Fix automatically and the attribute is changed
-|* accordingly.
-|*
-|*************************************************************************/
-
+/** Change the relative position
+ *
+ * The position will be Fix automatically and the attribute is changed accordingly.
+ */
void SwFlyFrm::ChgRelPos( const Point &rNewPos )
{
if ( GetCurrRelPos() != rNewPos )
@@ -1280,15 +1202,11 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
pFmt->GetDoc()->SetAttr( aSet, *pFmt );
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::Format()
-|*
-|* "Formats" the Frame; Frm and PrtArea.
-|* The FixSize is not inserted here.
-|*
-|*************************************************************************/
+/** "Formats" the Frame; Frm and PrtArea.
+ *
+ * The FixSize is not inserted here.
+ */
void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "FlyFrm::Format, pAttrs is 0." );
@@ -1779,11 +1697,6 @@ void CalcCntnt( SwLayoutFrm *pLay,
while( true );
}
-/*************************************************************************
-|*
-|* SwFlyFrm::MakeFlyPos()
-|*
-|*************************************************************************/
// OD 2004-03-23 #i26791#
//void SwFlyFrm::MakeFlyPos()
void SwFlyFrm::MakeObjPos()
@@ -1810,11 +1723,6 @@ void SwFlyFrm::MakeObjPos()
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::MakePrtArea()
-|*
-|*************************************************************************/
void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
{
@@ -1831,12 +1739,6 @@ void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::_Grow(), _Shrink()
-|*
-|*************************************************************************/
-
SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst )
{
SWRECTFN( this )
@@ -2012,12 +1914,6 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
return 0L;
}
-/*************************************************************************
-|*
-|* SwFlyFrm::ChgSize()
-|*
-|*************************************************************************/
-
Size SwFlyFrm::ChgSize( const Size& aNewSize )
{
// #i53298#
@@ -2060,12 +1956,6 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
return Frm().SSize();
}
-/*************************************************************************
-|*
-|* SwFlyFrm::IsLowerOf()
-|*
-|*************************************************************************/
-
sal_Bool SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const
{
OSL_ENSURE( GetAnchorFrm(), "8-( Fly is lost in Space." );
@@ -2088,12 +1978,6 @@ void SwFlyFrm::Cut()
{
}
-/*************************************************************************
-|*
-|* SwFrm::AppendFly(), RemoveFly()
-|*
-|*************************************************************************/
-
void SwFrm::AppendFly( SwFlyFrm *pNew )
{
if ( !mpDrawObjs )
@@ -2175,13 +2059,6 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove )
GetUpper()->InvalidateSize();
}
-/*************************************************************************
-|*
-|* SwFrm::AppendDrawObj(), RemoveDrawObj()
-|*
-|* --> OD 2004-07-06 #i28701# - new methods
-|*
-|*************************************************************************/
void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
{
if ( !_rNewObj.ISA(SwAnchoredDrawObject) )
@@ -2273,12 +2150,6 @@ void SwFrm::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj )
_rToRemoveObj.ChgAnchorFrm( 0 );
}
-/*************************************************************************
-|*
-|* SwFrm::InvalidateObjs()
-|*
-|*************************************************************************/
-// #i28701# - change purpose of method and adjust its name
void SwFrm::InvalidateObjs( const bool _bInvaPosOnly,
const bool _bNoInvaOfAsCharAnchoredObjs )
{
@@ -2348,12 +2219,6 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly,
}
}
-/*************************************************************************
-|*
-|* SwLayoutFrm::NotifyLowerObjs()
-|*
-|*************************************************************************/
-// #i28701# - change purpose of method and its name
// #i26945# - correct check, if anchored object is a lower
// of the layout frame. E.g., anchor character text frame can be a follow text
// frame.
@@ -2428,12 +2293,6 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs )
}
}
-/*************************************************************************
-|*
-|* SwFlyFrm::NotifyDrawObj()
-|*
-|*************************************************************************/
-
void SwFlyFrm::NotifyDrawObj()
{
SwVirtFlyDrawObj* pObj = GetVirtDrawObj();
@@ -2445,12 +2304,6 @@ void SwFlyFrm::NotifyDrawObj()
ClrContourCache( pObj );
}
-/*************************************************************************
-|*
-|* SwFlyFrm::CalcRel()
-|*
-|*************************************************************************/
-
Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const
{
Size aRet( rSz.GetSize() );
@@ -2519,12 +2372,6 @@ Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const
return aRet;
}
-/*************************************************************************
-|*
-|* SwFlyFrm::CalcAutoWidth()
-|*
-|*************************************************************************/
-
static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm )
{
SwTwips nRet = 0;
@@ -2581,11 +2428,6 @@ SwTwips SwFlyFrm::CalcAutoWidth() const
return lcl_CalcAutoWidth( *this );
}
-/*************************************************************************
-|*
-|* SwFlyFrm::GetContour()
-|*
-|*************************************************************************/
/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains
/// a graphic, load of intrinsic graphic has to be avoided.
sal_Bool SwFlyFrm::GetContour( PolyPolygon& rContour,
@@ -2698,10 +2540,9 @@ SwVirtFlyDrawObj* SwFlyFrm::GetVirtDrawObj()
return static_cast<SwVirtFlyDrawObj*>(DrawObj());
}
-// =============================================================================
// OD 2004-03-24 #i26791# - implementation of pure virtual method declared in
// base class <SwAnchoredObject>
-// =============================================================================
+
void SwFlyFrm::InvalidateObjPos()
{
InvalidatePos();
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 06c6885..045a877 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/bigint.hxx>
#include "pagefrm.hxx"
#include "txtfrm.hxx"
@@ -45,13 +44,6 @@
using namespace ::com::sun::star;
-
-/*************************************************************************
-|*
-|* SwFlyAtCntFrm::SwFlyAtCntFrm()
-|*
-|*************************************************************************/
-
SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
SwFlyFreeFrm( pFmt, pSib, pAnch )
{
@@ -61,11 +53,6 @@ SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
// #i28701#
TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
-/*************************************************************************
-|*
-|* SwFlyAtCntFrm::Modify()
-|*
-|*************************************************************************/
void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
@@ -179,25 +166,6 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
SwFlyFrm::Modify( pOld, pNew );
}
-/*************************************************************************
-|*
-|* SwFlyAtCntFrm::MakeAll()
-|*
-|* Description With a paragraph-anchored fly it's absolutely possible that
-|* the anchor reacts to changes of the fly. To this reaction the fly must
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list