Hi Cédric,
The last survivors in attachment. ;-)
Under the LGPLv3+ / MPL license.
The next patch will remove all empty comments, // <--, and other trash.
Regards,
Júlio.
From 8de7b78739cf12c08714e76f1cd9a86ecea25479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Mon, 18 Apr 2011 12:36:49 -0300
Subject: [PATCH] all bogus comments finally removed
---
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 0024eb7..9b02e5c 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1198,7 +1198,7 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount
)
return sal_True;
}
return sal_False;
- // --> tkr #67048# copy & paste images doesn't display.
+ // #67048# copy & paste images doesn't display.
// if we have a bad connection try again. Up to three times.
case DAVException::DAV_HTTP_ERROR:
// retry up to three times, if not a client-side error.
@@ -1208,11 +1208,9 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int
errorCount )
return sal_True;
}
return sal_False;
- // <--
- // --> tkr: if connection has said retry then retry!
+ // if connection has said retry then retry!
case DAVException::DAV_HTTP_RETRY:
return sal_True;
- // <--
default:
return sal_False; // Abort
}
--
1.7.0.4
From f838ddcef37e5b84fcb05de2a254a2ea46c32b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Mon, 18 Apr 2011 12:37:38 -0300
Subject: [PATCH] all bogus comments finally removed
---
sw/source/core/inc/rowfrm.hxx | 2 +-
sw/source/core/layout/atrfrm.cxx | 2 +-
sw/source/core/layout/calcmove.cxx | 6 +-
sw/source/core/layout/findfrm.cxx | 6 +-
sw/source/core/layout/flowfrm.cxx | 28 +++++++-------
sw/source/core/layout/fly.cxx | 4 +-
sw/source/core/layout/flyincnt.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 30 +++++++-------
sw/source/core/layout/layact.cxx | 4 +-
sw/source/core/layout/laycache.cxx | 2 +-
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 2 +-
sw/source/core/layout/newfrm.cxx | 2 +-
sw/source/core/layout/objectformatterlayfrm.cxx | 6 +-
sw/source/core/layout/pagedesc.cxx | 2 +-
sw/source/core/layout/paintfrm.cxx | 10 ++--
sw/source/core/layout/sectfrm.cxx | 6 +-
sw/source/core/layout/tabfrm.cxx | 48 +++++++++++-----------
sw/source/core/layout/trvlfrm.cxx | 10 ++--
sw/source/core/layout/wsfrm.cxx | 4 +-
sw/source/core/table/swtable.cxx | 2 +-
sw/source/core/text/frmform.cxx | 2 +-
sw/source/core/text/inftxt.cxx | 2 +-
sw/source/core/text/itrform2.cxx | 2 +-
sw/source/core/text/txtfly.cxx | 10 ++--
sw/source/core/text/txtfrm.cxx | 10 ++--
sw/source/core/text/txttab.cxx | 6 +-
sw/source/core/txtnode/atrfld.cxx | 2 +-
sw/source/core/txtnode/ndtxt.cxx | 4 +-
sw/source/ui/inc/regionsw.hxx | 8 ++--
sw/source/ui/misc/outline.cxx | 6 +-
sw/source/ui/shells/drwtxtex.cxx | 2 +-
sw/source/ui/shells/grfsh.cxx | 6 +-
sw/source/ui/uno/unotxdoc.cxx | 2 +-
sw/source/ui/wrtsh/delete.cxx | 8 ++--
sw/source/ui/wrtsh/wrtsh1.cxx | 4 +-
35 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 90bbb30..43def61 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -98,7 +98,7 @@ public:
void SetFollowFlowRow( bool bNew ) { bIsFollowFlowRow = bNew; }
// <-- split table rows
- // --> FME 2006-02-10 #131283# Table row keep feature
+ // #131283# Table row keep feature
bool ShouldRowKeepWithNext() const;
// <--
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index e747d73..c6d6aa5 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3083,7 +3083,7 @@ sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
return bReturn;
}
-// --> OD 2006-02-28 #125892#
+// #125892#
SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
const SwFmtAnchor& _rNewAnchorFmt,
SwFlyFrm* _pKeepThisFlyFrm )
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 49cc01b..2229d18 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1354,7 +1354,7 @@ void SwCntntFrm::MakeAll()
//FixSize einstellen, die VarSize wird von Format() justiert.
if ( !bValidSize )
{
- // --> OD 2006-01-03 #125452#
+ // #125452#
// invalidate printing area flag, if the following conditions are hold:
// - current frame width is 0.
// - current printing area width is 0.
@@ -1395,7 +1395,7 @@ void SwCntntFrm::MakeAll()
if ( bValidSize && !IsUndersized() &&
nOldH != (Frm().*fnRect->fnGetHeight)() )
{
- // --> OD 2004-11-25 #115759# - no PREP_ADJUST_FRM and size
+ // #115759# - no PREP_ADJUST_FRM and size
// invalidation, if height decreases only by the additional
// lower space as last content of a table cell and an existing
// follow containing one line exists.
@@ -1779,7 +1779,7 @@ void SwCntntFrm::MakeAll()
LOOPING_LOUIE_LIGHT( bMovedFwd && bMovedBwd && !IsInBalancedSection() &&
(
- // --> FME 2005-01-26 #118572#
+ // #118572#
( bFtn && !FindFtnFrm()->GetRef()->IsInSct() ) ||
// <--
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index d117946..ad1f3dc 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -158,7 +158,7 @@ const SwCellFrm *SwLayoutFrm::FirstCell() const
|*
|*************************************************************************/
-// --> OD 2006-02-01 #130797#
+// #130797#
// New parameter <_bInvestigateFtnForSections> controls investigation of
// content of footnotes for sections.
const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const
@@ -169,7 +169,7 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
// Oder bis wir einen SectionFrm oder TabFrm gefunden haben
const SwLayoutFrm *pLayLeaf = this;
- // --> OD 2006-02-01 #130797#
+ // #130797#
const bool bNoFtn = IsSctFrm() && !_bInvestigateFtnForSections;
// <--
do
@@ -1044,7 +1044,7 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
SwFtnFrm* pMasterFtnFrmOfCurr(
const_cast<SwFtnFrm*>(pFtnFrmOfCurr) );
pPrevCntntFrm = 0L;
- // --> OD 2007-07-05 #146872#
+ // #146872#
// correct wrong loop-condition
do {
pMasterFtnFrmOfCurr = pMasterFtnFrmOfCurr->GetMaster();
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index c93692e..81e13f9 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -216,7 +216,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
if( 0 != (pNxt = rThis.FindNextCnt()) &&
(!pFollow || pNxt != pFollow->GetFrm()))
{
- // --> FME 2006-05-15 #135914#
+ // #135914#
// The last row of a table only keeps with the next content
// it they are in the same section:
if ( bCheckIfLastRowShouldKeep )
@@ -617,8 +617,8 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
// Wenn durch das Cut&Paste ein leerer SectionFrm entstanden ist, sollte
// dieser automatisch verschwinden.
SwSectionFrm *pSct;
- // --> OD 2006-01-04 #126020# - adjust check for empty section
- // --> OD 2006-02-01 #130797# - correct fix #126020#
+ // #126020# - adjust check for empty section
+ // #130797# - correct fix #126020#
if ( pOldParent && !pOldParent->Lower() &&
( pOldParent->IsInSct() &&
!(pSct = pOldParent->FindSctFrm())->ContainsCntnt() &&
@@ -1725,7 +1725,7 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const
// - correct consideration of table frames
// - use new method <CalcAddLowerSpaceAsLastInTableCell(..)>
if ( ( ( rThis.IsTabFrm() && rThis.GetUpper()->IsInTab() ) ||
- // --> OD 2004-11-16 #115759# - no lower spacing, if frame has a follow
+ // #115759# - no lower spacing, if frame has a follow
( rThis.IsInTab() && !GetFollow() ) ) &&
// <--
!rThis.GetIndNext() )
@@ -2096,7 +2096,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
if ( pFtn && pFtn->IsBackMoveLocked() )
return sal_False;
- // --> OD 2004-11-29 #115759# - text frames, which are directly inside
+ // #115759# - text frames, which are directly inside
// tables aren't allowed to move backward.
if ( rThis.IsTxtFrm() && rThis.IsInTab() )
{
@@ -2181,14 +2181,14 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// Now <pNewUpper> is a previous layout frame, which contains
// content. But the new upper layout frame has to be the next one.
// Thus, hack for issue i14206 no longer needed, but fix for issue 114442
- // --> OD 2006-05-17 #136024# - correct fix for i53139:
+ // #136024# - correct fix for i53139
// Check for wrong page description before using next new upper.
// #i66051# - further correction of fix for i53139
// Check for correct type of new next upper layout frame
- // --> OD 2006-06-08 #136538# - another correction of fix for i53139
+ // #136538# - another correction of fix for i53139
// Assumption, that in all cases <pNewUpper> is a previous
// layout frame, which contains content, is wrong.
- // --> OD 2006-07-05 #136538# - another correction of fix for i53139
+ // #136538# - another correction of fix for i53139
// Beside type check, check also, if proposed new next upper
// frame is inside the same frame types.
// #i73194# - and yet another correction
@@ -2246,11 +2246,11 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// Now <pNewUpper> is a previous layout frame, which
// contains content. But the new upper layout frame
// has to be the next one.
- // --> OD 2006-05-17 #136024# - correct fix for i53139
+ // #136024# - correct fix for i53139
// Check for wrong page description before using next new upper.
// #i66051# - further correction of fix for i53139
// Check for correct type of new next upper layout frame
- // --> OD 2006-07-05 #136538# - another correction of fix for i53139
+ // #136538# - another correction of fix for i53139
// Beside type check, check also, if proposed new next upper
// frame is inside the same frame types.
SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, sal_True );
@@ -2298,11 +2298,11 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
// Now <pNewUpper> is a previous layout frame, which
// contains content. But the new upper layout frame
// has to be the next one.
- // --> OD 2006-05-17 #136024# - correct fix for i53139
+ // #136024# - correct fix for i53139
// Check for wrong page description before using next new upper.
// #i66051# - further correction of fix for i53139
// Check for correct type of new next upper layout frame
- // --> OD 2006-07-05 #136538# - another correction of fix for i53139
+ // #136538# - another correction of fix for i53139
// Beside type check, check also, if proposed new next upper
// frame is inside the same frame types.
// #i71065#
@@ -2436,8 +2436,8 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
else
{
SwSectionFrm* pSectFrm = pNewUpper->FindSctFrm();
- // --> OD 2006-01-04 #126020# - adjust check for empty section
- // --> OD 2006-02-01 #130797# - correct fix #126020#
+ // #126020# - adjust check for empty section
+ // #130797# - correct fix #126020#
if ( pSectFrm && !pSectFrm->IsColLocked() &&
!pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) )
// <--
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 7a8d347..7281540 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1408,7 +1408,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
nRemaining += ((SwSectionFrm*)pFrm)->Undersize();
pFrm = pFrm->GetNext();
}
- // --> OD 2006-02-09 #130878#
+ // #130878#
// Do not keep old height, if content has no height.
// The old height could be wrong due to wrong layout cache
// and isn't corrected in the further formatting, because
@@ -2396,7 +2396,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly,
{
continue;
}
- // --> OD 2004-11-24 #115759# - unlock its position, if anchored
+ // #115759# - unlock its position, if anchored
// object isn't registered at the page, where its anchor
// character text frame is on, respectively if it has no
// anchor character text frame.
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 22eace2..e07d0df 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -212,7 +212,7 @@ void SwFlyInCntFrm::MakeObjPos()
}
}
-// --> OD 2004-12-02 #115759#
+// #115759#
void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid )
{
if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 24a5dce..5092c53 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -273,7 +273,7 @@ SwFrmNotify::~SwFrmNotify()
bool bNotifySize = false;
SwAnchoredObject* pObj = rObjs[i];
SwContact* pContact = ::GetUserCall( pObj->GetDrawObj() );
- // --> OD 2004-12-08 #115759#
+ // #115759#
const bool bAnchoredAsChar = pContact->ObjAnchoredAsChar();
if ( !bAnchoredAsChar )
// <--
@@ -357,7 +357,7 @@ SwFrmNotify::~SwFrmNotify()
SwFlyFrm* pFlyFrm = static_cast<SwFlyFrm*>(pObj);
if ( bNotifySize )
pFlyFrm->_InvalidateSize();
- // --> OD 2004-12-08 #115759# - no invalidation of
+ // #115759# - no invalidation of
// position for as-character anchored objects.
if ( !bAnchoredAsChar )
{
@@ -368,7 +368,7 @@ SwFrmNotify::~SwFrmNotify()
}
else if ( pObj->ISA(SwAnchoredDrawObject) )
{
- // --> OD 2004-12-08 #115759# - no invalidation of
+ // #115759# - no invalidation of
// position for as-character anchored objects.
if ( !bAnchoredAsChar )
{
@@ -656,7 +656,7 @@ SwLayNotify::~SwLayNotify()
SwFlyNotify::SwFlyNotify( SwFlyFrm *pFlyFrm ) :
SwLayNotify( pFlyFrm ),
- // --> OD 2004-11-24 #115759# - keep correct page frame - the page frame
+ // #115759# - keep correct page frame - the page frame
// the Writer fly frame is currently registered at.
pOldPage( pFlyFrm->GetPageFrm() ),
// <--
@@ -2384,7 +2384,7 @@ const SdrObject *SwOrderIter::Prev()
//verboten.
//Unterwegs werden die Flys bei der Seite abgemeldet.
-// --> OD 2004-11-29 #115759# - 'remove' also drawing object from page and
+// #115759# - 'remove' also drawing object from page and
// at-fly anchored objects from page
void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm )
{
@@ -2393,20 +2393,20 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm )
for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i )
{
SwAnchoredObject* pObj = rObjs[i];
- // --> OD 2004-11-29 #115759# - reset member, at which the anchored
+ // #115759# - reset member, at which the anchored
// object orients its vertical position
pObj->ClearVertPosOrientFrm();
// <--
// #i43913#
pObj->ResetLayoutProcessBools();
// <--
- // --> OD 2004-11-29 #115759# - remove also lower objects of as-character
+ // #115759# - remove also lower objects of as-character
// anchored Writer fly frames from page
if ( pObj->ISA(SwFlyFrm) )
{
SwFlyFrm* pFlyFrm = static_cast<SwFlyFrm*>(pObj);
- // --> OD 2004-11-29 #115759# - remove also direct lowers of Writer
+ // #115759# - remove also direct lowers of Writer
// fly frame from page
if ( pFlyFrm->GetDrawObjs() )
{
@@ -2428,7 +2428,7 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm )
}
}
// <--
- // --> OD 2004-11-29 #115759# - remove also drawing objects from page
+ // #115759# - remove also drawing objects from page
else if ( pObj->ISA(SwAnchoredDrawObject) )
{
if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
@@ -2552,7 +2552,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
return bGo ? pStart : NULL;
}
-// --> OD 2004-11-29 #115759# - add also drawing objects to page and at-fly
+// #115759# - add also drawing objects to page and at-fly
// anchored objects to page
void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
{
@@ -2562,11 +2562,11 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
{
SwAnchoredObject* pObj = rObjs[i];
- // --> OD 2004-11-29 #115759# - unlock position of anchored object
+ // #115759# - unlock position of anchored object
// in order to get the object's position calculated.
pObj->UnlockPosition();
// <--
- // --> OD 2004-11-29 #115759# - add also lower objects of as-character
+ // #115759# - add also lower objects of as-character
// anchored Writer fly frames from page
if ( pObj->ISA(SwFlyFrm) )
{
@@ -2579,7 +2579,7 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
pFlyFrm->_InvalidateSize();
pFlyFrm->InvalidatePage( _pPage );
- // --> OD 2004-11-29 #115759# - add also at-fly anchored objects
+ // #115759# - add also at-fly anchored objects
// to page
if ( pFlyFrm->GetDrawObjs() )
{
@@ -2596,7 +2596,7 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
}
}
// <--
- // --> OD 2004-11-29 #115759# - remove also drawing objects from page
+ // #115759# - remove also drawing objects from page
else if ( pObj->ISA(SwAnchoredDrawObject) )
{
if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR)
@@ -3083,7 +3083,7 @@ void Notify_Background( const SdrObject* pObj,
// pFrm->Frm().IsOver( rRect ) ) ) )
// pFrm->InvalidateSize();
// }
- // --> OD 2007-07-24 #128702# - make code robust
+ // #128702# - make code robust
if ( pPage && pPage->GetSortedObjs() )
// <--
{
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 6686dfa..f8b0091 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1322,7 +1322,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
prPage = (SwPageFrm*)prPage->GetPrev();
}
}
- // --> OD 2005-04-25 #121980# - no shortcut, if at previous page
+ // #121980# - no shortcut, if at previous page
// an anchored object is registered, whose anchor is <pCntnt>.
else if ( prPage->GetPrev() &&
static_cast<SwPageFrm*>(prPage->GetPrev())->GetSortedObjs() )
@@ -2406,7 +2406,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
SwRect aTmp( pSh->VisArea() );
pSh->UISizeNotify();
- // --> FME 2006-08-03 #137134#
+ // #137134#
// Are we supposed to crash if pSh isn't a cursor shell?!
// bActions |= aTmp != pSh->VisArea() ||
// aBools[nBoolIdx] != ((SwCrsrShell*)pSh)->GetCharRect().IsOver(
pSh->VisArea() );
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index de11892..74a0a45 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -630,7 +630,7 @@ sal_Bool SwLayHelper::CheckInsertPage()
const SwAttrSet* pAttr = rpFrm->GetAttrSet();
const SvxFmtBreakItem& rBrk = pAttr->GetBreak();
const SwFmtPageDesc& rDesc = pAttr->GetPageDesc();
- // --> FME 2004-10-26 #118195# Do not evaluate page description if frame
+ // #118195# Do not evaluate page description if frame
// is a follow frame!
const SwPageDesc* pDesc = rpFrm->IsFlowFrm() &&
SwFlowFrm::CastFlowFrm( rpFrm )->IsFollow() ?
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index 2b63d7e..8bd035e 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -89,7 +89,7 @@ bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm
SwIterator<SwTxtFrm,SwTxtNode> aFrmIter( *rEntry.first );
for( SwTxtFrm* pTxtFrm = aFrmIter.First(); pTxtFrm; pTxtFrm =
(SwTxtFrm*)aFrmIter.Next() )
{
- // --> OD 2004-12-03 #115759# - assure that found text frame
+ // #115759# - assure that found text frame
// is the first one.
if ( _rRowFrm.IsAnLower( pTxtFrm ) && !pTxtFrm->GetIndPrev() )
// <--
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 8afe162..02dee54 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -534,7 +534,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
SwDoc* pDoc = pFmt->GetDoc();
SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, sal_True, sal_False );
- // --> FME 2005-05-25 #123067# pNode = 0 can really happen:
+ // #123067# pNode = 0 can really happen
SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0;
// <--
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx
b/sw/source/core/layout/objectformatterlayfrm.cxx
index e52c7e9..2ee7f71 100644
--- a/sw/source/core/layout/objectformatterlayfrm.cxx
+++ b/sw/source/core/layout/objectformatterlayfrm.cxx
@@ -34,7 +34,7 @@
#include <layfrm.hxx>
#include <pagefrm.hxx>
-// --> OD 2005-07-13 #124218#
+// #124218#
#include <layact.hxx>
// <--
@@ -93,7 +93,7 @@ bool SwObjectFormatterLayFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
{
_FormatObj( _rAnchoredObj );
- // --> OD 2005-07-13 #124218# - consider that the layout action has to be
+ // #124218# - consider that the layout action has to be
// restarted due to a deleted page frame.
return GetLayAction() ? !GetLayAction()->IsAgain() : true;
// <--
@@ -133,7 +133,7 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()
return true;
}
- // --> OD 2005-07-13 #124218# - consider, if the layout action
+ // #124218# - consider, if the layout action
// has to be restarted due to a delete of a page frame.
if ( GetLayAction() && GetLayAction()->IsAgain() )
{
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index fdf8997..a94fdf3 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -224,7 +224,7 @@ const SwTxtFmtColl* SwPageDesc::GetRegisterFmtColl() const
void SwPageDesc::RegisterChange()
{
- // --> OD 2004-06-15 #117072# - During destruction of the document <SwDoc>
+ // #117072# - During destruction of the document <SwDoc>
// the page description is modified. Thus, do nothing, if the document
// is in destruction respectively if no viewshell exists.
SwDoc* pDoc = GetMaster().GetDoc();
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3b64c28..13cb0bf 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -321,7 +321,7 @@ class SwSavePaintStatics
*pSFlyOnlyDraw;
SwLineRects *pSLines;
SwSubsRects *pSSubsLines;
- // --> OD 2005-07-04 #123196#
+ // #123196#
SwSubsRects* pSSpecSubsLines;
// <--
SfxProgress *pSProgress;
@@ -348,7 +348,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
pSFlyOnlyDraw ( pFlyOnlyDraw ),
pSLines ( pLines ),
pSSubsLines ( pSubsLines ),
- // --> OD 2005-07-04 #123196#
+ // #123196#
pSSpecSubsLines ( pSpecSubsLines ),
// <--
pSProgress ( pProgress ),
@@ -374,7 +374,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
aEdgeScale = 0.5;
pLines = 0;
pSubsLines = 0;
- // --> OD 2005-07-04 #123196#
+ // #123196#
pSpecSubsLines = 0L;
// <--
pProgress = 0;
@@ -390,7 +390,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pFlyOnlyDraw = pSFlyOnlyDraw;
pLines = pSLines;
pSubsLines = pSSubsLines;
- // --> OD 2005-07-04 #123196#
+ // #123196#
pSpecSubsLines = pSSpecSubsLines;
// <--
pProgress = pSProgress;
@@ -6441,7 +6441,7 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
rBack.GetGraphicPos() == GPOS_NONE &&
!pOpt->IsPagePreview() &&
!pOpt->IsReadonly() &&
- // --> FME 2004-06-29 #114856# Formular view
+ // #114856# Formular view
!pOpt->IsFormView() &&
// <--
SwViewOption::IsIndexShadings() &&
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index f2a28d1..d1c97a2 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -347,7 +347,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
//In den Baum einhaengen.
SwSectionFrm* pSect = pParent->FindSctFrm();
- // --> OD 2008-06-23 #156927#
+ // #156927#
// Assure that parent is not inside a table frame, which is inside the found section frame.
if ( pSect )
{
@@ -1411,8 +1411,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
FormatWidthCols( *pAttr, nRemaining, MINLAY );
}
// <--
- // --> OD 2006-01-04 #126020# - adjust check for empty section
- // --> OD 2006-02-01 #130797# - correct fix #126020#
+ // #126020# - adjust check for empty section
+ // #130797# - correct fix #126020#
while( HasFollow() && !GetFollow()->ContainsCntnt() &&
!GetFollow()->ContainsAny( true ) )
// <--
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 4b6f443..603b1d3 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -313,7 +313,7 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm,
// due to the movement
SwObjPositioningInProgress aObjPosInProgress( *pAnchoredObj );
pAnchoredObj->SetObjLeft( _pPageFrm->Frm().Right() );
- // --> OD 2004-11-24 #115759# - reset character rectangle,
+ // #115759# - reset character rectangle,
// top of line and relative position in order to assure,
// that anchored object is correctly positioned.
pAnchoredObj->ClearCharRectAndTopOfLine();
@@ -430,7 +430,7 @@ void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
SwRowFrm* pTmpSourceRow = (SwRowFrm*)pCurrSourceCell->Lower();
while ( pTmpSourceRow )
{
- // --> FME 2006-01-10 #125926# Achtung! It is possible,
+ // #125926# Achtung! It is possible,
// that pTmpSourceRow->IsFollowFlowRow() but pTmpDestRow
// cannot be found. In this case, we have to move the complete
// row.
@@ -720,7 +720,7 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
// Do the recalculation
//
lcl_RecalcRow( rLastLine, LONG_MAX );
- // --> OD 2004-11-23 #115759# - force a format of the last line in order to
+ // #115759# - force a format of the last line in order to
// get the correct height.
rLastLine.InvalidateSize();
rLastLine.Calc();
@@ -910,7 +910,7 @@ bool SwTabFrm::RemoveFollowFlowLine()
// this flag is set.
SetFollowFlowLine( sal_False );
- // --> FME 2007-07-19 #140081# Make code robust.
+ // #140081# Make code robust.
if ( !pFollowFlowLine || !pLastLine )
return true;
@@ -1509,7 +1509,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
while ( pCnt && pDontLeave->IsAnLower( pCnt ) )
{
- // --> OD 2004-11-23 #115759# - check, if a format of content frame is
+ // #115759# - check, if a format of content frame is
// possible. Thus, 'copy' conditions, found at the beginning of
// <SwCntntFrm::MakeAll(..)>, and check these.
const bool bFormatPossible = !pCnt->IsJoinLocked() &&
@@ -1601,7 +1601,7 @@ sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm,
( !_bOnlyRowsAndCells || pFrm->IsRowFrm() || pFrm->IsCellFrm() ) )
// <--
{
- // --> FME 2006-02-23 #130744# An invalid locked table frame will
+ // #130744# An invalid locked table frame will
// not be calculated => It will not become valid =>
// Loop in lcl_RecalcRow(). Therefore we do not consider them for bRet.
bRet |= !pFrm->IsValid() && ( !pFrm->IsTabFrm() ||
!static_cast<SwTabFrm*>(pFrm)->IsJoinLocked() );
@@ -1673,7 +1673,7 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
if( bCheck )
{
- // --> OD 2004-11-23 #115759# - force another format of the
+ // #115759# - force another format of the
// lowers, if at least one of it was invalid.
bCheck = SwCntntFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true );
// <--
@@ -1922,7 +1922,7 @@ void SwTabFrm::MakeAll()
// table rows.
bool bTryToSplit = true;
- // --> FME 2006-02-16 #131283#
+ // #131283#
// Indicates that two individual rows may keep together, based on the keep
// attribute set at the first paragraph in the first cell.
const bool bTableRowKeep = !bDontSplit &&
GetFmt()->GetDoc()->get(IDocumentSettingAccess::TABLE_ROW_KEEP);
@@ -2485,7 +2485,7 @@ void SwTabFrm::MakeAll()
RemoveFollowFlowLine();
}
- // --> FME 2005-02-10 #119477#
+ // #119477#
// If splitting the table was successfull or not,
// we do not want to have 'empty' follow tables.
if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() )
@@ -2756,7 +2756,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
// table isn't lower of fly
!pFly->IsAnLower( this ) &&
// fly is lower of fly, the table is in
- // --> OD 2005-05-31 #123274# - correction:
+ // #123274# - correction
// assure that fly isn't a lower of a fly, the table isn't in.
// E.g., a table in the body doesn't wrap around a graphic,
// which is inside a frame.
@@ -2778,7 +2778,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
const SwFrm* pThisHeaderFooterFrm = FindFooterOrHeader();
if ( pFlyHeaderFooterFrm != pThisHeaderFooterFrm &&
- // --> FME 2007-07-02 #148493# If bConsiderWrapOnObjPos is set,
+ // #148493# If bConsiderWrapOnObjPos is set,
// we want to consider the fly if it is located in the header and
// the table is located in the body:
( !bConsiderWrapOnObjPos || 0 != pThisHeaderFooterFrm ||
!pFlyHeaderFooterFrm->IsHeaderFrm() ) )
@@ -3560,7 +3560,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
&r
// <--
SwTwips nTmpHeight = CalcHeightOfFirstContentLine();
- // --> FME 2005-01-17 #118840#
+ // #118840#
// For some mysterious reason, I changed the good old
// 'return nHeight <= nSpace' to 'return nTmpHeight < nSpace'.
// This obviously results in problems with table frames in
@@ -3639,8 +3639,8 @@ void SwTabFrm::Cut()
{
OSL_ENSURE( !pUp->IsFtnFrm(), "Tabelle in Fussnote." );
SwSectionFrm *pSct = 0;
- // --> OD 2006-01-04 #126020# - adjust check for empty section
- // --> OD 2006-02-01 #130797# - correct fix #126020#
+ // #126020# - adjust check for empty section
+ // #130797# - correct fix #126020#
if ( !pUp->Lower() && pUp->IsInSct() &&
!(pSct = pUp->FindSctFrm())->ContainsCntnt() &&
!pSct->ContainsAny( true ) )
@@ -4279,7 +4279,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
SwIterator<SwRowFrm,SwFmt> aIter( *pPrevTabLine->GetFrmFmt() );
for ( SwRowFrm* pRow = aIter.First(); pRow; pRow = aIter.Next() )
{
- // --> OD 2004-11-23 #115759# - do *not* take repeated
+ // #115759# - do *not* take repeated
// headlines, because during split of table it can be
// invalid and thus can't provide correct border values.
if ( pRow->GetTabLine() == pPrevTabLine &&
@@ -4879,7 +4879,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva )
if ( pFly->IsFlyInCntFrm() )
{
static_cast<SwFlyInCntFrm*>(pFly)->AddRefOfst( lDiff );
- // --> OD 2004-12-02 #115759# - reset current relative
+ // #115759# - reset current relative
// position to get re-positioned, if not directly moved.
if ( !bDirectMove )
{
@@ -4899,7 +4899,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva )
// a follow table and table frame isn't in its
// rebuild of last line.
const SwTabFrm* pTabFrm = pLay->FindTabFrm();
- // --> OD 2004-11-23 #115759#
+ // #115759#
// - save: check, if table frame is found.
if ( pTabFrm &&
!( pTabFrm->IsFollow() &&
@@ -5187,10 +5187,10 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
SwPageFrm* pPg = 0;
if ( !FindTabFrm()->IsRebuildLastLine() && text::VertOrientation::NONE != rOri.GetVertOrient()
&&
- // --> OD 2008-07-16 #158225# no vertical alignment of covered cells
+ // #158225# no vertical alignment of covered cells
!IsCoveredCell() &&
// <--
- // --> FME 2004-06-29 #116532# Do not consider vertical alignment in grid mode
+ // #116532# Do not consider vertical alignment in grid mode
!(pPg = FindPageFrm())->HasGrid() )
// <--
{
@@ -5479,7 +5479,7 @@ sal_uInt16 SwTabFrm::GetBottomLineSize() const
const SwFrm* pTmp = GetLastLower();
- // --> FME 2005-12-07 #124755# Try to make code robust:
+ // #124755# Try to make code robust
if ( !pTmp ) return 0;
// <--
@@ -5569,7 +5569,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
// #i26831#, #i26520#
// The additional lower space of the current last.
- // --> OD 2004-11-25 #115759# - do *not* consider the
+ // #115759# - do *not* consider the
// additional lower space for 'master' text frames
if ( pLast && pLast->IsFlowFrm() &&
( !pLast->IsTxtFrm() ||
@@ -5579,7 +5579,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
nReal +=
SwFlowFrm::CastFlowFrm(pLast)->CalcAddLowerSpaceAsLastInTableCell();
}
// Don't forget the upper space and lower space,
- // --> OD 2004-11-25 #115759# - do *not* consider the upper
+ // #115759# - do *not* consider the upper
// and the lower space for follow text frames.
if ( pTmp->IsFlowFrm() &&
( !pTmp->IsTxtFrm() ||
@@ -5589,7 +5589,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine )
nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcLowerSpace();
}
// <--
- // --> OD 2004-11-25 #115759# - consider additional lower
+ // #115759# - consider additional lower
// space of <pTmp>, if contains only one line.
// In this case it would be the new last text frame, which
// would have no follow and thus would add this space.
@@ -5738,7 +5738,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
}
}
- // --> FME 2004-11-18 #118411#
+ // #118411#
// Optimization: lcl_CalcHeightOfFirstContentLine actually can trigger
// a formatting of the row frame (via the GetFormatted()). We don't
// want this formatting if the row does not have a height.
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index cacb1d5..d41a310 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1429,7 +1429,7 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
|*
|*************************************************************************/
-// --> OD 2005-05-25 #123110# - helper class to disable creation of an action
+// #123110# - helper class to disable creation of an action
// by a callback event - e.g., change event from a drawing object
class DisableCallbackAction
{
@@ -1456,7 +1456,7 @@ class DisableCallbackAction
//JP 11.10.2001: only in tables we try to find the right column - Bug 72294
Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, sal_Bool bNext ) const
{
- // --> OD 2005-05-25 #123110# - disable creation of an action by a callback
+ // #123110# - disable creation of an action by a callback
// event during processing of this method. Needed because formatting is
// triggered by this method.
DisableCallbackAction aDisableCallbackAction( *this );
@@ -1837,7 +1837,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
}
}
- // --> FME 2008-01-14 #151012# Made code robust here:
+ // #151012# Made code robust here
const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode();
const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(sal_False);
@@ -2459,7 +2459,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode )
const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm();
SwRect aPrvRect;
- // --> OD 2006-01-24 #123908# - introduce robust code:
+ // #123908# - introduce robust code
// The stacktrace issue reveals that <pCntnt> could be NULL.
// One root cause found by AMA - see #130650#
OSL_ENSURE( pCntnt,
@@ -2502,7 +2502,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode )
}
}
pCntnt = pCntnt->GetNextCntntFrm();
- // --> OD 2006-01-24 #123908#
+ // #123908#
OSL_ENSURE( pCntnt,
"<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious
defect -> please inform OD" );
// <--
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 5a39bfb..8295077 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1032,8 +1032,8 @@ void SwCntntFrm::Cut()
// This can happen due to the new cell split feature.
!pUp->IsCellFrm() &&
// <--
- // --> OD 2006-01-04 #126020# - adjust check for empty section
- // --> OD 2006-02-01 #130797# - correct fix #126020#
+ // #126020# - adjust check for empty section
+ // #130797# - correct fix #126020#
!(pSct = pUp->FindSctFrm())->ContainsCntnt() &&
!pSct->ContainsAny( true ) ) ) )
// <--
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index faebd03..c3357c8 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1524,7 +1524,7 @@ SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx )
if ( pCNd || pTblNd )
{
SwModify* pModify = pCNd;
- // --> FME 2007-3-26 #144862# Better handling of table in table:
+ // #144862# Better handling of table in table
if ( pTblNd && pTblNd->GetTable().GetFrmFmt() )
pModify = pTblNd->GetTable().GetFrmFmt();
// <--
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 05d91b8..091bd7f 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -486,7 +486,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
//In Tabellenzellen kann ich mir evtl. noch ein wenig dazuholen, weil
//durch eine vertikale Ausrichtung auch oben noch Raum sein kann.
- // --> OD 2004-11-25 #115759# - assure, that first lower in upper
+ // #115759# - assure, that first lower in upper
// is the current one or is valid.
if ( IsInTab() &&
( GetUpper()->Lower() == this ||
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index b970ca6..5c8da70 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1669,7 +1669,7 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
}
}
- // --> FME 2006-01-13 #130210# Check if character *behind* the portion has
+ // #130210# Check if character *behind* the portion has
// to become the hook:
if ( i == nEnd && i < GetTxt().Len() && bNumFound )
{
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 7f7fd40..903cf26 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1346,7 +1346,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
SwTabPortion* pLastTabPortion = rInf.GetLastTab();
if ( pLastTabPortion && cChar == rInf.GetTabDecimal() )
{
- // --> FME 2005-12-19 #127428# Abandon dec. tab position if line is full:
+ // #127428# Abandon dec. tab position if line is full
// We have a decimal tab portion in the line and the next character has to be
// aligned at the tab stop position. We store the width from the beginning of
// the tab stop portion up to the portion containint the decimal separator:
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index de0b19d..62c40a0 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -773,7 +773,7 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm )
{
mbIgnoreCurrentFrame = sal_False;
mbIgnoreContour = sal_False;
- // --> OD 2004-12-17 #118809#
+ // #118809#
mbIgnoreObjsInHeaderFooter = sal_False;
// <--
pPage = pFrm->FindPageFrm();
@@ -1287,7 +1287,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
pTmp = GetVirtualUpper( pTmp, aPos );
}
// #i26945#
- // --> OD 2004-11-29 #115759#
+ // #115759#
// If <pTmp> is a text frame inside a table, take the upper
// of the anchor frame, which contains the anchor position.
else if ( pTmp->IsTxtFrm() && pTmp->IsInTab() )
@@ -2058,7 +2058,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly,
OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
"SwTxtFly::CalcRightMargin with swapped frame" );
SWRECTFN( pCurrFrm )
- // --> OD 2004-12-14 #118796# - correct determination of right of printing area
+ // #118796# - correct determination of right of printing area
SwTwips nRight = (pCurrFrm->*fnRect->fnGetPrtRight)();
// <--
SwTwips nFlyRight = (rFly.*fnRect->fnGetRight)();
@@ -2162,7 +2162,7 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly,
OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
"SwTxtFly::CalcLeftMargin with swapped frame" );
SWRECTFN( pCurrFrm )
- // --> OD 2004-12-14 #118796# - correct determination of left of printing area
+ // #118796# - correct determination of left of printing area
SwTwips nLeft = (pCurrFrm->*fnRect->fnGetPrtLeft)();
// <--
const SwTwips nFlyLeft = (rFly.*fnRect->fnGetLeft)();
@@ -2211,7 +2211,7 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly,
if( (aTmp.*fnRect->fnGetLeft)() < nFlyLeft && aTmp.IsOver( aLine ) )
{
- // --> OD 2004-12-14 #118796# - no '+1', because <..fnGetRight>
+ // #118796# - no '+1', because <..fnGetRight>
// returns the correct value.
SwTwips nTmpRight = (aTmp.*fnRect->fnGetRight)();
if ( nLeft <= nTmpRight )
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index e317c27..4a0fc91 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -505,7 +505,7 @@ void SwTxtFrm::HideFootnotes( xub_StrLen nStart, xub_StrLen nEnd )
}
}
-// --> OD 2005-03-30 #120729# - hotfix: WW8 documents contain at its end hidden,
+// #120729# - hotfix
// as-character anchored graphics, which are used for a graphic bullet list.
// As long as these graphic bullet list aren't imported, do not hide a
// at-character anchored object, if
@@ -589,7 +589,7 @@ void SwTxtFrm::HideAndShowObjects()
{
SdrObject* pObj = (*GetDrawObjs())[i]->DrawObj();
SwContact* pContact = static_cast<SwContact*>(pObj->GetUserCall());
- // --> OD 2005-03-30 #120729# - hotfix: do not hide object
+ // #120729# - hotfix
// under certain conditions
const RndStdIds eAnchorType( pContact->GetAnchorId() );
const xub_StrLen nObjAnchorPos = pContact->GetCntntAnchorIndex().GetIndex();
@@ -618,7 +618,7 @@ void SwTxtFrm::HideAndShowObjects()
{
SdrObject* pObj = (*GetDrawObjs())[i]->DrawObj();
SwContact* pContact = static_cast<SwContact*>(pObj->GetUserCall());
- // --> OD 2005-03-30 #120729# - determine anchor type only once
+ // #120729# - determine anchor type only once
const RndStdIds eAnchorType( pContact->GetAnchorId() );
// <--
@@ -633,7 +633,7 @@ void SwTxtFrm::HideAndShowObjects()
xub_StrLen nHiddenEnd;
xub_StrLen nObjAnchorPos = pContact->GetCntntAnchorIndex().GetIndex();
SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart,
nHiddenEnd, 0 );
- // --> OD 2005-03-30 #120729# - hotfix: do not hide object
+ // #120729# - hotfix
// under certain conditions
if ( nHiddenStart != STRING_LEN && bShouldBeHidden &&
lcl_HideObj( *this, eAnchorType, nObjAnchorPos, (*GetDrawObjs())[i] ) )
@@ -2779,7 +2779,7 @@ void SwTxtFrm::CalcBaseOfstForFly()
SwTxtFly aTxtFly( this );
aTxtFly.SetIgnoreCurrentFrame( sal_True );
aTxtFly.SetIgnoreContour( sal_True );
- // --> OD 2004-12-17 #118809# - ignore objects in page header|footer for
+ // #118809# - ignore objects in page header|footer for
// text frames not in page header|footer
aTxtFly.SetIgnoreObjsInHeaderFooter( sal_True );
// <--
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index b2e8404..fa53227 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -288,7 +288,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
if ( bAuto )
{
if ( SVX_TAB_ADJUST_DECIMAL == eAdj &&
- // --> FME 2005-12-19 #127428#
+ // #127428#
1 == aLineInf.NumberOfTabStops() )
// <--
pTabPor = new SwAutoTabDecimalPortion( nNewTabPos, cDec, cFill );
@@ -467,7 +467,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
// Wir muessen aufpassen, dass wir nicht endlos schleifen,
// wenn die Breite kleiner ist, als ein Blank ...
if( rInf.GetIdx() == rInf.GetLineStart() &&
- // --> FME 2005-01-19 #119175# TabStop should be forced to current
+ // #119175# TabStop should be forced to current
// line if there is a fly reducing the line width:
!rInf.GetFly() )
// <--
@@ -516,7 +516,7 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
OSL_ENSURE( POR_TABLEFT != nWhich, "SwTabPortion::PostFormat: already formatted" );
const bool bTabCompat =
rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
- // --> FME 2005-12-19 #127428# Abandon dec. tab position if line is full:
+ // #127428# Abandon dec. tab position if line is full
if ( bTabCompat && POR_TABDECIMAL == nWhich )
{
KSHORT nPrePorWidth = static_cast<const
SwTabDecimalPortion*>(this)->GetWidthOfPortionsUpToDecimalPosition();
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 74d5408..e61c5ff 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -328,7 +328,7 @@ void SwTxtFld::Expand() const
const sal_uInt16 nWhich = pFld->GetTyp()->Which();
if( RES_CHAPTERFLD != nWhich && RES_PAGENUMBERFLD != nWhich &&
RES_REFPAGEGETFLD != nWhich &&
- // --> FME 2005-05-23 #122919# Page count fields to not use aExpand
+ // #122919# Page count fields to not use aExpand
// during formatting, therefore an invalidation of the text frame
// has to be triggered even if aNewExpand == aExpand:
( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast<const
SwDocStatField*>(pFld)->GetSubType() ) &&
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 84c2283..64dba45 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2640,7 +2640,7 @@ sal_Bool SwTxtNode::HasBullet() const
}
// <- #i29560#
-// --> OD 2005-11-17 #128041# - introduce parameter <_bInclPrefixAndSuffixStrings>
+// #128041# - introduce parameter <_bInclPrefixAndSuffixStrings>
//i53420 added max outline parameter
XubString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings, const unsigned int
_nRestrictToThisLevel ) const
{
@@ -3493,7 +3493,7 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem*
pNewVal
SwCntntNode::Modify( pOldValue, pNewValue );
SwDoc * pDoc = GetDoc();
- // --> OD 2005-11-02 #125329# - assure that text node is in document nodes array
+ // #125329# - assure that text node is in document nodes array
if ( pDoc && !pDoc->IsInDtor() && &pDoc->GetNodes() == &GetNodes() )
// <--
{
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 8133e18..243d161 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -95,7 +95,7 @@ class SwEditRegionDlg : public SfxModalDialog
FixedText aConditionFT;
ConditionEdit aConditionED;
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // #114856# edit in readonly sections
FixedLine aPropertiesFL;
TriStateBox aEditInReadonlyCB;
// <--
@@ -133,7 +133,7 @@ class SwEditRegionDlg : public SfxModalDialog
DECL_LINK( ChangePasswdHdl, Button * );
DECL_LINK( ChangeProtectHdl, TriStateBox * );
DECL_LINK( ChangeHideHdl, TriStateBox * );
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // #114856# edit in readonly sections
DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * );
// <--
DECL_LINK( ChangeDismissHdl, CheckBox * );
@@ -183,7 +183,7 @@ class SwInsertSectionTabPage : public SfxTabPage
FixedText aConditionFT;
ConditionEdit aConditionED;
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // #114856# edit in readonly sections
FixedLine aPropertiesFL;
CheckBox aEditInReadonlyCB;
// <--
@@ -199,7 +199,7 @@ class SwInsertSectionTabPage : public SfxTabPage
Window* m_pOldDefDlgParent;
DECL_LINK( ChangeHideHdl, CheckBox * );
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // #114856# edit in readonly sections
DECL_LINK( ChangeEditInReadonlyHdl, CheckBox * );
// <--
DECL_LINK( ChangeProtectHdl, CheckBox * );
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index aaabce9..b0410d6 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -357,7 +357,7 @@ short SwOutlineTabDialog::Ok()
// geschehen, um evtl. aufgehobene Zuordnungen
// auch wieder zu loeschen
- // --> OD 2006-12-11 #130443#
+ // #130443#
// encapsulate changes into a action to avoid effects on the current cursor
// position during the changes.
rWrtSh.StartAction();
@@ -1044,7 +1044,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
pVDev->SetFont(aStdFont);
if(pActNum->IsContinusNum())
aNumVector[nLevel] = nPreNum;
- // --> OD 2005-11-17 #128041#
+ // #128041#
String aText(pActNum->MakeNumString( aNumVector ));
// <--
pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
@@ -1150,7 +1150,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
pVDev->SetFont(aStdFont);
if(pActNum->IsContinusNum())
aNumVector[nLevel] = nPreNum;
- // --> OD 2005-11-17 #128041#
+ // #128041#
String aText(pActNum->MakeNumString( aNumVector ));
// <--
pVDev->DrawText( Point(nXStart, nYStart), aText );
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index a3fe8af..3e24f69 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -900,7 +900,7 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
case SID_PASTE_SPECIAL:
rSet.DisableItem( SID_PASTE_SPECIAL );
break;
- // --> OD 2008-06-20 #151110#
+ // #151110#
case SID_CLIPBOARD_FORMAT_ITEMS:
rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
break;
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 2d826fe..5b22912 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -212,7 +212,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
else
{
- // --> OD 2005-02-09 #119353# - robust
+ // #119353# - robust
const GraphicObject* pGrfObj = rSh.GetGraphicObj();
if ( pGrfObj )
{
@@ -496,7 +496,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
case SID_GRFFILTER_SOLARIZE:
if( GRAPHIC_BITMAP == nGrfType )
{
- // --> OD 2005-02-09 #119353# - robust
+ // #119353# - robust
const GraphicObject* pFilterObj( GetShell().GetGraphicObj() );
if ( pFilterObj )
{
@@ -622,7 +622,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
case SID_ATTR_GRAF_TRANSPARENCE:
if( !bParentCntProt )
{
- // --> OD 2005-02-09 #119353# - robust
+ // #119353# - robust
const GraphicObject* pGrfObj = rSh.GetGraphicObj();
if ( pGrfObj )
{
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 41a2837..ec54c23 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2574,7 +2574,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
bStateChanged = true;
}
- // --> FME 2005-05-23 #122919# Force field update before PDF export:
+ // #122919# Force field update before PDF export
pViewShell->ViewShell::UpdateFlds(sal_True);
// <--
if( bStateChanged )
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index da13600..d3f8be6 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -34,7 +34,7 @@
#include <crsskip.hxx>
#include <swcrsr.hxx>
#include <editeng/lrspitem.hxx> // #i23725#
-// --> OD 2006-07-10 #134369#
+// #134369#
#include <view.hxx>
#include <drawbase.hxx>
// <--
@@ -385,11 +385,11 @@ long SwWrtShell::DelRight()
LeaveSelFrmMode();
UnSelectFrm();
- // --> OD 2006-07-06 #134369#
+ // #134369#
OSL_ENSURE( !IsFrmSelected(),
"<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all
objects" );
// <--
- // --> OD 2006-07-10 #134369#
+ // #134369#
// leave draw mode, if necessary.
{
if (GetView().GetDrawFuncPtr())
@@ -405,7 +405,7 @@ long SwWrtShell::DelRight()
// <--
}
- // --> OD 2006-07-07 #134369#
+ // #134369#
// <IsFrmSelected()> can't be true - see above.
// <--
{
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index efe7882..b891b62 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1083,7 +1083,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
// retrieve numbering rule at paragraph
// style, which is found at current cursor position in the document.
SwNumRule* pCollRule = pDoc->FindNumRulePtr(pColl->GetNumRule().GetValue());
- // --> OD 2005-10-25 #125993# - The outline numbering rule isn't allowed
+ // #125993# - The outline numbering rule isn't allowed
// to be derived from a parent paragraph style to a derived one.
// Thus check, if the found outline numbering rule is directly
// set at the paragraph style <pColl>. If not, set <pCollRule> to NULL
@@ -1411,7 +1411,7 @@ void SwWrtShell::NumOrBulletOff()
DelNumRules();
}
- // --> OD 2005-10-24 #126346# - Cursor can not be anymore in front of
+ // #126346# - Cursor can not be anymore in front of
// a label, because numbering/bullet is switched off.
SetInFrontOfLabel( sal_False );
// <--
--
1.7.0.4
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.