[Libreoffice-commits] .: 2 commits - starmath/source sw/inc sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Apr 18 07:47:15 PDT 2011
starmath/source/node.cxx | 2
starmath/source/unomodel.cxx | 10
sw/inc/crstate.hxx | 2
sw/source/core/SwNumberTree/SwNodeNum.cxx | 18
sw/source/core/SwNumberTree/SwNumberTree.cxx | 20 -
sw/source/core/bastyp/init.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 2
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 6
sw/source/core/crsr/trvltbl.cxx | 2
sw/source/core/doc/doccomp.cxx | 4
sw/source/core/doc/doclay.cxx | 6
sw/source/core/doc/docnum.cxx | 6
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/docsort.cxx | 4
sw/source/core/doc/extinput.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 6
sw/source/core/doc/number.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 10
sw/source/core/docnode/node.cxx | 8
sw/source/core/draw/dcontact.cxx | 72 +--
sw/source/core/draw/dpage.cxx | 2
sw/source/core/draw/dview.cxx | 10
sw/source/core/edit/autofmt.cxx | 4
sw/source/core/edit/edfcol.cxx | 4
sw/source/core/edit/edfmt.cxx | 2
sw/source/core/edit/editsh.cxx | 2
sw/source/core/edit/ednumber.cxx | 14
sw/source/core/fields/docufld.cxx | 2
sw/source/core/fields/reffld.cxx | 20 -
sw/source/core/frmedt/fecopy.cxx | 10
sw/source/core/frmedt/fefly1.cxx | 12
sw/source/core/frmedt/feshview.cxx | 18
sw/source/core/frmedt/fetab.cxx | 10
sw/source/core/frmedt/tblsel.cxx | 10
sw/source/core/graphic/ndgrf.cxx | 38 +-
sw/source/core/inc/UndoAttribute.hxx | 2
sw/source/core/inc/cellfrm.hxx | 2
sw/source/core/inc/ftnfrm.hxx | 4
sw/source/core/inc/layact.hxx | 6
sw/source/core/inc/rowfrm.hxx | 6
sw/source/core/inc/tabfrm.hxx | 10
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/layout/anchoreddrawobject.cxx | 10
sw/source/core/layout/anchoredobject.cxx | 6
sw/source/core/layout/atrfrm.cxx | 26 -
sw/source/core/layout/calcmove.cxx | 66 +--
sw/source/core/layout/colfrm.cxx | 4
sw/source/core/layout/findfrm.cxx | 12
sw/source/core/layout/flowfrm.cxx | 88 ++--
sw/source/core/layout/fly.cxx | 112 ++---
sw/source/core/layout/flyincnt.cxx | 6
sw/source/core/layout/frmtool.cxx | 74 +--
sw/source/core/layout/ftnfrm.cxx | 70 +--
sw/source/core/layout/hffrm.cxx | 10
sw/source/core/layout/layact.cxx | 50 +-
sw/source/core/layout/laycache.cxx | 10
sw/source/core/layout/layouter.cxx | 24 -
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 2
sw/source/core/layout/newfrm.cxx | 2
sw/source/core/layout/objectformatter.cxx | 8
sw/source/core/layout/objectformatterlayfrm.cxx | 10
sw/source/core/layout/objectformatterlayfrm.hxx | 2
sw/source/core/layout/pagechg.cxx | 28 -
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/paintfrm.cxx | 72 +--
sw/source/core/layout/sectfrm.cxx | 22 -
sw/source/core/layout/sortedobjsimpl.cxx | 8
sw/source/core/layout/ssfrm.cxx | 10
sw/source/core/layout/tabfrm.cxx | 190 +++++-----
sw/source/core/layout/trvlfrm.cxx | 6
sw/source/core/layout/wsfrm.cxx | 46 +-
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 8
sw/source/core/ole/ndole.cxx | 2
sw/source/core/table/swtable.cxx | 8
sw/source/core/text/EnhancedPDFExportHelper.cxx | 18
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/frmform.cxx | 10
sw/source/core/text/frmpaint.cxx | 10
sw/source/core/text/guess.cxx | 4
sw/source/core/text/inftxt.cxx | 10
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/itradj.cxx | 2
sw/source/core/text/itrcrsr.cxx | 39 --
sw/source/core/text/itrform2.cxx | 10
sw/source/core/text/itrpaint.cxx | 6
sw/source/core/text/itrtxt.hxx | 4
sw/source/core/text/porfld.cxx | 27 -
sw/source/core/text/porfld.hxx | 2
sw/source/core/text/porfly.cxx | 6
sw/source/core/text/porftn.hxx | 4
sw/source/core/text/porlay.cxx | 12
sw/source/core/text/pormulti.cxx | 2
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portxt.cxx | 4
sw/source/core/text/txtfld.cxx | 4
sw/source/core/text/txtfly.cxx | 172 ++++-----
sw/source/core/text/txtfrm.cxx | 38 +-
sw/source/core/text/txtftn.cxx | 14
sw/source/core/text/txthyph.cxx | 2
sw/source/core/text/txttab.cxx | 10
sw/source/core/text/widorp.cxx | 2
sw/source/core/tox/tox.cxx | 4
sw/source/core/txtnode/atrfld.cxx | 2
sw/source/core/txtnode/atrflyin.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 89 ++--
sw/source/core/txtnode/thints.cxx | 23 -
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/unattr.cxx | 16
sw/source/core/undo/undobj.cxx | 8
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/unfmco.cxx | 4
sw/source/core/undo/unnum.cxx | 4
sw/source/core/undo/unsort.cxx | 8
sw/source/core/unocore/unobkm.cxx | 2
sw/source/core/unocore/unochart.cxx | 4
sw/source/core/unocore/unocoll.cxx | 6
sw/source/core/unocore/unoframe.cxx | 12
sw/source/core/unocore/unoobj.cxx | 10
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/view/viewsh.cxx | 2
sw/source/ui/app/docshini.cxx | 4
sw/source/ui/app/docst.cxx | 4
sw/source/ui/app/docstyle.cxx | 4
sw/source/ui/dochdl/gloshdl.cxx | 2
sw/source/ui/docvw/SidebarWin.cxx | 10
sw/source/ui/docvw/edtwin2.cxx | 2
sw/source/ui/fldui/fldref.cxx | 36 -
sw/source/ui/fldui/fldref.hxx | 8
sw/source/ui/inc/edtwin.hxx | 2
sw/source/ui/inc/view.hxx | 2
sw/source/ui/inc/wrtsh.hxx | 6
sw/source/ui/misc/outline.cxx | 7
sw/source/ui/shells/basesh.cxx | 14
sw/source/ui/shells/drwbassh.cxx | 4
sw/source/ui/shells/frmsh.cxx | 8
sw/source/ui/shells/listsh.cxx | 2
sw/source/ui/shells/tabsh.cxx | 4
sw/source/ui/shells/textsh.cxx | 5
sw/source/ui/shells/textsh1.cxx | 10
sw/source/ui/shells/txtnum.cxx | 8
sw/source/ui/uiview/view2.cxx | 2
sw/source/ui/uno/SwXDocumentSettings.cxx | 8
sw/source/ui/uno/unodefaults.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 24 -
sw/source/ui/utlui/initui.cxx | 2
sw/source/ui/wrtsh/delete.cxx | 16
sw/source/ui/wrtsh/select.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 22 -
sw/source/ui/wrtsh/wrtsh4.cxx | 2
155 files changed, 1084 insertions(+), 1142 deletions(-)
New commits:
commit 30e7d3a782edb61b045f255066752664273411c2
Author: Júlio Hoffimann <julio.hoffimann at gmail.com>
Date: Sat Apr 16 22:42:13 2011 -0300
all bogus comments removed keeping the indentation
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 6bceda4..e272ecd 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -859,7 +859,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
ExtendBy(rNodeRect, nSize > 1 ? RCP_NONE : RCP_ARG);
}
}
- // --> 4.7.2010 #i972#
+ // #i972#
if (HasBaseline())
nFormulaBaseline = GetBaseline();
else
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 736203a..7f5990f 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -303,10 +303,10 @@ PropertySetInfo * lcl_createModelPropertyInfo ()
{ RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 },
{ RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse" ), HANDLE_USED_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PropertyAttribute::READONLY, 0 },
{ RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE },
- // --> PB 2004-08-25 #i33095# Security Options
+ // #i33095# Security Options
{ RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 },
// <--
- // --> 3.7.2010 #i972#
+ // #i972#
{ RTL_CONSTASCII_STRINGPARAM( "BaseLine"), HANDLE_BASELINE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
// <--
{ NULL, 0, 0, NULL, 0, 0 }
@@ -709,7 +709,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
throw IllegalArgumentException();
}
break;
- // --> PB 2004-08-25 #i33095# Security Options
+ // #i33095# Security Options
case HANDLE_LOAD_READONLY :
{
if ( (*pValues).getValueType() != ::getBooleanCppuType() )
@@ -927,14 +927,14 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
case HANDLE_RUNTIME_UID:
*pValue <<= getRuntimeUID();
break;
- // --> PB 2004-08-25 #i33095# Security Options
+ // #i33095# Security Options
case HANDLE_LOAD_READONLY :
{
*pValue <<= pDocSh->IsLoadReadonly();
break;
}
// <--
- // --> 3.7.2010 #i972#
+ // #i972#
case HANDLE_BASELINE:
{
if ( !pDocSh->pTree )
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index ff1dddf..bf0ed23 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -156,7 +156,7 @@ struct SwCrsrMoveState
// position if screen position is inside second
// have of bound rect
- sal_Bool bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <--
+ sal_Bool bCntntCheck :1; // #i43742# Cursor position over content?
// #i27615#
/**
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 637c044..faf7b0c 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -35,7 +35,7 @@
#include <ndtxt.hxx>
#include <pam.hxx>
#include <stdio.h>
-// --> OD 2007-10-31 #i83479#
+// #i83479#
#include <IDocumentListItems.hxx>
// <--
#include <doc.hxx>
@@ -171,7 +171,7 @@ bool SwNodeNum::IsContinuous() const
{
bool aResult = false;
- // --> OD 2006-04-21 #i64311#
+ // #i64311#
if ( GetNumRule() )
{
aResult = mpNumRule->IsContinusNum();
@@ -195,7 +195,7 @@ bool SwNodeNum::IsCounted() const
if ( GetTxtNode() )
{
- // --> OD 2006-01-25 #i59559#
+ // #i59559#
// <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
aResult = GetTxtNode()->IsCountedInList();
// <--
@@ -206,7 +206,7 @@ bool SwNodeNum::IsCounted() const
return aResult;
}
-// --> OD 2006-04-26 #i64010#
+// #i64010#
bool SwNodeNum::HasCountedChildren() const
{
bool bResult = false;
@@ -231,7 +231,7 @@ bool SwNodeNum::HasCountedChildren() const
return bResult;
}
// <--
-// --> OD 2006-04-26 #i64010#
+// #i64010#
bool SwNodeNum::IsCountedForNumbering() const
{
return IsCounted() &&
@@ -262,7 +262,7 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
bResult = true;
else if (mpTxtNode != NULL && rTmpNode.mpTxtNode != NULL)
{
- // --> OD 2007-10-31 #i83479# - refactoring
+ // #i83479# - refactoring
// simplify comparison by comparing the indexes of the text nodes
bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() ) ? true : false;
// <--
@@ -287,7 +287,7 @@ bool SwNodeNum::IsCountPhantoms() const
{
bool bResult = true;
- // --> OD 2006-04-21 #i64311#
+ // #i64311#
// phantoms aren't counted in consecutive numbering rules
if ( mpNumRule )
bResult = !mpNumRule->IsContinusNum() &&
@@ -397,12 +397,12 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
}
// <--
-// --> OD 2007-09-06 #i81002#
+// #i81002#
const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const
{
const SwNodeNum* pPrecedingNodeNum( 0 );
- // --> OD 2007-10-31 #i83479#
+ // #i83479#
SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
// <--
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 03ccf0e..6f259e8 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -135,7 +135,7 @@ void SwNumberTreeNode::ClearObsoletePhantoms()
if ((*aIt)->mChildren.empty())
{
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aIt)> could destroy the element, which
// is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aIt>.
@@ -274,13 +274,13 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
{
SwNumberTreeNode * pPred = (*aIt)->GetPred();
- // --> OD 2006-04-21 #i64311#
+ // #i64311#
// correct consideration of phantoms
// correct consideration of restart at a number tree node
if ( pPred )
{
if ( !(*aIt)->IsCounted() )
- // --> OD 2006-05-12 #i65284#
+ // #i65284#
nTmpNumber = pPred->GetNumber( pPred->GetParent() != (*aIt)->GetParent() );
// <--
else
@@ -310,7 +310,7 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
}
while (aIt != mChildren.end() && *aIt != pNode);
- // --> OD 2008-05-21 #i74748# - applied patch from garnier_romain
+ // #i74748# - applied patch from garnier_romain
// number tree node has to be validated.
SetLastValid( aIt, true );
// <--
@@ -401,7 +401,7 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
_rDestNode.mChildren.insert(aItUpper, mChildren.end());
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aItUpper, mChildren.end())> could destroy
// the element, which is referenced by <mItLastValid>, it's needed to
// adjust <mItLastValid> before erasing <aIt>.
@@ -410,7 +410,7 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
mChildren.erase(aItUpper, mChildren.end());
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
if ( !mChildren.empty() )
{
SetLastValid( --(mChildren.end()) );
@@ -431,7 +431,7 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
tSwNumberTreeChildren::iterator aItBegin = mChildren.begin();
SwNumberTreeNode * pMyFirst = *mChildren.begin();
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aItBegin)> could destroy the element,
// which is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aItBegin>.
@@ -680,7 +680,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
(*aItPred)->NotifyInvalidChildren();
}
- // --> OD 2006-01-17 #i60652#
+ // #i60652#
// Because <mChildren.erase(aRemoveIt)> could destroy the element,
// which is referenced by <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aRemoveIt>.
@@ -1065,7 +1065,7 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
if ( aIt == mpParent->mChildren.begin() )
{
- // --> OD 2006-04-24 #i64311#
+ // #i64311#
// root node is no valid predecessor
pResult = mpParent->GetParent() ? mpParent : NULL;
// <--
@@ -1250,7 +1250,7 @@ void SwNumberTreeNode::NotifyInvalidSiblings()
mpParent->NotifyInvalidChildren();
}
-// --> OD 2007-09-07 #i81002#
+// #i81002#
const SwNumberTreeNode* SwNumberTreeNode::GetPrecedingNodeOf(
const SwNumberTreeNode& rNode ) const
{
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 55ff35d..a32f929 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -193,7 +193,7 @@ sal_uInt16 aTableSetRange[] = {
RES_KEEP, RES_KEEP,
RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
RES_FRAMEDIR, RES_FRAMEDIR,
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // #i29550#
RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS,
// <-- collapsing
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 38fe63f..c17ba08 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -647,7 +647,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
SwTxtNode * pTxtNd = pCrsr->GetNode()->GetTxtNode();
if ( pTxtNd && !IsTableMode() &&
- // --> FME 2004-11-25 #i37515# No bInFrontOfLabel during selection
+ // #i37515# No bInFrontOfLabel during selection
!pCrsr->HasMark() &&
// <--
pTxtNd->HasVisibleNumberingOrBullet() )
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ca4b282..2b07ab6 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1035,7 +1035,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
bRet = sal_True;
}
}
- // --> FME 2005-05-13 #i43742# New function: SW_CONTENT_CHECK
+ // #i43742# New function
else if ( SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos &&
bCrsrFoundExact )
{
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 4f646d2..e9e36ff 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -358,7 +358,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
0 == pFrm->Frm().Height() )
;
- // --> LIJIAN/FME 2007-11-27 #i72394# skip to prev /next valid paragraph
+ // #i72394# skip to prev /next valid paragraph
// with a layout in case the first search did not succeed:
if( !pFrm )
{
@@ -370,7 +370,6 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
: pFrm->GetPrevCntntFrm();
}
}
- // <--
SwCntntNode* pCNd;
if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) )
@@ -2046,7 +2045,7 @@ sal_Bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
bool bShortCut = false;
if ( fnWhichPara == fnParaCurr )
{
- // --> FME 2005-02-21 #i41048#
+ // #i41048#
// If fnWhichPara == fnParaCurr, (*fnWhichPara)( *this, fnPosPara )
// can already move the cursor to a different text node. In this case
// we better check if IsSelOvr().
@@ -2057,7 +2056,6 @@ sal_Bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
if ( GetPoint()->nContent.GetIndex() != nSttEnd )
bShortCut = true;
}
- // <--
}
else
{
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 12b43fe..b733d1b 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -177,7 +177,7 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
pStt = aBoxes[0];
pEnd = aBoxes[aBoxes.Count() - 1];
}
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+ // #i32329# Enhanced table selection
else if ( pTable->IsNewModel() )
{
const SwShellCrsr *pCrsr = _GetCrsr();
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index a8f2233..e0c4d3b 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1449,7 +1449,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
pTmp->GetPoint()->nNode++;
pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
}
- // --> mst 2010-05-17 #i101009#
+ // #i101009#
// prevent redlines that end on structural end node
if (& rDoc.GetNodes().GetEndOfContent() ==
& pTmp->GetPoint()->nNode.GetNode())
@@ -1482,7 +1482,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
pTmp->GetPoint()->nNode++;
pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
}
- // --> mst 2010-05-17 #i101009#
+ // #i101009#
// prevent redlines that end on structural end node
if (& rDoc.GetNodes().GetEndOfContent() ==
& pTmp->GetPoint()->nNode.GetNode())
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index a90b3a7..45624a2 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1247,7 +1247,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
//Erstmal das Format zum Fly besorgen und das Layout entkoppeln.
SwFrmFmt *pOldFmt = rDoc.GetNodes()[nNdIdx]->GetFlyFmt();
OSL_ENSURE( pOldFmt, "Format des Fly nicht gefunden." );
- // --> OD #i115719#
+ // #i115719#
// <title> and <description> attributes are lost when calling <DelFrms()>.
// Thus, keep them and restore them after the calling <MakeFrms()>
const bool bIsSwFlyFrmFmtInstance( dynamic_cast<SwFlyFrmFmt*>(pOldFmt) != 0 );
@@ -1395,7 +1395,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
//Nun nur noch die Flys erzeugen lassen. Das ueberlassen
//wir vorhanden Methoden (insb. fuer InCntFlys etwas aufwendig).
pNewFmt->MakeFrms();
- // --> OD #i115719#
+ // #i115719#
if ( bIsSwFlyFrmFmtInstance )
{
static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjTitle( sTitle );
@@ -2148,7 +2148,7 @@ void SwDoc::SetAllUniqueFlyNames()
if( GetFtnIdxs().Count() )
{
SwTxtFtn::SetUniqueSeqRefNo( *this );
- // --> FME 2005-08-02 #i52775# Chapter footnotes did not
+ // #i52775# Chapter footnotes did not
// get updated correctly. Calling UpdateAllFtn() instead of
// UpdateFtn() solves this problem, but I do not dare to
// call UpdateAllFtn() in all cases: Safety first.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index af16178..0e09bf6 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -930,7 +930,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
{
SvUShortsSort aResetAttrsArray;
aResetAttrsArray.Insert( RES_LR_SPACE );
- // --> OD 2010-10-05 #i114929#
+ // #i114929#
// On a selection setup a corresponding Point-and-Mark in order to get
// the indentation attribute reset on all paragraphs touched by the selection
if ( rPam.HasMark() &&
@@ -963,7 +963,7 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
{
SvUShortsSort aResetAttrsArray;
aResetAttrsArray.Insert( RES_PARATR_LIST_ISCOUNTED );
- // --> OD 2010-10-05 #i114929#
+ // #i114929#
// On a selection setup a corresponding Point-and-Mark in order to get
// the list-is-counted attribute reset on all paragraphs touched by the selection
if ( rPam.HasMark() &&
@@ -1077,7 +1077,7 @@ sal_Bool SwDoc::DelNumRule( const String& rName, sal_Bool bBroadcast )
deleteList( pList->GetListId() );
}
}
- // --> FME 2004-11-02 #i34097# DeleteAndDestroy deletes rName if
+ // #i34097# DeleteAndDestroy deletes rName if
// rName is directly taken from the numrule.
const String aTmpName( rName );
// <--
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 09e373f..6b21a4f 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -905,7 +905,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
if( *pRStt == *pStt )
{
- // --> mst 2010-05-17 #i97421#
+ // #i97421#
// redline w/out extent loops
if (*pStt != *pEnd)
// <--
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index c88f1f2..390f324 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -551,7 +551,7 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
// MIB 9.7.97: HTML-Layout loeschen
pTblNd->GetTable().SetHTMLTableLayout( 0 );
- // --> FME 2004-11-26 #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrms' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
SwNode2Layout aNode2Layout( *pTblNd );
// <--
@@ -600,7 +600,7 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
}
// Restore table frames:
- // --> FME 2004-11-26 #i37739# A simple 'MakeFrms' after the node sorting
+ // #i37739# A simple 'MakeFrms' after the node sorting
// does not work if the table is inside a frame and has no prev/next.
const sal_uLong nIdx = pTblNd->GetIndex();
aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 7722f13..0ad6155 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -79,7 +79,7 @@ SwExtTextInput::~SwExtTextInput()
// muss ueber die Doc-Schnittstellen gegangen werden !!!
if(eInputLanguage != LANGUAGE_DONTKNOW)
{
- // --> FME 2005-02-11 #i41974# Only set language attribute
+ // #i41974# Only set language attribute
// for CJK/CTL scripts.
bool bLang = true;
// <--
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4ffc90d..fa2b338 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -266,9 +266,8 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
}
if( pSh->GetAccessibilityOptions()->IsStopAnimatedGraphics() ||
- // --> FME 2004-06-21 #i9684# Stop animation during printing/pdf export
+ // #i9684# Stop animation during printing/pdf export
!pSh->GetWin() )
- // <--
StopAnimation();
SfxProgress::EnterLock(); //Keine Progress-Reschedules im Paint (SwapIn)
@@ -875,9 +874,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
const sal_Bool bAnimate = rGrfObj.IsAnimated() &&
!pShell->IsPreView() &&
!pShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() &&
- // --> FME 2004-06-21 #i9684# Stop animation during printing/pdf export
+ // #i9684# Stop animation during printing/pdf export
pShell->GetWin();
- // <--
if( bAnimate &&
FindFlyFrm() != ::GetFlyFromMarked( 0, pShell ))
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 95ea5c8..fc8d17c 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -245,7 +245,7 @@ void SwNumFmt::NotifyGraphicArrived()
// #i22362#
sal_Bool SwNumFmt::IsEnumeration() const
{
- // --> FME 2004-08-12 #i30655# native numbering did not work any longer
+ // #i30655# native numbering did not work any longer
// using this code. Therefore HBRINKM and I agreed upon defining
// IsEnumeration() as !IsItemize()
return !IsItemize();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 2af5012..540c302 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -600,7 +600,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
SwTxtNode * pTmpNd = new SwTxtNode( aIdx, pTxtColl );
- // --> FME 2006-04-13 #i60422# Propagate some more attributes.
+ // #i60422# Propagate some more attributes.
const SfxPoolItem* pItem = NULL;
if ( NULL != pAttrSet )
{
@@ -1408,7 +1408,7 @@ sal_Bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
if( !pTblNd )
return sal_False;
- // --> FME 2004-09-28 #i34471#
+ // #i34471#
// If this is trigged by SwUndoTblToTxt::Repeat() nobody ever deleted
// the table cursor.
SwEditShell* pESh = GetEditShell();
@@ -2223,7 +2223,7 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
nRet = TBLMERGE_NOSELECTION;
}
- // --> FME 2004-10-08 #i33394#
+ // #i33394#
GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_MERGE, NULL );
// <--
@@ -2559,7 +2559,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
if ( !pBoxFrm )
return;
- // --> FME 2005-01-06 #i39552# Collection of the boxes of the current
+ // #i39552# Collection of the boxes of the current
// column has to be done at the beginning of this function, because
// the table may be formatted in ::GetTblSel.
SwDeletionChecker aDelCheck( pBoxFrm );
@@ -2680,7 +2680,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
// delete first and last entry
OSL_ENSURE( rFill.Count(), "Deleting from empty vector. Fasten your seatbelts!" );
- // --> FME 2006-01-19 #i60818# There may be only one entry in rFill. Make
+ // #i60818# There may be only one entry in rFill. Make
// code robust by checking count of rFill.
if ( rFill.Count() ) rFill.Remove( 0, 1 );
if ( rFill.Count() ) rFill.Remove( rFill.Count() - 1 , 1 );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 1dcbbf6..7398dfa 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -156,7 +156,7 @@ int Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rNo
{
SwAttrSet aNewSet( (SwAttrSet&)*mrpAttrSet );
- // --> FME 2007-4-12 #i76273# Robust: Save the style name items:
+ // #i76273# Robust
SfxItemSet* pStyleNames = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, sal_False ) )
{
@@ -167,7 +167,7 @@ int Put( boost::shared_ptr<const SfxItemSet>& mrpAttrSet, const SwCntntNode& rNo
const int nRet = aNewSet.Put( rSet );
- // --> FME 2007-4-12 #i76273# Robust: Save the style name items:
+ // #i76273# Robust
if ( pStyleNames )
{
aNewSet.Put( *pStyleNames );
@@ -206,7 +206,7 @@ int Put_BC( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
{
SwAttrSet aNewSet( (SwAttrSet&)*mrpAttrSet );
- // --> FME 2007-4-12 #i76273# Robust: Save the style name items:
+ // #i76273# Robust
SfxItemSet* pStyleNames = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, sal_False ) )
{
@@ -222,7 +222,7 @@ int Put_BC( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
const int nRet = aNewSet.Put_BC( rSet, pOld, pNew );
- // --> FME 2007-4-12 #i76273# Robust: Save the style name items:
+ // #i76273# Robust
if ( pStyleNames )
{
aNewSet.Put( *pStyleNames );
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ec6693c..1828117 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -145,12 +145,12 @@ sal_Bool HasWrap( const SdrObject* pObj )
*
*****************************************************************************/
-// --> OD 2006-08-15 #i68520# - change naming
+// #i68520# - change naming
SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj )
// <--
{
SwRect aRet( pObj->GetCurrentBoundRect() );
- // --> OD 2006-08-10 #i68520# - call cache of <SwAnchoredObject>
+ // #i68520# - call cache of <SwAnchoredObject>
SwContact* pContact( GetUserCall( pObj ) );
if ( pContact )
{
@@ -218,14 +218,14 @@ void SwContact::SetInDTOR()
*/
void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
{
- // --> OD 2005-06-08 #i46297# - notify background about the arriving of
+ // #i46297# - notify background about the arriving of
// the object and invalidate its position.
const bool bNotify( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
// <--
_MoveObjToLayer( true, _pDrawObj );
- // --> OD 2005-05-23 #i46297#
+ // #i46297#
if ( bNotify )
{
SwAnchoredObject* pAnchoredObj = GetAnchoredObj( _pDrawObj );
@@ -256,13 +256,13 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
*/
void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
{
- // --> OD 2005-06-08 #i46297# - notify background about the leaving of the object.
+ // #i46297# - notify background about the leaving of the object.
const bool bNotify( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) );
// <--
_MoveObjToLayer( false, _pDrawObj );
- // --> OD 2005-05-19 #i46297#
+ // #i46297#
if ( bNotify )
{
SwAnchoredObject* pAnchoredObj = GetAnchoredObj( _pDrawObj );
@@ -549,7 +549,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
SwFlyFrm* pFlyFrm = static_cast<SwVirtFlyDrawObj*>(_pDrawObj)->GetFlyFrm();
- // --> OD 2005-03-09 #i44464# - consider, that Writer fly frame content
+ // #i44464# - consider, that Writer fly frame content
// already exists - (e.g. WW8 document is inserted into a existing document).
if ( !pFlyFrm->Lower() )
{
@@ -561,7 +561,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
{
for ( sal_uInt8 i = 0; i < pFlyFrm->GetDrawObjs()->Count(); ++i)
{
- // --> OD 2004-07-01 #i28701# - consider type of objects in sorted object list.
+ // #i28701# - consider type of objects in sorted object list.
SdrObject* pObj = (*pFlyFrm->GetDrawObjs())[i]->DrawObj();
SwContact* pContact = static_cast<SwContact*>(pObj->GetUserCall());
pContact->MoveObjToVisibleLayer( pObj );
@@ -594,7 +594,7 @@ void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
{
for ( sal_uInt8 i = 0; i < pFlyFrm->GetDrawObjs()->Count(); ++i)
{
- // --> OD 2004-07-01 #i28701# - consider type of objects in sorted object list.
+ // #i28701# - consider type of objects in sorted object list.
SdrObject* pObj = (*pFlyFrm->GetDrawObjs())[i]->DrawObj();
SwContact* pContact = static_cast<SwContact*>(pObj->GetUserCall());
pContact->MoveObjToInvisibleLayer( pObj );
@@ -1075,13 +1075,13 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
const SdrObject& _rObj,
const Rectangle* _pOldObjRect )
{
- // --> OD 2004-10-21 #i34640#
+ // #i34640#
SwAnchoredObject* pAnchoredObj =
const_cast<SwAnchoredObject*>(_rDrawContact.GetAnchoredObj( &_rObj ));
if ( pAnchoredObj && pAnchoredObj->GetAnchorFrm() )
// <--
{
- // --> OD 2004-10-21 #i34640# - determine correct page frame
+ // #i34640# - determine correct page frame
SwPageFrm* pPageFrm = pAnchoredObj->FindPageFrmOfAnchor();
// <--
if( _pOldObjRect && pPageFrm )
@@ -1089,14 +1089,14 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
SwRect aOldRect( *_pOldObjRect );
if( aOldRect.HasArea() )
{
- // --> OD 2004-10-21 #i34640# - determine correct page frame
+ // #i34640# - determine correct page frame
SwPageFrm* pOldPageFrm = (SwPageFrm*)::FindPage( aOldRect, pPageFrm );
// <--
::Notify_Background( &_rObj, pOldPageFrm, aOldRect,
PREP_FLY_LEAVE, sal_True);
}
}
- // --> OD 2004-10-21 #i34640# - include spacing for wrapping
+ // #i34640# - include spacing for wrapping
SwRect aNewRect( pAnchoredObj->GetObjRectWithSpaces() );
// <--
if( aNewRect.HasArea() && pPageFrm )
@@ -1122,7 +1122,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
return;
}
- // --> OD 2005-03-08 #i44339#
+ // #i44339#
// no event handling, if document is in destruction.
// Exception: It's the SDRUSERCALL_DELETE event
if ( pDoc->IsInDtor() && eType != SDRUSERCALL_DELETE )
@@ -1244,9 +1244,9 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
return;
}
// do *not* notify, if document is destructing
- // --> OD 2004-10-21 #i35912# - do *not* notify for as-character anchored
+ // #i35912# - do *not* notify for as-character anchored
// drawing objects.
- // --> OD 2004-11-11 #i35007#
+ // #i35007#
// improvement: determine as-character anchored object flag only once.
const bool bAnchoredAsChar = ObjAnchoredAsChar();
const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) &&
@@ -1337,39 +1337,39 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
case SDRUSERCALL_CHILD_DELETE :
case SDRUSERCALL_CHILD_COPY :
{
- // --> OD 2004-08-04 #i31698# - improvement:
+ // #i31698# - improvement
// get instance <SwAnchoredDrawObject> only once
const SwAnchoredDrawObject* pAnchoredDrawObj =
static_cast<const SwAnchoredDrawObject*>( GetAnchoredObj( &rObj ) );
// <--
// OD 2004-04-06 #i26791# - adjust positioning and alignment attributes,
// if positioning of drawing object isn't in progress.
- // --> OD 2005-08-15 #i53320# - no adjust of positioning attributes,
+ // #i53320# - no adjust of positioning attributes,
// if drawing object isn't positioned.
if ( !pAnchoredDrawObj->IsPositioningInProgress() &&
!pAnchoredDrawObj->NotYetPositioned() )
// <--
{
- // --> OD 2004-09-29 #i34748# - If no last object rectangle is
+ // #i34748# - If no last object rectangle is
// provided by the anchored object, use parameter <pOldBoundRect>.
const Rectangle& aOldObjRect = pAnchoredDrawObj->GetLastObjRect()
? *(pAnchoredDrawObj->GetLastObjRect())
: *(pOldBoundRect);
// <--
- // --> OD 2008-02-18 #i79400#
+ // #i79400#
// always invalidate object rectangle inclusive spaces
pAnchoredDrawObj->InvalidateObjRectWithSpaces();
// <--
- // --> OD 2005-01-28 #i41324# - notify background before
+ // #i41324# - notify background before
// adjusting position
if ( bNotify )
{
- // --> OD 2004-07-20 #i31573# - correction: Only invalidate
+ // #i31573# - correction
// background of given drawing object.
lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect );
}
// <--
- // --> OD 2004-08-04 #i31698# - determine layout direction
+ // #i31698# - determine layout direction
// via draw frame format.
SwFrmFmt::tLayoutDir eLayoutDir =
pAnchoredDrawObj->GetFrmFmt().GetLayoutDir();
@@ -1447,7 +1447,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
// keep new object rectangle, to avoid multiple
// changes of the attributes by multiple event from
// the drawing layer - e.g. group objects and its members
- // --> OD 2004-09-29 #i34748# - use new method
+ // #i34748# - use new method
// <SwAnchoredDrawObject::SetLastObjRect(..)>.
const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)
->SetLastObjRect( aObjRect.SVRect() );
@@ -1455,7 +1455,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
else if ( aObjRect.SSize() != aOldObjRect.GetSize() )
{
_InvalidateObjs();
- // --> OD 2004-11-11 #i35007# - notify anchor frame
+ // #i35007# - notify anchor frame
// of as-character anchored object
if ( bAnchoredAsChar )
{
@@ -1580,7 +1580,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
}
else if ( RES_UL_SPACE == nWhich || RES_LR_SPACE == nWhich ||
RES_HORI_ORIENT == nWhich || RES_VERT_ORIENT == nWhich ||
- // --> OD 2004-07-01 #i28701# - add attribute 'Follow text flow'
+ // #i28701# - add attribute 'Follow text flow'
RES_FOLLOW_TEXT_FLOW == nWhich ||
( RES_ATTRSET_CHG == nWhich &&
( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
@@ -1598,7 +1598,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
NotifyBackgrdOfAllVirtObjs( 0L );
_InvalidateObjs();
}
- // --> OD 2004-10-26 #i35443#
+ // #i35443#
else if ( RES_ATTRSET_CHG == nWhich )
{
lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L );
@@ -1618,13 +1618,13 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
#endif
}
- // --> OD 2005-07-18 #i51474#
+ // #i51474#
GetAnchoredObj( 0L )->ResetLayoutProcessBools();
// <--
}
// OD 2004-03-31 #i26791#
-// --> OD 2004-07-01 #i28701# - added parameter <_bUpdateSortedObjsList>
+// #i28701# - added parameter <_bUpdateSortedObjsList>
void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
{
// invalidate position of existing 'virtual' drawing objects
@@ -1633,12 +1633,12 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
++aDisconnectIter )
{
SwDrawVirtObj* pDrawVirtObj = (*aDisconnectIter);
- // --> OD 2004-08-23 #i33313# - invalidation only for connected
+ // #i33313# - invalidation only for connected
// 'virtual' drawing objects
if ( pDrawVirtObj->IsConnected() )
{
pDrawVirtObj->AnchoredObj()->InvalidateObjPos();
- // --> OD 2004-07-01 #i28701#
+ // #i28701#
if ( _bUpdateSortedObjsList )
{
pDrawVirtObj->AnchoredObj()->UpdateObjInSortedList();
@@ -1651,7 +1651,7 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
// invalidate position of 'master' drawing object
SwAnchoredObject* pAnchoredObj = GetAnchoredObj( 0L );
pAnchoredObj->InvalidateObjPos();
- // --> OD 2004-07-01 #i28701#
+ // #i28701#
if ( _bUpdateSortedObjsList )
{
pAnchoredObj->UpdateObjInSortedList();
@@ -1892,7 +1892,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
}
}
}
- // --> OD 2004-06-15 #i29199# - It is possible, that
+ // #i29199# - It is possible, that
// the anchor doesn't exist - E.g., reordering the
// sub-documents in a master document.
// Note: The anchor will be inserted later.
@@ -2264,7 +2264,7 @@ SwDrawVirtObj::SwDrawVirtObj( SdrObject& _rNewObj,
{
// OD 2004-03-29 #i26791#
maAnchoredDrawObj.SetDrawObj( *this );
- // --> OD 2004-11-17 #i35635# - set initial position out of sight
+ // #i35635# - set initial position out of sight
NbcMove( Size( -RECT_EMPTY, -RECT_EMPTY ) );
// <--
}
@@ -2339,10 +2339,10 @@ void SwDrawVirtObj::AddToDrawingPage()
// insert 'virtual' drawing object into page, set layer and user call.
SdrPage* pDrawPg;
- // --> OD 2004-08-16 #i27030# - apply order number of referenced object
+ // #i27030# - apply order number of referenced object
if ( 0 != ( pDrawPg = pOrgMasterSdrObj->GetPage() ) )
{
- // --> OD 2004-08-16 #i27030# - apply order number of referenced object
+ // #i27030# - apply order number of referenced object
pDrawPg->InsertObject( this, GetReferencedObj().GetOrdNum() );
}
else
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 8b6e6dd..30be2e2 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -199,7 +199,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
if ( sTxt.Len() )
{
- // --> OD 2007-07-26 #i80029#
+ // #i80029#
sal_Bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly();
if ( !bExecHyperlinks )
{
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 7d0dea7..7b5c04f 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -61,7 +61,7 @@
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <vector>
-// --> OD 2004-06-24 #i28701#
+// #i28701#
#include <sortedobjs.hxx>
#include <flyfrms.hxx>
// <--
@@ -139,7 +139,7 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_Writer());
}
-// --> OD 2009-03-05 #i99665#
+// #i99665#
sal_Bool SwDrawView::IsAntiAliasing() const
{
return getOptionsDrawinglayer().IsAntiAliasing();
@@ -257,7 +257,7 @@ void SwDrawView::AddCustomHdl()
if ( FLY_AT_CHAR == rAnchor.GetAnchorId() )
{
- // --> OD 2004-06-24 #i28701# - use last character rectangle saved at object
+ // #i28701# - use last character rectangle saved at object
// in order to avoid a format of the anchor frame
SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
SwRect aAutoPos = pAnchoredObj->GetLastCharRect();
@@ -623,7 +623,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
const SdrObject* pTmpObj = pDrawPage->GetObj( nNewPos + 1 );
while ( pTmpObj )
{
- // --> OD 2004-12-07 #i38563# - assure, that anchor frame exists.
+ // #i38563# - assure, that anchor frame exists.
// If object is anchored inside a invisible part of the document
// (e.g. page header, whose page style isn't applied, or hidden
// section), no anchor frame exists.
@@ -677,7 +677,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
if ( pTmpObj == pObj )
break;
- // --> OD 2004-12-07 #i38563# - assure, that anchor frame exists.
+ // #i38563# - assure, that anchor frame exists.
// If object is anchored inside a invisible part of the document
// (e.g. page header, whose page style isn't applied, or hidden
// section), no anchor frame exists.
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 559fd69..62130d6 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1467,7 +1467,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
// falls die Numerierung gesetzt werden, die akt. besorgen
SwNumRule aRule( pDoc->GetUniqueNumRuleName(),
- // --> OD 2008-06-06 #i89178#
+ // #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
@@ -1507,7 +1507,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
cBullChar = nBulletPos < cnPosEmDash
? cStarSymbolEnDash
: cStarSymbolEmDash;
- // --> OD 2008-06-03 #i63395#
+ // #i63395#
// Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 4b4b229..b4c8445 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -67,7 +67,7 @@ SwTxtFmtColl& SwEditShell::GetTxtFmtColl( sal_uInt16 nFmtColl) const
return *((*(GetDoc()->GetTxtFmtColls()))[nFmtColl]);
}
-// --> OD 2007-11-06 #i62675#
+// #i62675#
void SwEditShell::SetTxtFmtColl( SwTxtFmtColl *pFmt,
bool bResetListAttrs )
{
@@ -111,7 +111,7 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset)
{
if( bReset )
{
- // --> OD 2007-01-25 #i73790# - method renamed
+ // #i73790# - method renamed
pColl->ResetAllFmtAttr();
// <--
}
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 9b9c3fd..2b31f72 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -79,7 +79,7 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset)
{
if ( bReset )
{
- // --> OD 2007-01-25 #i73790# - method renamed
+ // #i73790# - method renamed
pCharFmt->ResetAllFmtAttr();
// <--
}
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 21af3df..1f84505 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -668,7 +668,7 @@ void *SwEditShell::GetIMapInventor() const
return (void*)GetCrsr()->GetNode();
}
-// --> OD 2007-03-01 #i73788#
+// #i73788#
// remove default parameter, because method is always called this default value
Graphic SwEditShell::GetIMapGraphic() const
{
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 8540d4e..098e914 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -263,7 +263,7 @@ sal_Bool SwEditShell::NumUpDown( sal_Bool bDown )
}
GetDoc()->SetModified();
- // --> FME 2005-09-19 #i54693# Update marked numbering levels
+ // #i54693# Update marked numbering levels
if ( IsInFrontOfLabel() )
UpdateMarkedListLevel();
// <--
@@ -299,7 +299,7 @@ sal_Bool SwEditShell::IsFirstOfNumRule(const SwPaM & rPaM) const
// <- #i23726#
// -> #i23725#
-// --> OD 2008-06-09 #i90078#
+// #i90078#
// Remove unused default parameter <nLevel> and <bRelative>.
// Adjust method name and parameter name
void SwEditShell::ChangeIndentOfAllListLevels( short nDiff )
@@ -311,7 +311,7 @@ void SwEditShell::ChangeIndentOfAllListLevels( short nDiff )
if (pCurNumRule)
{
SwNumRule aRule(*pCurNumRule);
- // --> OD 2008-06-09 #i90078#
+ // #i90078#
aRule.ChangeIndent( nDiff );
// <--
@@ -322,7 +322,7 @@ void SwEditShell::ChangeIndentOfAllListLevels( short nDiff )
EndAllAction();
}
-// --> OD 2008-06-09 #i90078#
+// #i90078#
// Adjust method name
void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
// <--
@@ -336,7 +336,7 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
SwPaM aPaM(rPos);
SwTxtNode * pTxtNode = aPaM.GetNode()->GetTxtNode();
- // --> OD 2008-06-09 #i90078#
+ // #i90078#
SwNumRule aRule(*pCurNumRule);
@@ -351,7 +351,7 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
}
// <--
- // --> OD 2005-02-18 #i42921# - 3rd parameter = false in order to
+ // #i42921# - 3rd parameter = false in order to
// suppress setting of num rule at <aPaM>.
// do not apply any list
GetDoc()->SetNumRule( aPaM, aRule, false, String(), sal_False );
@@ -464,7 +464,7 @@ sal_Bool SwEditShell::MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft )
{
++nIdx;
}
- // --> OD 2005-11-14 #i57856#
+ // #i57856#
else
{
break;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 082942f..30b2777 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2190,7 +2190,7 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
if( !pFrm ||
pFrm->IsInDocBody() ||
- // --> FME 2004-07-27 #i31868#
+ // #i31868#
// Check if pFrm is not yet connected to the layout.
!pFrm->FindPageFrm() )
// <--
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 3217a00..89c02e7 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -239,7 +239,7 @@ void SwGetRefField::SetSubType( sal_uInt16 n )
nSubType = n;
}
-// --> OD 2007-11-09 #i81002#
+// #i81002#
bool SwGetRefField::IsRefToHeadingCrossRefBookmark() const
{
return GetSubType() == REF_BOOKMARK &&
@@ -259,7 +259,7 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
return SwGetRefFieldType::FindAnchor( pDoc, sSetRefName, nSubType, nSeqNo, &nDummy );
}
// <--
-// --> OD 2008-01-09 #i85090#
+// #i85090#
String SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const
{
const SwTxtNode* pReferencedTxtNode( GetReferencedTxtNode() );
@@ -282,7 +282,7 @@ String SwGetRefField::GetFieldName() const
return aStr;
}
-// --> OD 2007-09-07 #i81002# - parameter <pFldTxtAttr> added
+// #i81002# - parameter <pFldTxtAttr> added
void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
{
sTxt.Erase();
@@ -428,7 +428,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
case REF_UPDOWN:
{
- // --> OD 2007-09-07 #i81002#
+ // #i81002#
// simplified: use parameter <pFldTxtAttr>
if( !pFldTxtAttr || !pFldTxtAttr->GetpTxtNode() )
break;
@@ -453,7 +453,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
: aLocaleData.getBelowWord();
}
break;
- // --> OD 2007-08-24 #i81002#
+ // #i81002#
case REF_NUMBER:
case REF_NUMBER_NO_CONTEXT:
case REF_NUMBER_FULL_CONTEXT:
@@ -470,7 +470,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
}
}
-// --> OD 2007-09-06 #i81002#
+// #i81002#
String SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
const SwTxtNode& rTxtNodeOfReferencedItem,
const sal_uInt32 nRefNumFormat ) const
@@ -594,7 +594,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
case REF_ONLYNUMBER : nPart = ReferenceFieldPart::CATEGORY_AND_NUMBER ; break;
case REF_ONLYCAPTION: nPart = ReferenceFieldPart::ONLY_CAPTION ; break;
case REF_ONLYSEQNO : nPart = ReferenceFieldPart::ONLY_SEQUENCE_NUMBER; break;
- // --> OD 2007-09-06 #i81002#
+ // #i81002#
case REF_NUMBER: nPart = ReferenceFieldPart::NUMBER; break;
case REF_NUMBER_NO_CONTEXT: nPart = ReferenceFieldPart::NUMBER_NO_CONTEXT; break;
case REF_NUMBER_FULL_CONTEXT: nPart = ReferenceFieldPart::NUMBER_FULL_CONTEXT; break;
@@ -668,7 +668,7 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
case ReferenceFieldPart::CATEGORY_AND_NUMBER: nPart = REF_ONLYNUMBER; break;
case ReferenceFieldPart::ONLY_CAPTION: nPart = REF_ONLYCAPTION; break;
case ReferenceFieldPart::ONLY_SEQUENCE_NUMBER : nPart = REF_ONLYSEQNO; break;
- // --> OD 2007-09-06 #i81002#
+ // #i81002#
case ReferenceFieldPart::NUMBER: nPart = REF_NUMBER; break;
case ReferenceFieldPart::NUMBER_NO_CONTEXT: nPart = REF_NUMBER_NO_CONTEXT; break;
case ReferenceFieldPart::NUMBER_FULL_CONTEXT: nPart = REF_NUMBER_FULL_CONTEXT; break;
@@ -787,7 +787,7 @@ void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
*pTFld->GetStart() ) );
}
- // --> OD 2007-09-06 #i81002#
+ // #i81002#
pGRef->UpdateField( pFld->GetTxtFld() );
// <--
}
@@ -857,7 +857,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark,
if(!pBkmk->IsExpanded())
{
*pEnd = *pStt;
- // --> OD 2007-10-18 #i81002#
+ // #i81002#
if(dynamic_cast< ::sw::mark::CrossRefBookmark const *>(pBkmk))
{
OSL_ENSURE( pTxtNd,
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 8ee2d17..44f9fda 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -413,7 +413,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
// direct positioning
pFmt->SetFmtAttr( SwFmtHoriOrient( aPos.X(), text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
pFmt->SetFmtAttr( SwFmtVertOrient( aPos.Y(), text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
- // --> OD 2005-04-15 #i47455# - notify draw frame format
+ // #i47455# - notify draw frame format
// that position attributes are already set.
if ( pFmt->ISA(SwDrawFrmFmt) )
{
@@ -1006,7 +1006,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
else
{
OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), "Neues Format.");
- // --> OD 2005-09-01 #i52780# - drawing object has
+ // #i52780# - drawing object has
// to be made visible on paste.
{
SwDrawContact* pContact =
@@ -1017,7 +1017,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
SdrObject *pObj = pNew->FindSdrObject();
SwDrawView *pDV = Imp()->GetDrawView();
pDV->MarkObj( pObj, pDV->GetSdrPageView() );
- // --> OD 2005-04-15 #i47455# - notify draw frame format
+ // #i47455# - notify draw frame format
// that position attributes are already set.
if ( pNew->ISA(SwDrawFrmFmt) )
{
@@ -1295,7 +1295,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
return bConvert;
}
-// --> OD 2005-08-03 #i50824#
+// #i50824#
// replace method <lcl_RemoveOleObjsFromSdrModel> by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>
void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel )
{
@@ -1476,7 +1476,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
if( !bDesignMode )
pView->SetDesignMode( sal_True );
- // --> OD 2005-08-03 #i50824#
+ // #i50824#
// method <lcl_RemoveOleObjsFromSdrModel> replaced by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>
lcl_ConvertSdrOle2ObjsToSdrGrafObjs( pModel );
pView->Paste( *pModel, aPos );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index f8ec5c1..4b8dd3c 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -412,7 +412,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
return aRet;
SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
- // --> OD 2004-07-16 #i28701#
+ // #i28701#
SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
RndStdIds nAnchorId = rFmt.GetAnchor().GetAnchorId();
@@ -568,7 +568,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
delete pHandleAnchorNodeChg;
}
// <--
- // --> OD 2004-06-24 #i28701# - no call of method
+ // #i28701# - no call of method
// <CheckCharRectAndTopOfLine()> for to-character anchored
// Writer fly frame needed. This method call can cause a
// format of the anchor frame, which is no longer intended.
@@ -625,7 +625,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
// Position gesetzt.
ParkCrsr( SwNodeIndex( *aBoxes[0]->GetSttNd() ));
- // --> FME 2005-12-01 #i127787# pCurCrsr will be deleted in ParkCrsr,
+ // #i127787# pCurCrsr will be deleted in ParkCrsr,
// we better get the current pCurCrsr instead of working with the
// deleted one:
pCrsr = GetCrsr();
@@ -895,7 +895,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
SfxItemSet rFlyAttrSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange );
rFlyAttrSet.Put( SwFmtAnchor( FLY_AT_PARA ));
- // --> OD 2009-12-29 #i89920#
+ // #i89920#
rFlyAttrSet.Put( SwFmtSurround( SURROUND_THROUGHT ) );
rDrawObj.SetLayer( getIDocumentDrawModelAccess()->GetHeavenId() );
// <--
@@ -1137,7 +1137,7 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
if ( nNew != pFmt->GetAnchor().GetAnchorId() )
{
ChgAnchor( nNew );
- // --> OD 2004-06-17 #i26791# - clear anchor attribute in item set,
+ // #i26791# - clear anchor attribute in item set,
// because method <ChgAnchor(..)> takes care of it.
rSet.ClearItem( RES_ANCHOR );
}
@@ -2019,7 +2019,7 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
EndAction();
}
-// --> OD 2009-07-13 #i73249#
+// #i73249#
const String SwFEShell::GetObjTitle() const
{
String aTitle;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 8a8a1c6..6170faf 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -306,7 +306,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
if( pOld )
{
SwFrm* pNew = pOld;
- // --> OD 2004-07-16 #i28701#
+ // #i28701#
SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( pObj );
SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
SwFmtAnchor aAnch( rFmt.GetAnchor() );
@@ -516,7 +516,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
delete pHandleAnchorNodeChg;
}
// <--
- // --> OD 2004-06-24 #i28701# - no call of method
+ // #i28701# - no call of method
// <CheckCharRectAndTopOfLine()> for to-character anchored
// Writer fly frame needed. This method call can cause a
// format of the anchor frame, which is no longer intended.
@@ -814,7 +814,7 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst )
if( !pAnch )
continue;
pPage = pAnch->FindPageFrm();
- // --> OD 2006-08-15 #i68520# - naming changed
+ // #i68520# - naming changed
aRect = GetBoundRectOfAnchoredObj( pO );
// <--
}
@@ -1142,7 +1142,7 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
if ( bRet && pObj )
{
const IDocumentDrawModelAccess* pIDDMA = getIDocumentDrawModelAccess();
- // --> OD 2009-12-30 #i89920#
+ // #i89920#
// Do not select object in background which is overlapping this text
// at the given position.
bool bObjInBackground( false );
@@ -1781,7 +1781,7 @@ sal_Bool SwFEShell::ImpEndCreate()
//Erzeugtes Object wegwerfen, so kann der Fly am elegentesten
//ueber vorhandene SS erzeugt werden.
GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false); // see above
- // --> OD 2005-08-08 #i52858# - method name changed
+ // #i52858# - method name changed
SdrPage *pPg = getIDocumentDrawModelAccess()->GetOrCreateDrawModel()->GetPage( 0 );
// <--
if( !pPg )
@@ -1853,16 +1853,16 @@ sal_Bool SwFEShell::ImpEndCreate()
SwFmtVertOrient aVert( nYOffset, text::VertOrientation::NONE, text::RelOrientation::FRAME );
aSet.Put( aVert );
SwDrawFrmFmt* pFmt = (SwDrawFrmFmt*)getIDocumentLayoutAccess()->MakeLayoutFmt( RND_DRAW_OBJECT, &aSet );
- // --> OD 2004-10-25 #i36010# - set layout direction of the position
+ // #i36010# - set layout direction of the position
pFmt->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
// <--
- // --> OD 2005-03-11 #i44344#, #i44681# - positioning attributes already set
+ // #i44344#, #i44681# - positioning attributes already set
pFmt->PosAttrSet();
// <--
SwDrawContact *pContact = new SwDrawContact( pFmt, &rSdrObj );
- // --> OD 2004-11-22 #i35635#
+ // #i35635#
pContact->MoveObjToVisibleLayer( &rSdrObj );
// <--
if( bCharBound )
@@ -2638,7 +2638,7 @@ void SwFEShell::CheckUnboundObjects()
SwDrawContact *pContact = new SwDrawContact(
(SwDrawFrmFmt*)pFmt, pObj );
- // --> OD 2004-11-22 #i35635#
+ // #i35635#
pContact->MoveObjToVisibleLayer( pObj );
// <--
pContact->ConnectToLayout();
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index df558c0..4f11e8e 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1608,7 +1608,7 @@ const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt,
if ( pFrm ) // Note: this condition should be the same like the while condition!!!
{
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+ // #i32329# Enhanced table selection
// used for hotspot selection of tab/cols/rows
if ( !bMouseMoveRowCols )
{
@@ -1679,7 +1679,7 @@ const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) con
SwTwips nFuzzy = COLFUZZY;
if( pOutWin )
{
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+ // #i32329# Enhanced table selection
SwTwips nSize = pbCol ? ENHANCED_TABLE_SELECTION_FUZZY : RULER_MOUSE_MARGINWIDTH;
// <--
Size aTmp( nSize, nSize );
@@ -1846,7 +1846,7 @@ Point lcl_ProjectOntoClosestTableFrm( const SwTabFrm& rTab, const Point& rPoint,
return aRet;
}
-// --> FME 2004-07-30 #i32329# Enhanced table selection
+// #i32329# Enhanced table selection
bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag )
{
bool bRet = false;
@@ -1941,7 +1941,7 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
if ( bNewSelection )
{
- // --> FME 2004-10-20 #i35543# SelTblRowCol should remove any existing
+ // #i35543# SelTblRowCol should remove any existing
// table cursor:
if ( IsTableMode() )
TblCrsrToCursor();
@@ -2082,7 +2082,7 @@ sal_Bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
}
// <- #i23726#
-// --> OD 2005-02-21 #i42921#
+// #i42921#
bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
const Point& _rDocPos ) const
{
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 34fd69d..dbd3f3a 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -524,7 +524,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
sal_Bool bTblIsValid, bValidChartSel;
- // --> FME 2006-01-25 #i55421# Reduced value 10
+ // #i55421# Reduced value 10
int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292
// <--
sal_uInt16 i = 0;
@@ -1975,7 +1975,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
while ( pRow && !pRow->Frm().IsOver( aUnion ) )
pRow = (SwLayoutFrm*)pRow->GetNext();
- // --> FME 2004-07-26 #i31976#
+ // #i31976#
// A follow flow row may contain emtpy cells. These are not
// considered by FirstCell(). Therefore we have to find
// the first cell manually:
@@ -2325,7 +2325,7 @@ void _FndBox::DelFrms( SwTable &rTable )
if ( pPrev )
{
pPrev->SetFollow( pFollow );
- // --> FME 2006-01-31 #i60340# Do not transfer the
+ // #i60340# Do not transfer the
// flag from pUp to pPrev. pUp may still have the
// flag set although there is not more follow flow
// line associated with pUp.
@@ -2462,7 +2462,7 @@ void _FndBox::MakeFrms( SwTable &rTable )
pSibling->GetTabLine() != pLine ||
!lcl_IsLineOfTblFrm( *pTable, *pSibling ) ||
pSibling->IsRepeatedHeadline() ||
- // --> FME 2005-08-24 #i53647# If !pLineBehind,
+ // #i53647# If !pLineBehind,
// IsInSplitTableRow() should be checked.
( pLineBehind && pSibling->IsInFollowFlowRow() ) ||
(!pLineBehind && pSibling->IsInSplitTableRow() ) ) )
@@ -2585,7 +2585,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
// only consider row frames that are not follow flow rows
// 2. case: pLineBefore != 0:
// only consider row frames that are not split table rows
- // --> FME 2004-11-23 #i37476# If !pLineBefore,
+ // #i37476# If !pLineBefore,
// check IsInFollowFlowRow instead of IsInSplitTableRow.
( ( !pLineBefore && pSibling->IsInFollowFlowRow() ) ||
( pLineBefore && pSibling->IsInSplitTableRow() ) ) ) )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 6bcbec2..962da22 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -60,7 +60,7 @@
#include <tools/link.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/io/XSeekable.hpp>
-// --> OD 2007-03-28 #i73788#
+// #i73788#
#include <retrieveinputstreamconsumer.hxx>
// <--
@@ -76,7 +76,7 @@ SwGrfNode::SwGrfNode(
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr ) :
SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
- // --> OD 2007-01-23 #i73788#
+ // #i73788#
mbLinkedInputStreamReady( false ),
mbIsStreamReadOnly( sal_False )
// <--
@@ -93,7 +93,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
const GraphicObject& rGrfObj,
SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) :
SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
- // --> OD 2007-01-23 #i73788#
+ // #i73788#
mbLinkedInputStreamReady( false ),
mbIsStreamReadOnly( sal_False )
// <--
@@ -116,7 +116,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr ) :
SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
- // --> OD 2007-01-23 #i73788#
+ // #i73788#
mbLinkedInputStreamReady( false ),
mbIsStreamReadOnly( sal_False )
// <--
@@ -217,7 +217,7 @@ sal_Bool SwGrfNode::ReRead(
SwMsgPoolItem aMsgHint( RES_GRF_REREAD_AND_INCACHE );
ModifyNotification( &aMsgHint, &aMsgHint );
}
- // --> OD 2006-11-03 #i59688#
+ // #i59688#
// do not load linked graphic, if it isn't a new linked graphic.
// else {
else if ( bNewGrf )
@@ -315,7 +315,7 @@ sal_Bool SwGrfNode::ReRead(
SwGrfNode::~SwGrfNode()
{
- // --> OD 2007-03-30 #i73788#
+ // #i73788#
mpThreadConsumer.reset();
// <--
@@ -328,7 +328,7 @@ SwGrfNode::~SwGrfNode()
}
else
{
- // --> OD 2005-01-19 #i40014# - A graphic node, which are in linked
+ // #i40014# - A graphic node, which are in linked
// section, whose link is another section is the document, doesn't
// have to remove the stream from the storage.
// Because it's hard to detect this case here and it would only fix
@@ -453,7 +453,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
else
{
- // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
+ // #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
try
{
// #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
@@ -471,7 +471,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
}
catch ( uno::Exception& )
{
- // --> OD 2005-04-25 #i48434#
+ // #i48434#
OSL_FAIL( "<SwGrfNode::SwapIn(..)> - unhandled exception!" );
// <--
}
@@ -564,7 +564,7 @@ sal_Bool SwGrfNode::SavePersistentData()
if( HasStreamName() && !SwapIn() )
return sal_False;
- // --> OD 2005-04-19 #i44367#
+ // #i44367#
// Do not delete graphic file in storage, because the graphic file could
// be referenced by other graphic nodes.
// Because it's hard to detect this case here and it would only fix
@@ -744,7 +744,7 @@ void SwGrfNode::DelStreamName()
}
catch ( uno::Exception& )
{
- // --> OD 2005-04-25 #i48434#
+ // #i48434#
OSL_FAIL( "<SwGrfNode::DelStreamName()> - unhandled exception!" );
// <--
}
@@ -832,7 +832,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
}
-// --> OD 2005-08-17 #i53025# - stream couldn't be in a 3.1 - 5.2 storage any more.
+// #i53025# - stream couldn't be in a 3.1 - 5.2 storage any more.
// Thus, removing corresponding code.
void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
String& rStorName ) const
@@ -884,7 +884,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
if( !pLink && HasStreamName() )
{
- // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
+ // #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
try
{
// #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
@@ -901,7 +901,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
}
catch ( uno::Exception& )
{
- // --> OD 2005-04-25 #i48434#
+ // #i48434#
OSL_FAIL( "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
// <--
}
@@ -968,7 +968,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
if( HasStreamName() )
{
- // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
+ // #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
try
{
// #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
@@ -993,7 +993,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
}
catch ( uno::Exception& )
{
- // --> OD 2005-04-25 #i48434#
+ // #i48434#
OSL_FAIL( "<SwapGraphic> - unhandled exception!" );
// <--
}
@@ -1116,7 +1116,7 @@ sal_Bool SwGrfNode::IsSelected() const
return bRet;
}
-// --> OD 2006-12-22 #i73788#
+// #i73788#
boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > SwGrfNode::GetThreadConsumer()
{
return mpThreadConsumer;
@@ -1172,7 +1172,7 @@ void SwGrfNode::UpdateLinkWithInputStream()
SwMsgPoolItem aMsgHint( RES_GRAPHIC_ARRIVED );
ModifyNotification( &aMsgHint, &aMsgHint );
- // --> OD 2008-06-18 #i88291#
+ // #i88291#
mxInputStream.clear();
GetLink()->clearStreamToLoadFrom();
// <--
@@ -1182,7 +1182,7 @@ void SwGrfNode::UpdateLinkWithInputStream()
}
// <--
-// --> OD 2008-07-21 #i90395#
+// #i90395#
bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
{
bool bRet = false;
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 849603e..22d69b4 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -112,7 +112,7 @@ class SwUndoFmtAttr : public SwUndo
bool IsFmtInDoc( SwDoc* ); //is the attribute format still in the Doc?
void SaveFlyAnchor( bool bSaveDrawPt = false );
- // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
+ // #i35443# - Add return value, type <bool>.
// Return value indicates, if anchor attribute is restored.
// Notes: - If anchor attribute is restored, all other existing attributes
// are also restored.
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 66a2f6d..5f6a3e9 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -53,7 +53,7 @@ public:
SwPrintData const*const pPrintData = NULL ) const;
virtual void CheckDirection( sal_Bool bVert );
- // --> OD 2010-02-17 #i103961#
+ // #i103961#
virtual void Cut();
// <--
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 0e370f0..4388b80 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -69,7 +69,7 @@ class SwFtnFrm: public SwLayoutFrm
sal_Bool bBackMoveLocked : 1; //Absaetze in dieser Fussnote duerfen derzeit
//nicht rueckwaerts fliessen.
- // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects.
+ // #i49383# - control unlock of position of lower anchored objects.
bool mbUnlockPosOfLowerObjs : 1;
// <--
#if OSL_DEBUG_LEVEL > 1
@@ -122,7 +122,7 @@ public:
inline void ColLock() { bColLocked = sal_True; }
inline void ColUnlock() { bColLocked = sal_False; }
- // --> OD 2005-05-18 #i49383#
+ // #i49383#
inline void UnlockPosOfLowerObjs()
{
mbUnlockPosOfLowerObjs = true;
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index eb300c0..ec5e13e 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -39,7 +39,7 @@ class SwTabFrm;
class SwViewImp;
class SwCntntNode;
class SwWait;
-// --> OD 2004-06-28 #i28701#
+// #i28701#
class SfxProgress;
//Die Verwendung der LayAction laeuft immer gleich ab:
@@ -192,10 +192,10 @@ public:
//Auch andere sollen den Wartecrsr einschalten koennen.
void CheckWaitCrsr();
- // --> OD 2004-06-09 #i28701# - method is now public;
+ // #i28701# - method is now public;
// delete 2nd parameter, because its not used;
sal_Bool FormatLayoutFly( SwFlyFrm * );
- // --> OD 2004-06-09 #i28701# - method is now public
+ // #i28701# - method is now public
sal_Bool _FormatFlyCntnt( const SwFlyFrm * );
};
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 3092ed6..90bbb30 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -44,7 +44,7 @@ class SwRowFrm: public SwLayoutFrm
const SwTableLine *pTabLine;
SwRowFrm* pFollowRow;
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // #i29550#
sal_uInt16 mnTopMarginForLowers;
sal_uInt16 mnBottomMarginForLowers;
sal_uInt16 mnBottomLineSize;
@@ -80,7 +80,7 @@ public:
SwRowFrm* GetFollowRow() const { return pFollowRow; }
void SetFollowRow( SwRowFrm* pNew ) { pFollowRow = pNew; }
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // #i29550#
sal_uInt16 GetTopMarginForLowers() const { return mnTopMarginForLowers; }
void SetTopMarginForLowers( sal_uInt16 nNew ) { mnTopMarginForLowers = nNew; }
sal_uInt16 GetBottomMarginForLowers() const { return mnBottomMarginForLowers; }
@@ -102,7 +102,7 @@ public:
bool ShouldRowKeepWithNext() const;
// <--
- // --> FME 2006-10-30 #i4032# NEW TABLES
+ // #i4032# NEW TABLES
bool IsRowSpanLine() const { return mbIsRowSpanLine; }
void SetRowSpanLine( bool bNew ) { mbIsRowSpanLine = bNew; }
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 2468b59..ab35e36 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -81,7 +81,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// is necessary, in order to let the text
// flow into the FollowFlowLine
sal_Bool bRemoveFollowFlowLinePending :1;
- // --> OD 2004-10-04 #i26945#
+ // #i26945#
sal_Bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen objects
// are considered on the calculation
// for the minimal cell height.
@@ -91,7 +91,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// of the re-calculation of the
// last table row.
// <--
- // --> OD 2004-10-15 #i26945#
+ // #i26945#
sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
// indicates, if the floating screen objects fits
// <--
@@ -173,7 +173,7 @@ public:
sal_Bool IsRemoveFollowFlowLinePending() const { return bRemoveFollowFlowLinePending; }
void SetRemoveFollowFlowLinePending( sal_Bool bNew ) { bRemoveFollowFlowLinePending = bNew; }
- // --> OD 2004-10-04 #i26945#
+ // #i26945#
sal_Bool IsConsiderObjsForMinCellHeight() const
{
return bConsiderObjsForMinCellHeight;
@@ -183,7 +183,7 @@ public:
bConsiderObjsForMinCellHeight = _bNewConsiderObjsForMinCellHeight;
}
// <--
- // --> OD 2004-10-04 #i26945#
+ // #i26945#
sal_Bool DoesObjsFit() const
{
return bObjsDoesFit;
@@ -209,7 +209,7 @@ public:
bool IsLayoutSplitAllowed() const;
- // --> collapsing borders FME 2005-05-27 #i29550#
+ // #i29550#
bool IsCollapsingBorders() const;
// used for collapsing border lines:
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 94f6c2d..4a03a0f 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -459,7 +459,7 @@ public:
SwTxtFrm *FindQuoVadisFrm();
// holt die Formatierug nach, wenn der Idle-Handler zugeschlagen hat.
- // --> FME 2004-10-29 #i29062# GetFormatted() can trigger a full formatting
+ // #i29062# GetFormatted() can trigger a full formatting
// of the paragraph, causing other layout frames to become invalid. This
// has to be avoided during painting. Therefore we need to pass the
// information that we are currently in the paint process.
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index c8f0009..7f8308e 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -70,7 +70,7 @@ class SwPosNotify
public:
SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj );
~SwPosNotify();
- // --> OD 2004-08-12 #i32795#
+ // #i32795#
Point LastObjPos() const;
// <--
};
@@ -244,7 +244,7 @@ SwAnchoredDrawObject::SwAnchoredDrawObject() :
SwAnchoredDrawObject::~SwAnchoredDrawObject()
{
- // --> follow-up of #i34748#
+ // #i34748#
delete mpLastObjRect;
// <--
}
@@ -326,7 +326,7 @@ void SwAnchoredDrawObject::MakeObjPos()
// <--
// --> perform conversion of positioning
// attributes only for 'master' drawing objects
- // --> #i44334#, #i44681# - check, if positioning
+ // #i44334#, #i44681# - check, if positioning
// attributes already have been set.
if ( !GetDrawObj()->ISA(SwDrawVirtObj) &&
!static_cast<SwDrawFrmFmt&>(GetFrmFmt()).IsPosAttrSet() )
@@ -660,7 +660,7 @@ void SwAnchoredDrawObject::InvalidateObjPos()
_InvalidatePage( pPageFrmRegisteredAt );
}
// <--
- // --> #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
+ // #i33751#, #i34060# - method <GetPageFrmOfAnchor()>
// is replaced by method <FindPageFrmOfAnchor()>. It's return value
// have to be checked.
SwPageFrm* pPageFrmOfAnchor = FindPageFrmOfAnchor();
@@ -810,7 +810,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
SwTwips nHoriPos = aObjRect.Left();
SwTwips nVertPos = aObjRect.Top();
- // --> #i44334#, #i44681#
+ // #i44334#, #i44681#
// perform conversion only if position is in horizontal-left-to-right-layout.
if ( GetFrmFmt().GetPositionLayoutDir() ==
text::PositionLayoutDir::PositionInHoriL2R )
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index e01dc40..1efe243 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -263,7 +263,7 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr
{
mpVertPosOrientFrm = &_rVertPosOrientFrm;
- // --> OD 2004-07-02 #i28701# - take over functionality of deleted method
+ // #i28701# - take over functionality of deleted method
// <SwFlyAtCntFrm::AssertPage()>: assure for at-paragraph and at-character
// an anchored object, that it is registered at the correct page frame
RegisterAtCorrectPage();
@@ -375,7 +375,7 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch,
( (aCharRect.*fnRect->fnGetTop)() !=
(maLastCharRect.*fnRect->fnGetTop)() ) ) )
{
- // --> #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() )
@@ -414,7 +414,7 @@ void SwAnchoredObject::_CheckTopOfLine( const SwFmtAnchor& _rAnch,
// check alignment for invalidation of position
if ( GetFrmFmt().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE )
{
- // --> #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() )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a74ae8a..e747d73 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -204,7 +204,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
{
SwNode *pNode = 0;
{
- // --> OD 2008-10-07 #i92993#
+ // #i92993#
// Begin with start node of page header/footer to assure that
// complete content is checked for cursors and the complete content
// is deleted on below made method call <pDoc->DeleteSection(pNode)>
@@ -2603,7 +2603,7 @@ SwContact* SwFrmFmt::FindContactObj()
SdrObject* SwFrmFmt::FindSdrObject()
{
- // --> OD 2005-01-06 #i30669# - use method <FindContactObj()> instead of
+ // #i30669# - use method <FindContactObj()> instead of
// duplicated code.
SwContact* pFoundContact = FindContactObj();
return pFoundContact ? pFoundContact->GetMaster() : 0;
@@ -2677,7 +2677,7 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
return sal_False;
}
-// --> OD 2004-07-27 #i31698#
+// #i31698#
SwFrmFmt::tLayoutDir SwFrmFmt::GetLayoutDir() const
{
return SwFrmFmt::HORI_L2R;
@@ -2689,7 +2689,7 @@ void SwFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir )
}
// <--
-// --> OD 2004-08-06 #i28749#
+// #i28749#
sal_Int16 SwFrmFmt::GetPositionLayoutDir() const
{
return text::PositionLayoutDir::PositionInLayoutDirOfAnchor;
@@ -2760,7 +2760,7 @@ void SwFlyFrmFmt::MakeFrms()
//die Suche vom StartNode zum FrameFormat sein.
SwNodeIndex aIdx( aAnchorAttr.GetCntntAnchor()->nNode );
SwCntntNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
- // --> OD 2009-12-28 #i105535#
+ // #i105535#
if ( pCNd == 0 )
{
pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
@@ -2773,7 +2773,7 @@ void SwFlyFrmFmt::MakeFrms()
pModify = pCNd;
}
}
- // --> OD 2009-12-28 #i105535#
+ // #i105535#
if ( pModify == 0 )
// <--
{
@@ -2820,7 +2820,7 @@ void SwFlyFrmFmt::MakeFrms()
{
if ( pPage->GetPhyPageNum() == nPgNum )
{
- // --> OD 2005-06-09 #i50432# - adjust synopsis of <PlaceFly(..)>
+ // #i50432# - adjust synopsis of <PlaceFly(..)>
pPage->PlaceFly( 0, this );
// <--
break;
@@ -2843,7 +2843,7 @@ void SwFlyFrmFmt::MakeFrms()
if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
{
- // --> OD 2009-12-28 #i105535#
+ // #i105535#
// fallback to anchor type at-paragraph, if no fly frame is found.
// pFrm = pFrm->FindFlyFrm();
SwFrm* pFlyFrm = pFrm->FindFlyFrm();
@@ -2863,11 +2863,11 @@ void SwFlyFrmFmt::MakeFrms()
if( pFrm->GetDrawObjs() )
{
- // --> OD 2004-07-01 #i28701# - new type <SwSortedObjs>
+ // #i28701# - new type <SwSortedObjs>
SwSortedObjs &rObjs = *pFrm->GetDrawObjs();
for( sal_uInt16 i = 0; i < rObjs.Count(); ++i)
{
- // --> OD 2004-07-01 #i28701# - consider changed type of
+ // #i28701# - consider changed type of
// <SwSortedObjs> entries.
SwAnchoredObject* pObj = rObjs[i];
if( pObj->ISA(SwFlyFrm) &&
@@ -2945,7 +2945,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
return sal_True;
}
-// --> OD 2009-07-14 #i73249#
+// #i73249#
void SwFlyFrmFmt::SetObjTitle( const String& rTitle, bool bBroadcast )
{
SdrObject* pMasterObject = FindSdrObject();
@@ -3173,7 +3173,7 @@ void SwDrawFrmFmt::DelFrms()
pContact->DisconnectFromLayout();
}
-// --> OD 2004-07-27 #i31698#
+// #i31698#
SwFrmFmt::tLayoutDir SwDrawFrmFmt::GetLayoutDir() const
{
return meLayoutDir;
@@ -3185,7 +3185,7 @@ void SwDrawFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir )
}
// <--
-// --> OD 2004-08-06 #i28749#
+// #i28749#
sal_Int16 SwDrawFrmFmt::GetPositionLayoutDir() const
{
return mnPositionLayoutDir;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index a357d8b..49cc01b 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -58,10 +58,10 @@
#include "sectfrm.hxx"
#include "dbg_lay.hxx"
-// --> OD 2004-06-23 #i28701#
+// #i28701#
#include <sortedobjs.hxx>
#include <layouter.hxx>
-// --> OD 2004-11-01 #i36347#
+// #i36347#
#include <flyfrms.hxx>
// <--
@@ -276,7 +276,7 @@ bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm )
{
return !rFrm.GetUpper()->IsSctFrm() &&
!rFrm.GetUpper()->IsFooterFrm() &&
- // --> OD 2004-11-02 #i23129#, #i36347# - no format of upper Writer fly frame
+ // #i23129#, #i36347# - no format of upper Writer fly frame
!rFrm.GetUpper()->IsFlyFrm() &&
// <--
!( rFrm.GetUpper()->IsTabFrm() && rFrm.GetUpper()->GetUpper()->IsInTab() ) &&
@@ -325,7 +325,7 @@ void SwFrm::PrepareMake()
}
}
- // --> OD 2005-03-04 #i44049# - no format of previous frame, if current
+ // #i44049# - no format of previous frame, if current
// frame is a table frame and its previous frame wants to keep with it.
const bool bFormatPrev = !bTab ||
!GetPrev() ||
@@ -393,7 +393,7 @@ void SwFrm::PrepareMake()
void SwFrm::OptPrepareMake()
{
- // --> OD 2004-11-02 #i23129#, #i36347# - no format of upper Writer fly frame
+ // #i23129#, #i36347# - no format of upper Writer fly frame
if ( GetUpper() && !GetUpper()->IsFooterFrm() &&
!GetUpper()->IsFlyFrm() )
// <--
@@ -593,7 +593,7 @@ void SwFrm::MakePos()
// NOTE: Footer frame is <ColLocked()> during its
// <FormatSize(..)>, which is called from <Format(..)>, which
// is called from <MakeAll()>, which is called from <Calc()>.
- // --> OD 2005-11-17 #i56850#
+ // #i56850#
// - no format of upper Writer fly frame, which is anchored
// at-paragraph or at-character.
if ( !GetUpper()->IsTabFrm() &&
@@ -667,7 +667,7 @@ void SwFrm::MakePos()
|* SwPageFrm::MakeAll()
|*
|*************************************************************************/
-// --> OD 2004-07-01 #i28701# - new type <SwSortedObjs>
+// #i28701# - new type <SwSortedObjs>
void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot )
{
//Und dann kann es natuerlich noch Absatzgebundene
@@ -675,7 +675,7 @@ void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot )
long nMax = 0;
for ( sal_uInt16 i = 0; i < pSortedObjs->Count(); ++i )
{
- // --> OD 2004-07-01 #i28701# - consider changed type of <SwSortedObjs>
+ // #i28701# - consider changed type of <SwSortedObjs>
// entries.
SwAnchoredObject* pObj = (*pSortedObjs)[i];
long nTmp = 0;
@@ -813,7 +813,7 @@ void SwPageFrm::MakeAll()
if ( pSortedObjs )
lcl_CheckObjects( pSortedObjs, this, nBot );
nBot -= Frm().Top();
- // --> OD 2004-11-10 #i35143# - If second page frame
+ // #i35143# - If second page frame
// exists, the first page doesn't have to fulfill the
// visible area.
if ( !GetPrev() && !GetNext() )
@@ -821,7 +821,7 @@ void SwPageFrm::MakeAll()
{
nBot = Max( nBot, pSh->VisArea().Height() );
}
- // --> OD 2004-11-10 #i35143# - Assure, that the page
+ // #i35143# - Assure, that the page
// doesn't exceed the defined browse height.
Frm().Height( Min( nBot, BROWSE_HEIGHT ) );
// <--
@@ -1032,7 +1032,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
for (sal_uInt16 i = 0; GetDrawObjs() && i < GetDrawObjs()->Count();++i)
{
- // --> OD 2004-07-01 #i28701# - consider changed type of
+ // #i28701# - consider changed type of
// <SwSortedObjs> entries
SwAnchoredObject* pObj = (*GetDrawObjs())[i];
const SwFrmFmt& rFmt = pObj->GetFrmFmt();
@@ -1252,7 +1252,7 @@ void SwCntntFrm::MakeAll()
}
// <--
- // --> OD 2004-06-23 #i28701# - move master forward, if it has to move,
+ // #i28701# - move master forward, if it has to move,
// because of its object positioning.
if ( !static_cast<SwTxtFrm*>(this)->IsFollow() )
{
@@ -1261,7 +1261,7 @@ void SwCntntFrm::MakeAll()
*(GetAttrSet()->GetDoc()),
*(static_cast<SwTxtFrm*>(this)),
nToPageNum );
- // --> OD 2006-01-27 #i58182#
+ // #i58182#
// Also move a paragraph forward, which is the first one inside a table cell.
if ( bMoveFwdByObjPos &&
FindPageFrm()->GetPhyPageNum() < nToPageNum &&
@@ -1380,18 +1380,18 @@ void SwCntntFrm::MakeAll()
if ( !bValidPrtArea )
{
const long nOldW = (Prt().*fnRect->fnGetWidth)();
- // --> OD 2004-09-28 #i34730# - keep current frame height
+ // #i34730# - keep current frame height
const SwTwips nOldH = (Frm().*fnRect->fnGetHeight)();
// <--
MakePrtArea( rAttrs );
if ( nOldW != (Prt().*fnRect->fnGetWidth)() )
Prepare( PREP_FIXSIZE_CHG );
- // --> OD 2004-09-28 #i34730# - check, if frame height has changed.
+ // #i34730# - check, if frame height has changed.
// If yes, send a PREP_ADJUST_FRM and invalidate the size flag to
// force a format. The format will check in its method
// <SwTxtFrm::CalcPreps()>, if the already formatted lines still
// fit and if not, performs necessary actions.
- // --> OD 2005-01-10 #i40150# - no check, if frame is undersized.
+ // #i40150# - no check, if frame is undersized.
if ( bValidSize && !IsUndersized() &&
nOldH != (Frm().*fnRect->fnGetHeight)() )
{
@@ -1544,7 +1544,7 @@ void SwCntntFrm::MakeAll()
//dazu fuehren, dass seine Position obwohl unrichtig valide ist.
if ( bValidPos )
{
- // --> OD 2006-01-23 #i59341#
+ // #i59341#
// Workaround for inadequate layout algorithm:
// suppress invalidation and calculation of position, if paragraph
// has formatted itself at least STOP_FLY_FORMAT times and
@@ -1783,7 +1783,7 @@ void SwCntntFrm::MakeAll()
( bFtn && !FindFtnFrm()->GetRef()->IsInSct() ) ||
// <--
- // --> FME 2005-01-27 #i33887#
+ // #i33887#
( IsInSct() && bKeep )
// <--
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index bc2aaa7..c4c1c2e 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -206,7 +206,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
{
if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn )
return;
- // --> OD 2009-08-12 #i97379#
+ // #i97379#
// If current lower is a no text frame, then columns are not allowed
if ( Lower() && Lower()->IsNoTxtFrm() &&
rNew.GetNumCols() > 1 )
@@ -360,7 +360,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut
const sal_Bool bR2L = IsRightToLeft();
SwFrm *pCol = bR2L ? GetLastLower() : Lower();
- // --> FME 2004-07-16 #i27399#
+ // #i27399#
// bOrtho means we have to adjust the column frames manually. Otherwise
// we may use the values returned by CalcColWidth:
const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index ad00060..d117946 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -457,7 +457,7 @@ SwPageFrm* SwFrm::FindPageFrm()
pRet = pRet->GetUpper();
else if ( pRet->IsFlyFrm() )
{
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if ( static_cast<SwFlyFrm*>(pRet)->GetPageFrm() )
pRet = static_cast<SwFlyFrm*>(pRet)->GetPageFrm();
else
@@ -482,7 +482,7 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( sal_Bool bFootnotes )
pRet = pRet->GetUpper();
else if ( pRet->IsFlyFrm() )
{
- // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()>
+ // #i28701# - use new method <GetPageFrm()>
if ( static_cast<SwFlyFrm*>(pRet)->GetPageFrm() )
pRet = static_cast<SwFlyFrm*>(pRet)->GetPageFrm();
else
@@ -831,7 +831,7 @@ SwFrm *SwFrm::_FindNext()
return pRet;
}
-// --> OD 2005-12-01 #i27138# - add parameter <_bInSameFtn>
+// #i27138# - add parameter <_bInSameFtn>
SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
{
SwFrm *pThis = this;
@@ -870,7 +870,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
SwCntntFrm *pNxtCnt = ((SwCntntFrm*)pThis)->GetNextCntntFrm();
if ( pNxtCnt )
{
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
if ( bBody || ( bFtn && !_bInSameFtn ) )
// <--
{
@@ -883,7 +883,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
pNxtCnt = pNxtCnt->GetNextCntntFrm();
}
}
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
else if ( bFtn && _bInSameFtn )
{
// handling for environments 'each footnote':
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 9f40012..c93692e 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -311,12 +311,12 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe
} while ( !nRet && pTmp );
if ( pPage->GetSortedObjs() )
{
- // --> OD 2004-07-01 #i28701# - new type <SwSortedObjs>
+ // #i28701# - new type <SwSortedObjs>
const SwSortedObjs &rObjs = *pPage->GetSortedObjs();
sal_uLong nIndex = ULONG_MAX;
for ( sal_uInt16 i = 0; nRet < 3 && i < rObjs.Count(); ++i )
{
- // --> OD 2004-07-01 #i28701# - consider changed type of
+ // #i28701# - consider changed type of
// <SwSortedObjs> entries.
SwAnchoredObject* pObj = rObjs[i];
const SwFrmFmt& rFmt = pObj->GetFrmFmt();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list