Hi,
Here's a patch (another one) who removes bogus comments. It's released under the
LGPLv3+ / MPL.
Antoine
From c682830d71f4c446c16860a81102801e4ad4a9c9 Mon Sep 17 00:00:00 2001
From: Antoine Proulx <proulx.antoine@gmail.com>
Date: Sat, 12 Feb 2011 19:53:13 -0500
Subject: [PATCH] Remove bogus comments
---
sw/source/core/layout/flycnt.cxx | 149 +++++++--------------
sw/source/core/layout/flylay.cxx | 141 ++++++++------------
sw/source/core/layout/objectformattertxtfrm.cxx | 161 ++++++++---------------
sw/source/core/layout/objectformattertxtfrm.hxx | 41 ++----
4 files changed, 178 insertions(+), 314 deletions(-)
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 8c0ccb2..6753aa0 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -57,20 +57,12 @@
#include "crstate.hxx"
#include "sectfrm.hxx"
-// OD 29.10.2003 #113049#
#include <tocntntanchoredobjectposition.hxx>
-// OD 2004-05-24 #i28701#
#include <dcontact.hxx>
#include <sortedobjs.hxx>
-// --> OD 2005-09-29 #125370#,#125957#
#include <layouter.hxx>
-// <--
-// --> OD 2005-11-17 #i56300#
#include <objectformattertxtfrm.hxx>
-// <--
-// --> OD 2006-03-06 #125892#
#include <HandleAnchorNodeChg.hxx>
-// <--
using namespace ::com::sun::star;
@@ -88,9 +80,8 @@ SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
bAutoPosition = (FLY_AT_CHAR == pFmt->GetAnchor().GetAnchorId());
}
-// --> OD 2004-06-29 #i28701#
+// #i28701#
TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
-// <--
/*************************************************************************
|*
|* SwFlyAtCntFrm::Modify()
@@ -143,13 +134,11 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
//immer noch vom Node einen Frame besorgen. Die Change, dass dies dann
//der richtige ist, ist gut.
const bool bNext = aOldIdx < aNewIdx;
- // --> OD 2006-02-28 #125892#
// consider the case that at found anchor frame candidate already a
// fly frame of the given fly format is registered.
- // --> OD 2006-03-15 #133407# - consider, that <pCntnt> is the already
+ // consider, that <pCntnt> is the already
// the new anchor frame.
bool bFound( aOldIdx == aNewIdx );
- // <--
while ( pCntnt && !bFound )
{
do
@@ -164,7 +153,6 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
if ( pCntnt )
aOldIdx = *pCntnt->GetNode();
- // --> OD 2006-02-28 #125892#
// check, if at found anchor frame candidate already a fly frame
// of the given fly frame format is registered.
bFound = aOldIdx == aNewIdx;
@@ -183,9 +171,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
}
}
}
- // <--
}
- // <--
if ( !pCntnt )
{
SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode();
@@ -208,7 +194,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
_InvalidatePos();
InvalidatePage();
SetNotifyBack();
- // --> OD 2004-06-24 #i28701# - reset member <maLastCharRect> and
+ // #i28701# - reset member <maLastCharRect> and
// <mnLastTopOfLine> for to-character anchored objects.
ClearCharRectAndTopOfLine();
}
@@ -242,7 +228,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
|*************************************************************************/
//Wir brauchen ein Paar Hilfsklassen zur Kontrolle der Ozillation und ein paar
//Funktionen um die Uebersicht zu gewaehrleisten.
-// OD 2004-08-25 #i3317# - re-factoring of the position stack
+// #i3317# - re-factoring of the position stack
class SwOszControl
{
static const SwFlyFrm *pStk1;
@@ -252,10 +238,9 @@ class SwOszControl
static const SwFlyFrm *pStk5;
const SwFlyFrm *pFly;
- // --> OD 2004-08-25 #i3317#
+ // #i3317#
sal_uInt8 mnPosStackSize;
std::vector<Point*> maObjPositions;
- // <--
public:
SwOszControl( const SwFlyFrm *pFrm );
@@ -271,9 +256,8 @@ const SwFlyFrm *SwOszControl::pStk5 = 0;
SwOszControl::SwOszControl( const SwFlyFrm *pFrm )
: pFly( pFrm ),
- // --> OD 2004-08-25 #i3317#
+ // #i3317#
mnPosStackSize( 20 )
- // <--
{
if ( !SwOszControl::pStk1 )
SwOszControl::pStk1 = pFly;
@@ -299,7 +283,7 @@ SwOszControl::~SwOszControl()
SwOszControl::pStk4 = 0;
else if ( SwOszControl::pStk5 == pFly )
SwOszControl::pStk5 = 0;
- // --> OD 2004-08-25 #i3317#
+ // #i3317#
while ( !maObjPositions.empty() )
{
Point* pPos = maObjPositions.back();
@@ -307,7 +291,6 @@ SwOszControl::~SwOszControl()
maObjPositions.pop_back();
}
- // <--
}
BOOL SwOszControl::IsInProgress( const SwFlyFrm *pFly )
@@ -360,7 +343,6 @@ bool SwOszControl::ChkOsz()
void SwFlyAtCntFrm::MakeAll()
{
- // OD 2004-01-19 #110582#
if ( !GetFmt()->GetDoc()->IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
{
return;
@@ -368,7 +350,7 @@ void SwFlyAtCntFrm::MakeAll()
if ( !SwOszControl::IsInProgress( this ) && !IsLocked() && !IsColLocked() )
{
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if( !GetPageFrm() && GetAnchorFrm() && GetAnchorFrm()->IsInFly() )
{
SwFlyFrm* pFly = AnchorFrm()->FindFlyFrm();
@@ -376,7 +358,7 @@ void SwFlyAtCntFrm::MakeAll()
if( pTmpPage )
pTmpPage->AppendFlyToPage( this );
}
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if( GetPageFrm() )
{
bSetCompletePaintOnInvalidate = TRUE;
@@ -399,50 +381,46 @@ void SwFlyAtCntFrm::MakeAll()
SwOszControl aOszCntrl( this );
- // --> OD 2005-02-22 #i43255#
- // --> OD 2005-06-07 #i50356# - format the anchor frame, which
+ // #i43255#
+ // #i50356# - format the anchor frame, which
// contains the anchor position. E.g., for at-character anchored
// object this can be the follow frame of the anchor frame.
const bool bFormatAnchor =
!static_cast<const SwTxtFrm*>( GetAnchorFrmContainingAnchPos()
)->IsAnyJoinLocked() &&
!ConsiderObjWrapInfluenceOnObjPos() &&
!ConsiderObjWrapInfluenceOfOtherObjs();
- // <--
const SwFrm* pFooter = GetAnchorFrm()->FindFooterOrHeader();
if( pFooter && !pFooter->IsFooterFrm() )
pFooter = NULL;
bool bOsz = false;
BOOL bExtra = Lower() && Lower()->IsColumnFrm();
- // --> OD 2004-08-25 #i3317# - boolean, to apply temporarly the
+ // #i3317# - boolean, to apply temporarly the
// 'straightforward positioning process' for the frame due to its
// overlapping with a previous column.
bool bConsiderWrapInfluenceDueToOverlapPrevCol( false );
- // <--
- // --> OD 2004-10-22 #i35911# - boolean, to apply temporarly the
+ // #i35911# - boolean, to apply temporarly the
// 'straightforward positioning process' for the frame due to fact
// that it causes the complete content of its layout environment
// to move forward.
- // --> OD 2005-01-14 #i40444# - extend usage of this boolean:
+ // #i40444# - extend usage of this boolean:
// apply temporarly the 'straightforward positioning process' for
// the frame due to the fact that the frame clears the area for
// the anchor frame, thus it has to move forward.
bool bConsiderWrapInfluenceDueToMovedFwdAnchor( false );
- // <--
do {
SWRECTFN( this )
Point aOldPos( (Frm().*fnRect->fnGetPos)() );
SwFlyFreeFrm::MakeAll();
const bool bPosChgDueToOwnFormat =
aOldPos != (Frm().*fnRect->fnGetPos)();
- // --> OD 2004-08-25 #i3317#
+ // #i3317#
if ( !ConsiderObjWrapInfluenceOnObjPos() &&
OverlapsPrevColumn() )
{
bConsiderWrapInfluenceDueToOverlapPrevCol = true;
}
- // <--
- // OD 2004-05-12 #i28701# - no format of anchor frame, if
+ // #i28701# - no format of anchor frame, if
// wrapping style influence is considered on object positioning
if ( bFormatAnchor )
{
@@ -450,23 +428,21 @@ void SwFlyAtCntFrm::MakeAll()
dynamic_cast<SwTxtFrm*>(GetAnchorFrmContainingAnchPos());
OSL_ENSURE( pAnchPosAnchorFrm,
"<SwFlyAtCntFrm::MakeAll()> - anchor frame of wrong type -> crash" );
- // --> OD 2006-01-27 #i58182# - For the usage of new method
+ // #i58182# - For the usage of new method
// <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
// to check move forward of anchor frame due to the object
// positioning it's needed to know, if the object is anchored
// at the master frame before the anchor frame is formatted.
const bool bAnchoredAtMaster( !pAnchPosAnchorFrm->IsFollow() );
- // <--
- // --> OD 2005-11-17 #i56300#
+ // #i56300#
// perform complete format of anchor text frame and its
// previous frames, which have become invalid due to the
// fly frame format.
SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( *pAnchPosAnchorFrm );
- // <--
- // --> OD 2004-10-22 #i35911#
- // --> OD 2005-01-14 #i40444#
- // --> OD 2006-01-27 #i58182# - usage of new method
+ // #i35911#
+ // #i40444#
+ // #i58182# - usage of new method
// <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
sal_uInt32 nToPageNum( 0L );
bool bDummy( false );
@@ -475,7 +451,7 @@ void SwFlyAtCntFrm::MakeAll()
bAnchoredAtMaster, nToPageNum, bDummy ) )
{
bConsiderWrapInfluenceDueToMovedFwdAnchor = true;
- // --> OD 2005-09-29 #125370#,#125957# - mark anchor text frame
+ // mark anchor text frame
// directly, that it is moved forward by object positioning.
SwTxtFrm* pAnchorTxtFrm( static_cast<SwTxtFrm*>(AnchorFrm()) );
bool bInsert( true );
@@ -494,9 +470,7 @@ void SwFlyAtCntFrm::MakeAll()
SwLayouter::InsertMovedFwdFrm( rDoc, *pAnchorTxtFrm,
nToPageNum );
}
- // <--
}
- // <--
}
if ( aOldPos != (Frm().*fnRect->fnGetPos)() ||
@@ -505,7 +479,7 @@ void SwFlyAtCntFrm::MakeAll()
{
bOsz = aOszCntrl.ChkOsz();
- // --> OD 2006-04-13 #b6403541#
+ // #b6403541#
// special loop prevention for dedicated document:
if ( bOsz &&
HasFixSize() && IsClipped() &&
@@ -531,7 +505,6 @@ void SwFlyAtCntFrm::MakeAll()
}
}
}
- // <--
}
if ( bExtra && Lower() && !Lower()->GetValidPosFlag() )
@@ -543,17 +516,15 @@ void SwFlyAtCntFrm::MakeAll()
bExtra = FALSE; // Sicherhaltshalber gibt es nur eine Ehrenrunde.
}
} while ( !IsValid() && !bOsz &&
- // --> OD 2004-08-25 #i3317#
+ // #i3317#
!bConsiderWrapInfluenceDueToOverlapPrevCol &&
- // <--
- // --> OD 2005-01-14 #i40444#
+ // #i40444#
!bConsiderWrapInfluenceDueToMovedFwdAnchor &&
- // <--
GetFmt()->GetDoc()->IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) );
- // --> OD 2004-08-25 #i3317# - instead of attribute change apply
+ // #i3317# - instead of attribute change apply
// temporarly the 'straightforward positioning process'.
- // --> OD 2007-11-29 #i80924#
+ // #i80924#
// handle special case during splitting of table rows
if ( bConsiderWrapInfluenceDueToMovedFwdAnchor &&
GetAnchorFrm()->IsInTab() &&
@@ -574,19 +545,15 @@ void SwFlyAtCntFrm::MakeAll()
}
}
}
- // <--
if ( bOsz || bConsiderWrapInfluenceDueToOverlapPrevCol ||
- // --> OD 2005-01-14 #i40444#
+ // #i40444#
bConsiderWrapInfluenceDueToMovedFwdAnchor )
- // <--
{
SetTmpConsiderWrapInfluence( true );
SetRestartLayoutProcess( true );
- // --> OD 2006-07-24 #b6449874#
+ // #b6449874#
SetTmpConsiderWrapInfluenceOfOtherObjs( true );
- // <--
}
- // <--
bSetCompletePaintOnInvalidate = FALSE;
}
}
@@ -594,9 +561,7 @@ void SwFlyAtCntFrm::MakeAll()
/** method to determine, if a <MakeAll()> on the Writer fly frame is possible
- OD 2004-05-11 #i28701#
-
- @author OD
+ #i28701#
*/
bool SwFlyAtCntFrm::IsFormatPossible() const
{
@@ -650,7 +615,7 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet,
pUp = pUp->GetUpper();
const bool bVert = pUp->IsVertical();
//Dem Textflus folgen.
- // --> OD 2009-01-12 #i70582#
+ // #i70582#
const SwTwips nTopForObjPos =
bVert
? ( pCnt->Frm().Left() +
@@ -658,41 +623,38 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet,
pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() )
: ( pCnt->Frm().Top() +
pCnt->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() );
- // <--
if ( pUp->Frm().IsInside( rPt ) )
{
- // OD 26.09.2003 - <rPt> point is inside environment of given content frame
- // --> OD 2009-01-12 #i70582#
+ // <rPt> point is inside environment of given content frame
+ // #i70582#
if( bVert )
rRet.nMain = nTopForObjPos - rPt.X();
else
rRet.nMain = rPt.Y() - nTopForObjPos;
- // <--
return pCnt;
}
else if ( rPt.Y() <= pUp->Frm().Top() )
{
- // OD 26.09.2003 - <rPt> point is above environment of given content frame
- // OD: correct for vertical layout?
+ // <rPt> point is above environment of given content frame
+ // correct for vertical layout?
rRet.nMain = LONG_MAX;
}
else if( rPt.X() < pUp->Frm().Left() &&
rPt.Y() <= ( bVert ? pUp->Frm().Top() : pUp->Frm().Bottom() ) )
{
- // OD 26.09.2003 - <rPt> point is left of environment of given content frame
- // OD: seems not to be correct for vertical layout!?
+ // <rPt> point is left of environment of given content frame
+ // seems not to be correct for vertical layout!?
const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, FALSE, pCnt );
if( !pLay ||
(bVert && (pLay->Frm().Top() + pLay->Prt().Bottom()) <rPt.Y())||
(!bVert && (pLay->Frm().Left() + pLay->Prt().Right())<rPt.X()) )
{
- // OD 26.09.2003 - <rPt> point is in left border of environment
- // --> OD 2009-01-12 #i70582#
+ // <rPt> point is in left border of environment
+ // #i70582#
if( bVert )
rRet.nMain = nTopForObjPos - rPt.X();
else
rRet.nMain = rPt.Y() - nTopForObjPos;
- // <--
return pCnt;
}
else
@@ -700,11 +662,10 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet,
}
else
{
- // --> OD 2009-01-12 #i70582#
+ // #i70582#
rRet.nMain = bVert
? nTopForObjPos - (pUp->Frm().Left() + pUp->Prt().Left())
: (pUp->Frm().Top() + pUp->Prt().Bottom()) - nTopForObjPos;
- // <--
const SwFrm *pPre = pCnt;
const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, TRUE, pCnt );
@@ -1181,7 +1142,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
//fluss sondern in irgendwelchen Raendern steht.
if ( nDownLst.nMain == LONG_MAX && nUpLst.nMain == LONG_MAX )
{
- // #102861# If an OLE objects, which is contained in a fly frame
+ // If an OLE objects, which is contained in a fly frame
// is resized in inplace mode and the new Position is outside the
// fly frame, we do not want to leave our fly frame.
if ( pCnt->IsInFly() )
@@ -1243,7 +1204,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
SwTwips nY;
if ( pCnt->Frm().IsInside( aNew ) )
{
- // --> OD 2009-01-12 #i70582#
+ // #i70582#
const SwTwips nTopForObjPos =
bVert
? ( pCnt->Frm().Left() +
@@ -1259,7 +1220,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
{
nY = rNew.Y() - nTopForObjPos;
}
- // <--
}
else
{
@@ -1302,7 +1262,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
if ( nY == LONG_MAX )
{
- // --> OD 2009-01-12 #i70582#
+ // #i70582#
const SwTwips nTopForObjPos =
bVert
? ( pCnt->Frm().Left() +
@@ -1318,7 +1278,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
{
nY = rNew.Y() - nTopForObjPos;
}
- // <--
}
SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
@@ -1390,7 +1349,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
pPos->nContent.Assign( pCnt->GetNode(), 0 );
}
- // --> OD 2006-02-27 #125892#
// handle change of anchor node:
// if count of the anchor frame also change, the fly frames have to be
// re-created. Thus, delete all fly frames except the <this> before the
@@ -1399,9 +1357,8 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
SwHandleAnchorNodeChg aHandleAnchorNodeChg( *pFmt, aAnch, this );
pFmt->GetDoc()->SetAttr( aAnch, *pFmt );
}
- // <--
}
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
else if ( pTmpPage && pTmpPage != GetPageFrm() )
GetPageFrm()->MoveFly( this, pTmpPage );
@@ -1418,10 +1375,8 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
+ #i28701#
takes over functionality of deleted method <SwFlyAtCntFrm::AssertPage()>
-
- @author OD
*/
void SwFlyAtCntFrm::RegisterAtCorrectPage()
{
@@ -1439,33 +1394,31 @@ void SwFlyAtCntFrm::RegisterAtCorrectPage()
}
}
-// OD 2004-03-23 #i26791#
+// #i26791#
//void SwFlyAtCntFrm::MakeFlyPos()
void SwFlyAtCntFrm::MakeObjPos()
{
- // OD 02.10.2002 #102646#
// if fly frame position is valid, nothing is to do. Thus, return
if ( bValidPos )
{
return;
}
- // OD 2004-03-24 #i26791# - validate position flag here.
+ // #i26791# - validate position flag here.
bValidPos = TRUE;
- // --> OD 2004-10-22 #i35911# - no calculation of new position, if
+ // #i35911# - no calculation of new position, if
// anchored object is marked that it clears its environment and its
// environment is already cleared.
- // --> OD 2006-01-02 #125977# - before checking for cleared environment
+ // before checking for cleared environment
// check, if member <mpVertPosOrientFrm> is set.
if ( GetVertPosOrientFrm() &&
ClearedEnvironment() && HasClearedEnvironment() )
{
return;
}
- // <--
- // OD 29.10.2003 #113049# - use new class to position object
+ // use new class to position object
objectpositioning::SwToCntntAnchoredObjectPosition
aObjPositioning( *GetVirtDrawObj() );
aObjPositioning.CalcPosition();
@@ -1473,7 +1426,7 @@ void SwFlyAtCntFrm::MakeObjPos()
SetVertPosOrientFrm ( aObjPositioning.GetVertPosOrientFrm() );
}
-// OD 2004-05-12 #i28701#
+// #i28701#
bool SwFlyAtCntFrm::_InvalidationAllowed( const InvalidationType _nInvalid ) const
{
bool bAllowed( SwFlyFreeFrm::_InvalidationAllowed( _nInvalid ) );
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index e9eedd8..d3bc833 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -53,11 +53,10 @@
#include "ndole.hxx"
#include "tabfrm.hxx"
#include "flyfrms.hxx"
-// OD 22.09.2003 #i18732#
+// #i18732#
#include <fmtfollowtextflow.hxx>
-// OD 29.10.2003 #113049#
#include <environmentofanchoredobject.hxx>
-// OD 2004-05-24 #i28701#
+// #i28701#
#include <sortedobjs.hxx>
#include <viewsh.hxx>
#include <viewimp.hxx>
@@ -75,24 +74,22 @@ using namespace ::com::sun::star;
SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
SwFlyFrm( pFmt, pAnch ),
pPage( 0 ),
- // --> OD 2004-11-15 #i34753#
+ // #i34753#
mbNoMakePos( false ),
- // <--
- // --> OD 2004-11-12 #i37068#
+ // #i37068#
mbNoMoveOnCheckClip( false )
- // <--
{
}
SwFlyFreeFrm::~SwFlyFreeFrm()
{
//und Tschuess.
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if( GetPageFrm() )
{
if( GetFmt()->GetDoc()->IsInDtor() )
{
- // --> OD 2004-06-04 #i29879# - remove also to-frame anchored Writer
+ // #i29879# - remove also to-frame anchored Writer
// fly frame from page.
const bool bRemoveFromPage =
GetPageFrm()->GetSortedObjs() &&
@@ -111,9 +108,8 @@ SwFlyFreeFrm::~SwFlyFreeFrm()
}
}
-// --> OD 2004-06-29 #i28701#
+// #i28701#
TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
-// <--
/*************************************************************************
|*
|* SwFlyFreeFrm::NotifyBackground()
@@ -141,7 +137,6 @@ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm,
void SwFlyFreeFrm::MakeAll()
{
- // OD 2004-01-19 #110582#
if ( !GetFmt()->GetDoc()->IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) )
{
return;
@@ -149,7 +144,7 @@ void SwFlyFreeFrm::MakeAll()
if ( !GetAnchorFrm() || IsLocked() || IsColLocked() )
return;
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if( !GetPageFrm() && GetAnchorFrm() && GetAnchorFrm()->IsInFly() )
{
SwFlyFrm* pFly = AnchorFrm()->FindFlyFrm();
@@ -168,23 +163,21 @@ void SwFlyFreeFrm::MakeAll()
if ( IsClipped() )
{
bValidSize = bHeightClipped = bWidthClipped = FALSE;
- // --> OD 2004-11-03 #114798# - no invalidation of position,
+ // no invalidation of position,
// if anchored object is anchored inside a Writer fly frame,
// its position is already locked, and it follows the text flow.
- // --> OD 2004-11-15 #i34753# - add condition:
+ // #i34753# - add condition:
// no invalidation of position, if no direct move is requested in <CheckClip(..)>
if ( !IsNoMoveOnCheckClip() &&
!( PositionLocked() &&
GetAnchorFrm()->IsInFly() &&
GetFrmFmt().GetFollowTextFlow().GetValue() ) )
- // <--
{
bValidPos = FALSE;
}
- // <--
}
- // FME 2007-08-30 #i81146# new loop control
+ // #i81146# new loop control
USHORT nLoopControlRuns = 0;
const USHORT nLoopControlMax = 10;
@@ -217,14 +210,13 @@ void SwFlyFreeFrm::MakeAll()
if ( !bValidPos )
{
const Point aOldPos( (Frm().*fnRect->fnGetPos)() );
- // OD 2004-03-23 #i26791# - use new method <MakeObjPos()>
- // --> OD 2004-11-15 #i34753# - no positioning, if requested.
+ // #i26791# - use new method <MakeObjPos()>
+ // #i34753# - no positioning, if requested.
if ( IsNoMakePos() )
bValidPos = TRUE;
else
- // OD 2004-03-23 #i26791# - use new method <MakeObjPos()>
+ // #i26791# - use new method <MakeObjPos()>
MakeObjPos();
- // <--
if( aOldPos == (Frm().*fnRect->fnGetPos)() )
{
if( !bValidPos && GetAnchorFrm()->IsInSct() &&
@@ -263,14 +255,12 @@ void SwFlyFreeFrm::MakeAll()
/** determines, if direct environment of fly frame has 'auto' size
- OD 07.08.2003 #i17297#, #111066#, #111070#
+ #i17297#
start with anchor frame and search via <GetUpper()> for a header, footer,
row or fly frame stopping at page frame.
return <true>, if such a frame is found and it has 'auto' size.
otherwise <false> is returned.
- @author OD
-
@return boolean indicating, that direct environment has 'auto' size
*/
bool SwFlyFreeFrm::HasEnvironmentAutoSize() const
@@ -330,10 +320,9 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
if ( bBot || bRig )
{
BOOL bAgain = FALSE;
- // --> OD 2004-11-12 #i37068# - no move, if it's requested
+ // #i37068# - no move, if it's requested
if ( bBot && !IsNoMoveOnCheckClip() &&
!GetDrawObjs() && !GetAnchorFrm()->IsInTab() )
- // <--
{
SwFrm* pHeader = FindFooterOrHeader();
// In a header, correction of the position is no good idea.
@@ -398,7 +387,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
bWidthClipped = TRUE;
}
- // OD 06.08.2003 #i17297#, #111066#, #111070# - no proportional
+ // #i17297# - no proportional
// scaling of graphics in environments, which determines its size
// by its content ('auto' size). Otherwise layout loops can occur and
// layout sizes of the environment can be incorrect.
@@ -439,9 +428,10 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
bWidthClipped = TRUE;
}
- // OD 07.08.2003 #i17297#, #111066#, #111070# - reactivate change
+ // #i17297# - reactivate change
// of size attribute for fly frames containing an ole object.
- // FME: 2004-05-19 Added the aFrmRect.HasArea() hack, because
+
+ // Added the aFrmRect.HasArea() hack, because
// the environment of the ole object does not have to be valid
// at this moment, or even worse, it does not have to have a
// resonable size. In this case we do not want to change to
@@ -495,17 +485,13 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
}
}
- // --> OD 2004-10-14 #i26945#
+ // #i26945#
OSL_ENSURE( Frm().Height() >= 0,
"<SwFlyFreeFrm::CheckClip(..)> - fly frame has negative height now." );
- // <--
}
/** method to determine, if a <MakeAll()> on the Writer fly frame is possible
-
- OD 2005-03-03 #i43771#
-
- @author OD
+ #i43771#
*/
bool SwFlyFreeFrm::IsFormatPossible() const
{
@@ -526,9 +512,8 @@ SwFlyLayFrm::SwFlyLayFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
bLayout = TRUE;
}
-// --> OD 2004-06-29 #i28701#
+// #i28701#
TYPEINIT1(SwFlyLayFrm,SwFlyFreeFrm);
-// <--
/*************************************************************************
|*
|* SwFlyLayFrm::Modify()
@@ -562,7 +547,7 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
//Abmelden, Seite besorgen, an den entsprechenden LayoutFrm
//haengen.
SwRect aOld( GetObjRectWithSpaces() );
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
SwPageFrm *pOldPage = GetPageFrm();
AnchorFrm()->RemoveFly( this );
@@ -576,9 +561,8 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
{
if ( i == nPgNum )
{
- // --> OD 2005-06-09 #i50432# - adjust synopsis of <PlaceFly(..)>
+ // #i50432# - adjust synopsis of <PlaceFly(..)>
pTmpPage->PlaceFly( this, 0 );
- // <--
}
}
if( !pTmpPage )
@@ -599,7 +583,7 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
pTmp->AppendFly( this );
}
}
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if ( pOldPage && pOldPage != GetPageFrm() )
NotifyBackground( pOldPage, aOld, PREP_FLY_LEAVE );
SetCompletePaint();
@@ -665,14 +649,13 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
(void) bSucessInserted;
#endif
- // --> OD 2008-04-22 #i87493#
+ // #i87493#
OSL_ENSURE( pNew->GetPageFrm() == 0 || pNew->GetPageFrm() == this,
"<SwPageFrm::AppendFlyToPage(..)> - anchored fly frame seems to be registered at
another page frame. Serious defect -> please inform OD." );
- // <--
- // --> OD 2004-06-30 #i28701# - use new method <SetPageFrm(..)>
+ // #i28701# - use new method <SetPageFrm(..)>
pNew->SetPageFrm( this );
pNew->InvalidatePage( this );
- // OD 2004-05-17 #i28701#
+ // #i28701#
pNew->UnlockPosition();
// Notify accessible layout. That's required at this place for
@@ -687,7 +670,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
}
}
- // --> OD 2004-06-09 #i28701# - correction: consider also drawing objects
+ // #i28701# - correction: consider also drawing objects
if ( pNew->GetDrawObjs() )
{
SwSortedObjs &rObjs = *pNew->GetDrawObjs();
@@ -697,14 +680,13 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
if ( pTmpObj->ISA(SwFlyFrm) )
{
SwFlyFrm* pTmpFly = static_cast<SwFlyFrm*>(pTmpObj);
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if ( pTmpFly->IsFlyFreeFrm() && !pTmpFly->GetPageFrm() )
AppendFlyToPage( pTmpFly );
}
else if ( pTmpObj->ISA(SwAnchoredDrawObject) )
{
- // --> OD 2008-04-22 #i87493#
-// AppendDrawObjToPage( *pTmpObj );
+ // #i87493#
if ( pTmpObj->GetPageFrm() != this )
{
if ( pTmpObj->GetPageFrm() != 0 )
@@ -713,7 +695,6 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
}
AppendDrawObjToPage( *pTmpObj );
}
- // <--
}
}
}
@@ -765,7 +746,7 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove )
{ DELETEZ( pSortedObjs );
}
}
- // --> OD 2004-06-30 #i28701# - use new method <SetPageFrm(..)>
+ // #i28701# - use new method <SetPageFrm(..)>
pToRemove->SetPageFrm( 0L );
}
@@ -830,12 +811,12 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
(void) bSucessInserted;
#endif
- // --> OD 2004-06-30 #i28701# - use new method <SetPageFrm(..)>
+ // #i28701# - use new method <SetPageFrm(..)>
pToMove->SetPageFrm( pDest );
pToMove->InvalidatePage( pDest );
pToMove->SetNotifyBack();
pDest->InvalidateFlyCntnt();
- // OD 2004-05-17 #i28701#
+ // #i28701#
pToMove->UnlockPosition();
// Notify accessible layout. That's required at this place for
@@ -849,7 +830,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
->AddAccessibleFrm( pToMove );
}
- // --> OD 2004-06-09 #i28701# - correction: move lowers of Writer fly frame
+ // #i28701# - correction: move lowers of Writer fly frame
if ( pToMove->GetDrawObjs() )
{
SwSortedObjs &rObjs = *pToMove->GetDrawObjs();
@@ -861,7 +842,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pObj);
if ( pFly->IsFlyFreeFrm() )
{
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
SwPageFrm* pPageFrm = pFly->GetPageFrm();
if ( pPageFrm )
pPageFrm->MoveFly( pFly, pDest );
@@ -882,7 +863,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
|*
|* SwPageFrm::AppendDrawObjToPage(), RemoveDrawObjFromPage()
|*
-|* --> OD 2004-07-02 #i28701# - new methods
+|* #i28701# - new methods
|*
|*************************************************************************/
void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
@@ -928,10 +909,9 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
"Drawing object not appended into list <pSortedObjs>." );
#endif
}
- // --> OD 2008-04-22 #i87493#
+ // #i87493#
OSL_ENSURE( _rNewObj.GetPageFrm() == 0 || _rNewObj.GetPageFrm() == this,
"<SwPageFrm::AppendDrawObjToPage(..)> - anchored draw object seems to be registered at
another page frame. Serious defect -> please inform OD." );
- // <--
_rNewObj.SetPageFrm( this );
// invalidate page in order to force a reformat of object layout of the page.
@@ -974,10 +954,10 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
|*
|*************************************************************************/
-// --> OD 2005-06-09 #i50432# - adjust method description and synopsis.
+// #i50432# - adjust method description and synopsis.
void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
{
- // --> OD 2005-06-09 #i50432# - consider the case that page is an empty page:
+ // #i50432# - consider the case that page is an empty page:
// In this case append the fly frame at the next page
OSL_ENSURE( !IsEmptyPage() || GetNext(),
"<SwPageFrm::PlaceFly(..)> - empty page with no next page! -> fly frame appended at
empty page" );
@@ -998,7 +978,6 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
::RegistFlys( this, pFly );
}
}
- // <--
}
/*************************************************************************
@@ -1006,15 +985,15 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
|* ::CalcClipRect
|*
|*************************************************************************/
-// OD 22.09.2003 #i18732# - adjustments for following text flow or not
+// #i18732# - adjustments for following text flow or not
// AND alignment at 'page areas' for to paragraph/to character anchored objects
-// OD 06.11.2003 #i22305# - adjustment for following text flow
+// #i22305# - adjustment for following text flow
// for to frame anchored objects
-// OD 2004-06-02 #i29778# - Because the calculation of the position of the
+// #i29778# - Because the calculation of the position of the
// floating screen object (Writer fly frame or drawing object) doesn't perform
// a calculation on its upper frames and its anchor frame, a calculation of
// the upper frames in this method no longer sensible.
-// --> OD 2004-07-06 #i28701# - if document compatibility option 'Consider
+// #i28701# - if document compatibility option 'Consider
// wrapping style influence on object positioning' is ON, the clip area
// corresponds to the one as the object doesn't follows the text flow.
BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
@@ -1024,16 +1003,15 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
{
const SwFlyFrm* pFly = ((const SwVirtFlyDrawObj*)pSdrObj)->GetFlyFrm();
const bool bFollowTextFlow = pFly->GetFmt()->GetFollowTextFlow().GetValue();
- // --> OD 2004-07-06 #i28701#
+ // #i28701#
const bool bConsiderWrapOnObjPos =
pFly->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION);
- // <--
const SwFmtVertOrient &rV = pFly->GetFmt()->GetVertOrient();
if( pFly->IsFlyLayFrm() )
{
const SwFrm* pClip;
- // OD 06.11.2003 #i22305#
- // --> OD 2004-07-06 #i28701#
+ // #i22305#
+ // #i28701#
if ( !bFollowTextFlow || bConsiderWrapOnObjPos )
{
pClip = pFly->GetAnchorFrm()->FindPageFrm();
@@ -1064,7 +1042,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
}
else if( pFly->IsFlyAtCntFrm() )
{
- // OD 22.09.2003 #i18732# - consider following text flow or not
+ // #i18732# - consider following text flow or not
// AND alignment at 'page areas'
const SwFrm* pVertPosOrientFrm = pFly->GetVertPosOrientFrm();
if ( !pVertPosOrientFrm )
@@ -1079,7 +1057,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
const SwLayoutFrm* pClipFrm = pVertPosOrientFrm->FindPageFrm();
rRect = bMove ? pClipFrm->GetUpper()->Frm()
: pClipFrm->Frm();
- // --> OD 2004-10-14 #i26945# - consider that a table, during
+ // #i26945# - consider that a table, during
// its format, can exceed its upper printing area bottom.
// Thus, enlarge the clip rectangle, if such a case occurred
if ( pFly->GetAnchorFrm()->IsInTab() )
@@ -1089,7 +1067,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
SwRect aTmp( pTabFrm->Prt() );
aTmp += pTabFrm->Frm().Pos();
rRect.Union( aTmp );
- // --> OD 2005-03-30 #i43913# - consider also the cell frame
+ // #i43913# - consider also the cell frame
const SwFrm* pCellFrm = const_cast<SwFlyFrm*>(pFly)
->GetAnchorFrmContainingAnchPos()->GetUpper();
while ( pCellFrm && !pCellFrm->IsCellFrm() )
@@ -1102,13 +1080,12 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
aTmp += pCellFrm->Frm().Pos();
rRect.Union( aTmp );
}
- // <--
}
}
else if ( rV.GetRelationOrient() == text::RelOrientation::PAGE_FRAME ||
rV.GetRelationOrient() == text::RelOrientation::PAGE_PRINT_AREA )
{
- // OD 29.10.2003 #113049# - new class <SwEnvironmentOfAnchoredObject>
+ // new class <SwEnvironmentOfAnchoredObject>
objectpositioning::SwEnvironmentOfAnchoredObject
aEnvOfObj( bFollowTextFlow );
const SwLayoutFrm& rVertClipFrm =
@@ -1136,10 +1113,9 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
}
else
{
- // --> OD 2004-10-11 #i26945#
+ // #i26945#
const SwFrm *pClip =
const_cast<SwFlyFrm*>(pFly)->GetAnchorFrmContainingAnchPos();
- // <--
SWRECTFN( pClip )
const SwLayoutFrm *pUp = pClip->GetUpper();
const SwFrm *pCell = pUp->IsCellFrm() ? pUp : 0;
@@ -1214,8 +1190,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
const SwFrm *pTab = pUp->FindTabFrm();
(rRect.*fnRect->fnSetBottom)(
(pTab->GetUpper()->*fnRect->fnGetPrtBottom)() );
- // OD 08.08.2003 #110978# - expand to left and right
- // cell border
+ // expand to left and right cell border
rRect.Left ( pUp->Frm().Left() );
rRect.Width( pUp->Frm().Width() );
}
@@ -1251,7 +1226,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
}
else if ( pUp->GetUpper()->IsPageFrm() )
{
- // #111909# Objects anchored as character may exceed right margin
+ // Objects anchored as character may exceed right margin
// of body frame:
(rRect.*fnRect->fnSetRight)( (pUp->GetUpper()->Frm().*fnRect->fnGetRight)() );
}
@@ -1314,7 +1289,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
}
else
{
- // OD 2004-04-13 #i26791# - value of <nTmpH> is needed to
+ // #i26791# - value of <nTmpH> is needed to
// calculate value of <nTop>.
nTmpH = bVert ? pSdrObj->GetCurrentBoundRect().GetWidth() :
pSdrObj->GetCurrentBoundRect().GetHeight();
@@ -1326,9 +1301,9 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
}
else
{
- // OD 23.06.2003 #108784# - restrict clip rectangle for drawing
+ // restrict clip rectangle for drawing
// objects in header/footer to the page frame.
- // OD 2004-03-29 #i26791#
+ // #i26791#
const SwFrm* pAnchorFrm = pC->GetAnchorFrm( pSdrObj );
if ( pAnchorFrm && pAnchorFrm->FindFooterOrHeader() )
{
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx
b/sw/source/core/layout/objectformattertxtfrm.cxx
index db63431..b4dbec2 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -39,17 +39,14 @@
#include <frmfmt.hxx>
#include <fmtanchr.hxx>
#include <fmtwrapinfluenceonobjpos.hxx>
-// --> OD 2004-11-03 #114798#
#include <fmtfollowtextflow.hxx>
-// <--
#include <layact.hxx>
using namespace ::com::sun::star;
// =============================================================================
-// --> OD 2004-12-03 #115759# - little helper class to forbid follow formatting
-// for the given text frame
+// little helper class to forbid follow formatting for the given text frame
class SwForbidFollowFormat
{
private:
@@ -72,7 +69,6 @@ public:
}
}
};
-// <--
// =============================================================================
// implementation of class <SwObjectFormatterTxtFrm>
@@ -127,7 +123,7 @@ SwFrm& SwObjectFormatterTxtFrm::GetAnchorFrm()
return mrAnchorTxtFrm;
}
-// --> OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>.
+// #i40147# - add parameter <_bCheckForMovedFwd>.
bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
const bool _bCheckForMovedFwd )
{
@@ -139,13 +135,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
return true;
}
- // --> OD 2005-07-13 #124218# - consider, if the layout action has to be
+ // consider, if the layout action has to be
// restarted due to a delete of a page frame.
if ( GetLayAction() && GetLayAction()->IsAgain() )
{
return false;
}
- // <--
bool bSuccess( true );
@@ -154,17 +149,17 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
_rAnchoredObj.SetRestartLayoutProcess( false );
_FormatObj( _rAnchoredObj );
- // --> OD 2005-07-13 #124218# - consider, if the layout action has to be
+ // consider, if the layout action has to be
// restarted due to a delete of a page frame.
if ( GetLayAction() && GetLayAction()->IsAgain() )
{
return false;
}
- // <--
// check, if layout process has to be restarted.
// if yes, perform needed invalidations.
- // --> OD 2004-11-03 #114798# - no restart of layout process,
+
+ // no restart of layout process,
// if anchored object is anchored inside a Writer fly frame,
// its position is already locked, and it follows the text flow.
const bool bRestart =
@@ -173,7 +168,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
_rAnchoredObj.GetAnchorFrm()->IsInFly() &&
_rAnchoredObj.GetFrmFmt().GetFollowTextFlow().GetValue() );
if ( bRestart )
- // <--
{
bSuccess = false;
_InvalidatePrevObjs( _rAnchoredObj );
@@ -182,38 +176,36 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
// format anchor text frame, if wrapping style influence of the object
// has to be considered and it's <NONE_SUCCESSIVE_POSITIONED>
- // --> OD 2004-08-25 #i3317# - consider also anchored objects, whose
+ // #i3317# - consider also anchored objects, whose
// wrapping style influence is temporarly considered.
- // --> OD 2005-01-10 #i40147# - consider also anchored objects, for
+ // #i40147# - consider also anchored objects, for
// whose the check of a moved forward anchor frame is requested.
- // --> OD 2006-07-24 #b6449874# - revise decision made for i3317:
+ // #b6449874# - revise decision made for i3317:
// anchored objects, whose wrapping style influence is temporarly considered,
// have to be considered in method <SwObjectFormatterTxtFrm::DoFormatObjs()>
if ( bSuccess &&
_rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() &&
( _bCheckForMovedFwd ||
_rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos().
- // --> OD 2004-10-18 #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
+ // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
GetWrapInfluenceOnObjPos( true ) ==
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i35017# - constant name has changed
text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ) )
- // <--
{
- // --> OD 2004-10-11 #i26945# - check conditions for move forward of
+ // #i26945# - check conditions for move forward of
// anchor text frame
// determine, if anchor text frame has previous frame
const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 );
- // --> OD 2005-01-11 #i40141# - use new method - it also formats the
+ // #i40141# - use new method - it also formats the
// section the anchor frame is in.
_FormatAnchorFrmForCheckMoveFwd();
- // <--
- // --> OD 2004-10-22 #i35911#
+ // #i35911#
if ( _rAnchoredObj.HasClearedEnvironment() )
{
_rAnchoredObj.SetClearedEnvironment( true );
- // --> OD 2005-03-08 #i44049# - consider, that anchor frame
+ // #i44049# - consider, that anchor frame
// could already been marked to move forward.
SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() );
if ( pAnchorPageFrm != _rAnchoredObj.GetPageFrm() )
@@ -244,10 +236,8 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
"<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not
marked to move forward" );
}
}
- // <--
}
else if ( !mrAnchorTxtFrm.IsFollow() && bDoesAnchorHadPrev )
- // <--
{
// index of anchored object in collection of page numbers and
// anchor types
@@ -257,16 +247,15 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
--nIdx;
sal_uInt32 nToPageNum( 0L );
- // --> OD 2005-03-30 #i43913#
+ // #i43913#
bool bDummy( false );
- // --> OD 2006-01-27 #i58182# - consider new method signature
+ // #i58182# - consider new method signature
if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( nIdx ),
GetPgNumOfCollected( nIdx ),
IsCollectedAnchoredAtMaster( nIdx ),
nToPageNum, bDummy ) )
- // <--
{
- // --> OD 2005-06-01 #i49987# - consider, that anchor frame
+ // #i49987# - consider, that anchor frame
// could already been marked to move forward.
bool bInsert( true );
sal_uInt32 nMovedFwdToPageNum( 0L );
@@ -303,11 +292,9 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
OSL_ENSURE( false,
"<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not
marked to move forward" );
}
- // <--
}
}
- // <--
- // --> OD 2005-01-12 #i40155# - mark anchor frame not to wrap around
+ // i40155# - mark anchor frame not to wrap around
// objects under the condition, that its follow contains all its text.
else if ( !mrAnchorTxtFrm.IsFollow() &&
mrAnchorTxtFrm.GetFollow() &&
@@ -320,7 +307,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
*(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()),
mrAnchorTxtFrm );
}
- // <--
}
}
@@ -373,14 +359,13 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
bSuccess = _FormatObjsAtFrm();
}
- // --> OD 2006-07-24 #b449874#
+ // #b449874#
// consider anchored objects, whose wrapping style influence are temporarly
// considered.
if ( bSuccess &&
( ConsiderWrapOnObjPos() ||
( !mrAnchorTxtFrm.IsFollow() &&
_AtLeastOneObjIsTmpConsiderWrapInfluence() ) ) )
- // <--
{
const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 );
@@ -389,36 +374,32 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
// previous frames of the anchor frame. The format of the previous
// frames is needed to get a correct result of format of the
// anchor frame for the following check for moved forward anchors
- // --> OD 2005-01-11 #i40141# - use new method - it also formats the
+ // #i40141# - use new method - it also formats the
// section the anchor frame is in.
_FormatAnchorFrmForCheckMoveFwd();
- // <--
sal_uInt32 nToPageNum( 0L );
- // --> OD 2005-03-30 #i43913#
+ // #i43913#
bool bInFollow( false );
- // <--
SwAnchoredObject* pObj = 0L;
if ( !mrAnchorTxtFrm.IsFollow() )
{
pObj = _GetFirstObjWithMovedFwdAnchor(
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i35017# - constant name has changed
text::WrapInfluenceOnPosition::ONCE_CONCURRENT,
- // <--
nToPageNum, bInFollow );
}
- // --> OD 2004-10-25 #i35911#
+ // #i35911#
if ( pObj && pObj->HasClearedEnvironment() )
{
pObj->SetClearedEnvironment( true );
- // --> OD 2005-03-08 #i44049# - consider, that anchor frame
+ // #i44049# - consider, that anchor frame
// could already been marked to move forward.
SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() );
- // --> OD 2005-03-30 #i43913# - consider, that anchor frame
+ // #i43913# - consider, that anchor frame
// is a follow or is in a follow row, which will move forward.
if ( pAnchorPageFrm != pObj->GetPageFrm() ||
bInFollow )
- // <--
{
bool bInsert( true );
sal_uInt32 nTmpToPageNum( 0L );
@@ -448,11 +429,10 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
}
}
else if ( pObj && bDoesAnchorHadPrev )
- // <--
{
// Object found, whose anchor is moved forward
- // --> OD 2005-06-01 #i49987# - consider, that anchor frame
+ // #i49987# - consider, that anchor frame
// could already been marked to move forward.
bool bInsert( true );
sal_uInt32 nMovedFwdToPageNum( 0L );
@@ -488,10 +468,8 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
OSL_ENSURE( false,
"<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to
move forward" );
}
- // <--
}
- // <--
- // --> OD 2005-01-12 #i40155# - mark anchor frame not to wrap around
+ // #i40155# - mark anchor frame not to wrap around
// objects under the condition, that its follow contains all its text.
else if ( !mrAnchorTxtFrm.IsFollow() &&
mrAnchorTxtFrm.GetFollow() &&
@@ -504,7 +482,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
*(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()),
mrAnchorTxtFrm );
}
- // <--
}
return bSuccess;
@@ -516,12 +493,10 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject&
_rAnchoredO
// positioning is <NONE_CONCURRENT_POSIITIONED>.
// Note: list of objects at anchor frame is sorted by this property.
if ( _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos().
- // --> OD 2004-10-18 #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
+ // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
GetWrapInfluenceOnObjPos( true ) ==
- // <--
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i35017# - constant name has changed
text::WrapInfluenceOnPosition::ONCE_CONCURRENT )
- // <--
{
const SwSortedObjs* pObjs = GetAnchorFrm().GetDrawObjs();
if ( pObjs )
@@ -532,12 +507,10 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject&
_rAnchoredO
{
SwAnchoredObject* pAnchoredObj = (*pObjs)[i];
if ( pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos().
- // --> OD 2004-10-18 #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
+ // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
GetWrapInfluenceOnObjPos( true ) ==
- // <--
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i35017# - constant name has changed
text::WrapInfluenceOnPosition::ONCE_CONCURRENT )
- // <--
{
pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true );
}
@@ -572,11 +545,10 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
sal_uInt32& _noToPageNum,
bool& _boInFollow )
{
- // --> OD 2004-10-18 #i35017# - constant names have changed
+ // #i35017# - constant names have changed
OSL_ENSURE( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
_nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT,
"<SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for
parameter <_nWrapInfluenceOnPosition>" );
- // <--
SwAnchoredObject* pRetAnchoredObj = 0L;
@@ -586,13 +558,12 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
SwAnchoredObject* pAnchoredObj = GetCollectedObj(i);
if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() &&
pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos().
- // --> OD 2004-10-18 #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
+ // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE
GetWrapInfluenceOnObjPos( true ) == _nWrapInfluenceOnPosition )
- // <--
{
- // --> OD 2004-10-11 #i26945# - use new method <_CheckMovedFwdCondition(..)>
- // --> OD 2005-03-30 #i43913#
- // --> OD 2006-01-27 #i58182# - consider new method signature
+ // #i26945# - use new method <_CheckMovedFwdCondition(..)>
+ // #i43913#
+ // #i58182# - consider new method signature
if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( i ),
GetPgNumOfCollected( i ),
IsCollectedAnchoredAtMaster( i ),
@@ -601,14 +572,13 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
pRetAnchoredObj = pAnchoredObj;
break;
}
- // <--
}
}
return pRetAnchoredObj;
}
-// --> OD 2006-01-27 #i58182#
+// #i58182#
// - replace private method by corresponding static public method
bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
SwAnchoredObject& _rAnchoredObj,
@@ -626,7 +596,7 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
if ( nPageNum > _nFromPageNum )
{
_noToPageNum = nPageNum;
- // --> OD 2006-06-28 #b6443897#
+ // #b6443897#
// Handling of special case:
// If anchor frame is move forward into a follow flow row,
// <_noToPageNum> is set to <_nFromPageNum + 1>, because it is
@@ -642,12 +612,10 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
_noToPageNum = _nFromPageNum + 1;
}
}
- // <--
bAnchorIsMovedForward = true;
}
}
- // <--
- // --> OD 2004-11-05 #i26945# - check, if an at-paragraph|at-character
+ // #i26945# - check, if an at-paragraph|at-character
// anchored object is now anchored at a follow text frame, which will be
// on the next page. Also check, if an at-character anchored object
// is now anchored at a text frame, which is in a follow flow row,
@@ -688,33 +656,29 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
{
_noToPageNum = _nFromPageNum + 1;
bAnchorIsMovedForward = true;
- // --> OD 2005-03-30 #i43913#
+ // #i43913#
_boInFollow = true;
- // <--
}
}
}
- // <--
return bAnchorIsMovedForward;
}
-// <--
-// --> OD 2005-01-12 #i40140# - helper method to format layout frames used by
+// #i40140# - helper method to format layout frames used by
// method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
-// --> OD 2005-03-04 #i44049# - format till a certain lower frame, if provided.
+// #i44049# - format till a certain lower frame, if provided.
void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm,
SwFrm* pLastLowerFrm = 0L )
{
SwFrm* pLowerFrm = pLayFrm->GetLower();
while ( pLowerFrm )
{
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
if ( pLastLowerFrm && pLowerFrm == pLastLowerFrm )
{
break;
}
- // <--
if ( pLowerFrm->IsLayoutFrm() )
lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pLowerFrm),
pLastLowerFrm );
@@ -724,20 +688,18 @@ void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm,
pLowerFrm = pLowerFrm->GetNext();
}
}
-// <--
+
/** method to format given anchor text frame and its previous frames
- OD 2005-11-17 #i56300#
+ #i56300#
Usage: Needed to check, if the anchor text frame is moved forward
due to the positioning and wrapping of its anchored objects, and
to format the frames, which have become invalid due to the anchored
object formatting in the iterative object positioning algorithm
-
- @author OD
*/
void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtFrm )
{
- // --> OD 2005-04-13 #i47014# - no format of section and previous columns
+ // #i47014# - no format of section and previous columns
// for follow text frames.
if ( !_rAnchorTxtFrm.IsFollow() )
{
@@ -757,15 +719,13 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm&
_rAnchorTxtF
}
if ( pSectFrm && pSectFrm->IsSctFrm() )
{
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
_rAnchorTxtFrm.LockJoin();
- // <--
SwFrm* pFrm = pSectFrm->GetUpper()->GetLower();
- // --> OD 2005-05-23 #i49605# - section frame could move forward
+ // #i49605# - section frame could move forward
// by the format of its previous frame.
// Thus, check for valid <pFrm>.
while ( pFrm && pFrm != pSectFrm )
- // <--
{
if ( pFrm->IsLayoutFrm() )
lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) );
@@ -776,21 +736,19 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm&
_rAnchorTxtF
}
lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pSectFrm),
&_rAnchorTxtFrm );
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
_rAnchorTxtFrm.UnlockJoin();
- // <--
}
}
- // --> OD 2005-01-12 #i40140# - if anchor frame is inside a column,
+ // #i40140# - if anchor frame is inside a column,
// format the content of the previous columns.
// Note: It's a very simple format without formatting objects.
SwFrm* pColFrmOfAnchor = _rAnchorTxtFrm.FindColFrm();
if ( pColFrmOfAnchor )
{
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
_rAnchorTxtFrm.LockJoin();
- // <--
SwFrm* pColFrm = pColFrmOfAnchor->GetUpper()->GetLower();
while ( pColFrm != pColFrmOfAnchor )
{
@@ -807,16 +765,13 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm&
_rAnchorTxtF
pColFrm = pColFrm->GetNext();
}
- // --> OD 2005-03-04 #i44049#
+ // #i44049#
_rAnchorTxtFrm.UnlockJoin();
- // <--
}
- // <--
}
- // <--
// format anchor frame - format of its follow not needed
- // --> OD 2005-04-08 #i43255# - forbid follow format, only if anchor text
+ // #i43255# - forbid follow format, only if anchor text
// frame is in table
if ( _rAnchorTxtFrm.IsInTab() )
{
@@ -831,9 +786,7 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF
/** method to format the anchor frame for checking of the move forward condition
- OD 2005-01-11 #i40141#
-
- @author OD
+ #i40141#
*/
void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()
{
@@ -843,9 +796,7 @@ void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()
/** method to determine if at least one anchored object has state
<temporarly consider wrapping style influence> set.
- OD 2006-07-24 #b6449874#
-
- @author OD
+ #b6449874#
*/
bool SwObjectFormatterTxtFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence()
{
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx
b/sw/source/core/layout/objectformattertxtfrm.hxx
index 9ee7197..a5caa9f 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -34,7 +34,7 @@
class SwTxtFrm;
// -----------------------------------------------------------------------------
-// OD 2004-07-01 #i28701#
+// #i28701#
// Format floating screen objects, which are anchored at a given anchor text frame
// and registered at the given page frame.
// -----------------------------------------------------------------------------
@@ -52,18 +52,16 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
SwTxtFrm* _pMasterAnchorTxtFrm,
SwLayAction* _pLayAction );
- /* method to invalidate objects, anchored previous to given object at
+ /** method to invalidate objects, anchored previous to given object at
the anchor text frame
@param _rAnchoredObj
reference to anchored object - objects, anchored previous to
this one will be invalidated.
-
- @author OD
*/
void _InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj );
- /* method to invalidate objects, anchored after the given object at
+ /** method to invalidate objects, anchored after the given object at
the page frame
@param _rAnchoredObj
@@ -73,8 +71,6 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
@param _bInclObj
boolean indicates, if given anchored object <_rAnchoredObj> also have
to be invalidated.
-
- @author OD
*/
void _InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj,
const bool _bInclObj );
@@ -85,12 +81,12 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
'anchor (of an object) is moved forward', if the anchor frame
respectively the anchor character of the object isn't on the
proposed page frame. Instead its on a following page
- OD 2004-10-04 #i26945# - For at-character anchored objects,
+
+ #i26945# - For at-character anchored objects,
it has also to be checked, if the anchor character is in a follow
text frame, which would move to the next page.
- OD 2005-03-30 #i43913# - add output parameter <_boInFollow>
- @author OD
+ #i43913# - add output parameter <_boInFollow>
@param _nWrapInfluenceOnPosition
input parameter - only object with this given wrapping style
@@ -120,18 +116,14 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
/** method to format the anchor frame for checking of the move forward condition
- OD 2005-01-11 #i40141#
-
- @author OD
+ #i40141#
*/
void _FormatAnchorFrmForCheckMoveFwd();
/** method to determine if at least one anchored object has state
<temporarly consider wrapping style influence> set.
- OD 2006-07-24 #b6449874#
-
- @author OD
+ #b6449874#
*/
bool _AtLeastOneObjIsTmpConsiderWrapInfluence();
@@ -142,16 +134,13 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
public:
virtual ~SwObjectFormatterTxtFrm();
- // --> OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>.
+ // #i40147# - add parameter <_bCheckForMovedFwd>.
virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj,
const bool _bCheckForMovedFwd = false );
- // <--
virtual bool DoFormatObjs();
/** method to create an instance of <SwObjectFormatterTxtFrm> is
necessary.
-
- @author OD
*/
static SwObjectFormatterTxtFrm* CreateObjFormatter(
SwTxtFrm& _rAnchorTxtFrm,
@@ -160,14 +149,12 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
/** method to format given anchor text frame and its previous frames
- OD 2005-11-17 #i56300#
+ #i56300#
Usage: Needed to check, if the anchor text frame is moved forward
due to the positioning and wrapping of its anchored objects, and
to format the frames, which have become invalid due to the anchored
object formatting in the iterative object positioning algorithm
- @author OD
-
@param _rAnchorTxtFrm
input parameter - reference to anchor text frame, which has to be
formatted including its previous frames of the page.
@@ -176,13 +163,11 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
/** method to check the conditions, if 'anchor is moved forward'
- OD 2004-10-11 #i26945#
- OD 2005-03-30 #i43913# - add output parameter <_boInFollow>
- OD 2006-01-27 #i58182# - replace method by a corresponding static
+ #i26945#
+ #i43913# - add output parameter <_boInFollow>
+ #i58182# - replace method by a corresponding static
method, because it's needed for the iterative positioning algorithm.
- @author OD
-
@param _rAnchoredObj
input parameter - anchored object, for which the condition has to checked.
--
1.7.1
Context
- [Libreoffice] [PATCH] Remove bogus comments · Antoine Proulx
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.