[Libreoffice-commits] .: 9 commits - starmath/inc starmath/source sw/inc sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Feb 6 10:36:11 PST 2011
starmath/inc/node.hxx | 18 ---
starmath/source/document.cxx | 12 --
starmath/source/visitors.cxx | 4
sw/inc/fmtmeta.hxx | 1
sw/source/core/SwNumberTree/SwNodeNum.cxx | 101 -------------------
sw/source/core/SwNumberTree/SwNumberTree.cxx | 44 --------
sw/source/core/access/accmap.cxx | 3
sw/source/core/bastyp/swcache.cxx | 13 --
sw/source/core/doc/docedt.cxx | 3
sw/source/core/doc/htmltbl.cxx | 11 --
sw/source/core/inc/flyfrms.hxx | 36 +++---
sw/source/core/inc/layfrm.hxx | 12 --
sw/source/core/inc/layouter.hxx | 30 ++---
sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 6 -
sw/source/core/inc/swblocks.hxx | 95 ------------------
sw/source/core/layout/anchoreddrawobject.cxx | 137 +++++++++++++-------------
sw/source/core/layout/anchoredobject.cxx | 130 ++++++++++++-------------
sw/source/core/layout/flowfrm.cxx | 5
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 5
sw/source/core/layout/layact.cxx | 10 -
sw/source/core/layout/layouter.cxx | 6 -
sw/source/core/layout/objectformatter.cxx | 54 +++++-----
sw/source/core/layout/paintfrm.cxx | 39 -------
sw/source/core/layout/tabfrm.cxx | 30 -----
sw/source/core/layout/wsfrm.cxx | 3
sw/source/core/swg/SwXMLTextBlocks.cxx | 37 -------
sw/source/core/table/swnewtable.cxx | 3
sw/source/core/table/swtable.cxx | 44 --------
sw/source/core/text/frmform.cxx | 100 -------------------
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/itradj.cxx | 14 --
sw/source/core/text/txtfld.cxx | 21 ----
sw/source/core/text/txtfly.cxx | 2
sw/source/core/text/txthyph.cxx | 1
sw/source/core/text/txtpaint.cxx | 4
sw/source/core/tox/txmsrt.cxx | 61 -----------
sw/source/core/txtnode/ndhints.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 2
sw/source/core/unocore/unochart.cxx | 15 --
sw/source/core/unocore/unodraw.cxx | 46 --------
sw/source/core/unocore/unoredline.cxx | 37 -------
sw/source/core/unocore/unostyle.cxx | 140 ++-------------------------
sw/source/core/view/viewsh.cxx | 1
sw/source/filter/html/parcss1.cxx | 12 --
sw/source/filter/ww8/wrtw8sty.cxx | 6 -
sw/source/ui/dochdl/swdtflvr.cxx | 12 --
sw/source/ui/docvw/SidebarWin.cxx | 108 --------------------
sw/source/ui/table/swtablerep.cxx | 21 ----
sw/source/ui/table/tabledlg.cxx | 44 --------
sw/source/ui/utlui/content.cxx | 18 ---
sw/source/ui/wrtsh/wrtsh1.cxx | 31 -----
52 files changed, 218 insertions(+), 1376 deletions(-)
New commits:
commit 67bbb4364b071142dcd31b7ab54fb0a410f710b2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 5 23:33:23 2011 +0100
Remove some dead code
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 857ae2b..80eddb1 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -199,13 +199,6 @@ bool SwNodeNum::IsCounted() const
{
// --> OD 2006-01-25 #i59559#
// <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
-// const SwNumFmt * pNumFmt = GetNumFmt();
-// if (pNumFmt)
-// {
-// sal_Int16 nType = pNumFmt->GetNumberingType();
-// if ( nType != SVX_NUM_NUMBER_NONE)
-// aResult = mpTxtNode->IsCounted();
-// }
aResult = GetTxtNode()->IsCountedInList();
// <--
}
@@ -273,9 +266,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
{
// --> OD 2007-10-31 #i83479# - refactoring
// simplify comparison by comparing the indexes of the text nodes
-// SwPosition aMyPos(*mpTxtNode);
-// SwPosition aHisPos(*rTmpNode.mpTxtNode);
-// bResult = (aMyPos < aHisPos) ? true : false;
bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() ) ? true : false;
// <--
}
@@ -283,23 +273,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
return bResult;
}
-//void SwNodeNum::SetRestart(bool bRestart)
-//{
-// // --> OD 2005-10-19 #126009#
-// // - improvement: invalidation only, if <IsRestart()> state changes.
-// const bool bInvalidate( mbRestart != bRestart );
-// // <--
-// mbRestart = bRestart;
-
-// // --> OD 2005-10-19 #126009#
-// if ( bInvalidate )
-// {
-// InvalidateMe();
-// NotifyInvalidSiblings();
-// }
-// // <--
-//}
-
bool SwNodeNum::IsRestart() const
{
bool bIsRestart = false;
@@ -312,22 +285,6 @@ bool SwNodeNum::IsRestart() const
return bIsRestart;
}
-//void SwNodeNum::SetStart(SwNumberTree::tSwNumTreeNumber nStart)
-//{
-// // --> OD 2005-10-19 #126009#
-// // - improvement: invalidation only, if <IsRestart()> state changes.
-// const bool bInvalidate( mnStart != nStart );
-// // <--
-// mnStart = nStart;
-
-// // --> OD 2005-10-19 #126009#
-// if ( bInvalidate )
-// {
-// InvalidateMe();
-// NotifyInvalidSiblings();
-// }
-//}
-
bool SwNodeNum::IsCountPhantoms() const
{
bool bResult = true;
@@ -376,62 +333,6 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
return aResult;
}
-//String SwNodeNum::ToString() const
-//{
-// String aResult("[ ", RTL_TEXTENCODING_ASCII_US);
-
-// if (GetTxtNode())
-// {
-// char aBuffer[256];
-
-// sprintf(aBuffer, "%p ", GetTxtNode());
-
-// aResult += String(aBuffer, RTL_TEXTENCODING_ASCII_US);
-// aResult += String::CreateFromInt32(GetPosition().nNode.GetIndex());
-// }
-// else
-// aResult += String("*", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String(" ", RTL_TEXTENCODING_ASCII_US);
-
-// unsigned int nLvl = GetLevel();
-// aResult += String::CreateFromInt32(nLvl);
-
-// aResult += String(": ", RTL_TEXTENCODING_ASCII_US);
-
-// tNumberVector aNumVector;
-
-// _GetNumberVector(aNumVector, false);
-
-// for (unsigned int n = 0; n < aNumVector.size(); n++)
-// {
-// if (n > 0)
-// aResult += String(", ", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String::CreateFromInt32(aNumVector[n]);
-// }
-
-// if (IsCounted())
-//// aResult += String(" counted", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" C", RTL_TEXTENCODING_ASCII_US);
-
-// if (IsRestart())
-// {
-//// aResult += String(" restart(", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" R(", RTL_TEXTENCODING_ASCII_US);
-// aResult += String::CreateFromInt32(GetStart());
-// aResult += String(")", RTL_TEXTENCODING_ASCII_US);
-// }
-
-// if (! IsValid())
-//// aResult += String(" invalid", RTL_TEXTENCODING_ASCII_US);
-// aResult += String(" I", RTL_TEXTENCODING_ASCII_US);
-
-// aResult += String(" ]", RTL_TEXTENCODING_ASCII_US);
-
-// return aResult;
-//}
-
// --> OD 2006-03-07 #131436#
void SwNodeNum::HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum )
{
@@ -508,8 +409,6 @@ const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) c
const SwNodeNum* pPrecedingNodeNum( 0 );
// --> OD 2007-10-31 #i83479#
-// SwNodeNum aNodeNumForTxtNode;
-// aNodeNumForTxtNode.SetTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
// <--
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index ec691a0..0014bfd 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -172,23 +172,6 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
// of the previous node determines the start value for the following
// children loop, if all children have to be validated and the first
// one doesn't restart the counting.
-// tSwNumTreeNumber nTmpNumber = 0;
-// if (aIt != mChildren.end())
-// nTmpNumber = (*aIt)->mnNumber;
-// while (aIt != aValidateIt)
-// {
-// if (aIt == mChildren.end())
-// aIt = mChildren.begin();
-// else
-// {
-// aIt++;
-// if ((*aIt)->IsCounted())
-// nTmpNumber++;
-// }
-// if ((*aIt)->IsRestart() || aIt == mChildren.begin())
-// nTmpNumber = (*aIt)->GetStart();
-// (*aIt)->mnNumber = nTmpNumber;
-// }
SwNumberTree::tSwNumTreeNumber nTmpNumber( 0 );
if (aIt != mChildren.end())
nTmpNumber = (*aIt)->mnNumber;
@@ -342,7 +325,6 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
// --> OD 2008-05-21 #i74748# - applied patch from garnier_romain
// number tree node has to be validated.
-// SetLastValid(aIt);
SetLastValid( aIt, true );
// <--
}
@@ -1052,32 +1034,6 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
return aItResult;
}
-//String SwNumberTreeNode::print(const String & rIndent,
-// const String & rMyIndent,
-// int nDepth) const
-//{
-// String aStr = rIndent;
-// aStr += ToString();
-// aStr += String("\n", RTL_TEXTENCODING_ASCII_US);
-
-// if (nDepth != 0)
-// {
-// if (nDepth < 0)
-// nDepth = -1;
-
-// tSwNumberTreeChildren::const_iterator aIt;
-// for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
-// {
-// String aTmpStr(rIndent);
-
-// aTmpStr += rMyIndent;
-// aStr += (*aIt)->print(aTmpStr, rMyIndent, nDepth - 1);
-// }
-// }
-
-// return aStr;
-//}
-
#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::GetInstances()
{
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 90b4644..9d1021a 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -57,8 +57,6 @@ using namespace ::com::sun::star;
#define MAX_TABWIDTH (USHRT_MAX - 2001)
-/* */
-
class SwHTMLTableLayoutConstraints
{
USHORT nRow; // Start-Zeile
@@ -87,7 +85,6 @@ public:
USHORT GetColumn() const { return nCol; }
};
-/* */
SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts( const SwStartNode *pSttNd,
SwHTMLTableLayout* pTab,
@@ -109,8 +106,6 @@ const SwStartNode *SwHTMLTableLayoutCnts::GetStartNode() const
}
-/* */
-
SwHTMLTableLayoutCell::SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
USHORT nRSpan, USHORT nCSpan,
USHORT nWidth, BOOL bPrcWidth,
@@ -129,7 +124,6 @@ SwHTMLTableLayoutCell::~SwHTMLTableLayoutCell()
}
}
-/* */
SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( USHORT nWidth,
BOOL bRelWidth,
@@ -142,8 +136,6 @@ SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( USHORT nWidth,
{}
-/* */
-
SwHTMLTableLayoutConstraints::SwHTMLTableLayoutConstraints(
ULONG nMin, ULONG nMax, USHORT nRw, USHORT nColumn, USHORT nColSp ):
nRow( nRw ), nCol( nColumn ), nColSpan( nColSp ),
@@ -185,7 +177,6 @@ SwHTMLTableLayoutConstraints *SwHTMLTableLayoutConstraints::InsertNext(
return pConstr;
}
-/* */
typedef SwHTMLTableLayoutColumn *SwHTMLTableLayoutColumnPtr;
typedef SwHTMLTableLayoutCell *SwHTMLTableLayoutCellPtr;
@@ -1548,7 +1539,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelLeftFill && !pLeftFillerBox &&
( nWidthSet>0 || nAbsLeftFill<MINLAY+nInhLeftBorderWidth ||
(HasColTags() && nAbsLeftFill < nAbsLeftSpace+nParentInhAbsLeftSpace+20) ) )
-// (nAbsLeftFill<MINLAY || nAbsLeftFill<=nAbsLeftSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( 0 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsLeftFill );
@@ -1559,7 +1549,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
if( nRelRightFill && !pRightFillerBox &&
( nWidthSet>0 || nAbsRightFill<MINLAY+nInhRightBorderWidth ||
(HasColTags() && nAbsRightFill < nAbsRightSpace+nParentInhAbsRightSpace+20) ) )
-// (nAbsRightFill<MINLAY || nAbsRightFill<=nAbsRightSpace) )
{
SwHTMLTableLayoutColumn *pColumn = GetColumn( nCols-1 );
pColumn->SetAbsColWidth( pColumn->GetAbsColWidth()+nAbsRightFill );
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index e7b6de3..dfa0d3b 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1926,11 +1926,6 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
( rThis.GetUpper()->IsInTab() &&
rThis.GetUpper()->FindTabFrm()->IsFwdMoveAllowed() ) ) &&
0 != const_cast<SwFrm&>(rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
-/*
- &&
- // NEW TABLES
- // Have a look at our main competitor: We don't move inside row span cells:
- ( !rThis.GetUpper()->IsCellFrm() || !rThis.GetUpper()->IsLeaveUpperAllowed() ) )*/
{
bNoFwd = FALSE;
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index f0f6e18..0608f28 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1524,16 +1524,6 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
pRetoucheFly = 0;
}
-// --> OD 2008-05-16 #i84659# - no longer needed
-//inline BOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect )
-//{
-// //Wenn der Frm vollstaendig rechts neben bzw. unter dem
-// //Rect sitzt ist's genug mit Painten.
-// return rFrmRect.Top() > rRect.Bottom();
-// // PAGES01 || (rFrmRect.Left() > rRect.Right()) );
-//}
-// <--
-
//---------------- Ausgabe fuer das BrushItem ----------------
/** lcl_DrawGraphicBackgrd - local help method to draw a background for a graphic
@@ -2807,8 +2797,6 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
// --> OD 2008-10-07 #i92745#
// Extend check on certain states of the 'current' <ViewShell> instance to
// all existing <ViewShell> instances.
-// if ( !pSh->IsInEndAction() && !pSh->IsPaintInProgress() &&
-// (!pSh->Imp()->IsAction() || !pSh->Imp()->GetLayAction().IsActionInProgress() ) )
bool bPerformLayoutAction( true );
{
ViewShell* pTmpViewShell = pSh;
@@ -3571,7 +3559,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// --> OD 2007-12-13 #i80822#
// suppress painting of background in printing area for
// non-transparent graphics.
-// if ( bPaintMarginOnly )
if ( bPaintMarginOnly ||
( pNoTxt && !bIsGraphicTransparent ) )
// <--
@@ -3589,7 +3576,6 @@ void SwFlyFrm::Paint( const SwRect& rRect, const SwPrtOptions* /* pPrintData */
// used in <SwNoTxtFrm::Paint(..)> to set the clip region
// for painting the graphic/OLE. Thus, the clip region is
// also applied for the PDF export.
-// if ( !pOut->GetConnectMetaFile() || pOut->GetOutDevType() == OUTDEV_PRINTER )
ViewShell *pSh = GetShell();
if ( !pOut->GetConnectMetaFile() || !pSh->GetWin() )
// <--
@@ -4707,9 +4693,6 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
{
const SwFrm* pDirRefFrm = IsCellFrm() ? FindTabFrm() : this;
SWRECTFN( pDirRefFrm )
- // OD 19.05.2003 #109667# - use new method <lcl_PaintLeftRightLine(..)>
- //::lcl_PaintLeftLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
- //::lcl_PaintRightLine ( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
::lcl_PaintLeftRightLine ( sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) )
@@ -4722,14 +4705,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForTopBorderAttrs );
const SwBorderAttrs &rTopAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rTopAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rTopAttrs, fnRect );
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect );
::lcl_PaintTopBottomLine( sal_True, *(this), *(pPage), aRect, rRect, rAttrs, fnRect );
}
}
@@ -4743,14 +4722,10 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
SwBorderAttrAccess aAccess( SwFrm::GetCache(),
pCellFrmForBottomBorderAttrs );
const SwBorderAttrs &rBottomAttrs = *aAccess.Get();
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rBottomAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rBottomAttrs, fnRect);
}
else
{
- // OD 19.05.2003 #109667# - use new method <lcl_PaintTopBottomLine(..)>
- //::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs, fnRect);
::lcl_PaintTopBottomLine(sal_False, *(this), *(pPage), aRect, rRect, rAttrs, fnRect);
}
}
@@ -5232,17 +5207,6 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect,
}
}
-// ----------------------------------------------------------------------
-//
-// const SwPageFrm::mnBorderPxWidth, const SwPageFrm::mnShadowPxWidth
-// SwPageFrm::GetBorderRect (..), SwPageFrm::GetRightShadowRect(..),
-// SwPageFrm::GetBottomShadowRect(..),
-// SwPageFrm::PaintBorderAndShadow(..),
-// SwPageFrm::GetBorderAndShadowBoundRect(..)
-//
-// OD 12.02.2003 for #i9719# and #105645#
-// ----------------------------------------------------------------------
-
const sal_Int8 SwPageFrm::mnBorderPxWidth = 1;
const sal_Int8 SwPageFrm::mnShadowPxWidth = 2;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 46702b2..724fbe7 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2065,7 +2065,6 @@ void SwTabFrm::MakeAll()
delete pAccess;
bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrm( *this ), FALSE );
-// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE );
pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
pAttrs = pAccess->Get();
}
@@ -2137,15 +2136,6 @@ void SwTabFrm::MakeAll()
// Thus, find next content, table or section
// and, if a section is found, get its first
// content.
-// SwFrm *pNxt = FindNextCnt();
-// if( pNxt && pNxt->IsInTab() )
-// pNxt = pNxt->FindTabFrm();
-// if ( pNxt )
-// {
-// pNxt->Calc();
-// if ( !GetNext() )
-// bValidPos = FALSE;
-// }
if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() )
{
bValidPos = FALSE;
@@ -2756,19 +2746,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
// E.g., it could happen, that the fly frame is still registered
// at the page frame, the table is on, but it's anchor character
// text frame has already changed its page.
- //if ( WEIT_WECH != (pFly->Frm().*fnRect->fnGetTop)() &&
- // pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) &&
- // // OD 25.02.2003 #i9040# - use '<=' instead of '<'
- // (*fnRect->fnYDiff)(
- // (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetBottom)(),
- // (Frm().*fnRect->fnGetTop)() ) <= 0 &&
- // !IsAnLower( pFly ) && !pFly->IsAnLower( this ) &&
- // ( !pMyFly || pMyFly->IsAnLower( pFly ) ) &&
- // pPage->GetPhyPageNum() >=
- // pFly->GetAnchorFrm()->FindPageFrm()->GetPhyPageNum() &&
- // // anchor should be in same page body/header/footer
- // ( pFly->GetAnchorFrm()->FindFooterOrHeader() ==
- // FindFooterOrHeader() ) )
const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm();
bool bConsiderFly =
// --> OD 2005-04-06 #i46807# - do not consider invalid
@@ -3041,11 +3018,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
// OD 10.03.2003 #i9040# - consider right line attribute.
nRightSpacing = Max( nRightSpacing, ( nRightOffset + nRightLine ) );
}
- // OD 10.03.2003 #i9040# - do not hold wished table width.
- /*
- if ( !pAttrs->GetLRSpace().GetRight() )
- nRight = Max( nRight, nMax - (nWish + nLeft + nRight));
- */
}
break;
case text::HoriOrientation::LEFT_AND_WIDTH:
@@ -3249,8 +3221,6 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew )
{
SwPageFrm *pPage = FindPageFrm();
InvalidatePage( pPage );
-// if ( nInvFlags & 0x01 )
-// SetCompletePaint();
if ( nInvFlags & 0x02 )
_InvalidatePrt();
if ( nInvFlags & 0x40 )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index cd143b7..c80c784 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#include <hints.hxx>
#include <tools/pstm.hxx>
@@ -1015,7 +1014,6 @@ void SwCntntFrm::Cut()
{
// --> OD 2006-09-25 #b6448963#
// prevent delete of <ColLocked> footnote frame
-// if( pUp->IsFtnFrm() )
if ( pUp->IsFtnFrm() && !pUp->IsColLocked())
// <--
{
@@ -1031,7 +1029,6 @@ void SwCntntFrm::Cut()
else
{
// --> OD 2006-09-25 #b6448963#
-// if ( pSct->IsColLocked() || !pSct->IsInFtn() )
if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
// <--
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 63152fb..8692c1f 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <tools/resid.hxx>
#include <unotools/charclass.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
@@ -364,9 +363,6 @@ BOOL SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
//
// kleiner haengt nur vom Text ab
-
-//
-
BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
@@ -399,9 +395,6 @@ BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
//
// Das Stichwort selbst
-
-//
-
void SwTOXIndex::_GetText( String& rTxt, String& rTxtReading )
{
OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
@@ -533,7 +526,6 @@ void SwTOXCustom::_GetText( String& rTxt, String &rTxtReading )
{
rTxt = aKey;
rTxtReading = sReading;
- /// !!!!!!!!!!!!!!
}
@@ -621,13 +613,6 @@ void SwTOXPara::_GetText( String& rTxt, String& )
case nsSwTOXElement::TOX_OUTLINELEVEL:
{
xub_StrLen nStt = nStartIndex;
-/* JP 22.01.98:
- Tabs ueberspringen - macht aber keinen Sinn, solange in der TOX-Form
- nicht die KapitelNummer eingestellt werden kann
- const String& rTmp = ((SwTxtNode*)pNd)->GetTxt();
- while( '\t' == rTmp.GetChar( nStt ) && nStt < rTmp.Len() )
- ++nStt;
-*/
rTxt = ((SwTxtNode*)pNd)->GetExpandTxt(
nStt,
STRING_NOTFOUND == nEndIndex ? STRING_LEN : nEndIndex - nStt);
@@ -664,13 +649,6 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) const
{
SwTxtNode* pSrc = (SwTxtNode*)aTOXSources[0].pNd;
xub_StrLen nStt = nStartIndex;
-/* JP 22.01.98:
- Tabs ueberspringen - macht aber keinen Sinn, solange in der TOX-Form
- nicht die KapitelNummer eingestellt werden kann
- const String& rTxt = pSrc->GetTxt();
- while( '\t' == rTxt.GetChar( nStt ) && nStt < rTxt.Len() )
- ++nStt;
-*/
pSrc->GetExpandTxt( rNd, &rInsPos, nStt,
nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt,
FALSE, FALSE, TRUE );
@@ -692,9 +670,6 @@ USHORT SwTOXPara::GetLevel() const
if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() )
{
- //USHORT nTmp = ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
- //if(nTmp < NO_NUMBERING)
- // nRet = nTmp + 1;
const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//#outline level,zhaojianwei????
if(nTmp != 0 )
nRet = static_cast<USHORT>(nTmp);
@@ -714,41 +689,6 @@ String SwTOXPara::GetURL() const
{
const SwTxtNode * pTxtNd = static_cast<const SwTxtNode *>(pNd);
- // --> OD 2009-08-05 #i103265#
-// //if( MAXLEVEL >= pTxtNd->GetTxtColl()->GetOutlineLevel()) //#outline level,zhaojianwei
-// if ( pTxtNd->GetAttrOutlineLevel() > 0) //<-end,zhaojianwei
-// {
-// aTxt = '#';
-// const SwNumRule * pRule = pTxtNd->GetNumRule();
-// if( pRule )
-// {
-// // dann noch die rel. Nummer davor setzen
-// const USHORT nCurrLevel = static_cast<USHORT>(pTxtNd->GetActualListLevel());
-// if(nCurrLevel <= MAXLEVEL)
-// {
-// // --> OD 2005-11-02 #i51089 - TUNING#
-// if ( pTxtNd->GetNum() )
-// {
-// SwNumberTree::tNumberVector aNumVector =
-// pTxtNd->GetNumberVector();
-
-// for( USHORT n = 0; n <= nCurrLevel; ++n )
-// {
-// int nNum = aNumVector[ n ];
-// nNum -= ( pRule->Get( n ).GetStart() - 1 );
-// ( aTxt += String::CreateFromInt32( nNum )) += '.';
-// }
-// }
-// else
-// {
-// OSL_ENSURE( false,
-// "<SwTOXPara::GetURL()> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
-// }
-// }
-// }
-// aTxt += pTxtNd->GetExpandTxt();
-// ( aTxt += cMarkSeperator ).AppendAscii( pMarkToOutline );
-// }
SwDoc* pDoc = const_cast<SwDoc*>( pTxtNd->GetDoc() );
::sw::mark::IMark const * const pMark = pDoc->getIDocumentMarkAccess()->getMarkForTxtNode(
*(pTxtNd),
@@ -756,7 +696,6 @@ String SwTOXPara::GetURL() const
aTxt = '#';
const String aMarkName( pMark->GetName() );
aTxt += aMarkName;
- // <--
}
break;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index c602b83..262e870 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -226,7 +226,6 @@ SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
if( pAutoAttr )
SetAttr( *pAutoAttr );
-// SyncNumberAndNumRule();
if ( !IsInList() && GetNumRule() && GetListId().Len() > 0 )
{
// #i101516#
@@ -2489,7 +2488,6 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
// --> OD 2007-07-10 #i75353#
// No clear of hard set numbering rule at an outline paragraph at this point.
// Only if the paragraph style changes - see below.
-// aClearWhichIds.push_back( RES_PARATR_NUMRULE );
bClearHardSetNumRuleWhenFmtCollChanges = true;
// <--
}
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 32ff37e..06eb936 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1103,7 +1103,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
// be determined)
// -1: don't know yet, 0: not used, 1: always a single labe cell, ...
// -2: neither/failed
-// sal_Int32 nValuesSeqLen = -1; // used to see if all value sequences have the same size
for (sal_Int32 nDS1 = 0; nDS1 < nNumDS_LDS; ++nDS1)
{
uno::Reference< chart2::data::XLabeledDataSequence > xLabeledDataSequence( pDS_LDS[nDS1] );
@@ -1587,7 +1586,6 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
-// uno::Reference< util::XModifiable > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< util::XModifiable > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1621,7 +1619,6 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox
sal_Bool bNowEmpty = sal_False;
// check if weak reference is still valid...
-// uno::Reference< chart2::data::XDataSequence > xRef( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< chart2::data::XDataSequence > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1669,7 +1666,6 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
Set_DataSequenceRef_t::iterator aEndIt( aSet.end() );
while (aIt != aEndIt)
{
-// uno::Reference< lang::XComponent > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< lang::XComponent > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1743,7 +1739,6 @@ void SwChartDataProvider::AddRowCols(
Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
while (aIt != rSet.end())
{
-// uno::Reference< chart2::data::XTextualDataSequence > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
uno::Reference< chart2::data::XDataSequence > xTemp(*aIt); // temporary needed for g++ 3.3.5
uno::Reference< chart2::data::XTextualDataSequence > xRef( xTemp, uno::UNO_QUERY );
if (xRef.is())
@@ -1807,14 +1802,9 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri
{
String aRange( aRangeRepresentation.GetToken(i, ';') );
SwFrmFmt *pTblFmt = 0; // pointer to table format
- // BM: For what should the check be necessary? for #i79009# it is required that NO check is done
-// SwUnoCrsr *pUnoCrsr = 0; // here required to check if the cells in the range do actually exist
-// std::auto_ptr< SwUnoCrsr > pAuto( pUnoCrsr ); // to end lifetime of object pointed to by pUnoCrsr
GetFormatAndCreateCursorFromRangeRep( pDoc, aRange, &pTblFmt, NULL );
if (!pTblFmt)
throw lang::IllegalArgumentException();
-// if (!pUnoCrsr)
-// throw uno::RuntimeException();
SwTable* pTable = SwTable::FindTable( pTblFmt );
if (pTable->IsTblComplex())
throw uno::RuntimeException();
@@ -1918,7 +1908,6 @@ SwChartDataSource::SwChartDataSource(
SwChartDataSource::~SwChartDataSource()
{
-// delete pTblCrsr;
}
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences( )
@@ -2364,7 +2353,6 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2373,7 +2361,6 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2382,7 +2369,6 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
@@ -2391,7 +2377,6 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- //SolarMutexGuard aGuard;
DBG_ERROR( "not implemented" );
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 0183fe6..c6fe1e9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1466,26 +1466,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
}
else
xPrSet->setPropertyValue(rPropertyName, aValue);
- // --> OD 2004-11-11 #i35007# - adjustment of the position
- // attributes, if the transformation is set, causes wrong alignments
- // and is no longer needed.
- // The position attributes are set, if the drawing object is added
- // to the draw page - see <SwXDrawPage::add(..)> - and on its first
- // positioning - see <SwAnchoredDrawObject::MakeObjPos().
-// // --> OD 2004-07-28 #i31698# - additionally adjust the position
-// // properties of the shape, if the transformation is set and
-// // the shape isn't a group member.
-// if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation"))) &&
-// !_GetTopGroupObj() )
-// {
-// drawing::HomogenMatrix3 aMatrix;
-// aValue >>= aMatrix;
-// awt::Point aNewPos( basegfx::fround( aMatrix.Line1.Column3 ),
-// basegfx::fround( aMatrix.Line2.Column3 ) );
-// _AdjustPositionProperties( aNewPos );
-// }
- // --> OD 2004-08-05 #i31698# - restore object position, if caption
- // point is set.
+ // #i31698# - restore object position, if caption point is set.
if ( rPropertyName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CaptionPoint"))) &&
getShapeType().equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape"))) )
{
@@ -2251,36 +2232,11 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
const Rectangle aGroupObjRect = pTopGroupObj->GetSnapRect();
// --> OD 2005-08-16 #i53320# - relative position of group member and
// top group object is always given in horizontal left-to-right layout.
-// const SwFrmFmt::tLayoutDir eLayoutDir = GetFrmFmt()
-// ? GetFrmFmt()->GetLayoutDir()
-// : SwFrmFmt::HORI_L2R;
awt::Point aOffset( 0, 0 );
-// switch ( eLayoutDir )
-// {
-// case SwFrmFmt::HORI_L2R:
{
aOffset.X = ( aMemberObjRect.Left() - aGroupObjRect.Left() );
aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
}
-// break;
-// case SwFrmFmt::HORI_R2L:
-// {
-// aOffset.X = ( aGroupObjRect.Right() - aMemberObjRect.Right() );
-// aOffset.Y = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
-// }
-// break;
-// case SwFrmFmt::VERT_R2L:
-// {
-// aOffset.X = ( aMemberObjRect.Top() - aGroupObjRect.Top() );
-// aOffset.Y = ( aGroupObjRect.Right() - aMemberObjRect.Right() );
-// }
-// break;
-// default:
-// {
-// OSL_ENSURE( false,
-// "<SwXShape::getPosition()> - unsupported layout direction" );
-// }
-// }
// <--
aOffset.X = TWIP_TO_MM100(aOffset.X);
aOffset.Y = TWIP_TO_MM100(aOffset.Y);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 72dcebc..8ea4920 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#define _SVX_PARAITEM_HXX
#define _SVX_TEXTITEM_HXX
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index e56ef59..28bf6d2 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
@@ -70,10 +69,8 @@
#endif
-
const sal_Int32 MAX_LEN = 1024;
-/* */
void CSS1Parser::InitRead( const String& rIn )
{
@@ -113,8 +110,6 @@ sal_Unicode CSS1Parser::GetNextChar()
return c;
}
-/* */
-
// Diese Funktion realisiert den in
//
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
@@ -690,9 +685,6 @@ CSS1Token CSS1Parser::GetNextToken()
}
-/* */
-
-
// Dies folegenden Funktionen realisieren den in
//
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
@@ -1152,7 +1144,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty )
return pRoot;
}
-/* */
CSS1Parser::CSS1Parser()
: nValue(0)
@@ -1165,7 +1156,6 @@ CSS1Parser::~CSS1Parser()
{
}
-/* */
BOOL CSS1Parser::ParseStyleSheet( const String& rIn )
{
@@ -1255,8 +1245,6 @@ BOOL CSS1Parser::DeclarationParsed( const String& /*rProperty*/,
}
-/* */
-
CSS1Selector::~CSS1Selector()
{
delete pNext;
commit 745866274e930605d0e495fac78632f029b89139
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 5 21:00:17 2011 +0100
Remove unnecessary variable
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 3c9a7d6..37b3c3e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1926,7 +1926,6 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
}
else if( pVSh->ISA( SwFEShell ) )
{
- sal_uInt16 nObjCount;
const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
const SwFrm *pFlyFrm = pFESh->GetCurrFlyFrm();
if( pFlyFrm )
@@ -1935,7 +1934,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
"cursor is not contained in fly frame" );
aFrmOrObj = pFlyFrm;
}
- else if( (nObjCount = pFESh->IsObjSelected()) > 0 )
+ else if( pFESh->IsObjSelected() > 0 )
{
bShapeSelected = sal_True;
aFrmOrObj = static_cast<const SwFrm *>( 0 );
commit f5ea185dccdf92f3ce07feb464cae298d9da221b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 5 20:34:13 2011 +0100
Fix build and remove one more nested macro
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index b6dbd0c..2ef7e3b 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1945,12 +1945,11 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *((SwTxtNode*)pNd), aExpandText, pConversionMap );
// get error position of cursor in XFlatParagraph
- sal_Int32 nGrammarErrorPosInText;
linguistic2::ProofreadingResult aResult;
sal_Int32 nGrammarErrors;
do
{
- nGrammarErrorPosInText = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nBeginGrammarCheck );
+ ModelToViewHelper::ConvertToViewPosition( pConversionMap, nBeginGrammarCheck );
aResult = xGCIterator->checkSentenceAtPosition(
xDoc, xFlatPara, aExpandText, lang::Locale(), nBeginGrammarCheck, -1, -1 );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ec2791d..271ecee 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2549,6 +2549,7 @@ ULONG SwTableBox::IsValidNumTxtNd( BOOL bCheckAttr ) const
{
const SwNode* pNode = pSttNd->GetNodes()[nIndex];
if( pNode->IsTableNode() )
+ {
pTextNode = 0;
break;
}
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index b74f2d4..56ef92e 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -721,10 +721,8 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
//DBG_LOOP; shadows declaration above.
//resolved into:
#if OSL_DEBUG_LEVEL > 1
-#if OSL_DEBUG_LEVEL > 1
DbgLoop aDbgLoop2( (const void*) this );
#endif
-#endif
aLine.DrawTextLine( rRect, aClip, IsUndersized() );
} while( aLine.Next() && aLine.Y() <= nBottom );
commit 5e58c75a0e4eb7ec38eca521f61d9f642e59cfe6
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Sat Feb 5 18:00:33 2011 +0100
Removing bogus comments.
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 7ec9f1e..5c660dd 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -28,7 +28,7 @@
#ifndef _FLYFRMS_HXX
#define _FLYFRMS_HXX
#include "flyfrm.hxx"
-// --> OD 2004-06-23 #i28701#
+// --> #i28701#
class SwFlyAtCntFrm;
//Basisklasse fuer diejenigen Flys, die sich relativ frei Bewegen koennen -
@@ -37,12 +37,12 @@ class SwFlyFreeFrm : public SwFlyFrm
{
SwPageFrm *pPage; //Bei dieser Seite ist der Fly angemeldet.
- // --> OD 2004-11-15 #i34753# - flag for at-page anchored Writer fly frames
+ // --> #i34753# - flag for at-page anchored Writer fly frames
// to prevent a positioning - call of method <MakeObjPos()> -, if Writer
// fly frame is already clipped during its format by the object formatter.
bool mbNoMakePos;
// <--
- // --> OD 2004-11-12 #i37068# - flag to prevent move in method
+ // --> #i37068# - flag to prevent move in method
// <CheckClip(..)>
bool mbNoMoveOnCheckClip;
// <--
@@ -50,7 +50,7 @@ class SwFlyFreeFrm : public SwFlyFrm
/** determines, if direct environment of fly frame has 'auto' size
- OD 07.08.2003 #i17297#, #111066#, #111070#
+ #i17297#
start with anchor frame and search 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.
@@ -63,7 +63,7 @@ class SwFlyFreeFrm : public SwFlyFrm
bool HasEnvironmentAutoSize() const;
protected:
- // OD 2004-05-12 #i28701# - new friend class <SwFlyNotify> for access to
+ // #i28701# - new friend class <SwFlyNotify> for access to
// method <NotifyBackground>
friend class SwFlyNotify;
virtual void NotifyBackground( SwPageFrm *pPage,
@@ -72,14 +72,14 @@ protected:
SwFlyFreeFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
public:
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
TYPEINFO();
virtual ~SwFlyFreeFrm();
virtual void MakeAll();
- // --> OD 2004-11-12 #i37068# - accessors for member <mbNoMoveOnCheckClip>
+ // --> #i37068# - accessors for member <mbNoMoveOnCheckClip>
inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
{
mbNoMoveOnCheckClip = _bNewNoMoveOnCheckClip;
@@ -89,7 +89,7 @@ public:
return mbNoMoveOnCheckClip;
}
// <--
- // --> OD 2004-11-15 #i34753# - accessors for member <mbNoMakePos>
+ // --> #i34753# - accessors for member <mbNoMakePos>
inline void SetNoMakePos( const bool _bNoMakePos )
{
if ( IsFlyLayFrm() )
@@ -112,7 +112,7 @@ public:
/** method to determine, if a format on the Writer fly frame is possible
- OD 2004-05-11 #i28701#
+ #i28701#
refine 'IsFormatPossible'-conditions of method
<SwFlyFrm::IsFormatPossible()> by:
format isn't possible, if Writer fly frame isn't registered at a page frame
@@ -128,7 +128,7 @@ public:
class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
TYPEINFO();
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
@@ -144,20 +144,20 @@ class SwFlyAtCntFrm : public SwFlyFreeFrm
protected:
virtual void MakeAll();
- // OD 2004-05-12 #i28701#
+ // #i28701#
virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const;
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
+ #i28701#
@author OD
*/
virtual void RegisterAtCorrectPage();
public:
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
TYPEINFO();
SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
@@ -166,12 +166,12 @@ public:
void SetAbsPos( const Point &rNew );
- // OD 2004-03-23 #i26791#
+ // #i26791#
virtual void MakeObjPos();
/** method to determine, if a format on the Writer fly frame is possible
- OD 2004-05-11 #i28701#
+ #i28701#
refine 'IsFormatPossible'-conditions of method
<SwFlyFreeFrm::IsFormatPossible()> by:
format isn't possible, if method <MakeAll()> is already in progress.
@@ -196,7 +196,7 @@ protected:
virtual void MakeAll();
public:
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
TYPEINFO();
SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm *pAnchor );
@@ -230,10 +230,10 @@ public:
//siehe layact.cxx
void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; }
- // OD 2004-03-23 #i26791#
+ // #i26791#
virtual void MakeObjPos();
- // --> OD 2004-12-02 #115759# - invalidate anchor frame on invalidation
+ // --> #115759# - invalidate anchor frame on invalidation
// of the position, because the position is calculated during the
// format of the anchor frame
virtual void _ActionOnInvalidation( const InvalidationType _nInvalid );
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index f4684e5..48305d7 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -67,7 +67,7 @@ protected:
long CalcRel( const SwFmtFrmSize &rSz, BOOL bWidth ) const;
public:
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
TYPEINFO();
void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
@@ -113,7 +113,6 @@ public:
inline SwCntntFrm *ContainsCntnt();
const SwCellFrm *FirstCell() const;
inline SwCellFrm *FirstCell();
- // --> OD 2006-02-01 #130797#
// Method <ContainsAny()> doesn't investigate content of footnotes by default.
// But under certain circumstances this investigation is intended.
// Thus, introduce new optional parameter <_bInvestigateFtnForSections>.
@@ -121,7 +120,6 @@ public:
// investigated for sections.
const SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ) const;
inline SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false );
- // <--
BOOL IsAnLower( const SwFrm * ) const;
const SwFrmFmt *GetFmt() const { return (const SwFrmFmt*)GetDep(); }
@@ -134,8 +132,8 @@ public:
BOOL MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
SwFtnBossFrm *pNewBoss, const BOOL bFtnNums );
- // --> OD 2004-07-01 #i28701# - change purpose of method and its name
- // --> OD 2005-03-11 #i44016# - add parameter <_bUnlockPosOfObjs> to
+ // --> #i28701# - change purpose of method and its name
+ // --> #i44016# - add parameter <_bUnlockPosOfObjs> to
// force an unlockposition call for the lower objects.
void NotifyLowerObjs( const bool _bUnlockPosOfObjs = false );
// <--
@@ -156,7 +154,7 @@ public:
/** method to check relative position of layout frame to
a given layout frame.
- OD 08.11.2002 - refactoring of pseudo-local method <lcl_Apres(..)> in
+ refactoring of pseudo-local method <lcl_Apres(..)> in
<txtftn.cxx> for #104840#.
@param _aCheckRefLayFrm
@@ -184,12 +182,10 @@ inline SwCellFrm* SwLayoutFrm::FirstCell()
return (SwCellFrm*)(((const SwLayoutFrm*)this)->FirstCell());
}
-// --> OD 2006-02-01 #130797#
inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
{
return (SwFrm*)(((const SwLayoutFrm*)this)->ContainsAny( _bInvestigateFtnForSections ));
}
-// <--
// Diese SwFrm-inlines sind hier, damit frame.hxx nicht layfrm.hxx includen muss
inline BOOL SwFrm::IsColBodyFrm() const
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 9fb7d94..728d059 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -38,22 +38,22 @@ class SwPageFrm;
class SwLooping;
class IDocumentLayoutAccess;
-// --> OD 2004-06-23 #i28701#
+// --> #i28701#
class SwMovedFwdFrmsByObjPos;
class SwTxtFrm;
// <--
-// --> OD 2004-10-05 #i26945#
+// --> #i26945#
class SwRowFrm;
// <--
-// --> OD 2004-10-22 #i35911#
+// --> #i35911#
class SwObjsMarkedAsTmpConsiderWrapInfluence;
class SwAnchoredObject;
// <--
-// --> OD 2005-01-12 #i40155#
+// --> #i40155#
#include <vector>
class SwFrm;
// <--
-// --> OD 2006-05-10 #i65250#
+// --> #i65250#
#include <swtypes.hxx>
#include <boost/unordered_map.hpp>
class SwFlowFrm;
@@ -69,19 +69,19 @@ class SwLayouter
void _CollectEndnotes( SwSectionFrm* pSect );
BOOL StartLooping( SwPageFrm* pPage );
- // --> OD 2004-06-23 #i28701#
+ // --> #i28701#
SwMovedFwdFrmsByObjPos* mpMovedFwdFrms;
// <--
- // --> OD 2004-10-22 #i35911#
+ // --> #i35911#
SwObjsMarkedAsTmpConsiderWrapInfluence* mpObjsTmpConsiderWrapInfl;
// <--
- // --> OD 2005-01-12 #i40155# - data structure to collect frames, which are
+ // --> #i40155# - data structure to collect frames, which are
// marked not to wrap around objects.
std::vector< const SwFrm* > maFrmsNotToWrap;
// <--
public:
- // --> OD 2006-05-10 #i65250#
+ // --> #i65250#
// - data structure to collect moving backward layout information
struct tMoveBwdLayoutInfoKey
{
@@ -137,7 +137,7 @@ public:
static BOOL Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn );
static BOOL StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage );
- // --> OD 2004-06-23 #i28701#
+ // --> #i28701#
static void ClearMovedFwdFrms( const SwDoc& _rDoc );
static void InsertMovedFwdFrm( const SwDoc& _rDoc,
const SwTxtFrm& _rMovedFwdFrmByObjPos,
@@ -146,29 +146,29 @@ public:
const SwTxtFrm& _rTxtFrm,
sal_uInt32& _ornToPageNum );
// <--
- // --> OD 2005-01-12 #i40155# - ummark given frame as to be moved forward.
+ // --> #i40155# - ummark given frame as to be moved forward.
static void RemoveMovedFwdFrm( const SwDoc& _rDoc,
const SwTxtFrm& _rTxtFrm );
// <--
- // --> OD 2004-10-05 #i26945#
+ // --> #i26945#
static bool DoesRowContainMovedFwdFrm( const SwDoc& _rDoc,
const SwRowFrm& _rRowFrm );
// <--
- // --> OD 2004-10-22 #i35911#
+ // --> #i35911#
static void ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc );
static void InsertObjForTmpConsiderWrapInfluence(
const SwDoc& _rDoc,
SwAnchoredObject& _rAnchoredObj );
// <--
- // --> OD 2005-01-12 #i40155#
+ // --> #i40155#
static void ClearFrmsNotToWrap( const SwDoc& _rDoc );
static void InsertFrmNotToWrap( const SwDoc& _rDoc,
const SwFrm& _rFrm );
static bool FrmNotToWrap( const IDocumentLayoutAccess& _rIDLA,
const SwFrm& _rFrm );
// <--
- // --> OD 2006-05-10 #i65250#
+ // --> #i65250#
static bool MoveBwdSuppressed( const SwDoc& p_rDoc,
const SwFlowFrm& p_rFlowFrm,
const SwLayoutFrm& p_rNewUpperFrm );
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index 83a594a..52ea300 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -33,7 +33,7 @@
class SwTxtNode;
class SwTxtFrm;
-// --> OD 2004-10-05 #i26945#
+// --> #i26945#
class SwRowFrm;
// <--
@@ -54,14 +54,14 @@ class SwMovedFwdFrmsByObjPos
void Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos,
const sal_uInt32 _nToPageNum );
- // --> OD 2005-01-12 #i40155#
+ // --> #i40155#
void Remove( const SwTxtFrm& _rTxtFrm );
// <--
bool FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm,
sal_uInt32& _ornToPageNum ) const;
- // --> OD 2004-10-05 #i26945#
+ // --> #i26945#
bool DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm ) const;
// <--
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index c899cda..0b56b12 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -39,18 +39,18 @@
#include <tolayoutanchoredobjectposition.hxx>
#include <frmtool.hxx>
#include <fmtornt.hxx>
-// --> OD 2004-08-12 #i32795#
+// --> #i32795#
#include <txtfrm.hxx>
// <--
-// --> OD 2004-08-12 #i32795#
+// --> #i32795#
// template class <std::vector>
#include <vector>
// <--
-// --> OD 2004-08-10 #i28749#
+// --> #i28749#
#include <com/sun/star/text/PositionLayoutDir.hpp>
// <--
-// --> OD 2005-03-09 #i44559#
+// --> #i44559#
#include <ndtxt.hxx>
// <--
@@ -79,7 +79,7 @@ SwPosNotify::SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj ) :
mpAnchoredDrawObj( _pAnchoredDrawObj )
{
maOldObjRect = mpAnchoredDrawObj->GetObjRect();
- // --> OD 2004-10-20 #i35640# - determine correct page frame
+ // --> #i35640# - determine correct page frame
mpOldPageFrm = mpAnchoredDrawObj->GetPageFrm();
// <--
}
@@ -96,7 +96,7 @@ SwPosNotify::~SwPosNotify()
SwRect aNewObjRect( mpAnchoredDrawObj->GetObjRect() );
if( aNewObjRect.HasArea() )
{
- // --> OD 2004-10-20 #i35640# - determine correct page frame
+ // --> #i35640# - determine correct page frame
SwPageFrm* pNewPageFrm = mpAnchoredDrawObj->GetPageFrm();
// <--
if( pNewPageFrm )
@@ -106,9 +106,9 @@ SwPosNotify::~SwPosNotify()
::ClrContourCache( mpAnchoredDrawObj->GetDrawObj() );
- // --> OD 2004-10-20 #i35640# - additional notify anchor text frame
+ // --> #i35640# - additional notify anchor text frame
// Needed for negative positioned drawing objects
- // --> OD 2005-03-01 #i43255# - refine condition to avoid unneeded
+ // --> #i43255# - refine condition to avoid unneeded
// invalidations: anchored object had to be on the page of its anchor
// text frame.
if ( mpAnchoredDrawObj->GetAnchorFrm()->IsTxtFrm() &&
@@ -143,7 +143,7 @@ SwPosNotify::~SwPosNotify()
}
}
-// --> OD 2004-08-12 #i32795#
+// --> #i32795#
Point SwPosNotify::LastObjPos() const
{
return maOldObjRect.Pos();
@@ -151,7 +151,7 @@ Point SwPosNotify::LastObjPos() const
//<--
// ============================================================================
-// OD 2004-08-12 #i32795#
+// #i32795#
// helper class for oscillation control on object positioning
// ============================================================================
class SwObjPosOscillationControl
@@ -229,14 +229,14 @@ TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject);
SwAnchoredDrawObject::SwAnchoredDrawObject() :
SwAnchoredObject(),
mbValidPos( false ),
- // --> OD 2004-09-29 #i34748#
+ // --> #i34748#
mpLastObjRect( 0L ),
// <--
mbNotYetAttachedToAnchorFrame( true ),
- // --> OD 2004-08-09 #i28749#
+ // --> #i28749#
mbNotYetPositioned( true ),
// <--
- // --> OD 2006-03-17 #i62875#
+ // --> #i62875#
mbCaptureAfterLayoutDirChange( false )
// <--
{
@@ -244,12 +244,12 @@ SwAnchoredDrawObject::SwAnchoredDrawObject() :
SwAnchoredDrawObject::~SwAnchoredDrawObject()
{
- // --> OD 2004-11-03 - follow-up of #i34748#
+ // --> follow-up of #i34748#
delete mpLastObjRect;
// <--
}
-// --> OD 2006-03-17 #i62875#
+// --> #i62875#
void SwAnchoredDrawObject::UpdateLayoutDir()
{
SwFrmFmt::tLayoutDir nOldLayoutDir( GetFrmFmt().GetLayoutDir() );
@@ -266,7 +266,7 @@ void SwAnchoredDrawObject::UpdateLayoutDir()
}
// <--
-// --> OD 2006-03-17 #i62875#
+// --> #i62875#
bool SwAnchoredDrawObject::IsOutsidePage() const
{
bool bOutsidePage( false );
@@ -283,7 +283,7 @@ bool SwAnchoredDrawObject::IsOutsidePage() const
// <--
// =============================================================================
-// OD 2004-03-25 #i26791# - implementation of pure virtual method declared in
+// #i26791# - implementation of pure virtual method declared in
// base class <SwAnchoredObject>
// =============================================================================
void SwAnchoredDrawObject::MakeObjPos()
@@ -300,7 +300,7 @@ void SwAnchoredDrawObject::MakeObjPos()
return;
}
- // --> OD 2004-08-09 #i28749# - anchored drawing object has to be attached
+ // --> #i28749# - anchored drawing object has to be attached
// to anchor frame
if ( mbNotYetAttachedToAnchorFrame )
{
@@ -312,23 +312,22 @@ void SwAnchoredDrawObject::MakeObjPos()
SwDrawContact* pDrawContact =
static_cast<SwDrawContact*>(::GetUserCall( GetDrawObj() ));
- // --> OD 2004-08-09 #i28749# - if anchored drawing object hasn't been yet
+ // --> #i28749# - if anchored drawing object hasn't been yet
// positioned, convert its positioning attributes, if its positioning
// attributes are given in horizontal left-to-right layout.
- // --> OD 2004-10-25 #i36010# - Note: horizontal left-to-right layout is made
+ // --> #i36010# - Note: horizontal left-to-right layout is made
// the default layout direction for <SwDrawFrmFmt> instances. Thus, it has
// to be adjusted manually, if no adjustment of the positioning attributes
// have to be performed here.
- // --> OD 2004-11-17 #i35635# - additionally move drawing object to the
- // visible layer.
+ // --> #i35635# - additionally move drawing object to the visible layer.
if ( mbNotYetPositioned )
{
- // --> OD 2004-11-17 #i35635#
+ // --> #i35635#
pDrawContact->MoveObjToVisibleLayer( DrawObj() );
// <--
- // --> OD 2004-09-29 #117975# - perform conversion of positioning
+ // --> perform conversion of positioning
// attributes only for 'master' drawing objects
- // --> OD 2005-03-11 #i44334#, #i44681# - check, if positioning
+ // --> #i44334#, #i44681# - check, if positioning
// attributes already have been set.
if ( !GetDrawObj()->ISA(SwDrawVirtObj) &&
!static_cast<SwDrawFrmFmt&>(GetFrmFmt()).IsPosAttrSet() )
@@ -336,7 +335,7 @@ void SwAnchoredDrawObject::MakeObjPos()
_SetPositioningAttr();
}
// <--
- // --> OD 2006-05-24 #b6418964#
+ // -->
// - reset internal flag after all needed actions are performed to
// avoid callbacks from drawing layer
mbNotYetPositioned = false;
@@ -362,7 +361,7 @@ void SwAnchoredDrawObject::MakeObjPos()
case FLY_AT_PARA:
case FLY_AT_CHAR:
{
- // --> OD 2004-08-12 #i32795# - move intrinsic positioning to
+ // --> #i32795# - move intrinsic positioning to
// helper method <_MakeObjPosAnchoredAtPara()>
_MakeObjPosAnchoredAtPara();
}
@@ -370,7 +369,7 @@ void SwAnchoredDrawObject::MakeObjPos()
case FLY_AT_PAGE:
case FLY_AT_FLY:
{
- // --> OD 2004-08-12 #i32795# - move intrinsic positioning to
+ // --> #i32795# - move intrinsic positioning to
// helper method <_MakeObjPosAnchoredAtLayout()>
_MakeObjPosAnchoredAtLayout();
}
@@ -382,7 +381,7 @@ void SwAnchoredDrawObject::MakeObjPos()
}
// keep, current object rectangle
- // --> OD 2004-09-29 #i34748# - use new method <SetLastObjRect(..)>
+ // --> #i34748# - use new method <SetLastObjRect(..)>
SetLastObjRect( GetObjRect().SVRect() );
// <--
@@ -397,7 +396,7 @@ void SwAnchoredDrawObject::MakeObjPos()
}
}
- // --> OD 2006-03-17 #i62875#
+ // --> #i62875#
if ( mbCaptureAfterLayoutDirChange &&
GetPageFrm() )
{
@@ -424,22 +423,22 @@ void SwAnchoredDrawObject::MakeObjPos()
/** method for the intrinsic positioning of a at-paragraph|at-character
anchored drawing object
- OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+ #i32795# - helper method for method <MakeObjPos>
@author OD
*/
void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
{
- // --> OD 2004-08-12 #i32795# - adopt positioning algorithm from Writer
+ // --> #i32795# - adopt positioning algorithm from Writer
// fly frames, which are anchored at paragraph|at character
// Determine, if anchor frame can/has to be formatted.
// If yes, after each object positioning the anchor frame is formatted.
// If after the anchor frame format the object position isn't valid, the
// object is positioned again.
- // --> OD 2005-02-22 #i43255# - refine condition: anchor frame format not
+ // --> #i43255# - refine condition: anchor frame format not
// allowed, if another anchored object, has to be consider its wrap influence
- // --> OD 2005-06-07 #i50356# - format anchor frame containing the anchor
+ // --> #i50356# - format anchor frame containing the anchor
// position. E.g., for at-character anchored object this can be the follow
// frame of the anchor frame, which contains the anchor character.
const bool bFormatAnchor =
@@ -450,14 +449,14 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
if ( bFormatAnchor )
{
- // --> OD 2005-06-07 #i50356#
+ // --> #i50356#
GetAnchorFrmContainingAnchPos()->Calc();
// <--
}
bool bOscillationDetected = false;
SwObjPosOscillationControl aObjPosOscCtrl( *this );
- // --> 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 );
@@ -466,7 +465,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
// indicate that position will be valid after positioning is performed
mbValidPos = true;
- // --> OD 2004-10-20 #i35640# - correct scope for <SwPosNotify> instance
+ // --> #i35640# - correct scope for <SwPosNotify> instance
{
// create instance of <SwPosNotify> for correct notification
SwPosNotify aPosNotify( this );
@@ -492,12 +491,12 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
// to be invalid.
if ( bFormatAnchor )
{
- // --> OD 2005-06-07 #i50356#
+ // --> #i50356#
GetAnchorFrmContainingAnchPos()->Calc();
// <--
}
- // --> OD 2004-08-25 #i3317#
+ // --> #i3317#
if ( !ConsiderObjWrapInfluenceOnObjPos() &&
OverlapsPrevColumn() )
{
@@ -507,7 +506,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
} while ( !mbValidPos && !bOscillationDetected &&
!bConsiderWrapInfluenceDueToOverlapPrevCol );
- // --> OD 2004-08-25 #i3317# - consider a detected oscillation and overlapping
+ // --> #i3317# - consider a detected oscillation and overlapping
// with previous column.
// temporarly consider the anchored objects wrapping style influence
if ( bOscillationDetected || bConsiderWrapInfluenceDueToOverlapPrevCol )
@@ -521,7 +520,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()
/** method for the intrinsic positioning of a at-page|at-frame anchored
drawing object
- OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+ #i32795# - helper method for method <MakeObjPos>
@author OD
*/
@@ -540,14 +539,14 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout()
// set position
- // --> OD 2004-07-29 #i31698#
- // --> OD 2004-10-18 #i34995# - setting anchor position needed for filters,
+ // --> #i31698#
+ // --> #i34995# - setting anchor position needed for filters,
// especially for the xml-filter to the OpenOffice.org file format
{
const Point aNewAnchorPos =
GetAnchorFrm()->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) );
DrawObj()->SetAnchorPos( aNewAnchorPos );
- // --> OD 2006-10-05 #i70122# - missing invalidation
+ // --> #i70122# - missing invalidation
InvalidateObjRectWithSpaces();
// <--
}
@@ -564,7 +563,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout()
void SwAnchoredDrawObject::_SetDrawObjAnchor()
{
// new anchor position
- // --> OD 2004-07-29 #i31698# -
+ // --> #i31698# -
Point aNewAnchorPos =
GetAnchorFrm()->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) );
Point aCurrAnchorPos = GetDrawObj()->GetAnchorPos();
@@ -577,7 +576,7 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor()
DrawObj()->SetAnchorPos( aNewAnchorPos );
// correct object position, caused by setting new anchor position
DrawObj()->Move( aMove );
- // --> OD 2006-10-05 #i70122# - missing invalidation
+ // --> #i70122# - missing invalidation
InvalidateObjRectWithSpaces();
// <--
}
@@ -585,7 +584,7 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor()
/** method to invalidate the given page frame
- OD 2004-07-02 #i28701#
+ #i28701#
@author OD
*/
@@ -595,7 +594,7 @@ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm )
{
if ( _pPageFrm->GetUpper() )
{
- // --> OD 2004-11-11 #i35007# - correct invalidation for as-character
+ // --> #i35007# - correct invalidation for as-character
// anchored objects.
if ( GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR )
{
@@ -622,21 +621,21 @@ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm )
void SwAnchoredDrawObject::InvalidateObjPos()
{
- // --> OD 2004-07-01 #i28701# - check, if invalidation is allowed
+ // --> #i28701# - check, if invalidation is allowed
if ( mbValidPos &&
InvalidationOfPosAllowed() )
{
mbValidPos = false;
- // --> OD 2006-08-10 #i68520#
+ // --> #i68520#
InvalidateObjRectWithSpaces();
// <--
- // --> OD 2005-03-08 #i44339# - check, if anchor frame exists.
+ // --> #i44339# - check, if anchor frame exists.
if ( GetAnchorFrm() )
{
- // --> OD 2004-11-22 #118547# - notify anchor frame of as-character
+ // --> #118547# - notify anchor frame of as-character
// anchored object, because its positioned by the format of its anchor frame.
- // --> OD 2005-03-09 #i44559# - assure, that text hint is already
+ // --> #i44559# - assure, that text hint is already
// existing in the text frame
if ( GetAnchorFrm()->ISA(SwTxtFrm) &&
(GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
@@ -653,7 +652,7 @@ void SwAnchoredDrawObject::InvalidateObjPos()
SwPageFrm* pPageFrm = AnchorFrm()->FindPageFrm();
_InvalidatePage( pPageFrm );
- // --> OD 2004-08-12 #i32270# - also invalidate page frame, at which the
+ // --> #i32270# - also invalidate page frame, at which the
// drawing object is registered at.
SwPageFrm* pPageFrmRegisteredAt = GetPageFrm();
if ( pPageFrmRegisteredAt &&
@@ -662,7 +661,7 @@ void SwAnchoredDrawObject::InvalidateObjPos()
_InvalidatePage( pPageFrmRegisteredAt );
}
// <--
- // --> OD 2004-09-23 #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
+ // --> #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
// is replaced by method <FindPageFrmOfAnchor()>. It's return value
// have to be checked.
SwPageFrm* pPageFrmOfAnchor = FindPageFrmOfAnchor();
@@ -698,14 +697,14 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const
return GetDrawObj()->GetSnapRect();
}
-// --> OD 2006-10-05 #i70122#
+// --> #i70122#
const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
{
return GetDrawObj()->GetCurrentBoundRect();
}
// <--
-// --> OD 2006-08-10 #i68520#
+// --> #i68520#
bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop )
{
SwTwips nDiff = _nTop - GetObjRect().Top();
@@ -724,7 +723,7 @@ bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft )
/** adjust positioning and alignment attributes for new anchor frame
- OD 2004-08-24 #i33313# - add second optional parameter <_pNewObjRect>
+ #i33313# - add second optional parameter <_pNewObjRect>
@author OD
*/
@@ -734,7 +733,7 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm,
SwTwips nHoriRelPos = 0;
SwTwips nVertRelPos = 0;
const Point aAnchorPos = _pNewAnchorFrm->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) );
- // --> OD 2004-08-24 #i33313#
+ // --> #i33313#
const SwRect aObjRect( _pNewObjRect ? *_pNewObjRect : GetObjRect() );
// <--
const bool bVert = _pNewAnchorFrm->IsVertical();
@@ -759,14 +758,14 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm,
GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
}
-// --> OD 2004-09-29 #i34748# - change return type
+// --> #i34748# - change return type
const Rectangle* SwAnchoredDrawObject::GetLastObjRect() const
{
return mpLastObjRect;
}
// <--
-// --> OD 2004-09-29 #i34748# - change return type.
+// --> #i34748# - change return type.
// If member <mpLastObjRect> is NULL, create one.
void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect )
{
@@ -780,7 +779,7 @@ void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect )
void SwAnchoredDrawObject::ObjectAttachedToAnchorFrame()
{
- // --> OD 2004-07-27 #i31698#
+ // --> #i31698#
SwAnchoredObject::ObjectAttachedToAnchorFrame();
// <--
@@ -792,7 +791,7 @@ void SwAnchoredDrawObject::ObjectAttachedToAnchorFrame()
/** method to set positioning attributes
- OD 2004-10-20 #i35798#
+ #i35798#
During load the positioning attributes aren't set.
Thus, the positioning attributes are set by the current object geometry.
This method is also used for the conversion for drawing objects
@@ -812,7 +811,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
SwTwips nHoriPos = aObjRect.Left();
SwTwips nVertPos = aObjRect.Top();
- // --> OD 2005-03-10 #i44334#, #i44681#
+ // --> #i44334#, #i44681#
// perform conversion only if position is in horizontal-left-to-right-layout.
if ( GetFrmFmt().GetPositionLayoutDir() ==
text::PositionLayoutDir::PositionInHoriL2R )
@@ -845,7 +844,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
}
// <--
- // --> OD 2006-11-10 #i71182#
+ // --> #i71182#
// only change position - do not lose other attributes
SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
aHori.SetPos( nHoriPos );
@@ -857,13 +856,13 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
GetFrmFmt().SetFmtAttr( aVert );
// <--
- // --> OD 2004-10-25 #i36010# - set layout direction of the position
+ // --> #i36010# - set layout direction of the position
GetFrmFmt().SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
// <--
}
- // --> OD 2007-11-29 #i65798# - also for as-character anchored objects
- // --> OD 2005-05-10 #i45952# - indicate that position
+ // --> #i65798# - also for as-character anchored objects
+ // --> #i45952# - indicate that position
// attributes are set now.
static_cast<SwDrawFrmFmt&>(GetFrmFmt()).PosAttrSet();
// <--
@@ -879,7 +878,7 @@ void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm,
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
+ #i28701#
@author OD
*/
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index 9370ed7..034e780 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -35,7 +35,7 @@
#include <frmfmt.hxx>
#include <fmtanchr.hxx>
#include <fmtornt.hxx>
-// --> OD 2004-06-29 #i28701#
+// --> #i28701#
#include <doc.hxx>
#include <fmtsrnd.hxx>
#include <svx/svdobj.hxx>
@@ -46,10 +46,10 @@
#include <pagefrm.hxx>
// <--
#include <frmatr.hxx>
-// --> OD 2004-08-25 #i3317#
+// --> #i3317#
#include <colfrm.hxx>
// <--
-// --> OD 2004-10-22 #i35911#
+// --> #i35911#
#include <layouter.hxx>
@@ -58,28 +58,28 @@ using namespace ::com::sun::star;
// <--
// ============================================================================
-// --> OD 2004-06-30 #i28701# -
+// --> #i28701# -
// implementation of helper class <SwObjPositioningInProgress>
// ============================================================================
SwObjPositioningInProgress::SwObjPositioningInProgress( SdrObject& _rSdrObj ) :
mpAnchoredObj( 0L ),
- // --> OD 2005-08-09 #i52904#
+ // --> #i52904#
mbOldObjPositioningInProgress( false )
// <--
{
mpAnchoredObj = ::GetUserCall( &_rSdrObj )->GetAnchoredObj( &_rSdrObj );
- // --> OD 2005-08-09 #i52904#
+ // --> #i52904#
mbOldObjPositioningInProgress = mpAnchoredObj->IsPositioningInProgress();
// <--
mpAnchoredObj->SetPositioningInProgress( true );
}
SwObjPositioningInProgress::SwObjPositioningInProgress( SwAnchoredObject& _rAnchoredObj ) :
mpAnchoredObj( &_rAnchoredObj ),
- // --> OD 2005-08-09 #i52904#
+ // --> #i52904#
mbOldObjPositioningInProgress( false )
// <--
{
- // --> OD 2005-08-09 #i52904#
+ // --> #i52904#
mbOldObjPositioningInProgress = mpAnchoredObj->IsPositioningInProgress();
// <--
mpAnchoredObj->SetPositioningInProgress( true );
@@ -89,7 +89,7 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress()
{
if ( mpAnchoredObj )
{
- // --> OD 2005-08-09 #i52904#
+ // --> #i52904#
mpAnchoredObj->SetPositioningInProgress( mbOldObjPositioningInProgress );
// <--
}
@@ -102,29 +102,29 @@ TYPEINIT0(SwAnchoredObject);
SwAnchoredObject::SwAnchoredObject() :
mpDrawObj( 0L ),
mpAnchorFrm( 0L ),
- // --> OD 2004-06-30 #i28701#
+ // --> #i28701#
mpPageFrm( 0L ),
// <--
maRelPos(),
maLastCharRect(),
mnLastTopOfLine( 0L ),
mpVertPosOrientFrm( 0L ),
- // --> OD 2004-06-29 #i28701#
+ // --> #i28701#
mbPositioningInProgress( false ),
mbConsiderForTextWrap( false ),
mbPositionLocked( false ),
- // --> OD 2005-01-10 #i40147#
+ // --> #i40147#
mbKeepPositionLockedForSection( false ),
// <--
mbRestartLayoutProcess( false ),
// <--
- // --> OD 2004-10-22 #i35911#
+ // --> #i35911#
mbClearedEnvironment( false ),
// <--
- // --> OD 2004-08-25 #i3317#
+ // --> #i3317#
mbTmpConsiderWrapInfluence( false ),
// <--
- // --> OD 2006-08-10 #i68520#
+ // --> #i68520#
maObjRectWithSpaces(),
mbObjRectWithSpacesValid( false ),
maLastObjRect()
@@ -179,7 +179,7 @@ void SwAnchoredObject::ChgAnchorFrm( SwFrm* _pNewAnchorFrm )
/** determine anchor frame containing the anchor position
- OD 2004-10-08 #i26945#
+ #i26945#
the anchor frame, which is determined, is <mpAnchorFrm>
for an at-page, at-frame or at-paragraph anchored object
and the anchor character frame for an at-character and as-character
@@ -199,7 +199,7 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos()
}
// =============================================================================
-// OD 2004-06-30 #i28701# accessors for member <mpPageFrm>
+// #i28701# accessors for member <mpPageFrm>
// =============================================================================
SwPageFrm* SwAnchoredObject::GetPageFrm()
{
@@ -213,7 +213,6 @@ const SwPageFrm* SwAnchoredObject::GetPageFrm() const
void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm )
{
- // --> OD 2006-01-02 #125977#
if ( mpPageFrm != _pNewPageFrm )
{
// clear member, which denotes the layout frame at which the vertical
@@ -228,7 +227,6 @@ void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm )
// assign new page frame
mpPageFrm = _pNewPageFrm;
}
- // <--
}
// =============================================================================
@@ -279,7 +277,7 @@ SwTwips SwAnchoredObject::GetLastTopOfLine() const
return mnLastTopOfLine;
}
-// OD 2004-05-18 #i28701# - follow-up of #i22341#
+// #i28701# - follow-up of #i22341#
void SwAnchoredObject::AddLastTopOfLineY( SwTwips _nDiff )
{
mnLastTopOfLine += _nDiff;
@@ -287,12 +285,12 @@ void SwAnchoredObject::AddLastTopOfLineY( SwTwips _nDiff )
/** check anchor character rectangle and top of line
- OD 2004-03-24 #i26791
+ #i26791
For to-character anchored Writer fly frames the members <maLastCharRect>
and <maLastTopOfLine> are updated. These are checked for change and
depending on the applied positioning, it's decided, if the Writer fly
frame has to be invalidated.
- OD 2004-07-15 #117380#
+
add parameter <_bCheckForParaPorInf>, default value <true>
@author OD
@@ -307,13 +305,13 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine(
if ( (rAnch.GetAnchorId() == FLY_AT_CHAR) &&
rAnch.GetCntntAnchor() )
{
- // --> OD 2004-07-14 #117380# - if requested, assure that anchor frame,
+ // --> if requested, assure that anchor frame,
// which contains the anchor character, has a paragraph portion information.
// The paragraph portion information is needed to determine the
// anchor character rectangle respectively the top of the line.
// Thus, a format of this frame is avoided to determine the
// paragraph portion information.
- // --> OD 2004-10-04 #i26945# - use new method <FindAnchorCharFrm()>
+ // --> #i26945# - use new method <FindAnchorCharFrm()>
const SwTxtFrm& aAnchorCharFrm = *(FindAnchorCharFrm());
// <--
if ( !_bCheckForParaPorInf || aAnchorCharFrm.HasPara() )
@@ -328,12 +326,12 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine(
/** check anchor character rectangle
- OD 11.11.2003 #i22341#
+ #i22341#
helper method for method <CheckCharRectAndTopOfLine()>
For to-character anchored Writer fly frames the member <maLastCharRect>
is updated. This is checked for change and depending on the applied
positioning, it's decided, if the Writer fly frame has to be invalidated.
- OD 2004-07-14 #117380#
+
improvement - add second parameter <_rAnchorCharFrm>
@author OD
@@ -358,7 +356,7 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
// check for anchor character rectangle changes for certain
// positionings and alignments
- // OD 07.10.2003 #110978# - add condition to invalidate position,
+ // add condition to invalidate position,
// if vertical aligned at frame/page area and vertical position
// of anchor character has changed.
const sal_Int16 eVertRelOrient = aVert.GetRelationOrient();
@@ -377,7 +375,7 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
( (aCharRect.*fnRect->fnGetTop)() !=
(maLastCharRect.*fnRect->fnGetTop)() ) ) )
{
- // --> OD 2004-10-08 #i26945#, #i35911# - unlock position of
+ // --> #i26945#, #i35911# - unlock position of
// anchored object, if it isn't registered at the page,
// where its anchor character frame is on.
if ( GetPageFrm() != _rAnchorCharFrm.FindPageFrm() )
@@ -395,12 +393,12 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
/** check top of line
- OD 11.11.2003 #i22341#
+ #i22341#
helper method for method <CheckCharRectAndTopOfLine()>
For to-character anchored Writer fly frames the member <mnLastTopOfLine>
is updated. This is checked for change and depending on the applied
positioning, it's decided, if the Writer fly frame has to be invalidated.
- OD 2004-07-14 #117380#
+
improvement - add second parameter <_rAnchorCharFrm>
@author OD
@@ -416,7 +414,7 @@ void SwAnchoredObject::_CheckTopOfLine( const SwFmtAnchor& _rAnch,
// check alignment for invalidation of position
if ( GetFrmFmt().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE )
{
- // --> OD 2004-10-08 #i26945#, #i35911# - unlock position of
+ // --> #i26945#, #i35911# - unlock position of
// anchored object, if it isn't registered at the page,
// where its anchor character frame is on.
if ( GetPageFrm() != _rAnchorCharFrm.FindPageFrm() )
@@ -457,7 +455,7 @@ void SwAnchoredObject::ObjectAttachedToAnchorFrame()
/** method update layout direction the layout direction, the anchored
object is in
- OD 2004-07-27 #i31698#
+ #i31698#
method has typically to be called, if the anchored object gets its
anchor frame assigned.
@@ -487,7 +485,7 @@ void SwAnchoredObject::UpdateLayoutDir()
objects, for whose the wrapping style influence has to be considered
on the object positioning.
- OD 2004-06-30 #i28701#
+ #i28701#
@author OD
*/
@@ -513,7 +511,7 @@ void SwAnchoredObject::InvalidateObjPosForConsiderWrapInfluence(
/** method to determine, if wrapping style influence of the anchored
object has to be considered on the object positioning
- OD 2004-06-30 #i28701#
+ #i28701#
Note: result of this method also decides, if the booleans for the
layout process are of relevance.
@@ -525,8 +523,8 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const
const SwFrmFmt& rObjFmt = GetFrmFmt();
- // --> OD 2004-08-25 #i3317# - add condition <IsTmpConsiderWrapInfluence()>
- // --> OD 2005-09-29 #i55204#
+ // --> #i3317# - add condition <IsTmpConsiderWrapInfluence()>
+ // --> #i55204#
// - correction: wrapping style influence has been considered, if condition
// <IsTmpConsiderWrapInfluence()> is hold, regardless of its anchor type
// or its wrapping style.
@@ -542,7 +540,7 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const
(rAnchor.GetAnchorId() == FLY_AT_PARA)) &&
rObjFmt.GetSurround().GetSurround() != SURROUND_THROUGHT )
{
- // --> OD 2004-09-23 #i34520# - text also wraps around anchored
+ // --> #i34520# - text also wraps around anchored
// objects in the layer Hell - see the text formatting.
// Thus, it hasn't to be checked here.
bRet = true;
@@ -556,7 +554,7 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const
/** method to determine, if other anchored objects, also attached at
to the anchor frame, have to consider its wrap influence.
- // --> OD 2005-02-22 #i43255#
+ // --> #i43255#
@author OD
*/
@@ -584,7 +582,7 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOfOtherObjs() const
}
// =============================================================================
-// --> OD 2004-06-29 #i28701# - accessors to booleans for layout process
+// --> #i28701# - accessors to booleans for layout process
// =============================================================================
bool SwAnchoredObject::ConsiderForTextWrap() const
{
@@ -620,7 +618,7 @@ void SwAnchoredObject::SetRestartLayoutProcess( const bool _bRestartLayoutProces
mbRestartLayoutProcess = _bRestartLayoutProcess;
}
-// --> OD 2004-10-22 #i35911#
+// --> #i35911#
bool SwAnchoredObject::ClearedEnvironment() const
{
if ( ConsiderObjWrapInfluenceOnObjPos() )
@@ -637,7 +635,7 @@ void SwAnchoredObject::SetClearedEnvironment( const bool _bClearedEnvironment )
/** method to determine, if due to anchored object size and wrapping
style, its layout environment is cleared.
- OD 2004-10-22 #i35911#
+ #i35911#
@author OD
*/
@@ -645,7 +643,7 @@ bool SwAnchoredObject::HasClearedEnvironment() const
{
bool bHasClearedEnvironment( false );
- // --> OD 2005-03-03 #i43913# - layout frame, vertical position is orient at, has to be set.
+ // --> #i43913# - layout frame, vertical position is orient at, has to be set.
OSL_ENSURE( GetVertPosOrientFrm(),
"<SwAnchoredObject::HasClearedEnvironment()> - layout frame missing, at which the vertical position is oriented at." );
if ( GetVertPosOrientFrm() &&
@@ -681,8 +679,8 @@ bool SwAnchoredObject::HasClearedEnvironment() const
/** method to add spacing to object area
- OD 2004-06-30 #i28701#
- OD 2006-08-10 #i68520# - return constant reference and use cache
+ #i28701#
+ #i68520# - return constant reference and use cache
@author OD
*/
@@ -697,7 +695,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
}
if ( !mbObjRectWithSpacesValid )
{
- // --> OD 2006-10-05 #i70122# - correction:
+ // --> #i70122# - correction:
// use bounding rectangle of anchored objects.
// maObjRectWithSpaces = GetObjRect();
maObjRectWithSpaces = GetObjBoundRect();
@@ -719,7 +717,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
return maObjRectWithSpaces;
}
-// --> OD 2006-08-10 #i68520#
+// --> #i68520#
void SwAnchoredObject::SetObjTop( const SwTwips _nTop)
{
const bool bTopChanged( _SetObjTop( _nTop ) );
@@ -741,7 +739,7 @@ void SwAnchoredObject::SetObjLeft( const SwTwips _nLeft)
/** method to update anchored object in the <SwSortedObjs> lists
- OD 2004-07-01 #i28701#
+ #i28701#
If document compatibility option 'Consider wrapping style influence
on object positioning' is ON, additionally all anchored objects
at the anchor frame and all following anchored objects on the page
@@ -799,13 +797,13 @@ void SwAnchoredObject::UpdateObjInSortedList()
/** method to determine, if invalidation of position is allowed
- OD 2004-07-01 #i28701#
+ #i28701#
@author OD
*/
bool SwAnchoredObject::InvalidationOfPosAllowed() const
{
- // --> OD 2004-11-03 #114798# - Check, if page frame layout is in progress,
+ // --> Check, if page frame layout is in progress,
// isn't needed, because of anchored object, whose are moved forward.
return !PositionLocked();
// <--
@@ -814,8 +812,8 @@ bool SwAnchoredObject::InvalidationOfPosAllowed() const
/** method to determine the page frame, on which the 'anchor' of
the given anchored object is.
- OD 2004-07-02 #i28701#
- OD 2004-09-23 #i33751#, #i34060#
+ #i28701#
+ #i33751#, #i34060#
Adjust meaning of method and thus its name: If the anchored object
or its anchor isn't correctly inserted in the layout, no page frame
can be found. Thus, the return type changed to be a pointer and can
@@ -827,10 +825,10 @@ SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()
{
SwPageFrm* pRetPageFrm = 0L;
- // --> OD 2005-03-08 #i44339# - check, if anchor frame exists.
+ // --> #i44339# - check, if anchor frame exists.
if ( mpAnchorFrm )
{
- // --> OD 2004-10-08 #i26945# - use new method <GetAnchorFrmContainingAnchPos()>
+ // --> #i26945# - use new method <GetAnchorFrmContainingAnchPos()>
pRetPageFrm = GetAnchorFrmContainingAnchPos()->FindPageFrm();
// <--
}
@@ -841,7 +839,7 @@ SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()
/** get frame, which contains the anchor character, if the object
is anchored at-character or as-character.
- OD 2004-10-04 #i26945#
+ #i26945#
@author OD
@@ -853,7 +851,7 @@ SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm()
{
SwTxtFrm* pAnchorCharFrm( 0L );
- // --> OD 2005-03-08 #i44339# - check, if anchor frame exists.
+ // --> #i44339# - check, if anchor frame exists.
if ( mpAnchorFrm )
{
const SwFmtAnchor& rAnch = GetFrmFmt().GetAnchor();
@@ -871,7 +869,7 @@ SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm()
/** method to determine, if a format on the anchored object is possible
- OD 2004-07-23 #i28701#
+ #i28701#
A format is possible, if anchored object is in an invisible layer.
Note: method is virtual to refine the conditions for the sub-classes.
@@ -882,11 +880,11 @@ bool SwAnchoredObject::IsFormatPossible() const
return GetFrmFmt().GetDoc()->IsVisibleLayerId( GetDrawObj()->GetLayer() );
}
-// --> OD 2004-08-25 #i3317#
+// --> #i3317#
void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence )
{
mbTmpConsiderWrapInfluence = _bTmpConsiderWrapInfluence;
- // --> OD 2004-10-22 #i35911#
+ // --> #i35911#
if ( mbTmpConsiderWrapInfluence )
{
SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrmFmt().GetDoc()),
@@ -901,7 +899,6 @@ bool SwAnchoredObject::IsTmpConsiderWrapInfluence() const
}
// <--
-// --> OD 2006-07-24 #b6449874#
void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence )
{
const SwSortedObjs* pObjs = GetAnchorFrm()->GetDrawObjs();
@@ -918,12 +915,11 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpCo
}
}
}
-// <--
/** method to determine, if the anchored object is overlapping with a
previous column
- OD 2004-08-25 #i3317#
+ #i3317#
overlapping with a previous column means, that the object overlaps
with a column, which is a previous one of the column its anchor
frame is in.
@@ -957,7 +953,7 @@ bool SwAnchoredObject::OverlapsPrevColumn() const
/** method to determine position of anchored object relative to
anchor frame
- OD 2005-01-06 #i30669#
+ #i30669#
Usage: Needed layout information for WW8 export
@author OD
@@ -977,9 +973,9 @@ Point SwAnchoredObject::GetRelPosToAnchorFrm() const
/** method to determine position of anchored object relative to
page frame
- OD 2005-01-06 #i30669#
+ #i30669#
Usage: Needed layout information for WW8 export
- OD 2005-01-27 #i33818# - add parameters <_bFollowTextFlow> and
+ #i33818# - add parameters <_bFollowTextFlow> and
<_obRelToTableCell>
If <_bFollowTextFlow> is set and object is anchored inside table,
the position relative to the table cell is determined. Output
@@ -999,7 +995,7 @@ Point SwAnchoredObject::GetRelPosToPageFrm( const bool _bFollowTextFlow,
"<SwAnchoredObject::GetRelPosToPageFrm()> - missing page frame." );
aRelPos = GetObjRect().Pos();
- // --> OD 2005-01-27 #i33818# - search for cell frame, if object has to
+ // --> #i33818# - search for cell frame, if object has to
// follow the text flow.
const SwFrm* pFrm( 0L );
if ( _bFollowTextFlow && !GetAnchorFrm()->IsPageFrm() )
@@ -1031,7 +1027,7 @@ Point SwAnchoredObject::GetRelPosToPageFrm( const bool _bFollowTextFlow,
/** method to determine position of anchored object relative to
anchor character
- OD 2005-01-06 #i30669#
+ #i30669#
Usage: Needed layout information for WW8 export
@author OD
@@ -1049,7 +1045,7 @@ Point SwAnchoredObject::GetRelPosToChar() const
/** method to determine position of anchored object relative to
top of line
- OD 2005-01-06 #i30669#
+ #i30669#
Usage: Needed layout information for WW8 export
@author OD
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 70efc16..47b0d19 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -46,7 +46,7 @@
// =============================================================================
// helper class <SwPageNumAndTypeOfAnchors>
-// --> OD 2004-10-04 #i26945# - Additionally the type of the anchor text frame
+// --> #i26945# - Additionally the type of the anchor text frame
// is collected - by type is meant 'master' or 'follow'.
// =============================================================================
class SwPageNumAndTypeOfAnchors
@@ -79,7 +79,7 @@ class SwPageNumAndTypeOfAnchors
{
tEntry* pNewEntry = new tEntry();
pNewEntry->mpAnchoredObj = &_rAnchoredObj;
- // --> OD 2004-09-23 #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
+ // --> #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
// is replaced by method <FindPageFrmOfAnchor()>. It's return value
// have to be checked.
SwPageFrm* pPageFrmOfAnchor = _rAnchoredObj.FindPageFrmOfAnchor();
@@ -92,7 +92,7 @@ class SwPageNumAndTypeOfAnchors
pNewEntry->mnPageNumOfAnchor = 0;
}
// <--
- // --> OD 2004-10-04 #i26945# - collect type of anchor
+ // --> #i26945# - collect type of anchor
SwTxtFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm();
if ( pAnchorCharFrm )
{
@@ -130,7 +130,7 @@ class SwPageNumAndTypeOfAnchors
return nRetPgNum;
}
- // --> OD 2004-10-04 #i26945#
+ // --> #i26945#
inline bool AnchoredAtMaster( sal_uInt32 _nIndex )
{
bool bAnchoredAtMaster( true );
@@ -160,7 +160,7 @@ SwObjectFormatter::SwObjectFormatter( const SwPageFrm& _rPageFrm,
mbFormatOnlyAsCharAnchored( false ),
mbConsiderWrapOnObjPos( _rPageFrm.GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) ),
mpLayAction( _pLayAction ),
- // --> OD 2004-10-04 #i26945#
+ // --> #i26945#
mpPgNumAndTypeOfAnchors( _bCollectPgNumOfAnchors ? new SwPageNumAndTypeOfAnchors() : 0L )
// <--
{
@@ -248,7 +248,7 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj,
if ( pObjFormatter )
{
// format given floating screen object
- // --> OD 2005-01-10 #i40147# - check for moved forward anchor frame
+ // --> #i40147# - check for moved forward anchor frame
bSuccess = pObjFormatter->DoFormatObj( _rAnchoredObj, true );
// <--
}
@@ -260,7 +260,7 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj,
/** helper method for method <_FormatObj(..)> - performs the intrinsic format
of the layout of the given layout frame and all its lower layout frames.
- OD 2004-06-28 #i28701#
+ #i28701#
IMPORTANT NOTE:
Method corresponds to methods <SwLayAction::FormatLayoutFly(..)> and
<SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have
@@ -286,7 +286,7 @@ void SwObjectFormatter::_FormatLayout( SwLayoutFrm& _rLayoutFrm )
/** helper method for method <_FormatObj(..)> - performs the intrinsic
format of the content of the given floating screen object.
- OD 2004-06-28 #i28701#
+ #i28701#
@author OD
*/
@@ -307,7 +307,7 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj )
pCntnt->OptCalc();
// format floating screen objects at content text frame
- // --> OD 2004-11-01 #i23129#, #i36347# - pass correct page frame to
+ // --> #i23129#, #i36347# - pass correct page frame to
// the object formatter
if ( pCntnt->IsTxtFrm() &&
!SwObjectFormatter::FormatObjsAtFrm( *pCntnt,
@@ -327,7 +327,7 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj )
/** performs the intrinsic format of a given floating screen object and its content.
- OD 2004-06-28 #i28701#
+ #i28701#
@author OD
*/
@@ -350,14 +350,14 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
if ( _rAnchoredObj.ISA(SwFlyFrm) )
{
SwFlyFrm& rFlyFrm = static_cast<SwFlyFrm&>(_rAnchoredObj);
- // --> OD 2004-11-15 #i34753# - reset flag, which prevents a positioning
+ // --> #i34753# - reset flag, which prevents a positioning
if ( rFlyFrm.IsFlyLayFrm() )
{
static_cast<SwFlyLayFrm&>(rFlyFrm).SetNoMakePos( false );
}
// <--
- // FME 2007-08-30 #i81146# new loop control
+ // #i81146# new loop control
USHORT nLoopControlRuns = 0;
const USHORT nLoopControlMax = 15;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list