diff options
151 files changed, 1008 insertions, 1049 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 0f1c44b38307..986a8011db04 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 d3d41c36ee40..c48644e2d95f 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 53a449e7e804..5baa14d07ee9 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 67a0110000c6..4a3827b4e637 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 03ccf0e71bad..6f259e81a128 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 270385c63bbb..c4fa4faed5ce 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 a91ccd2ee847..8315d5f2a51b 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 712670302367..56ff58e60805 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 9d26aaac80c9..b938c19ec3a8 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 7bd158d3be87..5b81801c75ef 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 69c070ab3d20..7070d039074b 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 f6f5946cb7a4..7227f2e5feab 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 b184b636162b..ec91aca54b3f 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 bbd8bc4ee608..0fbc8285764b 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 62b9560151c6..fd763effd264 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 6ed12fd4cce5..79bf115c21dc 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 d00e8d6415c8..892dfbaaf789 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 a5d12082f8fd..0ec02518522c 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 a17567e7d04f..233d9fa2bb0b 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 26521624abb7..3f2ed93fc2b2 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 d1b6e3783cfd..58b631fdefd6 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 b47d1a1c134c..7071f302ee89 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 4827627f6ef1..632936a09f37 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 14df0bd9749e..afe1661655e5 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 5f1b07d5315d..c591561d94ff 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 e597cac10d02..ea47c6348526 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 5f428d85c4f9..d9f4c6a6d840 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 f4b54f774903..992808d2b3ae 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 cf340a808417..16ec23302efb 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 2035ac97fc38..04fa0e1e2eb2 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 8662286726de..aa03137a0b71 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 0661ae227dbc..64080095b14b 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 693fe638532a..4d8504d20028 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 90d74a24a380..43d0aa70e082 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 7de8f0727ee1..93f2ec6a42f5 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 b1d1c75b54a7..a02e2417a11f 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 849603e2b534..22d69b4b536d 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 66a2f6d36662..5f6a3e94b84e 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 773c4eca68b7..648562c810ee 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 e0ff55d151e4..093ff61af563 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 d8c3abb0346d..5250146a7177 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 40e0df831408..1555650c93df 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 b6f3afbe6081..b561953a30f3 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 c00f394c9a83..472aff9a9bd7 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 d33b6e009753..6dc2644f10fd 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 5d3c7924531e..8a58d4b49df8 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 349dd62c74c8..5ff293e1084f 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 5e9aa78fdb59..b8f5532dbb9f 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 c393b09e31ef..eab05147222e 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 bff79f067074..6a1c04ed579f 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(); @@ -405,7 +405,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) if ( pLay->IsInFtn() ) pLay = pLay->FindFtnFrm(); - // --> OD 2006-05-08 #i58846# + // #i58846# // <pPrepare( PREP_QUOVADIS )> only for frames in footnotes if( pStart->IsInFtn() ) { @@ -594,7 +594,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) if ( pPre ) { pPre->SetRetouche(); - // --> OD 2004-11-23 #115759# - follow-up of #i26250# + // #115759# - follow-up of #i26250# // invalidate printing area of previous frame, if it's in a table if ( pPre->GetUpper()->IsInTab() ) { @@ -812,7 +812,7 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd ) if ( IsInFtn() ) return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage ); - // --> OD 2005-08-16 #i53323# + // #i53323# // A frame could be inside a table AND inside a section. // Thus, it has to be determined, which is the first parent. bool bInTab( IsInTab() ); @@ -993,7 +993,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) const ViewShell *pSh = getRootFrm()->GetCurrShell(); // #111704# The pagedesc check does not make sense for frames in fly frames if ( pNew != FindPageFrm() && !bNewPg && !IsInFly() && - // --> FME 2005-05-10 #i46683# + // #i46683# // Do not consider page descriptions in browse mode (since // MoveBwd ignored them) !(pSh && pSh->GetViewOptions()->getBrowseMode() ) ) @@ -1140,16 +1140,16 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const pPreUp->GetUpper()->GetUpper()->IsSctFrm() ) pPreUp = pPreUp->GetUpper()->GetUpper()->GetUpper(); } - // --> OD 2004-10-15 #i26945# - re-factoring: + // #i26945# - re-factoring // use <GetVertPosOrientFrm()> to determine, if object has followed the // text flow to the next layout frame for ( sal_uInt16 i = 0; i < pPre->GetDrawObjs()->Count(); ++i ) { - // --> OD 2004-07-01 #i28701# - consider changed type of + // #i28701# - consider changed type of // <SwSortedObjs> entries. const SwAnchoredObject* pObj = (*pPre->GetDrawObjs())[i]; // OD 2004-01-20 #110582# - do not consider hidden objects - // --> OD 2004-10-15 #i26945# - do not consider object, which + // #i26945# - do not consider object, which // doesn't follow the text flow. if ( pObj->GetFrmFmt().GetDoc()->IsVisibleLayerId( pObj->GetDrawObj()->GetLayer() ) && @@ -1454,7 +1454,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // values of found previous frame and use these values. SwTwips nPrevLowerSpace = 0; SwTwips nPrevLineSpacing = 0; - // --> OD 2009-08-28 #i102458# + // #i102458# bool bPrevLineSpacingPorportional = false; GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, @@ -1484,7 +1484,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // building its maximum. if ( pOwn->IsTxtFrm() ) { - // --> OD 2009-08-28 #i102458# + // #i102458# // Correction: // A proportional line spacing of the previous text frame // is added up to a own leading line spacing. @@ -1531,7 +1531,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, SwTwips nAdd = nPrevLineSpacing; if ( pOwn->IsTxtFrm() ) { - // --> OD 2009-08-28 #i102458# + // #i102458# // Correction: // A proportional line spacing of the previous text frame // is added up to a own leading line spacing. @@ -1650,7 +1650,7 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const { SwTwips nPrevLowerSpace = 0; SwTwips nPrevLineSpacing = 0; - // --> OD 2009-08-28 #i102458# + // #i102458# bool bDummy = false; GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy ); // <-- @@ -1721,7 +1721,7 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const _pAttrs->GetBottomLine( rThis ) : _pAttrs->CalcBottomLine(); - // --> OD 2004-07-16 #i26250# + // #i26250# // - correct consideration of table frames // - use new method <CalcAddLowerSpaceAsLastInTableCell(..)> if ( ( ( rThis.IsTabFrm() && rThis.GetUpper()->IsInTab() ) || @@ -1968,7 +1968,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // First, we move the footnotes. sal_Bool bFtnMoved = sal_False; - // --> FME 2004-07-15 #i26831# + // #i26831# // If pSect has just been created, the printing area of pSect has // been calculated based on the first content of its follow. // In this case we prefer to call a SimpleFormat for this new @@ -2003,7 +2003,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // MoveSubTree bzw. PasteTree ist auf so etwas nicht vorbereitet. if( pNewUpper != rThis.GetUpper() ) { - // --> FME 2004-04-19 #i27145# + // #i27145# SwSectionFrm* pOldSct = 0; if ( rThis.GetUpper()->IsSctFrm() ) { @@ -2013,7 +2013,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b MoveSubTree( pNewUpper, pNewUpper->Lower() ); - // --> FME 2004-04-19 #i27145# + // #i27145# if ( pOldSct && pOldSct->GetSection() ) { // Prevent loops by setting the new height at @@ -2029,7 +2029,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b } // <-- - // --> FME 2004-07-15 #i26831# + // #i26831# if ( bForceSimpleFormat ) { pSect->SimpleFormat(); @@ -2063,7 +2063,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b if ( !( pSh && pSh->GetViewOptions()->getBrowseMode() ) ) { - // --> OD 2009-12-31 #i106452# + // #i106452# // check page description not only in situation with sections. if ( !bSamePage && ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() || @@ -2128,7 +2128,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) //steht, ist nix mit zurueckfliessen. Die breaks brauche fuer die //Fussnoten nicht geprueft zu werden. - // --> FME 2004-11-15 #i37084# FindLastCntnt does not necessarily + // #i37084# FindLastCntnt does not necessarily // have to have a result != 0 SwFrm* pRef = 0; const bool bEndnote = pFtn->GetAttr()->GetFtn().IsEndNote(); @@ -2177,13 +2177,13 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) if ( nDiff > 1 ) { pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); - // --> OD 2006-05-08 #i53139# + // #i53139# // 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: // Check for wrong page description before using next new upper. - // --> OD 2006-06-06 #i66051# - further correction of fix for i53139 + // #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 // Assumption, that in all cases <pNewUpper> is a previous @@ -2191,7 +2191,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // --> OD 2006-07-05 #136538# - another correction of fix for i53139 // Beside type check, check also, if proposed new next upper // frame is inside the same frame types. - // --> OD 2007-01-10 #i73194# - and yet another correction + // #i73194# - and yet another correction // of fix for i53139: // Assure that the new next upper layout frame doesn't // equal the current one. @@ -2238,18 +2238,17 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) { pNewUpper = 0; } - // --> OD 2006-05-08 #i53139# - // --> OD 2006-09-11 #i69409# - check <pNewUpper> - // --> OD 2006-11-02 #i71065# - check <SwFlowFrm::IsMoveBwdJump()> + // #i53139# + // #i69409# - check <pNewUpper> + // #i71065# - check <SwFlowFrm::IsMoveBwdJump()> else if ( pNewUpper && !SwFlowFrm::IsMoveBwdJump() ) - // <-- { // 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 // Check for wrong page description before using next new upper. - // --> OD 2006-06-06 #i66051# - further correction of fix for i53139 + // #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 // Beside type check, check also, if proposed new next upper @@ -2295,18 +2294,18 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) if( SwFlowFrm::IsMoveBwdJump() ) { pNewUpper = pColBody; - // --> OD 2006-05-08 #i53139# + // #i53139# // 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 // Check for wrong page description before using next new upper. - // --> OD 2006-06-06 #i66051# - further correction of fix for i53139 + // #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 // Beside type check, check also, if proposed new next upper // frame is inside the same frame types. - // --> OD 2006-11-02 #i71065# + // #i71065# // Check that the proposed new next upper layout // frame isn't the current one. SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True ); @@ -2340,12 +2339,12 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) else //Keine Breaks also kann ich zurueckfliessen pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); - // --> OD 2004-06-23 #i27801# - no move backward of 'master' text frame, + // #i27801# - no move backward of 'master' text frame, // if - due to its object positioning - it isn't allowed to be on the new page frame - // --> OD 2005-03-07 #i44049# - add another condition for not moving backward: + // #i44049# - add another condition for not moving backward // If one of its objects has restarted the layout process, moving backward // isn't sensible either. - // --> OD 2005-04-19 #i47697# - refine condition made for issue i44049: + // #i47697# - refine condition made for issue i44049 // - allow move backward as long as the anchored object is only temporarily // positions considering its wrapping style. if ( pNewUpper && @@ -2361,7 +2360,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) { pNewUpper = 0; } - // --> OD 2005-03-07 #i44049# - check, if one of its anchored objects + // #i44049# - check, if one of its anchored objects // has restarted the layout process. else if ( rThis.GetDrawObjs() ) { @@ -2369,7 +2368,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) for ( ; i < rThis.GetDrawObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*rThis.GetDrawObjs())[i]; - // --> OD 2005-04-19 #i47697# - refine condition - see above + // #i47697# - refine condition - see above if ( pAnchoredObj->RestartLayoutProcess() && !pAnchoredObj->IsTmpConsiderWrapInfluence() ) // <-- @@ -2454,13 +2453,13 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // OD 2004-05-26 #i21478# - don't move backward, if flow frame wants to // keep with next frame and next frame is locked. - // --> OD 2004-12-08 #i38232# - If next frame is a table, do *not* check, + // #i38232# - If next frame is a table, do *not* check, // if it's locked. if ( pNewUpper && !IsFollow() && rThis.GetAttrSet()->GetKeep().GetValue() && rThis.GetIndNext() ) { SwFrm* pIndNext = rThis.GetIndNext(); - // --> OD 2004-12-08 #i38232# + // #i38232# if ( !pIndNext->IsTabFrm() ) { // get first content of section, while empty sections are skipped @@ -2488,7 +2487,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // <-- } - // --> OD 2006-05-10 #i65250# + // #i65250# // layout loop control for flowing content again and again moving // backward under the same layout condition. if ( pNewUpper && !IsFollow() && @@ -2501,7 +2500,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) ? MAKEPAGE_NOSECTION : MAKEPAGE_NONE, sal_True ); - // --> OD 2007-01-10 #i73194# - make code robust + // #i73194# - make code robust OSL_ENSURE( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" ); if ( pNextNewUpper && ( pNextNewUpper == rThis.GetUpper() || diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 8ca13717577a..0194244f937a 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -253,7 +253,7 @@ void SwFlyFrm::InsertCnt() // OD 2004-02-12 #110582#-2 void SwFlyFrm::InsertColumns() { - // --> OD 2009-08-12 #i97379# + // #i97379# // Check, if column are allowed. // Columns are not allowed for fly frames, which represent graphics or embedded objects. const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt(); @@ -410,7 +410,7 @@ sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) else { // no other Writer fly frame found. Take order number of 'master' object - // --> OD 2004-11-11 #i35748# - use method <GetOrdNumDirect()> instead + // #i35748# - use method <GetOrdNumDirect()> instead // of method <GetOrdNum()> to avoid a recalculation of the order number, // which isn't intended. nOrdNum = pContact->GetMaster()->GetOrdNumDirect(); @@ -436,7 +436,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact ) const sal_uInt32 nOrdNum = pContact->GetMaster()->GetOrdNum(); pPg->ReplaceObject( pDrawObj, nOrdNum ); } - // --> OD 2004-08-16 #i27030# - insert new <SwVirtFlyDrawObj> instance + // #i27030# - insert new <SwVirtFlyDrawObj> instance // into drawing page with correct order number else { @@ -444,7 +444,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact ) InsertObject( pDrawObj, _GetOrdNumForNewRef( pContact ) ); } // <-- - // --> OD 2004-12-13 #i38889# - assure, that new <SwVirtFlyDrawObj> instance + // #i38889# - assure, that new <SwVirtFlyDrawObj> instance // is in a visible layer. pContact->MoveObjToVisibleLayer( pDrawObj ); // <-- @@ -463,7 +463,7 @@ void SwFlyFrm::InitDrawObj( sal_Bool bNotify ) SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFmt>::FirstElement( *GetFmt() ); if ( !pContact ) { - // --> OD 2005-08-08 #i52858# - method name changed + // #i52858# - method name changed pContact = new SwFlyDrawContact( (SwFlyFrmFmt*)GetFmt(), pIDDMA->GetOrCreateDrawModel() ); // <-- @@ -758,7 +758,7 @@ sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) const SwTwips nDiffWidth = Frm().Width() - rFrmSize.GetWidth(); aFrm.Height( aFrm.Height() - nDiffHeight ); aFrm.Width ( aFrm.Width() - nDiffWidth ); - // --> OD 2006-08-16 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- aPrt.Height( aPrt.Height() - nDiffHeight ); @@ -815,14 +815,14 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if ( nInvFlags & 0x01 ) { _InvalidatePos(); - // --> OD 2006-08-16 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- } if ( nInvFlags & 0x02 ) { _InvalidateSize(); - // --> OD 2006-08-16 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- } @@ -837,7 +837,7 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SwRootFrm *pRoot; if ( nInvFlags & 0x20 && 0 != (pRoot = getRootFrm()) ) pRoot->InvalidateBrowseWidth(); - // --> OD 2004-06-28 #i28701# + // #i28701# if ( nInvFlags & 0x80 ) { // update sorted object lists, the Writer fly frame is registered at. @@ -846,7 +846,7 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) // <-- } - // --> OD 2005-07-18 #i51474# - reset flags for the layout process + // #i51474# - reset flags for the layout process ResetLayoutProcessBools(); // <-- } @@ -898,7 +898,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, if ( pNd->HasContour() ) pNd->SetContour( 0 ); } - // --> OD 2004-06-28 #i28701# - perform reorder of object lists + // #i28701# - perform reorder of object lists // at anchor frame and at page frame. rInvFlags |= 0x80; } @@ -1015,7 +1015,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, } } - // --> OD 2004-06-28 #i28701# - perform reorder of object lists + // #i28701# - perform reorder of object lists // at anchor frame and at page frame. rInvFlags |= 0x80; @@ -1076,7 +1076,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, pSh->Imp()->AddAccessibleFrm( this ); } } - // --> OD 2004-06-28 #i28701# - perform reorder of object lists + // #i28701# - perform reorder of object lists // at anchor frame and at page frame. rInvFlags |= 0x80; } @@ -1198,7 +1198,7 @@ void SwFlyFrm::_Invalidate( SwPageFrm *pPage ) pFrm->InvalidateSize(); } - // --> OD 2008-01-21 #i85216# + // #i85216# // if vertical position is oriented at a layout frame inside a ghost section, // assure that the position is invalidated and that the information about // the vertical position oriented frame is cleared @@ -1238,7 +1238,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) SwFmtVertOrient aVert( pFmt->GetVertOrient() ); SwTxtFrm *pAutoFrm = NULL; - // --> OD 2004-11-12 #i34948# - handle also at-page and at-fly anchored + // #i34948# - handle also at-page and at-fly anchored // Writer fly frames const RndStdIds eAnchorType = GetFrmFmt().GetAnchor().GetAnchorId(); if ( eAnchorType == FLY_AT_PAGE ) @@ -1292,7 +1292,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) const SwTwips nNewX = bVert ? rNewPos.Y() : rNewPos.X(); SwTwips nTmpX = nNewX == LONG_MAX ? 0 : nNewX; SwFmtHoriOrient aHori( pFmt->GetHoriOrient() ); - // --> OD 2004-11-12 #i34948# - handle also at-page and at-fly anchored + // #i34948# - handle also at-page and at-fly anchored // Writer fly frames if ( eAnchorType == FLY_AT_PAGE ) { @@ -1359,7 +1359,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) { //Sicherheitsschaltung wegnehmen (siehe SwFrm::CTor) Frm().Pos().X() = Frm().Pos().Y() = 0; - // --> OD 2006-08-16 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- } @@ -1458,7 +1458,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) (Prt().*fnRect->fnSetHeight)( nRemaining ); nRemaining -= (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnAddBottom)( nRemaining + nUL ); - // --> OD 2006-08-16 #i68520# + // #i68520# if ( nRemaining + nUL != 0 ) { InvalidateObjRectWithSpaces(); @@ -1477,7 +1477,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) (Prt().*fnRect->fnSetHeight)( nNewSize ); nNewSize += nUL - (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnAddBottom)( nNewSize ); - // --> OD 2006-08-16 #i68520# + // #i68520# if ( nNewSize != 0 ) { InvalidateObjRectWithSpaces(); @@ -1510,7 +1510,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) (Prt().*fnRect->fnSetWidth)( nNewSize ); nNewSize += nLR - (Frm().*fnRect->fnGetWidth)(); (Frm().*fnRect->fnAddRight)( nNewSize ); - // --> OD 2006-08-16 #i68520# + // #i68520# if ( nNewSize != 0 ) { InvalidateObjRectWithSpaces(); @@ -1631,9 +1631,9 @@ void CalcCntnt( SwLayoutFrm *pLay, // of the prev to be invalid: // OD 2004-03-15 #116560# - Do not consider invalid previous frame // due to its keep-attribute, if current frame is a follow or is locked. - // --> OD 2005-03-08 #i44049# - do not consider invalid previous + // #i44049# - do not consider invalid previous // frame due to its keep-attribute, if it can't move forward. - // --> OD 2006-01-27 #i57765# - do not consider invalid previous + // #i57765# - do not consider invalid previous // frame, if current frame has a column/page break before attribute. SwFrm* pTmpPrev = pFrm->FindPrev(); SwFlowFrm* pTmpPrevFlowFrm = pTmpPrev && pTmpPrev->IsFlowFrm() ? SwFlowFrm::CastFlowFrm(pTmpPrev) : 0; @@ -1658,7 +1658,7 @@ void CalcCntnt( SwLayoutFrm *pLay, sal_uInt32 nCnt = pFrm->GetDrawObjs()->Count(); for ( sal_uInt16 i = 0; i < nCnt; ++i ) { - // --> OD 2004-07-01 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; // determine, if anchored object has to be formatted. if ( pAnchoredObj->PositionLocked() ) @@ -1669,7 +1669,7 @@ void CalcCntnt( SwLayoutFrm *pLay, // format anchored object if ( pAnchoredObj->IsFormatPossible() ) { - // --> OD 2005-05-17 #i43737# - no invalidation of + // #i43737# - no invalidation of // anchored object needed - causes loops for as-character // anchored objects. //pAnchoredObj->InvalidateObjPos(); @@ -1680,7 +1680,7 @@ void CalcCntnt( SwLayoutFrm *pLay, bRestartLayoutProcess = true; break; } - // --> OD 2004-08-25 #i3317# - restart layout process, + // #i3317# - restart layout process, // if the position of the anchored object is locked now. if ( pAnchoredObj->PositionLocked() ) { @@ -1736,7 +1736,7 @@ void CalcCntnt( SwLayoutFrm *pLay, } } - // --> OD 2004-06-11 #i28701# - restart layout process, if + // #i28701# - restart layout process, if // requested by floating screen object formatting if ( bRestartLayoutProcess ) { @@ -1865,7 +1865,7 @@ void SwFlyFrm::MakeObjPos() aObjPositioning( *GetVirtDrawObj() ); aObjPositioning.CalcPosition(); - // --> OD 2006-10-05 #i58280# + // #i58280# // update relative position SetCurrRelPos( aObjPositioning.GetRelPos() ); // <-- @@ -1873,7 +1873,7 @@ void SwFlyFrm::MakeObjPos() SWRECTFN( GetAnchorFrm() ); aFrm.Pos( aObjPositioning.GetRelPos() ); aFrm.Pos() += (GetAnchorFrm()->Frm().*fnRect->fnGetPos)(); - // --> OD 2006-09-11 #i69335# + // #i69335# InvalidateObjRectWithSpaces(); // <-- } @@ -1923,7 +1923,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) //das Wachstum (wg. des Ausgleichs). if ( !bTst ) { - // --> OD 2004-06-09 #i28701# - unlock position of Writer fly frame + // #i28701# - unlock position of Writer fly frame UnlockPosition(); _InvalidatePos(); InvalidateSize(); @@ -1939,14 +1939,14 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) Unlock(); if ( IsFlyFreeFrm() ) { - // --> OD 2004-11-12 #i37068# - no format of position here + // #i37068# - no format of position here // and prevent move in method <CheckClip(..)>. // This is needed to prevent layout loop caused by nested // Writer fly frames - inner Writer fly frames format its // anchor, which grows/shrinks the outer Writer fly frame. // Note: position will be invalidated below. bValidPos = sal_True; - // --> OD 2005-10-10 #i55416# + // #i55416# // Suppress format of width for autowidth frame, because the // format of the width would call <SwTxtFrm::CalcFitToContent()> // for the lower frame, which initiated this grow. @@ -1960,7 +1960,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true ); ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll(); static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( false ); - // --> OD 2005-10-10 #i55416# + // #i55416# if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { bFormatHeightOnly = bOldFormatHeightOnly; @@ -2012,7 +2012,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { SwRect aOld( GetObjRectWithSpaces() ); (Frm().*fnRect->fnSetHeight)( nHeight - nVal ); - // --> OD 2006-08-16 #i68520# + // #i68520# if ( nHeight - nVal != 0 ) { InvalidateObjRectWithSpaces(); @@ -2038,14 +2038,14 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) Unlock(); if ( IsFlyFreeFrm() ) { - // --> OD 2004-11-12 #i37068# - no format of position here + // #i37068# - no format of position here // and prevent move in method <CheckClip(..)>. // This is needed to prevent layout loop caused by nested // Writer fly frames - inner Writer fly frames format its // anchor, which grows/shrinks the outer Writer fly frame. // Note: position will be invalidated below. bValidPos = sal_True; - // --> OD 2005-10-10 #i55416# + // #i55416# // Suppress format of width for autowidth frame, because the // format of the width would call <SwTxtFrm::CalcFitToContent()> // for the lower frame, which initiated this shrink. @@ -2059,7 +2059,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true ); ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll(); static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( false ); - // --> OD 2005-10-10 #i55416# + // #i55416# if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { bFormatHeightOnly = bOldFormatHeightOnly; @@ -2096,7 +2096,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) Size SwFlyFrm::ChgSize( const Size& aNewSize ) { - // --> OD 2006-01-19 #i53298# + // #i53298# // If the fly frame anchored at-paragraph or at-character contains an OLE // object, assure that the new size fits into the current clipping area // of the fly frame @@ -2124,7 +2124,7 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) SwFrmFmt *pFmt = GetFmt(); SwFmtFrmSize aSz( pFmt->GetFrmSize() ); aSz.SetWidth( aAdjustedNewSize.Width() ); - // --> OD 2006-01-19 #i53298# - no tolerance any more. + // #i53298# - no tolerance any more. // If it reveals that the tolerance is still needed, then suppress a // <SetAttr> call, if <aSz> equals the current <SwFmtFrmSize> attribute. // if ( Abs(aAdjustedNewSize.Height() - aSz.GetHeight()) > 1 ) @@ -2228,7 +2228,7 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove ) { pPage->RemoveFlyFromPage( pToRemove ); } - // --> OD 2008-05-19 #i73201# + // #i73201# else { if ( pToRemove->IsAccessibleFrm() && @@ -2290,7 +2290,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj ) _rNewObj.ChgAnchorFrm( this ); } - // --> OD 2010-09-14 #i113730# + // #i113730# // Assure the control objects and group objects containing controls are on the control layer if ( ::CheckControlLayer( _rNewObj.DrawObj() ) ) { @@ -2362,18 +2362,18 @@ void SwFrm::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ) |* SwFrm::InvalidateObjs() |* |*************************************************************************/ -// --> OD 2004-07-01 #i28701# - change purpose of method and adjust its name +// #i28701# - change purpose of method and adjust its name void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, const bool _bNoInvaOfAsCharAnchoredObjs ) { if ( GetDrawObjs() ) { - // --> OD 2004-10-08 #i26945# - determine page the frame is on, + // #i26945# - determine page the frame is on, // in order to check, if anchored object is registered at the same // page. const SwPageFrm* pPageFrm = FindPageFrm(); // <-- - // --> OD 2004-07-01 #i28701# - re-factoring + // #i28701# - re-factoring sal_uInt32 i = 0; for ( ; i < GetDrawObjs()->Count(); ++i ) { @@ -2384,7 +2384,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, { continue; } - // --> OD 2004-10-08 #i26945# - no invalidation, if anchored object + // #i26945# - no invalidation, if anchored object // isn't registered at the same page and instead is registered at // the page, where its anchor character text frame is on. if ( pAnchoredObj->GetPageFrm() && @@ -2407,7 +2407,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, // <-- } // <-- - // --> OD 2005-07-18 #i51474# - reset flag, that anchored object + // #i51474# - reset flag, that anchored object // has cleared environment, and unlock its position, if the anchored // object is registered at the same page as the anchor frame is on. if ( pAnchoredObj->ClearedEnvironment() && @@ -2441,11 +2441,11 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, |* SwLayoutFrm::NotifyLowerObjs() |* |*************************************************************************/ -// --> OD 2004-07-01 #i28701# - change purpose of method and its name -// --> OD 2004-10-08 #i26945# - correct check, if anchored object is a lower +// #i28701# - change purpose of method and its name +// #i26945# - correct check, if anchored object is a lower // of the layout frame. E.g., anchor character text frame can be a follow text // frame. -// --> OD 2005-03-11 #i44016# - add parameter <_bUnlockPosOfObjs> to +// #i44016# - add parameter <_bUnlockPosOfObjs> to // force an unlockposition call for the lower objects. void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) { @@ -2457,7 +2457,7 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) for ( sal_uInt32 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; - // --> OD 2004-10-08 #i26945# - check, if anchored object is a lower + // #i26945# - check, if anchored object is a lower // of the layout frame is changed to check, if its anchor frame // is a lower of the layout frame. // determine the anchor frame - usually it's the anchor frame, @@ -2475,7 +2475,7 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) if ( pFly->IsAnLower( this ) ) continue; - // --> OD 2004-10-08 #i26945# - use <pAnchorFrm> to check, if + // #i26945# - use <pAnchorFrm> to check, if // fly frame is lower of layout frame resp. if fly frame is // at a different page registered as its anchor frame is on. const bool bLow = IsAnLower( pAnchorFrm ); @@ -2485,7 +2485,7 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) pFly->_Invalidate( pPageFrm ); if ( !bLow || pFly->IsFlyAtCntFrm() ) { - // --> OD 2005-03-11 #i44016# + // #i44016# if ( _bUnlockPosOfObjs ) { pFly->UnlockPosition(); @@ -2501,14 +2501,14 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) { OSL_ENSURE( pObj->ISA(SwAnchoredDrawObject), "<SwLayoutFrm::NotifyFlys() - anchored object of unexcepted type" ); - // --> OD 2004-10-08 #i26945# - use <pAnchorFrm> to check, if + // #i26945# - use <pAnchorFrm> to check, if // fly frame is lower of layout frame resp. if fly frame is // at a different page registered as its anchor frame is on. if ( IsAnLower( pAnchorFrm ) || pAnchorFrm->FindPageFrm() != pPageFrm ) // <-- { - // --> OD 2005-03-11 #i44016# + // #i44016# if ( _bUnlockPosOfObjs ) { pObj->UnlockPosition(); @@ -2784,7 +2784,7 @@ SwVirtFlyDrawObj* SwFlyFrm::GetVirtDrawObj() void SwFlyFrm::InvalidateObjPos() { InvalidatePos(); - // --> OD 2006-08-10 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- } @@ -2807,7 +2807,7 @@ const SwRect SwFlyFrm::GetObjRect() const return Frm(); } -// --> OD 2006-10-05 #i70122# +// #i70122# // for Writer fly frames the bounding rectangle equals the object rectangles const SwRect SwFlyFrm::GetObjBoundRect() const { @@ -2815,7 +2815,7 @@ const SwRect SwFlyFrm::GetObjBoundRect() const } // <-- -// --> OD 2006-08-10 #i68520# +// #i68520# bool SwFlyFrm::_SetObjTop( const SwTwips _nTop ) { const bool bChanged( Frm().Pos().Y() != _nTop ); diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 13ea56614986..b37cea2e33fa 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -74,7 +74,7 @@ SwFlyInCntFrm::~SwFlyInCntFrm() } } -// --> OD 2004-06-29 #i28701# +// #i28701# TYPEINIT1(SwFlyInCntFrm,SwFlyFrm); // <-- /************************************************************************* @@ -97,7 +97,7 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint, SetCurrRelPos( rRelAttr ); SWRECTFN( GetAnchorFrm() ) (Frm().*fnRect->fnSetPos)( rPoint + rRelPos ); - // --> OD 2006-08-25 #i68520# + // #i68520# InvalidateObjRectWithSpaces(); // <-- if( pNotify ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index a926b61f98f3..1435d54251f1 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -396,12 +396,12 @@ SwFrmNotify::~SwFrmNotify() // #i9046# Automatic frame width SwFlyFrm* pFly = 0; - // --> FME 2004-10-21 #i35879# Do not trust the inf flags. pFrm does not + // #i35879# Do not trust the inf flags. pFrm does not // necessarily have to have an upper! if ( !pFrm->IsFlyFrm() && 0 != ( pFly = pFrm->ImplFindFlyFrm() ) ) // <-- { - // --> OD 2006-05-08 #i61999# + // #i61999# // no invalidation of columned Writer fly frames, because automatic // width doesn't make sense for such Writer fly frames. if ( pFly->Lower() && !pFly->Lower()->IsColumnFrm() ) @@ -417,7 +417,7 @@ SwFrmNotify::~SwFrmNotify() // way: if ( ATT_FIX_SIZE != rFrmSz.GetWidthSizeType() ) { - // --> OD 2005-07-29 #i50668#, #i50998# - invalidation of position + // #i50668#, #i50998# - invalidation of position // of as-character anchored fly frames not needed and can cause // layout loops if ( !pFly->ISA(SwFlyInCntFrm) ) @@ -473,7 +473,7 @@ void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm ) SwLayNotify::~SwLayNotify() { - // --> OD 2005-07-29 #i49383# + // #i49383# if ( mbFrmDeleted ) { return; @@ -608,11 +608,11 @@ SwLayNotify::~SwLayNotify() pLay->Lower() && pLay->Lower()->IsColumnFrm()) && (bPos || bNotify) && !(pLay->GetType() & 0x1823) ) //Tab, Row, FtnCont, Root, Page { - // --> OD 2005-03-11 #i44016# - force unlock of position of lower objects. - // --> OD 2005-03-30 #i43913# - no unlock of position of objects, + // #i44016# - force unlock of position of lower objects. + // #i43913# - no unlock of position of objects, // if <pLay> is a cell frame, and its table frame resp. its parent table // frame is locked. - // --> OD 2005-04-15 #i47458# - force unlock of position of lower objects, + // #i47458# - force unlock of position of lower objects, // only if position of layout frame has changed. bool bUnlockPosOfObjs( bPos ); if ( bUnlockPosOfObjs && pLay->IsCellFrm() ) @@ -626,14 +626,14 @@ SwLayNotify::~SwLayNotify() bUnlockPosOfObjs = false; } } - // --> OD 2005-05-18 #i49383# - check for footnote frame, if unlock + // #i49383# - check for footnote frame, if unlock // of position of lower objects is allowed. else if ( bUnlockPosOfObjs && pLay->IsFtnFrm() ) { bUnlockPosOfObjs = static_cast<SwFtnFrm*>(pLay)->IsUnlockPosOfLowerObjs(); } // <-- - // --> OD 2005-07-29 #i51303# - no unlock of object positions for sections + // #i51303# - no unlock of object positions for sections else if ( bUnlockPosOfObjs && pLay->IsSctFrm() ) { bUnlockPosOfObjs = false; @@ -668,7 +668,7 @@ SwFlyNotify::SwFlyNotify( SwFlyFrm *pFlyFrm ) : SwFlyNotify::~SwFlyNotify() { - // --> OD 2005-07-29 #i49383# + // #i49383# if ( mbFrmDeleted ) { return; @@ -685,7 +685,7 @@ SwFlyNotify::~SwFlyNotify() //Wenn in der LayAction das IsAgain gesetzt ist kann es sein, //dass die alte Seite inzwischen vernichtet wurde! ::Notify( pFly, pOldPage, aFrmAndSpace, &aPrt ); - // --> OD 2004-10-20 #i35640# - additional notify anchor text frame, + // #i35640# - additional notify anchor text frame, // if Writer fly frame has changed its page if ( pFly->GetAnchorFrm()->IsTxtFrm() && pFly->GetPageFrm() != pOldPage ) @@ -724,7 +724,7 @@ SwFlyNotify::~SwFlyNotify() } } - // --> OD 2004-11-05 #i26945# - notify anchor. + // #i26945# - notify anchor. // Needed for negative positioned Writer fly frames if ( pFly->GetAnchorFrm()->IsTxtFrm() ) { @@ -734,14 +734,14 @@ SwFlyNotify::~SwFlyNotify() } // OD 2004-05-13 #i28701# - // --> OD 2005-03-21 #i45180# - no adjustment of layout process flags and + // #i45180# - no adjustment of layout process flags and // further notifications/invalidations, if format is called by grow/shrink if ( pFly->ConsiderObjWrapInfluenceOnObjPos() && ( !pFly->ISA(SwFlyFreeFrm) || !static_cast<SwFlyFreeFrm*>(pFly)->IsNoMoveOnCheckClip() ) ) // <-- { - // --> OD 2005-09-05 #i54138# - suppress restart of the layout process + // #i54138# - suppress restart of the layout process // on changed frame height. // Note: It doesn't seem to be necessary and can cause layout loops. if ( bPosChgd ) @@ -805,7 +805,7 @@ SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) : SwCntntNotify::~SwCntntNotify() { - // --> OD 2005-07-29 #i49383# + // #i49383# if ( mbFrmDeleted ) { return; @@ -1007,14 +1007,14 @@ SwCntntNotify::~SwCntntNotify() } } - // --> OD 2005-03-07 #i44049# + // #i44049# if ( pCnt->IsTxtFrm() && POS_DIFF( aFrm, pCnt->Frm() ) ) { pCnt->InvalidateObjs( true ); } // <-- - // --> OD 2005-04-12 #i43255# - move code to invalidate at-character + // #i43255# - move code to invalidate at-character // anchored objects due to a change of its anchor character from // method <SwTxtFrm::Format(..)>. if ( pCnt->IsTxtFrm() ) @@ -1325,7 +1325,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pPageMaker->CheckInsert( nIndex ); pFrm->InsertBehind( pLay, pPrv ); - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for next paragraph will change @@ -1341,7 +1341,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )), dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) ); - // --> OD 2006-08-28 #i68958# + // #i68958# // The information flags of the text frame are validated // in methods <FindNextCnt(..)> and <FindPrevCnt(..)>. // The information flags have to be invalidated, because @@ -1378,7 +1378,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pPageMaker->CheckInsert( nIndex ); pFrm->InsertBehind( pLay, pPrv ); - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for next paragraph will change @@ -1442,7 +1442,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // after insertion in the layout static_cast<SwSectionFrm*>(pFrm)->Init(); - // --> FME 2004-09-08 #i33963# + // #i33963# // Do not trust the IsInFtn flag. If we are currently // building up a table, the upper of pPrv may be a cell // frame, but the cell frame does not have an upper yet. @@ -1455,7 +1455,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, ((SwTxtFrm*)pPrv)->Prepare( PREP_QUOVADIS, 0, sal_False ); } } - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for next paragraph will change @@ -1858,7 +1858,7 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) ? ((SwCntntFrm*)pConstructor)->GetNode()->GetSwAttrSet() : ((SwLayoutFrm*)pConstructor)->GetFmt()->GetAttrSet() ), rUL ( rAttrSet.GetULSpace() ), - // --> OD 2008-12-04 #i96772# + // #i96772# // LRSpaceItem is copied due to the possibility that it is adjusted - see below rLR ( rAttrSet.GetLRSpace() ), // <-- @@ -1866,7 +1866,7 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) rShadow ( rAttrSet.GetShadow() ), aFrmSize( rAttrSet.GetFrmSize().GetSize() ) { - // --> OD 2008-12-02 #i96772# + // #i96772# const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(pConstructor); if ( pTxtFrm ) { @@ -2397,7 +2397,7 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) // object orients its vertical position pObj->ClearVertPosOrientFrm(); // <-- - // --> OD 2005-03-03 #i43913# + // #i43913# pObj->ResetLayoutProcessBools(); // <-- // --> OD 2004-11-29 #115759# - remove also lower objects of as-character @@ -2423,7 +2423,7 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) } if ( pFlyFrm->IsFlyFreeFrm() ) { - // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()> + // #i28701# - use new method <GetPageFrm()> pFlyFrm->GetPageFrm()->RemoveFlyFromPage( pFlyFrm ); } } @@ -2775,7 +2775,7 @@ void MA_FASTCALL lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) { SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pObj); //Ggf. ummelden, nicht anmelden wenn bereits bekannt. - // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()> + // #i28701# - use new method <GetPageFrm()> SwPageFrm *pPg = pFly->IsFlyFreeFrm() ? pFly->GetPageFrm() : pFly->FindPageFrm(); if ( pPg != pPage ) @@ -2788,10 +2788,10 @@ void MA_FASTCALL lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) } else { - // --> OD 2008-04-22 #i87493# + // #i87493# if ( pPage != pObj->GetPageFrm() ) { - // --> OD 2004-07-02 #i28701# + // #i28701# if ( pObj->GetPageFrm() ) pObj->GetPageFrm()->RemoveDrawObjFromPage( *pObj ); pPage->AppendDrawObjToPage( *pObj ); @@ -2859,7 +2859,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, if( pSh && rOld.HasArea() ) pSh->InvalidateWindows( rOld ); - // --> OD 2005-08-19 #i51941# - consider case that fly frame isn't + // #i51941# - consider case that fly frame isn't // registered at the old page <pOld> SwPageFrm* pPageFrm = pFly->FindPageFrm(); if ( pOld != pPageFrm ) @@ -2945,13 +2945,13 @@ void MA_FASTCALL lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, aCntPrt.Pos() += pCnt->Frm().Pos(); if ( eHint == PREP_FLY_ATTR_CHG ) { - // --> OD 2004-10-20 #i35640# - use given rectangle <rRect> instead + // #i35640# - use given rectangle <rRect> instead // of current bound rectangle if ( aCntPrt.IsOver( rRect ) ) // <-- pCnt->Prepare( PREP_FLY_ATTR_CHG ); } - // --> OD 2004-11-01 #i23129# - only invalidate, if the text frame + // #i23129# - only invalidate, if the text frame // printing area overlaps with the given rectangle. else if ( aCntPrt.IsOver( rRect ) ) // <-- @@ -3026,7 +3026,7 @@ void Notify_Background( const SdrObject* pObj, // on the object positioning, the complete area has to be processed, // because content frames before the anchor frame also have to consider // the object for the text wrapping. - // --> OD 2004-08-25 #i3317# - The complete area has always been + // #i3317# - The complete area has always been // processed. { pCnt = pArea->ContainsCntnt(); @@ -3041,7 +3041,7 @@ void Notify_Background( const SdrObject* pObj, if ( pCnt->IsInTab() ) { SwLayoutFrm* pCell = pCnt->GetUpper(); - // --> OD 2005-01-14 #i40606# - use <GetLastBoundRect()> + // #i40606# - use <GetLastBoundRect()> // instead of <GetCurrentBoundRect()>, because a recalculation // of the bounding rectangle isn't intended here. if ( pCell->IsCellFrm() && @@ -3057,7 +3057,7 @@ void Notify_Background( const SdrObject* pObj, if ( pTab != pLastTab ) { pLastTab = pTab; - // --> OD 2005-01-14 #i40606# - use <GetLastBoundRect()> + // #i40606# - use <GetLastBoundRect()> // instead of <GetCurrentBoundRect()>, because a recalculation // of the bounding rectangle isn't intended here. if ( pTab->Frm().IsOver( pObj->GetLastBoundRect() ) || @@ -3146,7 +3146,7 @@ void Notify_Background( const SdrObject* pObj, if ( pFlyFrm && pAnchor->GetUpper() && pAnchor->IsInTab() )//MA_FLY_HEIGHT pAnchor->GetUpper()->InvalidateSize(); - // --> OD 2008-01-30 #i82258# - make code robust + // #i82258# - make code robust ViewShell* pSh = 0; if ( bInva && pPage && 0 != (pSh = pPage->getRootFrm()->GetCurrShell()) ) diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 608ecb57ddd5..ed606d2851d3 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -496,7 +496,7 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt pRef( pCnt ), pAttr( pAt ), bBackMoveLocked( sal_False ), - // --> OD 2005-08-11 #i49383# + // #i49383# mbUnlockPosOfLowerObjs( true ) // <-- { @@ -1778,12 +1778,12 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) pSect->InvalidateSize(); else { - // --> OD 2005-05-18 #i49383# - disable unlock of position of + // #i49383# - disable unlock of position of // lower objects during format of footnote content. const bool bOldFtnFrmLocked( pNew->IsColLocked() ); pNew->ColLock(); pNew->KeepLockPosOfLowerObjs(); - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify* pFtnFrmNotitfy = new SwLayNotify( pNew ); // <-- @@ -1791,7 +1791,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) { pCnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, @@ -1805,17 +1805,17 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // <-- pCnt = (SwCntntFrm*)pCnt->FindNextCnt(); } - // --> OD 2005-05-18 #i49383# + // #i49383# if ( !bOldFtnFrmLocked ) { pNew->ColUnlock(); } - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pNew->UnlockPosOfLowerObjs(); // <-- pNew->Calc(); - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // pNew->UnlockPosOfLowerObjs(); // delete pFtnFrmNotitfy; @@ -2168,7 +2168,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) const sal_uInt16 nMyCol = lcl_ColumnNum( this ); SWRECTFN( this ) - // --> OD 2004-06-11 #i21478# - keep last inserted footnote in order to + // #i21478# - keep last inserted footnote in order to // format the content of the following one. SwFtnFrm* pLastInsertedFtn = 0L; for ( sal_uInt16 i = 0; i < rFtnArr.Count(); ++i ) @@ -2223,10 +2223,10 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) sal_Bool bUnlock = !pFtn->IsBackMoveLocked(); pFtn->LockBackMove(); - // --> OD 2005-05-18 #i49383# - disable unlock of position of + // #i49383# - disable unlock of position of // lower objects during format of footnote content. pFtn->KeepLockPosOfLowerObjs(); - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify aFtnFrmNotitfy( pFtn ); // <-- @@ -2235,7 +2235,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { pCnt->_InvalidatePos(); pCnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, @@ -2266,21 +2266,21 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { pFtn->Cut(); delete pFtn; - // --> OD 2004-06-10 #i21478# + // #i21478# pFtn = 0L; } } - // --> OD 2005-05-18 #i49383# + // #i49383# if ( pFtn ) { - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pFtn->UnlockPosOfLowerObjs(); pFtn->Calc(); // pFtn->UnlockPosOfLowerObjs(); // <-- } - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // else // { @@ -2293,18 +2293,18 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { OSL_ENSURE( !pFtn->GetMaster() && !pFtn->GetFollow(), "DelFtn und Master/Follow?" ); delete pFtn; - // --> OD 2004-06-10 #i21478# + // #i21478# pFtn = 0L; } - // --> OD 2004-06-10 #i21478# + // #i21478# if ( pFtn ) { pLastInsertedFtn = pFtn; } } - // --> OD 2004-06-10 #i21478# - format content of footnote following + // #i21478# - format content of footnote following // the new inserted ones. if ( bCalc && pLastInsertedFtn ) { @@ -2316,10 +2316,10 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) sal_Bool bUnlock = !pNextFtn->IsBackMoveLocked(); pNextFtn->LockBackMove(); - // --> OD 2005-05-18 #i49383# - disable unlock of position of + // #i49383# - disable unlock of position of // lower objects during format of footnote content. pNextFtn->KeepLockPosOfLowerObjs(); - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify aFtnFrmNotitfy( pNextFtn ); // <-- @@ -2328,7 +2328,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { pCnt->_InvalidatePos(); pCnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, @@ -2356,8 +2356,8 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { pNextFtn->UnlockBackMove(); } - // --> OD 2005-05-18 #i49383# - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i49383# + // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pNextFtn->UnlockPosOfLowerObjs(); pNextFtn->Calc(); @@ -2437,7 +2437,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, pFirst->LockBackMove(); pFirst->Calc(); pCntnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCntnt->IsTxtFrm() && pCntnt->IsValid() ) { SwObjectFormatter::FormatObjsAtFrm( *pCntnt, @@ -2456,10 +2456,10 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, { sal_Bool bMore = sal_True; sal_Bool bStart = pAttr == 0; // wenn kein Attribut uebergeben wird, alle bearbeiten - // --> OD 2005-05-18 #i49383# - disable unlock of position of + // #i49383# - disable unlock of position of // lower objects during format of footnote and footnote content. SwFtnFrm* pLastFtnFrm( 0L ); - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify* pFtnFrmNotify( 0L ); // footnote frame needs to be locked, if <bLock> isn't set. @@ -2476,7 +2476,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, pCnt->_InvalidateSize(); pCnt->Prepare( PREP_ADJUST_FRM ); SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm(); - // --> OD 2005-05-18 #i49383# + // #i49383# if ( pFtnFrm != pLastFtnFrm ) { if ( pLastFtnFrm ) @@ -2485,7 +2485,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, { pLastFtnFrm->ColUnlock(); } - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pLastFtnFrm->UnlockPosOfLowerObjs(); pLastFtnFrm->Calc(); @@ -2510,7 +2510,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, } pFtnFrm->KeepLockPosOfLowerObjs(); pLastFtnFrm = pFtnFrm; - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // pFtnFrmNotify = new SwLayNotify( pLastFtnFrm ); // <-- @@ -2534,7 +2534,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, pFtnFrm->LockBackMove(); pFtnFrm->Calc(); pCnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, @@ -2552,11 +2552,11 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, if( !pFtnFrm->Lower() && !pFtnFrm->IsColLocked() ) { - // --> OD 2005-08-10 #i49383# + // #i49383# OSL_ENSURE( pLastFtnFrm == pFtnFrm, "<SwFtnBossFrm::RearrangeFtns(..)> - <pLastFtnFrm> != <pFtnFrm>" ); pLastFtnFrm = 0L; - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // pFtnFrmNotify->FrmDeleted(); // delete pFtnFrmNotify; @@ -2570,7 +2570,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, { pFtnFrm->Calc(); pCnt->Calc(); - // --> OD 2005-05-17 #i49383# - format anchored objects + // #i49383# - format anchored objects if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, @@ -2625,14 +2625,14 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, bMore = sal_False; } } while ( bMore ); - // --> OD 2005-05-18 #i49383# + // #i49383# if ( pLastFtnFrm ) { if ( !bLock && bUnlockLastFtnFrm ) { pLastFtnFrm->ColUnlock(); } - // --> OD 2006-02-02 #i57914# - adjust fix #i49383# + // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pLastFtnFrm->UnlockPosOfLowerObjs(); pLastFtnFrm->Calc(); diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index b8168dca941a..24bb79afb1b1 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -48,7 +48,7 @@ #include "hfspacingitem.hxx" // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> -// --> OD 2005-03-03 #i43771# +// #i43771# #include <objectformatter.hxx> // <-- @@ -257,7 +257,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) SwTwips nMaxHeight = LONG_MAX; SwTwips nRemaining, nOldHeight; - // --> OD 2006-05-24 #i64301# + // #i64301# // use the position of the footer printing area to control invalidation // of the first footer content. Point aOldFooterPrtPos; @@ -267,7 +267,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) { nOldHeight = Prt().Height(); SwFrm* pFrm = Lower(); - // --> OD 2006-05-24 #i64301# + // #i64301# if ( pFrm && aOldFooterPrtPos != ( Frm().Pos() + Prt().Pos() ) ) { @@ -278,9 +278,9 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) while( pFrm ) { pFrm->Calc(); - // --> OD 2005-03-03 #i43771# - format also object anchored + // #i43771# - format also object anchored // at the frame - // --> OD 2005-05-03 #i46941# - frame has to be valid. + // #i46941# - frame has to be valid. // Note: frame could be invalid after calling its format, // if it's locked OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTxtFrm() || diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index e19e086c8b47..e8e520e7d606 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -85,7 +85,7 @@ #include "sectfrm.hxx" #include "lineinfo.hxx" #include <acmplwrd.hxx> -// --> OD 2004-06-28 #i28701# +// #i28701# #include <sortedobjs.hxx> #include <objectformatter.hxx> #include <PostItMgr.hxx> @@ -526,7 +526,7 @@ SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage ) } // OD 2004-05-12 #i28701# -// --> OD 2004-11-03 #i114798# - unlock position on start and end of page +// #i114798# - unlock position on start and end of page // layout process. class NotifyLayoutOfPageInProgress { @@ -710,7 +710,7 @@ void SwLayAction::InternalAction() { pPage->ValidateFlyInCnt(); pPage->ValidateCntnt(); - // --> OD 2004-05-10 #i28701# + // #i28701# pPage->ValidateFlyLayout(); pPage->ValidateFlyCntnt(); // <-- @@ -719,7 +719,7 @@ void SwLayAction::InternalAction() XCHECKPAGE; pPage->InvalidateCntnt(); pPage->InvalidateFlyInCnt(); - // --> OD 2004-05-10 #i28701# + // #i28701# pPage->InvalidateFlyLayout(); pPage->InvalidateFlyCntnt(); // <-- @@ -840,14 +840,14 @@ void SwLayAction::InternalAction() // OD 14.04.2003 #106346# - set flag for interrupt content formatting mbFormatCntntOnInterrupt = IsInput() && !IsStopPrt(); long nBottom = rVis.Bottom(); - // --> OD 2005-02-15 #i42586# - format current page, if idle action is active + // #i42586# - format current page, if idle action is active // This is an optimization for the case that the interrupt is created by // the move of a form control object, which is represented by a window. while ( pPg && ( pPg->Frm().Top() < nBottom || ( IsIdle() && pPg == pPage ) ) ) // <-- { - // --> OD 2004-10-11 #i26945# - follow-up of #i28701# + // #i26945# - follow-up of #i28701# NotifyLayoutOfPageInProgress aLayoutOfPageInProgress( *pPg ); XCHECKPAGE; @@ -857,10 +857,10 @@ void SwLayAction::InternalAction() const sal_uInt16 nLoopControlMax = 20; // OD 14.04.2003 #106346# - special case: interrupt content formatting - // --> OD 2004-07-08 #i28701# - conditions, introduced by #106346#, + // #i28701# - conditions, introduced by #106346#, // are incorrect (marcos IS_FLYS and IS_INVAFLY only works for <pPage>) // and are too strict. - // --> OD 2005-06-09 #i50432# - adjust interrupt formatting to + // #i50432# - adjust interrupt formatting to // normal page formatting - see above. while ( ( mbFormatCntntOnInterrupt && ( pPg->IsInvalid() || @@ -868,10 +868,10 @@ void SwLayAction::InternalAction() ( !mbFormatCntntOnInterrupt && pPg->IsInvalidLayout() ) ) { XCHECKPAGE; - // --> OD 2005-06-09 #i50432# - format also at-page anchored objects + // #i50432# - format also at-page anchored objects SwObjectFormatter::FormatObjsAtFrm( *pPg, *pPg, this ); // <-- - // --> OD 2005-06-09 #i50432# + // #i50432# if ( !pPg->GetSortedObjs() ) { pPg->ValidateFlyLayout(); @@ -898,7 +898,7 @@ void SwLayAction::InternalAction() XCHECKPAGE; } - // --> OD 2005-06-09 #i50432# + // #i50432# if ( mbFormatCntntOnInterrupt && ( pPg->IsInvalidCntnt() || ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) ) @@ -906,7 +906,7 @@ void SwLayAction::InternalAction() { pPg->ValidateFlyInCnt(); pPg->ValidateCntnt(); - // --> OD 2004-05-10 #i26945# - follow-up of fix #117736# + // #i26945# - follow-up of fix #117736# pPg->ValidateFlyLayout(); pPg->ValidateFlyCntnt(); // <-- @@ -924,12 +924,12 @@ void SwLayAction::InternalAction() XCHECKPAGE; pPg->InvalidateCntnt(); pPg->InvalidateFlyInCnt(); - // --> OD 2004-05-10 #i26945# - follow-up of fix #117736# + // #i26945# - follow-up of fix #117736# pPg->InvalidateFlyLayout(); pPg->InvalidateFlyCntnt(); // <-- } - // --> OD 2005-04-06 #i46807# - we are statisfied, if the + // #i46807# - we are statisfied, if the // content is formatted once complete. else { @@ -1122,7 +1122,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto return 0; } -// --> OD 2005-02-21 #i37877# - consider drawing objects +// #i37877# - consider drawing objects static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, long _nBottom ) { @@ -1246,7 +1246,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( bTstCnt ) { - // --> OD 2004-06-04 #i27756# - check after each frame calculation, + // #i27756# - check after each frame calculation, // if the content frame has changed the page. If yes, no other // frame calculation is performed bool bPageChg = false; @@ -1260,7 +1260,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) pSct->SetCompletePaint(); if ( IsAgain() ) return sal_False; - // --> OD 2004-06-04 #i27756# + // #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); } @@ -1272,7 +1272,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) pCntnt->SetCompletePaint(); if ( IsAgain() ) return sal_False; - // --> OD 2004-06-04 #i27756# + // #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); } @@ -1286,7 +1286,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) pTab->SetCompletePaint(); if ( IsAgain() ) return sal_False; - // --> OD 2004-06-04 #i27756# + // #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); } @@ -1301,13 +1301,13 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) pSct->SetCompletePaint(); if ( IsAgain() ) return sal_False; - // --> OD 2004-06-04 #i27756# + // #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); } } - // --> OD 2004-06-04 #i27756# + // #i27756# if ( bPageChg ) { bRet = sal_False; @@ -1831,7 +1831,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) const sal_Bool bOldPaint = IsPaint(); bPaint = bOldPaint && !(pTab && pTab == pOptTab); _FormatCntnt( pCntnt, pPage ); - // --> OD 2004-11-05 #i26945# - reset <bPaint> before format objects + // #i26945# - reset <bPaint> before format objects bPaint = bOldPaint; // <-- @@ -1839,7 +1839,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) // No format, if action flag <bAgain> is set or action is interrupted. // OD 2004-08-30 #117736# - allow format on interruption of action, if // it's the format for this interrupt - // --> OD 2004-11-01 #i23129#, #i36347# - pass correct page frame + // #i23129#, #i36347# - pass correct page frame // to the object formatter. if ( !IsAgain() && ( !IsInterrupt() || mbFormatCntntOnInterrupt ) && @@ -2046,9 +2046,9 @@ sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) // OD 2004-05-10 #i28701# _FormatCntnt( pCntnt, pCntnt->FindPageFrm() ); - // --> OD 2004-07-23 #i28701# - format floating screen objects + // #i28701# - format floating screen objects // at content text frame - // --> OD 2004-11-02 #i23129#, #i36347# - pass correct page frame + // #i23129#, #i36347# - pass correct page frame // to the object formatter. if ( pCntnt->IsTxtFrm() && !SwObjectFormatter::FormatObjsAtFrm( diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index b730219b424b..caf8232ebb0f 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -883,7 +883,7 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) if( rpFrm->IsTabFrm() ) { SwTabFrm* pTab = (SwTabFrm*)rpFrm; - // --> OD 2004-09-23 #i33629#, #i29955# + // #i33629#, #i29955# ::RegistFlys( pTab->FindPageFrm(), pTab ); // <-- SwFrm *pRow = pTab->Lower(); @@ -1145,7 +1145,7 @@ sal_Bool SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) SwPageFrm *pPage = rpPage; while( pPage && pPage->GetPhyPageNum() < pFlyC->nPageNum ) pPage = (SwPageFrm*)pPage->GetNext(); - // --> OD 2005-02-22 #i43266# - if the found page is an empty page, + // #i43266# - if the found page is an empty page, // take the previous one (take next one, if previous one doesn't exists) if ( pPage && pPage->IsEmptyPage() ) { diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index a02b17401c01..60efe2d56dc6 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -38,10 +38,10 @@ #include "ftnfrm.hxx" #include "txtfrm.hxx" -// --> OD 2004-06-23 #i28701# +// #i28701# #include <movedfwdfrmsbyobjpos.hxx> // <-- -// --> OD 2004-10-22 #i35911# +// #i35911# #include <objstmpconsiderwrapinfl.hxx> // <-- @@ -228,10 +228,10 @@ void SwLooping::Control( SwPageFrm* pPage ) SwLayouter::SwLayouter() : pEndnoter( NULL ), pLooping( NULL ), - // --> OD 2004-06-23 #i28701# + // #i28701# mpMovedFwdFrms( 0L ), // <-- - // --> OD 2004-10-22 #i35911# + // #i35911# mpObjsTmpConsiderWrapInfl( 0L ) // <-- { @@ -241,11 +241,11 @@ SwLayouter::~SwLayouter() { delete pEndnoter; delete pLooping; - // --> OD 2004-06-23 #i28701# + // #i28701# delete mpMovedFwdFrms; mpMovedFwdFrms = 0L; // <-- - // --> OD 2004-10-22 #i35911# + // #i35911# delete mpObjsTmpConsiderWrapInfl; mpObjsTmpConsiderWrapInfl = 0L; // <-- @@ -339,7 +339,7 @@ sal_Bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ) pDoc->GetLayouter()->StartLooping( pPage ); } -// --> OD 2004-06-23 #i28701# +// #i28701# // ----------------------------------------------------------------------------- // methods to manage text frames, which are moved forward by the positioning // of its anchored objects @@ -372,7 +372,7 @@ void SwLayouter::InsertMovedFwdFrm( const SwDoc& _rDoc, _nToPageNum ); } -// --> OD 2005-01-12 #i40155# +// #i40155# void SwLayouter::RemoveMovedFwdFrm( const SwDoc& _rDoc, const SwTxtFrm& _rTxtFrm ) { @@ -405,7 +405,7 @@ bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc, } } // <-- -// --> OD 2004-10-05 #i26945# +// #i26945# bool SwLayouter::DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, const SwRowFrm& _rRowFrm ) { @@ -425,7 +425,7 @@ bool SwLayouter::DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, } // <-- -// --> OD 2004-10-22 #i35911# +// #i35911# void SwLayouter::ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ) { if ( _rDoc.GetLayouter() && @@ -452,7 +452,7 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence( _rDoc.GetLayouter()->mpObjsTmpConsiderWrapInfl->Insert( _rAnchoredObj ); } // <-- -// --> OD 2005-01-12 #i40155# +// #i40155# void SwLayouter::ClearFrmsNotToWrap( const SwDoc& _rDoc ) { if ( _rDoc.GetLayouter() ) @@ -514,7 +514,7 @@ void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm ) } } -// --> OD 2006-05-10 #i65250# +// #i65250# bool SwLayouter::MoveBwdSuppressed( const SwDoc& p_rDoc, const SwFlowFrm& p_rFlowFrm, const SwLayoutFrm& p_rNewUpperFrm ) diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx index 7ce3bf320579..1bf726e06031 100644 --- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx +++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx @@ -73,7 +73,7 @@ bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm, return false; } -// --> OD 2004-10-05 #i26945# +// #i26945# bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm ) const { bool bDoesRowContainMovedFwdFrm( false ); diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index faefa9c3e8b0..2decf75b06fb 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -355,7 +355,7 @@ SwRectFn fnRectVertL2R = &aVerticalLeftToRight; SwRectFn fnRectB2T = &aBottomToTop; SwRectFn fnRectVL2R = &aVerticalRightToLeft; -// --> OD 2006-05-10 #i65250# +// #i65250# sal_uInt32 SwFrm::mnLastFrmId=0; // <-- diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index c9cebfd93ce6..d86fd5f7fc5c 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -79,7 +79,7 @@ class SwPageNumAndTypeOfAnchors { tEntry* pNewEntry = new tEntry(); pNewEntry->mpAnchoredObj = &_rAnchoredObj; - // --> #i33751#, #i34060# - method <GetPageFrmOfAnchor()> + // #i33751#, #i34060# - method <GetPageFrmOfAnchor()> // is replaced by method <FindPageFrmOfAnchor()>. It's return value // have to be checked. SwPageFrm* pPageFrmOfAnchor = _rAnchoredObj.FindPageFrmOfAnchor(); @@ -306,7 +306,7 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj ) pCntnt->OptCalc(); // format floating screen objects at content text frame - // --> #i23129#, #i36347# - pass correct page frame to + // #i23129#, #i36347# - pass correct page frame to // the object formatter if ( pCntnt->IsTxtFrm() && !SwObjectFormatter::FormatObjsAtFrm( *pCntnt, @@ -383,7 +383,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) static_cast<SwFlyLayFrm&>(rFlyFrm).SetNoMakePos( true ); } // <-- - // --> #i23129#, #i36347# - pass correct page frame + // #i23129#, #i36347# - pass correct page frame // to the object formatter SwObjectFormatter::FormatObjsAtFrm( rFlyFrm, *(rFlyFrm.FindPageFrm()), @@ -486,7 +486,7 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) continue; } // <-- - // --> #i33751#, #i34060# - method <GetPageFrmOfAnchor()> + // #i33751#, #i34060# - method <GetPageFrmOfAnchor()> // is replaced by method <FindPageFrmOfAnchor()>. It's return value // have to be checked. SwPageFrm* pPageFrmOfAnchor = pAnchoredObj->FindPageFrmOfAnchor(); diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index 80fc372eb2f6..132fbee0ae57 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -85,7 +85,7 @@ SwFrm& SwObjectFormatterLayFrm::GetAnchorFrm() return mrAnchorLayFrm; } -// --> OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>. +// #i40147# - add parameter <_bCheckForMovedFwd>. // Not relevant for objects anchored at layout frame. bool SwObjectFormatterLayFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool ) @@ -157,23 +157,23 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage() { SwAnchoredObject* pAnchoredObj = (*rPageFrm.GetSortedObjs())[i]; - // --> OD 2005-08-18 #i51941# - do not format object, which are anchored + // #i51941# - do not format object, which are anchored // inside or at fly frame. if ( pAnchoredObj->GetAnchorFrm()->FindFlyFrm() ) { continue; } // <-- - // --> OD 2004-09-23 #i33751#, #i34060# - method <GetPageFrmOfAnchor()> + // #i33751#, #i34060# - method <GetPageFrmOfAnchor()> // is replaced by method <FindPageFrmOfAnchor()>. It's return value // have to be checked. SwPageFrm* pPageFrmOfAnchor = pAnchoredObj->FindPageFrmOfAnchor(); - // --> OD 2004-10-08 #i26945# - check, if the page frame of the + // #i26945# - check, if the page frame of the // object's anchor frame isn't the given page frame OSL_ENSURE( pPageFrmOfAnchor, "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - missing page frame" ); if ( pPageFrmOfAnchor && - // --> OD 2004-10-22 #i35911# + // #i35911# pPageFrmOfAnchor->GetPhyPageNum() < rPageFrm.GetPhyPageNum() ) // <-- // <-- diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index a2199030a61c..cfaf0d206bd5 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -66,7 +66,7 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter public: virtual ~SwObjectFormatterLayFrm(); - // --> OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>. + // #i40147# - add parameter <_bCheckForMovedFwd>. // Not relevant for objects anchored at layout frame. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool _bCheckForMovedFwd = false ); diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 948efb8452c5..6e9c6e96922e 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -497,7 +497,7 @@ void SwPageFrm::PreparePage( sal_Bool bFtn ) { SetFtnPage( bFtn ); - // --> OD 2008-01-30 #i82258# + // #i82258# // Due to made change on OOo 2.0 code line, method <::lcl_FormatLay(..)> has // the side effect, that the content of page header and footer are formatted. // For this formatting it is needed that the anchored objects are registered @@ -900,7 +900,7 @@ void SwPageFrm::Cut() for ( int i = 0; GetSortedObjs() && (sal_uInt16)i < GetSortedObjs()->Count(); ++i ) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*GetSortedObjs())[i]; if ( pAnchoredObj->ISA(SwFlyAtCntFrm) ) @@ -1009,7 +1009,7 @@ void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) { for( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; if ( pAnchoredObj->ISA(SwFlyInCntFrm) ) { @@ -1040,7 +1040,7 @@ void SwPageFrm::PrepareRegisterChg() { for( sal_uInt16 i = 0; i < GetSortedObjs()->Count(); ++i ) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*GetSortedObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) { @@ -1472,7 +1472,7 @@ void SwRootFrm::RemoveSuperfluous() SwSortedObjs &rObjs = *pPage->GetSortedObjs(); for ( sal_uInt16 i = 0; bOnlySuperfluosObjs && i < rObjs.Count(); ++i ) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = rObjs[i]; // OD 2004-01-19 #110582# - do not consider hidden objects if ( pPage->GetFmt()->GetDoc()->IsVisibleLayerId( @@ -1493,7 +1493,7 @@ void SwRootFrm::RemoveSuperfluous() pPage->FindFtnCont() || ( 0 != ( pBody = pPage->FindBodyCont() ) && ( pBody->ContainsCntnt() || - // --> FME 2005-05-18 #i47580# + // #i47580# // Do not delete page if there's an empty tabframe // left. I think it might be correct to use ContainsAny() // instead of ContainsCntnt() to cover the empty-table-case, @@ -1639,7 +1639,7 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage ) pPage->GetSortedObjs() && sal_uInt16(i) < pPage->GetSortedObjs()->Count(); ++i) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwFrmFmt& rFmt = (*pPage->GetSortedObjs())[i]->GetFrmFmt(); const SwFmtAnchor &rAnch = rFmt.GetAnchor(); const sal_uInt16 nPg = rAnch.GetPageNum(); @@ -1794,7 +1794,7 @@ void SwRootFrm::ImplCalcBrowseWidth() { for ( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { - // --> OD 2004-06-29 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); const sal_Bool bFly = pAnchoredObj->ISA(SwFlyFrm); @@ -1813,7 +1813,7 @@ void SwRootFrm::ImplCalcBrowseWidth() break; case FLY_AT_PARA: { - // --> FME 2004-09-13 #i33170# + // #i33170# // Reactivated old code because // nWidth = pAnchoredObj->GetObjRect().Right() // gives wrong results for objects that are still @@ -1903,7 +1903,7 @@ void SwRootFrm::UnoRemoveAllActions() if ( pSh ) do { - // --> OD 2008-05-16 #i84729# + // #i84729# // No end action, if <ViewShell> instance is currently in its end action. // Recursives calls to <::EndAction()> are not allowed. if ( !pSh->IsInEndAction() ) @@ -2033,7 +2033,7 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) pAnchoredDrawObj->DrawObj()->SetAnchorPos( aNewAnchorPos ); pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() ); } - // --> OD 2009-08-20 #i92511# + // #i92511# // cache for object rectangle inclusive spaces has to be invalidated. pAnchoredObj->InvalidateObjRectWithSpaces(); // <-- @@ -2076,7 +2076,7 @@ void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset ) // PAGES01: Calculate how the pages have to be positioned void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVisArea ) { - // --> OD 2008-07-07 #i91432# + // #i91432# // No calculation of page positions, if only an empty page is present. // This situation occurs when <SwRootFrm> instance is in construction // and the document contains only left pages. @@ -2409,7 +2409,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi bool SwRootFrm::IsLeftToRightViewLayout() const { // Layout direction determined by layout direction of the first page. - // --> OD 2008-04-08 #i88036# + // #i88036# // Only ask a non-empty page frame for its layout direction // const SwPageFrm* pPage = dynamic_cast<const SwPageFrm*>(Lower()); // return !pPage->IsRightToLeft() && !pPage->IsVertical(); @@ -2425,7 +2425,7 @@ const SwPageFrm& SwPageFrm::GetFormatPage() const if ( IsEmptyPage() ) { pRet = static_cast<const SwPageFrm*>( OnRightPage() ? GetNext() : GetPrev() ); - // --> OD 2008-04-08 #i88035# + // #i88035# // Typically a right empty page frame has a next non-empty page frame and // a left empty page frame has a previous non-empty page frame. // But under certain cirsumstances this assumption is not true - diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index dec5a75becf5..03991b1b3657 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -153,7 +153,7 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft ) { SwFrmFmt& rFmt = bLeft ? GetLeft() : GetMaster(); - // --> OD 2007-01-25 #i73790# - method renamed + // #i73790# - method renamed rFmt.ResetAllFmtAttr(); // <-- rFmt.SetFmtAttr( SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR) ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 101fb6992c3e..3b2f2d738ace 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -810,7 +810,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) //der Tabellen. if ( Count() != nLastCount ) { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); // <-- @@ -928,7 +928,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, { if ( Count() ) { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); // <-- @@ -1277,7 +1277,7 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, if ( bBottom ) { SwTwips nDiff = 0; - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( pFrm->IsTabFrm() && ((SwTabFrm*)pFrm)->IsCollapsingBorders() ) { @@ -1690,7 +1690,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, if( rSh.GetViewOptions()->IsGraphic() ) { //#125488#: load graphic directly in PDF import - // --> OD 2006-08-25 #i68953# - also during print load graphic directly. + // #i68953# - also during print load graphic directly. if ( (rSh).GetViewOptions()->IsPDFExport() || rSh.GetOut()->GetOutDevType() == OUTDEV_PRINTER ) // <-- @@ -1800,7 +1800,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, // calculate paint offset Point aPaintOffset( aAlignedPaintRect.Pos() - aGrf.Pos() ); // draw background graphic tiled for aligned paint rectangle - // --> OD 2005-02-15 #i42643# - apply fix #104004# for Calc + // #i42643# - apply fix #104004# for Calc // also for Writer - see /sc/source/view/printfun.cxx // For PDF export, every draw operation for bitmaps takes a // noticeable amount of place (~50 characters). Thus, optimize @@ -1911,7 +1911,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, ( ( aColor.GetTransparency() != 0) || bTransparentGrfWithNoFillBackgrd ); - // --> OD 2008-06-02 #i75614# + // #i75614# // reset draw mode in high contrast mode in order to get fill color set const sal_uLong nOldDrawMode = pOutDev->GetDrawMode(); if ( pGlobalShell->GetWin() && @@ -1935,7 +1935,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, pOutDev->SetFillColor( aColor ); } - // --> OD 2008-06-02 #i75614# + // #i75614# // restore draw mode pOutDev->SetDrawMode( nOldDrawMode ); // <-- @@ -2255,7 +2255,7 @@ void SwTabFrmPainter::HandleFrame( const SwLayoutFrm& rLayoutFrm ) void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) const { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev ); // <-- @@ -2786,7 +2786,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const //Ggf. eine Action ausloesen um klare Verhaeltnisse zu schaffen. //Durch diesen Kunstgriff kann in allen Paints davon ausgegangen werden, //das alle Werte gueltigt sind - keine Probleme, keine Sonderbehandlung(en). - // --> OD 2008-10-07 #i92745# + // #i92745# // Extend check on certain states of the 'current' <ViewShell> instance to // all existing <ViewShell> instances. bool bPerformLayoutAction( true ); @@ -2843,7 +2843,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // #i68597# const bool bGridPainting(pSh->GetWin() && pSh->Imp()->HasDrawView() && pSh->Imp()->GetDrawView()->IsGridVisible()); - // --> OD 2008-05-16 #i84659# + // #i84659# // while ( pPage && !::IsShortCut( aRect, pPage->Frm() ) ) while ( pPage ) // <-- @@ -2894,7 +2894,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const } // <-- - // --> OD 2007-08-20 #i80793# + // #i80793# // enlarge paint rectangle for objects overlapping the same pixel // in all cases and before the DrawingLayer overlay is initialized. lcl_AdjustRectToPixelSize( aPaintRect, *(pSh->GetOut()) ); @@ -3153,7 +3153,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { ViewShell *pSh = getRootFrm()->GetCurrShell(); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support Frm_Info aFrmInfo( *this ); SwTaggedPDFHelper aTaggedPDFHelper( 0, &aFrmInfo, 0, *pSh->GetOut() ); // <-- @@ -3491,7 +3491,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const bContour = GetContour( aPoly, sal_True ); } - // --> OD 2005-06-08 #i47804# - distinguish complete background paint + // #i47804# - distinguish complete background paint // and margin paint. // paint complete background for Writer text fly frames bool bPaintCompleteBack( !pNoTxt ); @@ -3514,7 +3514,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const const bool bPaintMarginOnly( !bPaintCompleteBack && Prt().SSize() != Frm().SSize() ); - // --> OD 2005-06-08 #i47804# - paint background of parent fly frame + // #i47804# - paint background of parent fly frame // for transparent graphics in layer Hell, if parent fly frame isn't // in layer Hell. It's only painted the intersection between the // parent fly frame area and the paint area <aRect> @@ -3558,7 +3558,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // paint background { SwRegionRects aRegion( aRect ); - // --> OD 2007-12-13 #i80822# + // #i80822# // suppress painting of background in printing area for // non-transparent graphics. if ( bPaintMarginOnly || @@ -3573,7 +3573,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( bContour ) { pOut->Push(); - // --> OD 2007-12-13 #i80822# + // #i80822# // apply clip region under the same conditions, which are // used in <SwNoTxtFrm::Paint(..)> to set the clip region // for painting the graphic/OLE. Thus, the clip region is @@ -3683,7 +3683,7 @@ void SwTabFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { if ( pGlobalShell->GetViewOptions()->IsTable() ) { - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( IsCollapsingBorders() ) { SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)this ); @@ -4609,7 +4609,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, !pGlobalShell->GetViewOptions()->IsTable() ) return; - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( IsTabFrm() || IsCellFrm() || IsRowFrm() ) { const SwTabFrm* pTabFrm = FindTabFrm(); @@ -5296,7 +5296,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; // No shadow in prefs if( !SwViewOption::IsShadow() ) return; - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *_pViewShell->GetOut() ); // <-- @@ -5547,7 +5547,7 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, OutputDevice *pOut = pGlobalShell->GetOut(); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); // <-- @@ -5610,7 +5610,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, ViewShell *pSh = pGlobalShell; - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); // <-- @@ -6014,7 +6014,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, { bool bNewTableModel = false; - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( IsTabFrm() || IsCellFrm() || IsRowFrm() ) { const SwTabFrm* pTabFrm = FindTabFrm(); @@ -6324,7 +6324,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const aRegion -= rRect; ViewShell *pSh = getRootFrm()->GetCurrShell(); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); // <-- diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 62a7c97f974e..24c529708054 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -192,7 +192,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) SwFrm* pUp = GetUpper(); if( pUp ) { - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for current next paragraph will change @@ -1158,7 +1158,7 @@ void SwSectionFrm::SimpleFormat() UnlockJoin(); } -// --> OD 2005-01-11 #i40147# - helper class to perform extra section format +// #i40147# - helper class to perform extra section format // to position anchored objects and to keep the position of whose objects locked. class ExtraFormatToPositionObjs { @@ -1195,7 +1195,7 @@ class ExtraFormatToPositionObjs } } - // --> OD 2008-06-20 #i81555# + // #i81555# void InitObjs( SwFrm& rFrm ) { SwSortedObjs* pObjs = rFrm.GetDrawObjs(); @@ -1238,7 +1238,7 @@ class ExtraFormatToPositionObjs (mpSectFrm->GetUpper()->*fnRect->fnGetPrtBottom)() ); (mpSectFrm->Frm().*fnRect->fnAddBottom)( nDiff ); (mpSectFrm->*fnRect->fnSetYMargins)( nTopMargin, 0 ); - // --> OD 2006-05-08 #i59789# + // #i59789# // suppress formatting, if printing area of section is too narrow if ( (mpSectFrm->Prt().*fnRect->fnGetHeight)() <= 0 ) { @@ -1262,7 +1262,7 @@ class ExtraFormatToPositionObjs } // unlock position of lower floating screen objects for the extra format - // --> OD 2008-06-20 #i81555# + // #i81555# // Section frame can already have changed the page and its content // can still be on the former page. // Thus, initialize objects via lower-relationship @@ -1353,7 +1353,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // OD 2004-05-17 #i28701# - If the wrapping style has to be considered // on object positioning, an extra formatting has to be performed // to determine the correct positions the floating screen objects. - // --> OD 2005-01-11 #i40147# + // #i40147# // use new helper class <ExtraFormatToPositionObjs>. // This class additionally keep the locked position of the objects // and releases this position lock keeping on destruction. @@ -1404,7 +1404,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { if( pFrm->IsColumnFrm() && pFrm->GetNext() ) { - // --> OD 2006-05-08 #i61435# + // #i61435# // suppress formatting, if upper frame has height <= 0 if ( (GetUpper()->Frm().*fnRect->fnGetHeight)() > 0 ) { @@ -1826,7 +1826,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) // this table. SwSectionFrm *pSect = FindSctFrm(); - // --> OD 2009-01-16 #i95698# + // #i95698# // A table cell containing directly a section does not break - see lcl_FindSectionsInRow(..) // Thus, a table inside a section, which is inside another table can only // flow backward in the columns of its section. @@ -2093,7 +2093,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst ) pFrm->InvalidatePos(); } } - // --> OD 2004-07-05 #i28701# - Due to the new object positioning + // #i28701# - Due to the new object positioning // the frame on the next page/column can flow backward (e.g. it // was moved forward due to the positioning of its objects ). // Thus, invalivate this next frame, if document compatibility diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx index dc81c71f0355..3ec7dc5cc47a 100644 --- a/sw/source/core/layout/sortedobjsimpl.cxx +++ b/sw/source/core/layout/sortedobjsimpl.cxx @@ -192,12 +192,12 @@ struct ObjAnchorOrder &(rFmtListed.GetWrapInfluenceOnObjPos()); const SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosNew = &(rFmtNew.GetWrapInfluenceOnObjPos()); - // --> OD 2004-10-18 #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE + // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) != pWrapInfluenceOnObjPosNew->GetWrapInfluenceOnObjPos( true ) ) // <-- { - // --> OD 2004-10-18 #i35017# - constant name has changed + // #i35017# - constant name has changed if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ) // <-- @@ -215,7 +215,7 @@ struct ObjAnchorOrder bool SwSortedObjsImpl::Insert( SwAnchoredObject& _rAnchoredObj ) { - // --> OD 2005-08-18 #i51941# + // #i51941# if ( Contains( _rAnchoredObj ) ) { // list already contains object @@ -298,7 +298,7 @@ sal_uInt32 SwSortedObjsImpl::ListPosOf( const SwAnchoredObject& _rAnchoredObj ) if ( aIter != maSortedObjLst.end() ) { - // --> OD 2005-08-18 #i51941# + // #i51941# // nRetLstPos = aIter - maSortedObjLst.begin(); std::vector< SwAnchoredObject* >::difference_type nPos = aIter - maSortedObjLst.begin(); diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 1bfaa40c7ae8..9d49a68db949 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -287,7 +287,7 @@ void SwFrm::CheckDirChange() else if( IsTxtFrm() ) ((SwTxtFrm*)this)->Prepare( PREP_CLEAR ); - // --> OD 2004-07-27 #i31698# - notify anchored objects also for page frames. + // #i31698# - notify anchored objects also for page frames. // Remove code above for special handling of page frames if ( GetDrawObjs() ) { @@ -305,7 +305,7 @@ void SwFrm::CheckDirChange() // invalidate pAnchoredObj->InvalidateObjPos(); } - // --> OD 2004-07-27 #i31698# - update layout direction of + // #i31698# - update layout direction of // anchored object { ::setContextWritingMode( pAnchoredObj->DrawObj(), pAnchoredObj->GetAnchorFrmContainingAnchPos() ); @@ -506,7 +506,7 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode ) SwIterator<SwCntntFrm,SwCntntNode> aIter( rNode ); for( SwCntntFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) { - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for current next paragraph will change @@ -580,7 +580,7 @@ SwLayoutFrm::~SwLayoutFrm() while ( pFrm->GetDrawObjs() && pFrm->GetDrawObjs()->Count() ) { nCnt = pFrm->GetDrawObjs()->Count(); - // --> OD 2004-06-30 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[0]; if ( pAnchoredObj->ISA(SwFlyFrm) ) delete pAnchoredObj; @@ -613,7 +613,7 @@ SwLayoutFrm::~SwLayoutFrm() { nCnt = GetDrawObjs()->Count(); - // --> OD 2004-06-30 #i28701# + // #i28701# SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[0]; if ( pAnchoredObj->ISA(SwFlyFrm) ) delete pAnchoredObj; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index fb8c0b34e4bb..ca35dd1e966d 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -95,7 +95,7 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ): bComplete = bCalcLowers = bONECalcLowers = bLowersFormatted = bLockBackMove = bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine = bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False; - // --> OD 2004-10-04 #i26945# + // #i26945# bConsiderObjsForMinCellHeight = sal_True; bObjsDoesFit = sal_True; // <-- @@ -128,7 +128,7 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) : bLockJoin = bComplete = bONECalcLowers = bCalcLowers = bLowersFormatted = bLockBackMove = bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine = bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False; - // --> OD 2004-10-04 #i26945# + // #i26945# bConsiderObjsForMinCellHeight = sal_True; bObjsDoesFit = sal_True; // <-- @@ -205,14 +205,14 @@ void SwTabFrm::RegistFlys() void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom ); void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ); sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ); -// --> OD 2004-10-15 #i26945# - add parameter <_bOnlyRowsAndCells> to control +// #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells = false ); // <-- // OD 2004-02-18 #106629# - correct type of 1st parameter -// --> OD 2004-10-04 #i26945# - add parameter <_bConsiderObjs> in order to +// #i26945# - add parameter <_bConsiderObjs> in order to // control, if floating screen objects have to be considered for the minimal // cell height. SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm *pRow, @@ -265,7 +265,7 @@ SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, boo return pFollowFlowLine; } -// --> OD 2004-11-05 #i26945# - local helper function to invalidate all lower +// #i26945# - local helper function to invalidate all lower // objects. By parameter <_bMoveObjsOutOfRange> it can be controlled, if // additionally the objects are moved 'out of range'. void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, @@ -361,7 +361,7 @@ void lcl_ShrinkCellsAndAllContent( SwRowFrm& rRow ) const_cast<SwCellFrm&>(pCurrMasterCell->FindStartEndOfRowSpanCell( true, true )) : *pCurrMasterCell; - // --> OD 2004-10-04 #i26945# + // #i26945# // all lowers should have the correct position lcl_ArrangeLowers( &rToAdjust, (rToAdjust.*fnRect->fnGetPrtTop)(), @@ -515,7 +515,7 @@ void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, SwTwips nTmpCut = nRemain; SwRowFrm* pTmpLastLineRow = (SwRowFrm*)pCurrLastLineCell->Lower(); - // --> OD 2004-10-04 #i26945# + // #i26945# SwTwips nCurrentHeight = lcl_CalcMinRowHeight( pTmpLastLineRow, rTab.IsConsiderObjsForMinCellHeight() ); @@ -524,7 +524,7 @@ void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, { nTmpCut -= nCurrentHeight; pTmpLastLineRow = (SwRowFrm*)pTmpLastLineRow->GetNext(); - // --> OD 2004-10-04 #i26945# + // #i26945# nCurrentHeight = lcl_CalcMinRowHeight( pTmpLastLineRow, rTab.IsConsiderObjsForMinCellHeight() ); @@ -675,19 +675,19 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // Here the recalculation process starts: // rTab.SetRebuildLastLine( sal_True ); - // --> OD 2004-10-15 #i26945# + // #i26945# rTab.SetDoesObjsFit( sal_True ); // <-- SWRECTFN( rTab.GetUpper() ) - // --> OD 2004-11-05 #i26945# - invalidate and move floating screen + // #i26945# - invalidate and move floating screen // objects 'out of range' ::lcl_InvalidateLowerObjs( rLastLine, true ); // <-- // // manipulate row and cell sizes // - // --> OD 2004-10-04 #i26945# - Do *not* consider floating screen objects + // #i26945# - Do *not* consider floating screen objects // for the minimal cell height. rTab.SetConsiderObjsForMinCellHeight( sal_False ); ::lcl_ShrinkCellsAndAllContent( rLastLine ); @@ -750,7 +750,7 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // // 1. Check if table fits to its upper. - // --> OD 2004-10-15 #i26945# - include check, if objects fit + // #i26945# - include check, if objects fit // const SwTwips nDistanceToUpperPrtBottom = (rTab.Frm().*fnRect->fnBottomDist)( (rTab.GetUpper()->*fnRect->fnGetPrtBottom)()); @@ -822,7 +822,7 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, } rTab.SetRebuildLastLine( sal_False ); - // --> OD 2004-10-15 #i26945# + // #i26945# rTab.SetDoesObjsFit( sal_True ); // <-- @@ -963,7 +963,7 @@ bool SwTabFrm::RemoveFollowFlowLine() return bJoin; } -// --> OD 2004-10-04 #i26945# - Floating screen objects are no longer searched. +// #i26945# - Floating screen objects are no longer searched. bool lcl_FindSectionsInRow( const SwRowFrm& rRow ) { bool bRet = false; @@ -982,7 +982,7 @@ bool lcl_FindSectionsInRow( const SwRowFrm& rRow ) } else { - // --> OD 2004-10-04 #i26945# - search only for sections + // #i26945# - search only for sections bRet = pTmpFrm->IsSctFrm(); // <-- } @@ -1008,10 +1008,10 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee SWRECTFN( this ) - // --> OD 2004-10-14 #i26745# - format row and cell frames of table + // #i26745# - format row and cell frames of table { this->Lower()->_InvalidatePos(); - // --> OD 2005-03-30 #i43913# - correction: + // #i43913# - correction // call method <lcl_InnerCalcLayout> with first lower. lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true ); // <-- @@ -1059,8 +1059,8 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee // bool bSplitRowAllowed = pRow->IsRowSplitAllowed(); - // --> FME 2004-06-03 #i29438# - // --> OD 2004-10-04 #i26945# - Floating screen objects no longer forbid + // #i29438# + // #i26945# - Floating screen objects no longer forbid // a splitting of the table row. // Special DoNotSplit case 1: // Search for sections inside pRow: @@ -1071,7 +1071,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee } // <-- - // --> FME 2004-06-07 #i29771# + // #i29771# // To avoid loops, we do some checks before actually trying to split // the row. Maybe we should keep the next row in this table. // Note: This is only done if we are at the beginning of our upper @@ -1180,7 +1180,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee if ( pRow == pFirstNonHeadlineRow ) return false; - // --> OD 2008-10-21 #i91764# + // #i91764# // Ignore row span lines SwRowFrm* pTmpRow = pFirstNonHeadlineRow; while ( pTmpRow && pTmpRow->IsRowSpanLine() ) @@ -1417,7 +1417,7 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) if ( ((SwLayoutFrm*)pFrm)->Lower() ) { ::SwInvalidatePositions( ((SwLayoutFrm*)pFrm)->Lower(), nBottom); - // --> OD 2004-11-05 #i26945# + // #i26945# ::lcl_InvalidateLowerObjs( *(static_cast<SwLayoutFrm*>(pFrm)) ); // <-- } @@ -1465,7 +1465,7 @@ void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom ) (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), nBottom ) < 0 ) ); } -// --> collapsing borders FME 2005-05-27 #i29550# +// #i29550# void lcl_InvalidateAllLowersPrt( SwLayoutFrm* pLayFrm ) { pLayFrm->_InvalidatePrt(); @@ -1531,14 +1531,14 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, if ( bFormatPossible && !bSkipContent ) { bRet |= !pCnt->IsValid(); - // --> OD 2004-10-06 #i26945# - no extra invalidation of floating + // #i26945# - no extra invalidation of floating // screen objects needed. // Thus, delete call of method <SwFrm::InvalidateObjs( true )> // <-- pCnt->Calc(); // OD 2004-05-11 #i28701# - usage of new method <::FormatObjsAtFrm(..)> // to format the floating screen objects - // --> OD 2005-05-03 #i46941# - frame has to be valid + // #i46941# - frame has to be valid // Note: frame could be invalid after calling its format, if it's locked. OSL_ENSURE( !pCnt->IsTxtFrm() || pCnt->IsValid() || @@ -1546,7 +1546,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, "<SwCntntFrm::CalcLowers(..)> - text frame invalid and not locked." ); if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) { - // --> OD 2004-11-02 #i23129#, #i36347# - pass correct page frame to + // #i23129#, #i36347# - pass correct page frame to // the object formatter if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) @@ -1582,7 +1582,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, return bRet; } -// --> OD 2004-10-15 #i26945# - add parameter <_bOnlyRowsAndCells> to control +// #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, @@ -1595,7 +1595,7 @@ sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, SWRECTFN( pFrm ) do { - // --> OD 2004-10-15 #i26945# - parameter <_bOnlyRowsAndCells> controls, + // #i26945# - parameter <_bOnlyRowsAndCells> controls, // if only row and cell frames are formatted. if ( pFrm->IsLayoutFrm() && ( !_bOnlyRowsAndCells || pFrm->IsRowFrm() || pFrm->IsCellFrm() ) ) @@ -1631,7 +1631,7 @@ sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) { - // --> OD 2004-10-05 #i26945# - For correct appliance of the 'straightforward + // #i26945# - For correct appliance of the 'straightforward // object positioning process, it's needed to notify that the page frame, // on which the given layout frame is in, is in its layout process. SwPageFrm* pPageFrm = rRow.FindPageFrm(); @@ -1723,7 +1723,7 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) break; } while( true ); - // --> OD 2004-10-05 #i26945# + // #i26945# if ( pPageFrm ) pPageFrm->SetLayoutInProgress( false ); // <-- @@ -1991,7 +1991,7 @@ void SwTabFrm::MakeAll() { bMovedFwd = sal_True; bCalcLowers = sal_True; - // --> OD 2009-08-12 #i99267# + // #i99267# // reset <bSplit> after forward move to assure that follows // can be joined, if further space is available. bSplit = sal_False; @@ -2023,7 +2023,7 @@ void SwTabFrm::MakeAll() pPre->GetAttrSet()->GetKeep().GetValue()) ) { bCalcLowers = sal_True; - // --> OD 2009-03-06 #i99267# + // #i99267# // reset <bSplit> after forward move to assure that follows // can be joined, if further space is available. bSplit = sal_False; @@ -2382,7 +2382,7 @@ void SwTabFrm::MakeAll() ( !bTableRowKeep || pFirstNonHeadlineRow->GetNext() || !pFirstNonHeadlineRow->ShouldRowKeepWithNext() ) && ( !bDontSplit || !pIndPrev ) ) { - // --> FME 2004-06-03 #i29438# + // #i29438# // Special DoNotSplit case: // We better avoid splitting of a row frame if we are inside a columned // section which has a height of 0, because this is not growable and thus @@ -2419,7 +2419,7 @@ void SwTabFrm::MakeAll() // Set to false again as early as possible. bLastRowHasToMoveToFollow = false; - // --> FME 2005-08-03 #i52781# + // #i52781# // YaSC - Yet another special case: // If our upper is inside a table cell which is not allowed // to split, we do not try to split: @@ -2476,7 +2476,7 @@ void SwTabFrm::MakeAll() if( !bTryToSplit && !bSplitError && nUnSplitted > 0 ) --nUnSplitted; - // --> FME 2004-06-09 #i29771# Two tries to split the table: + // #i29771# Two tries to split the table // If an error occurred during splitting. We start a second // try, this time without splitting of table rows. if ( bSplitError ) @@ -2512,7 +2512,7 @@ void SwTabFrm::MakeAll() //Follow gleich gueltig gemacht werden. if ( GetFollow() ) { - // --> OD 2007-11-30 #i80924# + // #i80924# // After a successful split assure that the first row // is invalid. When graphics are present, this isn't hold. // Note: defect i80924 could also be fixed, if it is @@ -2538,7 +2538,7 @@ void SwTabFrm::MakeAll() pAttrs = pAccess->Get(); ((SwTabFrm*)GetFollow())->SetLowersFormatted(sal_False); - // --> OD 2005-03-30 #i43913# - lock follow table + // #i43913# - lock follow table // to avoid its formatting during the format of // its content. const bool bOldJoinLock = GetFollow()->IsJoinLocked(); @@ -2546,8 +2546,8 @@ void SwTabFrm::MakeAll() // <-- ::lcl_RecalcRow( static_cast<SwRowFrm&>(*GetFollow()->Lower()), (GetFollow()->GetUpper()->Frm().*fnRectX->fnGetBottom)() ); - // --> OD 2005-03-30 #i43913# - // --> FME 2006-04-05 #i63632# Do not unlock the + // #i43913# + // #i63632# Do not unlock the // follow if it wasn't locked before. if ( !bOldJoinLock ) GetFollow()->UnlockJoin(); @@ -2597,7 +2597,7 @@ void SwTabFrm::MakeAll() ((SwSectionFrm*)GetUpper()->GetUpper()->GetUpper())->MoveAllowed(this) ) bMovedFwd = sal_False; - // --> FME 2004-06-09 #i29771# Reset bTryToSplit flag on change of upper + // #i29771# Reset bTryToSplit flag on change of upper const SwFrm* pOldUpper = GetUpper(); // <-- @@ -2605,7 +2605,7 @@ void SwTabFrm::MakeAll() if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) ) bMakePage = sal_False; - // --> FME 2004-06-09 #i29771# Reset bSplitError flag on change of upper + // #i29771# Reset bSplitError flag on change of upper if ( GetUpper() != pOldUpper ) { bTryToSplit = true; @@ -2644,7 +2644,7 @@ void SwTabFrm::MakeAll() if ( bCalcLowers && IsValid() ) { - // --> OD 2005-05-11 #i44910# - format of lower frames unnecessary + // #i44910# - format of lower frames unnecessary // and can cause layout loops, if table doesn't fit and isn't // allowed to split. SwTwips nDistToUpperPrtBottom = @@ -2723,7 +2723,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, { SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); const SwRect aFlyRect = pFly->GetObjRectWithSpaces(); - // --> OD 2004-10-07 #i26945# - correction of conditions, + // #i26945# - correction of conditions, // if Writer fly frame has to be considered: // - no need to check, if top of Writer fly frame differs // from WEIT_WECH, because its also check, if the Writer @@ -2741,7 +2741,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, // text frame has already changed its page. const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm(); bool bConsiderFly = - // --> OD 2005-04-06 #i46807# - do not consider invalid + // #i46807# - do not consider invalid // Writer fly frames. pFly->IsValid() && // <-- @@ -2866,7 +2866,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) long nRightOffset = Max( 0L, nTmpRight ); SwTwips nLower = pAttrs->CalcBottomLine(); - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( IsCollapsingBorders() ) nLower += GetBottomLineSize(); // <-- collapsing @@ -3040,7 +3040,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) OSL_FAIL( "Ungueltige orientation fuer Table." ); } - // --> OD 2004-07-15 #i26250# - extend bottom printing area, if table + // #i26250# - extend bottom printing area, if table // is last content inside a table cell. if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) && GetUpper()->IsInTab() && !GetIndNext() ) @@ -3157,7 +3157,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) if ( GetNext()->IsCntntFrm() ) GetNext()->InvalidatePage( pPage ); } - // --> OD 2004-07-05 #i28701# - Due to the new object positioning the + // #i28701# - Due to the new object positioning the // frame on the next page/column can flow backward (e.g. it was moved // forward due to the positioning of its objects ). Thus, invalivate this // next frame, if document compatibility option 'Consider wrapping style @@ -3519,7 +3519,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r } bMoveAnyway = BwdMoveNecessary( pNewPage, aRect) > 1; - // --> FME 2006-01-20 #i54861# Due to changes made in PrepareMake, + // #i54861# Due to changes made in PrepareMake, // the tabfrm may not have a correct position. Therefore // it is possible that pNewUpper->Prt().Height == 0. In this // case the above calculation of nSpace might give wrong @@ -3546,7 +3546,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r return rReformat = sal_True; else if ( !bLockBackMove && nSpace > 0 ) { - // --> OD 2004-10-05 #i26945# - check, if follow flow line + // #i26945# - check, if follow flow line // contains frame, which are moved forward due to its object // positioning. SwRowFrm* pFirstRow = GetFirstNonHeadlineRow(); @@ -3752,7 +3752,7 @@ SwRowFrm::SwRowFrm( const SwTableLine &rLine, SwFrm* pSib, bool bInsertContent ) SwLayoutFrm( rLine.GetFrmFmt(), pSib ), pTabLine( &rLine ), pFollowRow( 0 ), - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# mnTopMarginForLowers( 0 ), mnBottomMarginForLowers( 0 ), mnBottomLineSize( 0 ), @@ -3824,7 +3824,7 @@ void SwRowFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) { const bool bInFirstNonHeadlineRow = pTab->IsFollow() && this == pTab->GetFirstNonHeadlineRow(); - // --> FME 2004-10-27 #i35063# + // #i35063# // Invalidation required is pRow is last row if ( bInFirstNonHeadlineRow || !GetNext() ) // <-- @@ -3866,13 +3866,13 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) ((SwSectionFrm*)pFrm)->ContainsCntnt() : pFrm; while( pTmp ) { - // --> OD 2004-10-08 #i26945# - consider follow text frames + // #i26945# - consider follow text frames const SwSortedObjs* pObjs( 0L ); bool bIsFollow( false ); if ( pTmp->IsTxtFrm() && static_cast<const SwTxtFrm*>(pTmp)->IsFollow() ) { const SwFrm* pMaster; - // --> FME 2005-04-01 #i46450# Master does not necessarily have + // #i46450# Master does not necessarily have // to exist if this function is called from JoinFrm() -> // Cut() -> Shrink() const SwTxtFrm* pTmpFrm = static_cast<const SwTxtFrm*>(pTmp); @@ -3899,7 +3899,7 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; - // --> OD 2004-10-08 #i26945# - if <pTmp> is follow, the + // #i26945# - if <pTmp> is follow, the // anchor character frame has to be <pTmp>. if ( bIsFollow && const_cast<SwAnchoredObject*>(pAnchoredObj)->FindAnchorCharFrm() != pTmp ) @@ -3907,7 +3907,7 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) continue; } // <-- - // --> OD 2004-10-04 #i26945# - consider also drawing objects + // #i26945# - consider also drawing objects { // OD 30.09.2003 #i18732# - only objects, which follow // the text flow have to be considered. @@ -3936,7 +3936,7 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) nHeight = Max( nHeight, nDistOfFlyBottomToAnchorTop + nFrmDiff - (pFrm->Frm().*fnRect->fnGetHeight)() ); - // --> FME 2006-01-24 #i56115# The first height calculation + // #i56115# The first height calculation // gives wrong results if pFrm->Prt().Y() > 0. We do // a second calculation based on the actual rectangles of // pFrm and pAnchoredObj, and use the maximum of the results. @@ -3970,7 +3970,7 @@ SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttr SwTwips nTopSpace = 0; SwTwips nBottomSpace = 0; - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( pTab->IsCollapsingBorders() && rCell.Lower() && !rCell.Lower()->IsRowFrm() ) { nTopSpace = ((SwRowFrm*)rCell.GetUpper())->GetTopMarginForLowers(); @@ -3995,7 +3995,7 @@ SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttr } -// --> OD 2004-10-04 #i26945# - add parameter <_bConsiderObjs> in order to +// #i26945# - add parameter <_bConsiderObjs> in order to // control, if floating screen objects have to be considered for the minimal // cell height. SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, @@ -4014,7 +4014,7 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, // and else-body if ( pLow->IsRowFrm() ) { - // --> OD 2004-10-04 #i26945# + // #i26945# nHeight += ::lcl_CalcMinRowHeight( static_cast<const SwRowFrm*>(pLow), _bConsiderObjs ); // <-- @@ -4023,7 +4023,7 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, { long nLowHeight = (pLow->Frm().*fnRect->fnGetHeight)(); nHeight += nLowHeight; - // --> OD 2004-10-04 #i26945# + // #i26945# if ( _bConsiderObjs ) { nFlyAdd = Max( 0L, nFlyAdd - nLowHeight ); @@ -4055,7 +4055,7 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, } // OD 2004-02-18 #106629# - correct type of 1st parameter -// --> OD 2004-10-04 #i26945# - add parameter <_bConsiderObjs> in order to control, +// #i26945# - add parameter <_bConsiderObjs> in order to control, // if floating screen objects have to be considered for the minimal cell height SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow, const sal_Bool _bConsiderObjs ) @@ -4112,7 +4112,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow, return nHeight; } -// --> collapsing borders FME 2005-05-27 #i29550# +// #i29550# // Calculate the maximum of (TopLineSize + TopLineDist) over all lowers: sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) @@ -4224,7 +4224,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) aPrt.Width ( aFrm.Width() ); aPrt.Height( aFrm.Height() ); - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# // Here we calculate the top-printing area for the lower cell frames SwTabFrm* pTabFrm = FindTabFrm(); if ( pTabFrm->IsCollapsingBorders() ) @@ -4237,7 +4237,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) const SwRowFrm* pPreviousRow = 0; - // --> FME 2004-09-14 #i32456# + // #i32456# // In order to calculate the top printing area for the lower cell // frames, we have to find the 'previous' row frame and compare // the bottom values of the 'previous' row with the 'top' values @@ -4342,7 +4342,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) const SwTwips nDiff = (Frm().*fnRect->fnGetHeight)() - ( HasFixSize() && !IsRowSpanLine() ? pAttrs->GetSize().Height() - // --> OD 2004-10-04 #i26945# + // #i26945# : ::lcl_CalcMinRowHeight( this, FindTabFrm()->IsConsiderObjsForMinCellHeight() ) ); // <-- @@ -4491,7 +4491,7 @@ void SwRowFrm::Cut() pTab->FindMaster()->InvalidatePos(); } - // --> OD 2010-02-17 #i103961# + // #i103961# // notification for accessibility { SwRootFrm *pRootFrm = getRootFrm(); @@ -4621,7 +4621,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) // minimum height. if( nMinHeight < (Frm().*fnRect->fnGetHeight)() ) { - // --> OD 2004-10-04 #i26945# + // #i26945# OSL_ENSURE( FindTabFrm(), "<SwRowFrm::ShrinkFrm(..)> - no table frame -> crash." ); const bool bConsiderObjs( FindTabFrm()->IsConsiderObjsForMinCellHeight() ); // <-- @@ -4821,7 +4821,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) for ( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; - // --> OD 2004-10-08 #i26945# - check, if anchored object + // #i26945# - check, if anchored object // is lower of layout frame by checking, if the anchor // frame, which contains the anchor position, is a lower // of the layout frame. @@ -4830,7 +4830,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) continue; } // <-- - // --> OD 2005-08-08 #i52904# - distinguish between anchored + // #i52904# - distinguish between anchored // objects, whose vertical position depends on its anchor // frame and whose vertical position is independent // from its anchor frame. @@ -4854,7 +4854,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // which are anchored to-paragraph/to-character, if // the wrapping style influence has to be considered // on the object positioning. - // --> OD 2005-08-08 #i52904# - no direct move of objects, + // #i52904# - no direct move of objects, // whose vertical position doesn't depend on anchor frame. const bool bDirectMove = WEIT_WECH != pFly->Frm().Top() && @@ -4871,7 +4871,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // the drawing layer pFly->GetVirtDrawObj()->SetChanged(); // <-- - // --> OD 2006-10-13 #i58280# + // #i58280# pFly->InvalidateObjRectWithSpaces(); // <-- } @@ -4894,7 +4894,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // <mnLastTopOfLine> has also been adjusted. pFly->AddLastTopOfLineY( lDiff ); } - // --> OD 2004-11-05 #i26945# - re-registration at + // #i26945# - re-registration at // page frame of anchor frame, if table frame isn't // a follow table and table frame isn't in its // rebuild of last line. @@ -4925,7 +4925,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // of the Writer fly frame has to be invalidated. pFly->InvalidatePos(); - // --> OD 2004-11-04 #i26945# - follow-up of #i3317# + // #i26945# - follow-up of #i3317# // No arrangement of lowers, if Writer fly frame isn't // moved if ( bDirectMove && @@ -4939,7 +4939,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) } else if ( pAnchoredObj->ISA(SwAnchoredDrawObject) ) { - // --> OD 2004-11-05 #i26945# + // #i26945# const SwTabFrm* pTabFrm = pLay->FindTabFrm(); if ( pTabFrm && !( pTabFrm->IsFollow() && @@ -4959,11 +4959,11 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) pPageOfAnchor->AppendDrawObjToPage( *pAnchoredObj ); } } - // --> OD 2004-07-01 #i28701# - adjust last character + // #i28701# - adjust last character // rectangle and last top of line. pAnchoredObj->AddLastCharY( lDiff ); pAnchoredObj->AddLastTopOfLineY( lDiff ); - // --> OD 2005-08-08 #i52904# - re-introduce direct move + // #i52904# - re-introduce direct move // of drawing objects const bool bDirectMove = static_cast<const SwDrawFrmFmt&>(pAnchoredObj->GetFrmFmt()).IsPosAttrSet() && @@ -4980,7 +4980,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) { pAnchoredObj->DrawObj()->Move( Size( 0, lDiff ) ); } - // --> OD 2006-10-13 #i58280# + // #i58280# pAnchoredObj->InvalidateObjRectWithSpaces(); // <-- } @@ -5006,9 +5006,9 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // not fit into the cell anymore: SwTwips nDistanceToUpperPrtBottom = (pFrm->Frm().*fnRect->fnBottomDist)( (pLay->*fnRect->fnGetPrtBottom)()); - // --> OD 2006-01-19 #i56146# - Revise fix of issue #i26945# + // #i56146# - Revise fix of issue #i26945# // do *not* consider content inside fly frames, if it's an undersized paragraph. - // --> OD 2004-10-08 #i26945# - consider content inside fly frames + // #i26945# - consider content inside fly frames if ( nDistanceToUpperPrtBottom < 0 && ( ( pFrm->IsInFly() && ( !pFrm->IsTxtFrm() || @@ -5038,7 +5038,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( Lower() ) { SwTwips nTopSpace, nBottomSpace, nLeftSpace, nRightSpace; - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( pTab->IsCollapsingBorders() && !Lower()->IsRowFrm() ) { const SvxBoxItem& rBoxItem = pAttrs->GetBox(); @@ -5060,7 +5060,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) (this->*fnRect->fnSetYMargins)( nTopSpace, nBottomSpace ); } } - // --> OD 2004-10-04 #i26945# + // #i26945# long nRemaining = GetTabBox()->getRowSpan() >= 1 ? ::lcl_CalcMinCellHeight( this, pTab->IsConsiderObjsForMinCellHeight(), pAttrs ) : 0; @@ -5201,7 +5201,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) return; } sal_Bool bVertDir = sal_True; - // --> OD 2005-03-30 #i43913# - no vertical alignment, if wrapping + // #i43913# - no vertical alignment, if wrapping // style influence is considered on object positioning and // an object is anchored inside the cell. const bool bConsiderWrapOnObjPos( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) ); @@ -5231,11 +5231,11 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) } const SwFrm* pAnch = pAnchoredObj->GetAnchorFrm(); - // --> OD 2005-03-30 #i43913# - // --> OD 2005-08-08 #i52904# - no vertical alignment, + // #i43913# + // #i52904# - no vertical alignment, // if object, anchored inside cell, has temporarly // consider its wrapping style on object positioning. - // --> FME 2006-02-01 #i58806# - no vertical alignment + // #i58806# - no vertical alignment // if object does not follow the text flow. if ( bConsiderWrapOnObjPos || !IsAnLower( pAnch ) || @@ -5336,7 +5336,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) CheckDirChange(); } - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# if ( bAttrSetChg && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_BOX, sal_False, &pItem ) ) { @@ -5379,7 +5379,7 @@ long SwCellFrm::GetLayoutRowSpan() const return nRet; } -// --> OD 2010-02-17 #i103961# +// #i103961# void SwCellFrm::Cut() { // notification for accessibility @@ -5468,7 +5468,7 @@ bool SwTabFrm::IsLayoutSplitAllowed() const return GetFmt()->GetLayoutSplit().GetValue(); } -// --> collapsing borders FME 2005-05-27 #i29550# +// #i29550# sal_uInt16 SwTabFrm::GetBottomLineSize() const { @@ -5531,7 +5531,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) if ( pTmp ) { SwTwips nTmpHeight = USHRT_MAX; - // --> FME 2004-09-14 #i32456# Consider lower row frames + // #i32456# Consider lower row frames if ( pTmp->IsRowFrm() ) { const SwRowFrm* pTmpSourceRow = (SwRowFrm*)pCurrSourceCell->Lower(); @@ -5567,7 +5567,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) pFrm = pFrm->GetNext(); } - // --> FME, OD 2004-07-15 #i26831#, #i26520# + // #i26831#, #i26520# // The additional lower space of the current last. // --> OD 2004-11-25 #115759# - do *not* consider the // additional lower space for 'master' text frames @@ -5611,7 +5611,7 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) SwBorderAttrAccess aAccess( SwFrm::GetCache(), pCurrSourceCell ); const SwBorderAttrs &rAttrs = *aAccess.Get(); nTmpHeight += rAttrs.CalcTop() + rAttrs.CalcBottom(); - // --> OD 2004-07-16 #i26250# + // #i26250# // Don't forget the upper space and lower space, if ( pTmp->IsFlowFrm() ) { diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 2673082d5468..9abff22e48a8 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -120,7 +120,7 @@ sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { pFrm->Calc(); - // --> FME 2005-05-13 #i43742# New function: SW_CONTENT_CHECK + // #i43742# New function const bool bCntntCheck = pFrm->IsTxtFrm() && pCMS && pCMS->bCntntCheck; const SwRect aPaintRect( bCntntCheck ? pFrm->UnionFrm() : @@ -308,7 +308,7 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, // search for page containing rPoint. The borders around the pages are considerd const SwPageFrm* pPage = GetPageAtPos( rPoint, 0, true ); - // --> OD 2008-12-23 #i95626# + // #i95626# // special handling for <rPoint> beyond root frames area if ( !pPage && rPoint.X() > Frm().Right() && @@ -1977,7 +1977,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) ViewShell *pSh = GetCurrShell(); -// --> FME 2004-06-08 #i12836# enhanced pdf +// #i12836# enhanced pdf SwRegionRects aRegion( pSh && !pSh->GetViewOptions()->IsPDFExport() ? pSh->VisArea() : Frm() ); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index eedf5edef30a..c982c5d97671 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -89,7 +89,7 @@ using namespace ::com::sun::star; SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : SwClient( pMod ), - // --> OD 2006-05-10 #i65250# + // #i65250# mnFrmId( SwFrm::mnLastFrmId++ ), // <-- mpRoot( pSib ? pSib->getRootFrm() : 0 ), @@ -389,7 +389,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const if ( !pPage ) { pPage = FindPageFrm(); - // --> OD 2004-07-02 #i28701# - for at-character and as-character + // #i28701# - for at-character and as-character // anchored Writer fly frames additionally invalidate also page frame // its 'anchor character' is on. if ( pPage && pPage->GetUpper() && IsFlyFrm() ) @@ -397,7 +397,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const const SwFlyFrm* pFlyFrm = static_cast<const SwFlyFrm*>(this); if ( pFlyFrm->IsAutoPos() || pFlyFrm->IsFlyInCntFrm() ) { - // --> OD 2004-09-23 #i33751#, #i34060# - method <GetPageFrmOfAnchor()> + // #i33751#, #i34060# - method <GetPageFrmOfAnchor()> // is replaced by method <FindPageFrmOfAnchor()>. It's return value // have to be checked. SwPageFrm* pPageFrmOfAnchor = @@ -919,7 +919,7 @@ void SwCntntFrm::Cut() if( IsInFtn() ) pFrm->Prepare( PREP_QUOVADIS, 0, sal_False ); } - // --> OD 2004-07-15 #i26250# - invalidate printing area of previous + // #i26250# - invalidate printing area of previous // table frame. else if ( pFrm && pFrm->IsTabFrm() ) { @@ -1002,7 +1002,7 @@ void SwCntntFrm::Cut() pSct->InvalidatePage( pPage ); } } - // --> FME 2005-08-03 #i52253# The master table should take care + // #i52253# The master table should take care // of removing the follow flow line. if ( IsInTab() ) { @@ -1026,7 +1026,7 @@ void SwCntntFrm::Cut() if ( !pUp->Lower() && ( ( pUp->IsFtnFrm() && !pUp->IsColLocked() ) || ( pUp->IsInSct() && - // --> FME 2004-06-03 #i29438# + // #i29438# // We have to consider the case that the section may be "empty" // except from a temporary empty table frame. // This can happen due to the new cell split feature. @@ -1785,7 +1785,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() pFrm = pFrm->GetNext(); } SwCntntFrm *pCnt = ((SwLayoutFrm*)this)->ContainsCntnt(); - // --> OD 2004-12-20 #i36991# - be save. + // #i36991# - be save. // E.g., a row can contain *no* content. if ( pCnt ) { @@ -1887,7 +1887,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { GetNext()->InvalidatePos(); } - // --> OD 2004-07-05 #i28701# - Due to the new object positioning the + // #i28701# - Due to the new object positioning the // frame on the next page/column can flow backward (e.g. it was moved forward // due to the positioning of its objects ). Thus, invalivate this next frame, // if document compatibility option 'Consider wrapping style influence on @@ -1949,7 +1949,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) else nReal = nDist; - // --> OD 2004-07-05 #i28701# - Due to the new object positioning the + // #i28701# - Due to the new object positioning the // frame on the next page/column can flow backward (e.g. it was moved forward // due to the positioning of its objects ). Thus, invalivate this next frame, // if document compatibility option 'Consider wrapping style influence on @@ -2333,7 +2333,7 @@ SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt, SwFrm* pSib ): bFixSize = sal_True; } -// --> OD 2004-06-29 #i28701# +// #i28701# TYPEINIT1(SwLayoutFrm,SwFrm); // <-- /*-------------------------------------------------- @@ -2751,7 +2751,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) if ( !( bVert ? bHeightChgd : bWidthChgd ) && ! Lower()->IsColumnFrm() && ( ( IsBodyFrm() && IsInDocBody() && ( !IsInSct() || !FindSctFrm()->IsColLocked() ) ) || - // --> FME 2004-07-21 #i10826# Section frames without columns should not + // #i10826# Section frames without columns should not // invalidate all lowers! IsSctFrm() ) ) // <-- @@ -2854,12 +2854,12 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) ((SwCntntFrm*)pLowerFrm)->Prepare( PREP_ADJUST_FRM ); } } - // --> OD 2005-01-31 #i41694# - improvement by removing duplicates + // #i41694# - improvement by removing duplicates if ( pLowerFrm ) { if ( pLowerFrm->IsInSct() ) { - // --> OD 2005-01-31 #i41694# - follow-up of issue #i10826#: + // #i41694# - follow-up of issue #i10826# // No invalidation of section frame, if it's the this. SwFrm* pSectFrm = pLowerFrm->FindSctFrm(); if( pSectFrm != this && IsAnLower( pSectFrm ) ) @@ -3461,7 +3461,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, ( !(Frm().*fnRect->fnGetHeight)() && pAny ) ) { long nTop = (this->*fnRect->fnGetTopMargin)(); - // --> OD 2004-11-01 #i23129# - correction: enlarge section + // #i23129# - correction // to the calculated maximum height. (Frm().*fnRect->fnAddBottom)( nMaximum - (Frm().*fnRect->fnGetHeight)() ); @@ -3487,7 +3487,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, else nMaximum = LONG_MAX; - // --> OD 2004-08-25 #i3317# - reset temporarly consideration + // #i3317# - reset temporarly consideration // of wrapping style influence SwPageFrm* pPageFrm = FindPageFrm(); SwSortedObjs* pObjs = pPageFrm ? pPageFrm->GetSortedObjs() : 0L; @@ -3518,7 +3518,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, //Breiten und Hoehen der Spalten ein (so sie denn falsch sind). SwLayoutFrm *pCol = (SwLayoutFrm*)Lower(); - // --> FME 2004-07-19 #i27399# + // #i27399# // Simply setting the column width based on the values returned by // CalcColWidth does not work for automatic column width. AdjustColumns( &rCol, sal_False ); @@ -3649,7 +3649,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // nicht dadurch wieder unter das Minimum rutschen, wollen wir ein wenig // Luft herauslassen. if ( !bNoBalance && - // --> OD 2004-11-04 #i23129# - <nMinDiff> can be + // #i23129# - <nMinDiff> can be // big, because of an object at the beginning of // a column. Thus, decrease optimization here. //nMaxFree >= nMinDiff && @@ -3678,7 +3678,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, nDiff = (Prt().*fnRect->fnGetHeight)() + nDiff + nBorder - (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnAddBottom)( nDiff ); - // --> OD 2006-08-16 #i68520# + // #i68520# if ( dynamic_cast<SwFlyFrm*>(this) ) { dynamic_cast<SwFlyFrm*>(this)->InvalidateObjRectWithSpaces(); @@ -3688,7 +3688,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, ChgLowersProp( aOldSz ); NotifyLowerObjs(); - // --> OD 2004-08-25 #i3317# - reset temporarly consideration + // #i3317# - reset temporarly consideration // of wrapping style influence SwPageFrm* pTmpPageFrm = FindPageFrm(); SwSortedObjs* pTmpObjs = pTmpPageFrm ? pTmpPageFrm->GetSortedObjs() : 0L; @@ -3949,7 +3949,7 @@ void SwRootFrm::InvalidateAllObjPos() // only to paragraph and to character anchored objects are considered. continue; } - // --> OD 2004-07-07 #i28701# - special invalidation for anchored + // #i28701# - special invalidation for anchored // objects, whose wrapping style influence has to be considered. if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() ) pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index a5facaf474b9..8b85f39d8215 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -288,7 +288,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() if ( rAnchorFrm.IsVertical() ) rAnchorFrm.SwitchHorizontalToVertical( aAnchorPos ); - // --> OD 2005-03-09 #i44347# - keep last object rectangle at anchored object + // #i44347# - keep last object rectangle at anchored object OSL_ENSURE( GetAnchoredObj().ISA(SwAnchoredDrawObject), "<SwAsCharAnchoredObjectPosition::CalcPosition()> - wrong type of anchored object." ); SwAnchoredDrawObject& rAnchoredDrawObj = diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 3567441ae68b..62a249f57bc3 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; SwToLayoutAnchoredObjectPosition::SwToLayoutAnchoredObjectPosition( SdrObject& _rDrawObj ) : SwAnchoredObjectPosition( _rDrawObj ), maRelPos( Point() ), - // --> OD 2004-06-17 #i26791# + // #i26791# maOffsetToFrmAnchorPos( Point() ) {} @@ -94,7 +94,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() { eVertOrient = text::VertOrientation::TOP; } - // --> OD 2004-06-17 #i26791# - get vertical offset to frame anchor position. + // #i26791# - get vertical offset to frame anchor position. SwTwips nVertOffsetToFrmAnchorPos( 0L ); SwTwips nRelPosY = _GetVertRelPos( GetAnchorFrm(), GetAnchorFrm(), eVertOrient, @@ -117,7 +117,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() } // determine absolute 'vertical' position, depending on layout-direction - // --> OD 2004-06-17 #i26791# - determine offset to 'vertical' frame + // #i26791# - determine offset to 'vertical' frame // anchor position, depending on layout-direction if( bVert ) { @@ -209,7 +209,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() } // determine absolute 'horizontal' position, depending on layout-direction - // --> OD 2004-06-17 #i26791# - determine offset to 'horizontal' frame + // #i26791# - determine offset to 'horizontal' frame // anchor position, depending on layout-direction //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin // --> OD 2009-09-04 #mongolianlayout# diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index a9b3d43007fb..b6962a097fdf 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -622,7 +622,7 @@ void SwOLENode::CheckFileLink_Impl() } } -// --> OD 2009-03-05 #i99665# +// #i99665# bool SwOLENode::IsChart() const { bool bIsChart( false ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 8a9c2349d3fc..f9b20c6cd680 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1394,7 +1394,7 @@ sal_Bool IsValidRowName( const String& rStr ) return bIsValid; } -// --> OD 2007-08-03 #i80314# +// #i80314# // add 3rd parameter and its handling sal_uInt16 SwTable::_GetBoxNum( String& rStr, sal_Bool bFirstPart, const bool bPerformValidCheck ) @@ -1444,7 +1444,7 @@ sal_uInt16 SwTable::_GetBoxNum( String& rStr, sal_Bool bFirstPart, } // <-- -// --> OD 2007-08-03 #i80314# +// #i80314# // add 2nd parameter and its handling const SwTableBox* SwTable::GetTblBox( const String& rName, const bool bPerformValidCheck ) const @@ -1637,7 +1637,7 @@ void SwTableLine::ChgFrmFmt( SwTableLineFmt *pNewFmt ) pRow->SetCompletePaint(); pRow->ReinitializeFrmSizeAttrFlags(); - // --> FME 2004-10-27 #i35063# + // #i35063# // consider 'split row allowed' attribute SwTabFrm* pTab = pRow->FindTabFrm(); bool bInFollowFlowRow = false; @@ -1863,7 +1863,7 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt ) pCell->SetDerivedVert( sal_False ); pCell->CheckDirChange(); - // --> FME 2005-04-15 #i47489# + // #i47489# // make sure that the row will be formatted, in order // to have the correct Get(Top|Bottom)MarginForLowers values // set at the row. diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 623272cd4919..6f15e3a12f94 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1709,10 +1709,9 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( !bIntern || -1 != nDestId ) { - // --> FME 2005-05-09 #i44368# Links in Header/Footer + // #i44368# Links in Header/Footer const SwPosition aPos( *pTNd ); const bool bHeaderFooter = pDoc->IsInHeaderFooter( aPos.nNode ); - // <-- // Create links for all selected rectangles: const sal_uInt16 nNumOfRects = aTmp.Count(); @@ -1740,7 +1739,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() else pPDFExtOutDevData->SetLinkURL( nLinkId, aURL ); - // --> FME 2005-05-09 #i44368# Links in Header/Footer + // #i44368# Links in Header/Footer if ( bHeaderFooter ) MakeHeaderFooterLinks( *pPDFExtOutDevData, *pTNd, rLinkRect, nDestId, aURL, bIntern ); // <-- @@ -1806,7 +1805,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() else pPDFExtOutDevData->SetLinkURL( nLinkId, aURL ); - // --> FME 2005-05-09 #i44368# Links in Header/Footer + // #i44368# Links in Header/Footer const SwFmtAnchor &rAnch = pFrmFmt->GetAnchor(); if (FLY_AT_PAGE != rAnch.GetAnchorId()) { @@ -1818,7 +1817,6 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() MakeHeaderFooterLinks( *pPDFExtOutDevData, *pTNd, aLinkRect, nDestId, aURL, bIntern ); } } - // <-- } } } @@ -1870,10 +1868,9 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Destination Export const sal_Int32 nDestId = pPDFExtOutDevData->CreateDest( rDestRect.SVRect(), nDestPageNum ); - // --> FME 2005-05-09 #i44368# Links in Header/Footer + // #i44368# Links in Header/Footer const SwPosition aPos( *pTNd ); const bool bHeaderFooter = pDoc->IsInHeaderFooter( aPos.nNode ); - // <-- // Create links for all selected rectangles: const sal_uInt16 nNumOfRects = aTmp.Count(); @@ -1898,7 +1895,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Connect Link and Destination: pPDFExtOutDevData->SetLinkDest( nLinkId, nDestId ); - // --> FME 2005-05-09 #i44368# Links in Header/Footer + // #i44368# Links in Header/Footer if ( bHeaderFooter ) { const String aDummy; @@ -2000,9 +1997,8 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" ); if ( pTNd->IsHidden() || - // --> FME 2005-01-10 #i40292# Skip empty outlines: + // #i40292# Skip empty outlines: 0 == pTNd->GetTxt().Len() ) - // <-- continue; // Get parent id from stack: @@ -2044,7 +2040,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if( pPDFExtOutDevData->GetIsExportNamedDestinations() ) { - //---> i56629 the iteration to convert the OOo bookmark (#bookmark) + // #i56629# the iteration to convert the OOo bookmark (#bookmark) // into PDF named destination, see section 8.2.1 in PDF 1.4 spec // We need: // 1. a name for the destination, formed from the standard OOo bookmark name diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 92e88ecde74a..e882e57756a7 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -229,7 +229,7 @@ bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, RES_CHRATR_COLOR != rItem.Which() ) return false; - // --> FME 2004-09-13 #i15455# + // #i15455# // 1. case: // We do not want to show visited links: // (printing, pdf export, page preview) diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index e28b1694d8a6..9c799b4fd2ea 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -667,7 +667,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm() pFoll->MoveFlyInCnt( this, nStart, STRING_LEN ); pFoll->SetFtn( sal_False ); - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for current next paragraph will change // and relation CONTENT_FLOWS_TO for current previous paragraph, which @@ -707,7 +707,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) SetFollow( pNew ); pNew->Paste( GetUpper(), GetNext() ); - // --> OD 2005-12-01 #i27138# + // #i27138# // notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for current next paragraph will change // and relation CONTENT_FLOWS_TO for current previous paragraph, which @@ -1337,7 +1337,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, // AMA: Leider doch, Textgroessenaenderungen + FlyFrames, die Rueckwirkung // kann im Extremfall mehrere Zeilen (Frames!!!) betreffen! - // --> FME 2005-04-18 #i46560# + // #i46560# // FME: Yes, consider this case: (word ) has to go to the next line // because ) is a forbidden character at the beginning of a line although // (word would still fit on the previous line. Adding text right in front @@ -1347,7 +1347,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, // <-- sal_Bool bPrev = rLine.GetPrev() && ( FindBrk( rString, rLine.GetStart(), rReformat.Start() + 1 ) - // --> FME 2005-04-18 #i46560# + // #i46560# + 1 // <-- >= rReformat.Start() || @@ -1919,7 +1919,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) { SwFrm* pPre = GetPrev(); if( pPre && - // --> FME 2004-07-22 #i10826# It's the first, it cannot keep! + // #i10826# It's the first, it cannot keep! pPre->GetIndPrev() && // <-- pPre->GetAttrSet()->GetKeep().GetValue() ) diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index d2b5f42236d2..7402801400ce 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -58,7 +58,7 @@ #include <tabfrm.hxx> // SwTabFrm (Redlining) #include <SwGrammarMarkUp.hxx> -// --> FME 2004-06-08 #i12836# enhanced pdf export +// #i12836# enhanced pdf export #include <EnhancedPDFExportHelper.hxx> // <-- @@ -332,7 +332,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const SwLayoutModeModifier aLayoutModeModifier( *pSh->GetOut() ); aLayoutModeModifier.Modify( sal_False ); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); // <-- @@ -605,7 +605,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { ResetRepaint(); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support ViewShell *pSh = getRootFrm()->GetCurrShell(); Num_Info aNumInfo( *this ); @@ -631,7 +631,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { OSL_ENSURE( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" ); - // --> FME 2004-10-29 #i29062# pass info that we are currently + // #i29062# pass info that we are currently // painting. ((SwTxtFrm*)this)->GetFormatted( true ); // <-- diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index 31e0a4d8ed73..81d389f75b03 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -121,7 +121,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, nLineWidth -= nItalic; - // --> FME 2005-05-13 #i46524# LineBreak bug with italics + // #i46524# LineBreak bug with italics if ( nLineWidth < 0 ) nLineWidth = 0; // <-- } @@ -141,7 +141,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, nCutPos = rInf.GetIdx() + nMaxLen; if( nItalic && ( nCutPos >= rInf.GetTxt().Len() || - // --> FME 2005-05-13 #i48035# Needed for CalcFitToContent + // #i48035# Needed for CalcFitToContent // if first line ends with a manual line break rInf.GetTxt().GetChar( nCutPos ) == CH_BREAK ) ) // <-- diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 9c998f3e57bb..beb6fbc14f7e 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -73,7 +73,7 @@ #include <pam.hxx> #include <SwGrammarMarkUp.hxx> #include <cstdio> -// --> FME 2004-06-08 #i12836# enhanced pdf export +// #i12836# enhanced pdf export #include <EnhancedPDFExportHelper.hxx> // <-- @@ -692,7 +692,7 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo if ( nSpaceAdd ) { xub_StrLen nCharCnt; - // --> FME 2005-04-04 #i41860# Thai justified alignemt needs some + // #i41860# Thai justified alignemt needs some // additional information: aDrawInf.SetNumberOfBlanks( rPor.InTxtGrp() ? static_cast<const SwTxtPortion&>(rPor).GetSpaceCnt( *this, nCharCnt ) : @@ -1225,7 +1225,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const { OutputDevice* pTmpOut = (OutputDevice*)GetOut(); - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pTmpOut ); // <-- @@ -1598,7 +1598,7 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart, // const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0; const xub_Unicode cThousandSep = ',' == cTabDec ? '.' : ','; - // --> FME 2006-01-23 #i45951# German (Switzerland) uses ' as thousand separator: + // #i45951# German (Switzerland) uses ' as thousand separator const xub_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\''; // <-- diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 45f153c53612..cdaa8e46d707 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -532,7 +532,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo xub_StrLen nHyphWrdLen; // gefundene Wort-Laenge xub_StrLen nLineStart; // aktueller Zeilenbeginn im rTxt xub_StrLen nUnderScorePos; // enlarge repaint if underscore has been found - // --> FME 2004-11-25 #i34348# Changed type from sal_uInt16 to SwTwips + // #i34348# Changed type from sal_uInt16 to SwTwips SwTwips nLeft; // linker Rand SwTwips nRight; // rechter Rand SwTwips nFirst; // EZE diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 9323716fd6b2..ab5903a13ae7 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -304,7 +304,7 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent, if (!bSkipKashida) CalcRightMargin( pCurrent, nReal ); - // --> FME 2005-06-08 #i49277# + // #i49277# const sal_Bool bDoNotJustifyLinesWithManualBreak = GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); // <-- diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 9e288a36e006..469be4db0c4d 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -56,7 +56,7 @@ #include "pordrop.hxx" #include "crstate.hxx" // SwCrsrMoveState #include <pormulti.hxx> // SwMultiPortion -// --> OD 2010-05-05 #i111284# +// #i111284# #include <numrule.hxx> // <-- @@ -145,7 +145,7 @@ void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, } } -// --> OD 2010-05-05 #i111284# +// #i111284# namespace { bool AreListLevelIndentsApplicableAndLabelAlignmentActive( const SwTxtNode& rTxtNode ) { @@ -241,7 +241,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) nRight = pFrm->Frm().Left() + pFrm->Prt().Left() + pFrm->Prt().Width(); if( nLeft >= nRight && - // --> FME 2005-08-10 #i53066# Omit adjustment of nLeft for numbered + // #i53066# Omit adjustment of nLeft for numbered // paras inside cells inside new documents: ( pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) || !pFrm->IsInTab() || @@ -352,7 +352,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) bLastBlock = rAdjust.GetLastBlock() == SVX_ADJUST_BLOCK; bLastCenter = rAdjust.GetLastBlock() == SVX_ADJUST_CENTER; - // --> OD 2008-07-01 #i91133# + // #i91133# mnTabLeft = pNode->GetLeftMarginForTabCalculation(); // <-- @@ -1625,7 +1625,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if ( nSpaceAdd ) { xub_StrLen nCharCnt; - // --> FME 2005-04-04 #i41860# Thai justified alignemt needs some + // #i41860# Thai justified alignemt needs some // additional information: aDrawInf.SetNumberOfBlanks( pPor->InTxtGrp() ? static_cast<const SwTxtPortion*>(pPor)->GetSpaceCnt( aSizeInf, nCharCnt ) : diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index a31fd130f38d..bcde1a43e1fc 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -346,7 +346,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf, pPor = pCurr->GetPortion(); } - // --> OD 2010-07-07 #i112181# + // #i112181# rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() ); // <-- } @@ -775,7 +775,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) ((SwFldPortion*)pPor)->Height( pFldFnt->GetHeight( rInf.GetVsh(), *rInf.GetOut() ) ); ((SwFldPortion*)pPor)->SetAscent( pFldFnt->GetAscent( rInf.GetVsh(), *rInf.GetOut() ) ); } - // --> OD 2008-06-05 #i89179# + // #i89179# // tab portion representing the list tab of a list label gets the // same height and ascent as the corresponding number portion else if ( pPor->InTabGrp() && pPor->GetLen() == 0 && @@ -1236,7 +1236,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) if( !pPor ) { if( ( !pMulti || pMulti->IsBidi() ) && - // --> FME 2005-02-14 #i42734# + // #i42734# // No multi portion if there is a hook character waiting: ( !rInf.GetRest() || '\0' == rInf.GetHookChar() ) ) // <-- @@ -1852,7 +1852,7 @@ void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const rInf.SetIdx( nStart ); // Handle overflows: - // --> FME 2004-11-25 #i34348# Changed type from sal_uInt16 to SwTwips + // #i34348# Changed type from sal_uInt16 to SwTwips SwTwips nTmpLeft = Left(); SwTwips nTmpRight = Right(); SwTwips nTmpFirst = FirstLeft(); @@ -2052,7 +2052,7 @@ namespace { #ifndef QUARTZ #ifndef ENABLE_GRAPHITE - // --> FME 2004-09-27 #i28795#, #i34607#, #i38388# + // #i28795#, #i34607#, #i38388# // step back six(!) more characters for complex scripts // this is required e.g., for Khmer (thank you, Javier!) const SwScriptInfo& rSI = txtFmtInfo.GetParaPortion()->GetScriptInfo(); diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 0571efb8a5d3..1934d4036bb1 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -50,7 +50,7 @@ #include <pagedesc.hxx> // SwPageDesc #include <tgrditem.hxx> -// --> FME 2004-06-08 #i12836# enhanced pdf export +// #i12836# enhanced pdf export #include <EnhancedPDFExportHelper.hxx> // <-- @@ -398,7 +398,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, } { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support Por_Info aPorInfo( *pPor, *this ); SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, &aPorInfo, *pOut ); // <-- @@ -426,7 +426,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, pArrow = (SwArrowPortion*)pPor; pPor = bDrawInWindow || GetInfo().X() <= nMaxRight || - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support ( GetInfo().GetVsh() && GetInfo().GetVsh()->GetViewOptions()->IsPDFExport() && pNext && pNext->IsHolePortion() ) ? diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index 46ec8cfd7964..207fe05ae87c 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -149,7 +149,7 @@ private: KSHORT nDropDescent; MSHORT nDropLines; MSHORT nAdjust; - // --> OD 2008-06-30 #i91133# + // #i91133# SwTwips mnTabLeft; // <-- @@ -181,7 +181,7 @@ public: inline SwTwips GetLeftMin() const { return nFirst < nLeft ? nFirst : nLeft; } inline sal_Bool HasNegFirst() const { return nFirst < nLeft; } - // --> OD 2008-06-30 #i91133# + // #i91133# inline SwTwips GetTabLeft() const { return mnTabLeft; diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index e6548d6add0c..3f6ebe16e8ad 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -72,10 +72,9 @@ SwFldPortion *SwFldPortion::Clone( const XubString &rExpand ) const { pNewFnt = new SwFont( *pFnt ); } - // --> OD 2009-11-25 #i107143# + // #i107143# // pass placeholder property to created <SwFldPortion> instance. SwFldPortion* pClone = new SwFldPortion( rExpand, pNewFnt, bPlaceHolder ); - // <-- pClone->SetNextOffset( nNextOffset ); pClone->m_bNoLength = this->m_bNoLength; return pClone; @@ -243,12 +242,10 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) // #i16354# Change script type for RTL text to CTL. const SwScriptInfo& rSI = rInf.GetParaPortion()->GetScriptInfo(); - // --> OD 2009-01-29 #i98418# -// const sal_uInt8 nFldDir = IsNumberPortion() ? + // #i98418# const sal_uInt8 nFldDir = ( IsNumberPortion() || IsFtnNumPortion() ) ? rSI.GetDefaultDir() : rSI.DirType( IsFollow() ? rInf.GetIdx() - 1 : rInf.GetIdx() ); - // <-- if ( UBIDI_RTL == nFldDir ) { UErrorCode nError = U_ZERO_ERROR; @@ -283,11 +280,10 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) nTmp = SW_CTL; } - // --> OD 2009-01-29 #i98418# + // #i98418# // keep determined script type for footnote portions as preferred script type. // For footnote portions a font can not be created directly - see footnote // portion format method. -// if( !IsFtnPortion() && nTmp != nActual ) if ( IsFtnPortion() ) { dynamic_cast<SwFtnPortion*>(this)->SetPreferredScriptType( nTmp ); @@ -298,7 +294,6 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) pFnt = new SwFont( *rInf.GetFont() ); pFnt->SetActual( nTmp ); } - // <-- } } @@ -398,20 +393,16 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf ) case CHAR_HARDHYPHEN: // non-breaking hyphen case CHAR_SOFTHYPHEN: case CHAR_HARDBLANK: - // --> FME 2006-01-11 #i59759# Erase additional control + // #i59759# Erase additional control // characters from field string, otherwise we get stuck in // a loop. case CHAR_ZWSP : case CHAR_ZWNBSP : - // case CHAR_RLM : - // case CHAR_LRM : - // <-- - // --> OD 2010-06-03 #i111750# + // #i111750# // - Erasing further control characters from field string in // to avoid loop. case CH_TXTATR_BREAKWORD: case CH_TXTATR_INWORD: - // <-- { aNew.Erase( 0, 1 ); ++nNextOfst; @@ -597,9 +588,8 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf ) if ( !mbLabelAlignmentPosAndSpaceModeActive ) { if ( !rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) && - // --> FME 2004-08-13 #i32902# + // #i32902# !IsFtnNumPortion() ) - // <-- { nDiff = rInf.Left() + rInf.GetTxtFrm()->GetTxtNode()-> @@ -768,7 +758,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const static sal_Char const sDoubleSpace[] = " "; aInf.X( aInf.X() + nSpaceOffs ); - // --> FME 2005-08-12 #i53199# Adjust position of underline: + // #i53199# Adjust position of underline: if ( rInf.GetUnderFnt() ) { const Point aNewPos( aInf.GetPos().X(), rInf.GetUnderFnt()->GetPos().Y() ); @@ -1004,9 +994,8 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const else if ( pViewShell && !pViewShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() && !pViewShell->IsPreView() && - // --> FME 2004-06-21 #i9684# Stop animation during printing/pdf export. + // #i9684# Stop animation during printing/pdf export. pViewShell->GetWin() ) - // <-- { ( (Graphic*) pBrush->GetGraphic() )->StartAnimation( (OutputDevice*)rInf.GetOut(), aPos, aSize, nId ); diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 47890c7d05ea..dd6ea40fbcf7 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -73,7 +73,7 @@ public: void TakeNextOffset( const SwFldPortion* pFld ); void CheckScript( const SwTxtSizeInfo &rInf ); inline sal_Bool HasFont() const { return 0 != pFnt; } - // --> OD 2008-06-05 #i89179# - made public + // #i89179# - made public inline const SwFont *GetFont() const { return pFnt; } // <-- diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index c8515e1500f8..f54b5ea9662b 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -172,7 +172,7 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, xub_StrLen nStart, xub_StrLen nEnd for ( sal_uInt32 i = 0; GetDrawObjs() && i < pObjs->Count(); ++i ) { // OD 2004-03-29 #i26791# - // --> OD 2004-07-06 #i28701# - consider changed type of + // #i28701# - consider changed type of // <SwSortedList> entries SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; const SwFmtAnchor& rAnch = pAnchoredObj->GetFrmFmt().GetAnchor(); @@ -326,7 +326,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm, { // OD 2004-04-01 #i26791# - no direct positioning needed any more pDrawContact->ConnectToLayout(); - // --> OD 2005-01-14 #i40333# - follow-up of #i35635# + // #i40333# - follow-up of #i35635# // move object to visible layer pDrawContact->MoveObjToVisibleLayer( pDrawContact->GetMaster() ); // <-- @@ -369,7 +369,7 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase, OSL_FAIL( "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" ); pSdrObj = GetDrawContact()->GetMaster(); } - // --> OD 2007-11-29 #i65798# + // #i65798# // call <SwAnchoredDrawObject::MakeObjPos()> to assure that flag at // the <DrawFrmFmt> and at the <SwAnchoredDrawObject> instance are // correctly set. diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx index 384577d627ab..dbd85a19ab2c 100644 --- a/sw/source/core/text/porftn.hxx +++ b/sw/source/core/text/porftn.hxx @@ -42,7 +42,7 @@ class SwFtnPortion : public SwFldPortion SwTxtFrm *pFrm; // um im Dtor RemoveFtn rufen zu koennen. SwTxtFtn *pFtn; KSHORT nOrigHeight; - // --> OD 2009-01-29 #i98418# + // #i98418# bool mbPreferredScriptTypeSet; sal_uInt8 mnPreferredScriptType; // <-- @@ -56,7 +56,7 @@ public: virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); - // --> OD 2009-01-29 #i98418# + // #i98418# void SetPreferredScriptType( sal_uInt8 nPreferredScriptType ); // <-- diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 5da6fd03f352..711a24cbe9d0 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -415,7 +415,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) nFlyDescent = 0; } - // --> FME 2006-03-01 #i3952# + // #i3952# const bool bIgnoreBlanksAndTabsForLineHeightCalculation = rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); @@ -469,7 +469,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) nLineLength = nLineLength + pPos->GetLen(); AddPrtWidth( pPos->Width() ); - // --> FME 2006-03-01 #i3952# + // #i3952# if ( bIgnoreBlanksAndTabsForLineHeightCalculation ) { if ( pPos->InTabGrp() || pPos->IsHolePortion() || @@ -623,7 +623,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) { SetCntnt( !bTmpDummy ); - // --> FME 2006-03-01 #i3952# + // #i3952# if ( bIgnoreBlanksAndTabsForLineHeightCalculation && lcl_HasOnlyBlanks( rInf.GetTxt(), rInf.GetLineStart(), rInf.GetLineStart() + GetLen() ) ) { @@ -632,7 +632,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) // <-- } - // --> FME 2006-03-01 #i3952# + // #i3952# if ( bHasBlankPortion && bHasOnlyBlankPortions ) { sal_uInt16 nTmpAscent = GetAscent(); @@ -652,7 +652,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) rLine.GetRedln()->CheckLine( rLine.GetStart(), rLine.GetEnd() ) ); } -// --> OD 2005-05-20 #i47162# - add optional parameter <_bNoFlyCntPorAndLinePor> +// #i47162# - add optional parameter <_bNoFlyCntPorAndLinePor> // to control, if the fly content portions and line portion are considered. void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent, SwTwips& _orDescent, @@ -988,7 +988,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) if ( nChg > rTxt.Len() ) nChg = rTxt.Len(); - // --> FME 2008-09-17 #i28203# + // #i28203# // for 'complex' portions, we make sure that a portion does not contain more // than one script: if( i18n::ScriptType::COMPLEX == nScript && pBreakIt->GetScriptTypeDetector().is() ) diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 25ff3d0b047f..914377dc8c66 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -565,7 +565,7 @@ sal_Bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* pCurr, if( nMultiSpace < KSHRT_MAX * SPACING_PRECISION_FACTOR ) { // pCurr->SetLLSpaceAdd( nMultiSpace, 0 ); - // --> FME 2006-07-11 #i65711# SetLLSpaceAdd replaces the first value, + // #i65711# SetLLSpaceAdd replaces the first value, // instead we want to insert a new first value: std::vector<long>* pVec = pCurr->GetpLLSpaceAdd(); pVec->insert( pVec->begin(), nMultiSpace ); diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 814624a283c4..b7cd4b2b087d 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -368,7 +368,7 @@ sal_Bool SwTxtFrm::FormatEmpty() aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) ) return sal_False; - // --> OD 2004-11-17 #i35635# - call method <HideAndShowObjects()> + // #i35635# - call method <HideAndShowObjects()> // to assure that objects anchored at the empty paragraph are // correctly visible resp. invisible. HideAndShowObjects(); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 85114712c8a8..5a0f1e228de6 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -736,7 +736,7 @@ SwLinePortion *SwHolePortion::Compress() { return this; } void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support if( rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() ) { const XubString aTxt( ' ' ); diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index de1526462065..c000cdbb918b 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -468,7 +468,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const // pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); - // --> FME 2005-08-11 #i53199# + // #i53199# if ( !pIDSA->get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT) ) { // i18463: @@ -535,7 +535,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const // pNumFnt = new SwFont( &rInf.GetCharAttr(), pIDSA ); - // --> FME 2005-08-11 #i53199# + // #i53199# if ( !pIDSA->get(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT) ) { // i18463: diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 0443b23d7cf6..f88040edee34 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -58,7 +58,7 @@ #include <editeng/txtrange.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> -// --> OD 2004-06-16 #i28701# +// #i28701# #include <editeng/lspcitem.hxx> // <-- #include <txtflcnt.hxx> @@ -778,12 +778,12 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm ) // <-- pPage = pFrm->FindPageFrm(); const SwFlyFrm* pTmp = pFrm->FindFlyFrm(); - // --> OD 2006-08-15 #i68520# + // #i68520# mpCurrAnchoredObj = pTmp; // <-- pCurrFrm = pFrm; pMaster = pCurrFrm->IsFollow() ? NULL : pCurrFrm; - // --> OD 2006-08-15 #i68520# + // #i68520# mpAnchoredObjList = NULL; // <-- // Wenn wir nicht von einem Frame ueberlappt werden, oder wenn @@ -883,7 +883,7 @@ sal_Bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const if( pObj->GetObjRect().Left() > aRect.Right() ) continue; - // --> OD 2006-08-15 #i68520# + // #i68520# if( mpCurrAnchoredObj != pObj && aBound.IsOver( aRect ) ) // <-- return sal_True; @@ -944,14 +944,14 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) SwRegionRects aRegion( aRect ); sal_Bool bOpaque = sal_False; - // --> OD 2006-08-15 #i68520# + // #i68520# const sal_uInt32 nCurrOrd = mpCurrAnchoredObj ? mpCurrAnchoredObj->GetDrawObj()->GetOrdNum() : SAL_MAX_UINT32; // <-- OSL_ENSURE( !bTopRule, "DrawTextOpaque: Wrong TopRule" ); - // --> OD 2006-08-15 #i68520# + // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) // <-- @@ -959,13 +959,13 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) MSHORT nHellId = pPage->getRootFrm()->GetCurrShell()->getIDocumentDrawModelAccess()->GetHellId(); for( MSHORT i = 0; i < nCount; ++i ) { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pTmpAnchoredObj = (*mpAnchoredObjList)[i]; if( dynamic_cast<const SwFlyFrm*>(pTmpAnchoredObj) && mpCurrAnchoredObj != pTmpAnchoredObj ) // <-- { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFlyFrm* pFly = dynamic_cast<const SwFlyFrm*>(pTmpAnchoredObj); // <-- if( aRegion.GetOrigin().IsOver( pFly->Frm() ) ) @@ -980,14 +980,14 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) || pFly->IsShadowTransparent() ) && SURROUND_THROUGHT == rSur.GetSurround() && ( !rSur.IsAnchorOnly() || - // --> OD 2006-08-15 #i68520# + // #i68520# GetMaster() == pFly->GetAnchorFrm() || // <-- ((FLY_AT_PARA != rAnchor.GetAnchorId()) && (FLY_AT_CHAR != rAnchor.GetAnchorId()) ) ) && - // --> OD 2006-08-15 #i68520# + // #i68520# pTmpAnchoredObj->GetDrawObj()->GetLayer() != nHellId && nCurrOrd < pTmpAnchoredObj->GetDrawObj()->GetOrdNum() // <-- @@ -1056,7 +1056,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, { SwRegionRects aRegion( rRect ); OSL_ENSURE( !bTopRule, "DrawFlyRect: Wrong TopRule" ); - // --> OD 2006-08-15 #i68520# + // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) // <-- @@ -1064,27 +1064,27 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, MSHORT nHellId = pPage->getRootFrm()->GetCurrShell()->getIDocumentDrawModelAccess()->GetHellId(); for( MSHORT i = 0; i < nCount; ++i ) { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pAnchoredObjTmp = (*mpAnchoredObjList)[i]; if( mpCurrAnchoredObj != pAnchoredObjTmp && dynamic_cast<const SwFlyFrm*>(pAnchoredObjTmp) ) // <-- { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFmtSurround& rSur = pAnchoredObjTmp->GetFrmFmt().GetSurround(); // <-- // OD 24.01.2003 #106593# - correct clipping of fly frame area. // Consider that fly frame background/shadow can be transparent // and <SwAlignRect(..)> fly frame area - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFlyFrm* pFly = dynamic_cast<const SwFlyFrm*>(pAnchoredObjTmp); // <-- - // --> OD 2005-06-08 #i47804# - consider transparent graphics + // #i47804# - consider transparent graphics // and OLE objects. bool bClipFlyArea = ( ( SURROUND_THROUGHT == rSur.GetSurround() ) - // --> OD 2006-08-15 #i68520# + // #i68520# ? (pAnchoredObjTmp->GetDrawObj()->GetLayer() != nHellId) // <-- : !rSur.IsContour() ) && @@ -1096,7 +1096,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, // <-- if ( bClipFlyArea ) { - // --> OD 2006-08-15 #i68520# + // #i68520# SwRect aFly( pAnchoredObjTmp->GetObjRect() ); // <-- // OD 24.01.2003 #106593# @@ -1122,19 +1122,19 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, } } -// --> OD 2004-10-06 #i26945# - change first parameter: +// #i26945# - change first parameter // Now it's the <SwAnchoredObject> instance of the floating screen object sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, const sal_Bool bInFtn, const sal_Bool bInFooterOrHeader ) // <-- { - // --> OD 2006-08-15 #i68520# + // #i68520# // <mpCurrAnchoredObj> is set, if <pCurrFrm> is inside a fly frame if( _pAnchoredObj != mpCurrAnchoredObj ) // <-- { - // --> OD 2004-10-06 #i26945# + // #i26945# const SdrObject* pNew = _pAnchoredObj->GetDrawObj(); // <-- // #102344# Ignore connectors which have one or more connections @@ -1149,7 +1149,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, if( ( bInFtn || bInFooterOrHeader ) && bTopRule ) { - // --> OD 2004-10-06 #i26945# + // #i26945# const SwFrmFmt& rFrmFmt = _pAnchoredObj->GetFrmFmt(); const SwFmtAnchor& rNewA = rFrmFmt.GetAnchor(); // <-- @@ -1169,7 +1169,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, } } - // --> OD 2006-08-15 #i68520# + // #i68520# // bEvade: consider pNew, if we are not inside a fly // consider pNew, if pNew is lower of <mpCurrAnchoredObj> sal_Bool bEvade = !mpCurrAnchoredObj || @@ -1188,15 +1188,15 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, else { // innerhalb von verketteten Flys wird nur Lowern ausgewichen - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFmtChain &rChain = mpCurrAnchoredObj->GetFrmFmt().GetChain(); // <-- if ( !rChain.GetPrev() && !rChain.GetNext() ) { - // --> OD 2004-10-06 #i26945# + // #i26945# const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor(); // <-- - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFmtAnchor& rCurrA = mpCurrAnchoredObj->GetFrmFmt().GetAnchor(); // <-- @@ -1224,7 +1224,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, bEvade = sal_True; // Nicht seitengeb. weichen Rahmengeb. aus else if( FLY_AT_FLY == rCurrA.GetAnchorId() ) return sal_False; // Rahmengebundene weichen abs.geb. nicht aus - // --> OD 2006-01-30 #i57062# + // #i57062# // In order to avoid loop situation, it's decided to adjust // the wrapping behaviour of content of at-paragraph/at-character // anchored objects to one in the page header/footer and @@ -1246,12 +1246,12 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // aber: es wird niemals einem hierarchisch untergeordnetem // ausgewichen und ausserdem braucht nur bei Ueberlappung // ausgewichen werden. - // --> OD 2006-08-15 #i68520# + // #i68520# bEvade &= ( mpCurrAnchoredObj->GetDrawObj()->GetOrdNum() < pNew->GetOrdNum() ); // <-- if( bEvade ) { - // --> OD 2006-08-15 #i68520# + // #i68520# SwRect aTmp( _pAnchoredObj->GetObjRectWithSpaces() ); if ( !aTmp.IsOver( mpCurrAnchoredObj->GetObjRectWithSpaces() ) ) bEvade = sal_False; @@ -1261,7 +1261,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, if ( bEvade ) { - // --> OD 2004-10-06 #i26945# + // #i26945# const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor(); // <-- OSL_ENSURE( FLY_AS_CHAR != rNewA.GetAnchorId(), @@ -1274,19 +1274,19 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // Wenn wir aber gerade den Text des FlyCnt formatieren, dann // muss er natuerlich dem absatzgebundenen Frm ausweichen! // pCurrFrm ist der Anker von pNew? - // --> OD 2004-10-06 #i26945# + // #i26945# const SwFrm* pTmp = _pAnchoredObj->GetAnchorFrm(); // <-- if( pTmp == pCurrFrm ) return sal_True; if( pTmp->IsTxtFrm() && ( pTmp->IsInFly() || pTmp->IsInFtn() ) ) { - // --> OD 2004-10-06 #i26945# + // #i26945# Point aPos = _pAnchoredObj->GetObjRect().Pos(); // <-- pTmp = GetVirtualUpper( pTmp, aPos ); } - // --> OD 2004-10-06 #i26945# + // #i26945# // --> OD 2004-11-29 #115759# // If <pTmp> is a text frame inside a table, take the upper // of the anchor frame, which contains the anchor position. @@ -1296,13 +1296,13 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, ->GetAnchorFrmContainingAnchPos()->GetUpper(); } // <-- - // --> OD 2004-05-13 #i28701# - consider all objects in same context, + // #i28701# - consider all objects in same context, // if wrapping style is considered on object positioning. // Thus, text will wrap around negative positioned objects. - // --> OD 2004-08-25 #i3317# - remove condition on checking, + // #i3317# - remove condition on checking, // if wrappings style is considered on object postioning. // Thus, text is wrapping around negative positioned objects. - // --> OD 2004-10-20 #i35640# - no consideration of negative + // #i35640# - no consideration of negative // positioned objects, if wrapping style isn't considered on // object position and former text wrapping is applied. // This condition is typically for documents imported from the @@ -1319,7 +1319,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, const SwFrm* pHeader = 0; if ( pCurrFrm->GetNext() != pTmp && ( IsFrmInSameKontext( pTmp, pCurrFrm ) || - // --> #i13832#, #i24135# wrap around objects in page header + // #i13832#, #i24135# wrap around objects in page header ( !pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) && 0 != ( pHeader = pTmp->FindFooterOrHeader() ) && !pHeader->IsFooterFrm() && @@ -1347,7 +1347,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, } return sal_False; } -// --> OD 2006-08-15 #i68520# +// #i68520# struct AnchoredObjOrder { sal_Bool mbR2L; @@ -1403,11 +1403,11 @@ struct AnchoredObjOrder } }; -// --> OD 2006-08-15 #i68520# +// #i68520# SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() { OSL_ENSURE( pCurrFrm, "InitFlyList: No Frame, no FlyList" ); - // --> OD 2006-08-15 #i68520# + // #i68520# OSL_ENSURE( !mpAnchoredObjList, "InitFlyList: FlyList already initialized" ); // <-- @@ -1419,7 +1419,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() // floating screen objects const bool bFooterHeader = 0 != pCurrFrm->FindFooterOrHeader(); const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTxtNode()->getIDocumentSettingAccess(); - // --> OD 2005-01-12 #i40155# - check, if frame is marked not to wrap + // #i40155# - check, if frame is marked not to wrap const sal_Bool bWrapAllowed = ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) || ( !pCurrFrm->IsInFtn() && !bFooterHeader ) ) && !SwLayouter::FrmNotToWrap( *pCurrFrm->GetTxtNode()->getIDocumentLayoutAccess(), *pCurrFrm ); @@ -1429,11 +1429,11 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() if( nCount && bWrapAllowed ) { - // --> OD 2006-08-15 #i68520# + // #i68520# mpAnchoredObjList = new SwAnchoredObjList(); // <-- - // --> OD 2004-06-18 #i28701# - consider complete frame area for new + // #i28701# - consider complete frame area for new // text wrapping SwRect aRect; if ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) ) @@ -1456,33 +1456,14 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() for( sal_uInt32 i = 0; i < nCount; i++ ) { - // --> OD 2006-08-15 #i68520# -// SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ]; -// const SwRect aBound( pAnchoredObj->GetObjRectWithSpaces() ); - -// // OD 2004-01-15 #110582# - do not consider hidden objects -// // OD 2004-05-13 #i28701# - check, if object has to be considered -// // for text wrap. -// if ( !pDoc->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) || -// !pAnchoredObj->ConsiderForTextWrap() || -// nRight < (aBound.*fnRect->fnGetLeft)() || -// (*fnRect->fnYDiff)( (aRect.*fnRect->fnGetTop)(), -// (aBound.*fnRect->fnGetBottom)() ) > 0 || -// nLeft > (aBound.*fnRect->fnGetRight)() || -// // --> OD 2004-12-17 #118809# - If requested, do not consider -// // objects in page header|footer for text frames not in page -// // header|footer. This is requested for the calculation of -// // the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()> -// ( mbIgnoreObjsInHeaderFooter && !bFooterHeader && -// pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() ) || -// // <-- -// // --> FME 2004-07-14 #i20505# Do not consider oversized objects -// (aBound.*fnRect->fnGetHeight)() > -// 2 * (pPage->Frm().*fnRect->fnGetHeight)() ) -// // <-- -// { -// continue; -// } + // #i68520# + // do not consider hidden objects + // check, if object has to be considered for text wrap + // #118809# - If requested, do not consider + // objects in page header|footer for text frames not in page + // header|footer. This is requested for the calculation of + // the base offset for objects <SwTxtFrm::CalcBaseOfstForFly()> + // #i20505# Do not consider oversized objects SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ]; if ( !pIDDMA->IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) || !pAnchoredObj->ConsiderForTextWrap() || @@ -1502,9 +1483,8 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() { continue; } - // <-- - // --> OD 2004-10-06 #i26945# - pass <pAnchoredObj> to method + // #i26945# - pass <pAnchoredObj> to method // <GetTop(..)> instead of only the <SdrObject> instance of the // anchored object if ( GetTop( pAnchoredObj, pCurrFrm->IsInFtn(), bFooterHeader ) ) @@ -1515,7 +1495,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() // inside left to right sorting from top to bottom. // If objects on the same position are found, they are sorted // on its width. - // --> OD 2006-08-15 #i68520# + // #i68520# // sal_uInt16 nPos = pFlyList->Count(); // while ( nPos ) // { @@ -1573,7 +1553,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() // <-- const SwFmtSurround &rFlyFmt = pAnchoredObj->GetFrmFmt().GetSurround(); - // --> OD 2006-08-15 #i68520# + // #i68520# if ( rFlyFmt.IsAnchorOnly() && pAnchoredObj->GetAnchorFrm() == GetMaster() ) // <-- @@ -1598,14 +1578,14 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() } else { - // --> OD 2006-08-15 #i68520# + // #i68520# mpAnchoredObjList = new SwAnchoredObjList(); // <-- } UNDO_SWAP( pCurrFrm ) - // --> OD 2006-08-15 #i68520# + // #i68520# return mpAnchoredObjList; // <-- } @@ -1708,7 +1688,7 @@ void ClrContourCache() * lappung von BoundRect (inkl. Abstand!) und Zeile, * bei Konturumfluss wird das Polypolygon des Objekts abgeklappert *************************************************************************/ -// --> OD 2006-08-15 #i68520# +// #i68520# const SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj, const SwRect &rLine, const SwTxtFrm* pFrm, @@ -1957,14 +1937,14 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid SWAP_IF_SWAPPED( pCurrFrm ) sal_Bool bRet = sal_False; - // --> OD 2006-08-15 #i68520# + // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) // <-- { for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i ) { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pAnchoredObj = (*mpAnchoredObjList)[i]; SwRect aRect( pAnchoredObj->GetObjRectWithSpaces() ); @@ -1974,11 +1954,11 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid SWRECTFN( pCurrFrm ) if( (aRect.*fnRect->fnGetLeft)() > (rRect.*fnRect->fnGetRight)() ) break; - // --> OD 2006-08-15 #i68520# + // #i68520# if ( mpCurrAnchoredObj != pAnchoredObj && aRect.IsOver( rRect ) ) // <-- { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwFmt* pFmt( &(pAnchoredObj->GetFrmFmt()) ); const SwFmtSurround &rSur = pFmt->GetSurround(); // <-- @@ -1990,7 +1970,7 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if( ( SURROUND_THROUGHT == rSur.GetSurround() && ( !rSur.IsAnchorOnly() || - // --> OD 2006-08-15 #i68520# + // #i68520# GetMaster() == pAnchoredObj->GetAnchorFrm() || // <-- ((FLY_AT_PARA != rAnchor.GetAnchorId()) && @@ -1999,14 +1979,14 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid continue; } - // --> OD 2006-01-20 #i58642# + // #i58642# // Compare <GetMaster()> instead of <pCurrFrm> with the anchor // frame of the anchored object, because a follow frame have // to ignore the anchored objects of its master frame. // Note: Anchored objects are always registered at the master // frame, exception are as-character anchored objects, // but these aren't handled here. - // --> OD 2006-08-15 #i68520# + // #i68520# if ( mbIgnoreCurrentFrame && GetMaster() == pAnchoredObj->GetAnchorFrm() ) continue; @@ -2014,7 +1994,7 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid if( pRect ) { - // --> OD 2006-08-15 #i68520# + // #i68520# SwRect aFly = AnchoredObjToRect( pAnchoredObj, rRect ); // <-- if( aFly.IsEmpty() || !aFly.IsOver( rRect ) ) @@ -2050,7 +2030,7 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid * liefert die Position im sorted Array zurueck *************************************************************************/ -// --> OD 2006-08-15 #i68520# +// #i68520# SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchoredObj ) const { SwAnchoredObjList::size_type nCount = GetAnchoredObjList()->size(); @@ -2069,7 +2049,7 @@ SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchored * Der rechte Rand ist der rechte Rand oder * er wird durch das naechste Object, welches in die Zeile ragt, bestimmt. *************************************************************************/ -// --> OD 2006-08-15 #i68520# +// #i68520# void SwTxtFly::CalcRightMargin( SwRect &rFly, SwAnchoredObjList::size_type nFlyPos, const SwRect &rLine ) const @@ -2092,16 +2072,16 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, // unsichtbar, das heisst, dass sie bei der Berechnung der Raender // anderer Flys ebenfalls nicht auffallen. // 3301: pNext->Frm().IsOver( rLine ) ist noetig - // --> OD 2006-08-15 #i68520# + // #i68520# SwSurround eSurroundForTextWrap; // <-- sal_Bool bStop = sal_False; - // --> OD 2006-08-15 #i68520# + // #i68520# SwAnchoredObjList::size_type nPos = 0; // <-- - // --> OD 2006-08-15 #i68520# + // #i68520# while( nPos < mpAnchoredObjList->size() && !bStop ) // <-- { @@ -2110,7 +2090,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, ++nPos; continue; } - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nPos++ ]; if ( pNext == mpCurrAnchoredObj ) continue; @@ -2174,7 +2154,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, * Der linke Rand ist der linke Rand der aktuellen PrintArea oder * er wird durch den vorigen FlyFrm, der in die Zeile ragt, bestimmt. *************************************************************************/ -// --> OD 2006-08-15 #i68520# +// #i68520# void SwTxtFly::CalcLeftMargin( SwRect &rFly, SwAnchoredObjList::size_type nFlyPos, const SwRect &rLine ) const @@ -2200,12 +2180,12 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, // anderer Flys ebenfalls nicht auffallen. // 3301: pNext->Frm().IsOver( rLine ) ist noetig - // --> OD 2006-08-15 #i68520# + // #i68520# SwAnchoredObjList::size_type nMyPos = nFlyPos; while( ++nFlyPos < mpAnchoredObjList->size() ) // <-- { - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nFlyPos ]; const SwRect aTmp( pNext->GetObjRectWithSpaces() ); // <-- @@ -2217,7 +2197,7 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, { if( --nFlyPos == nMyPos ) continue; - // --> OD 2006-08-15 #i68520# + // #i68520# const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nFlyPos ]; if( pNext == mpCurrAnchoredObj ) continue; @@ -2254,7 +2234,7 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, * unter Beruecksichtigung der eingestellten Attribute fuer den Abstand * zum Text zurueck. *************************************************************************/ -// --> OD 2006-08-15 #i68520# +// #i68520# SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj, const SwRect &rLine ) const { @@ -2309,7 +2289,7 @@ SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj, return aFly; } -// --> OD 2006-08-15 #i68520# +// #i68520# // new method <_GetSurroundForTextWrap(..)> replaces methods // <CalcSmart(..)> and <GetOrder(..)> /************************************************************************* diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 8e1114ba5853..f2894d1aec85 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -669,7 +669,7 @@ xub_StrLen SwTxtFrm::FindBrk( const XubString &rTxt, const xub_StrLen nStart, const xub_StrLen nEnd ) const { - // --> OD 2009-12-28 #i104291# - applying patch to avoid overflow. + // #i104291# - applying patch to avoid overflow. unsigned long nFound = nStart; const xub_StrLen nEndLine = Min( nEnd, rTxt.Len() ); @@ -1065,7 +1065,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } } - // --> OD 2010-02-16 #i104008# + // #i104008# ViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if ( pViewSh ) { @@ -1322,7 +1322,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SwCntntFrm::Modify( pOld, pNew ); } - // --> OD 2009-01-06 #i88069# + // #i88069# ViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if ( pViewSh ) { @@ -1559,7 +1559,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid, if ( pGrid && GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() ) break; - // --> OD 2004-07-16 #i28701# - consider anchored objects + // #i28701# - consider anchored objects if ( GetDrawObjs() ) break; // <-- @@ -1743,7 +1743,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid, for ( MSHORT i = 0; i < nCnt; ++i ) { SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[i]; - // --> OD 2004-07-16 #i28701# - consider all + // #i28701# - consider all // to-character anchored objects if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_CHAR ) @@ -2162,7 +2162,7 @@ SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat ) SwTwips SwTxtFrm::CalcFitToContent() { - // --> FME 2004-07-16 #i31490# + // #i31490# // If we are currently locked, we better return with a // fairly reasonable value: if ( IsLocked() ) @@ -2184,11 +2184,11 @@ SwTwips SwTxtFrm::CalcFitToContent() Frm().Width( nPageWidth ); Prt().Width( nPageWidth ); - // --> FME 2004-07-19 #i25422# objects anchored as character in RTL + // #i25422# objects anchored as character in RTL if ( IsRightToLeft() ) Frm().Pos().X() += nOldFrmWidth - nPageWidth; - // --> FME 2004-07-16 #i31490# + // #i31490# SwTxtFrmLocker aLock( this ); // <-- @@ -2197,7 +2197,7 @@ SwTwips SwTxtFrm::CalcFitToContent() SwTxtFormatter aLine( this, &aInf ); SwHookOut aHook( aInf ); - // --> OD 2005-09-06 #i54031# - assure mininum of MINLAY twips. + // #i54031# - assure mininum of MINLAY twips. const SwTwips nMax = Max( (SwTwips)MINLAY, aLine._CalcFitToContent() + 1 ); // <-- @@ -2205,7 +2205,7 @@ SwTwips SwTxtFrm::CalcFitToContent() Frm().Width( nOldFrmWidth ); Prt().Width( nOldPrtWidth ); - // --> FME 2004-07-19 #i25422# objects anchored as character in RTL + // #i25422# objects anchored as character in RTL if ( IsRightToLeft() ) Frm().Pos() = aOldFrmPos; @@ -2302,14 +2302,14 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset() */ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) { - // --> OD 2006-11-13 #i71281# + // #i71281# // invalidate printing area, if height of last line changes const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine ); // <-- // determine output device ViewShell* pVsh = getRootFrm()->GetCurrShell(); OSL_ENSURE( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no ViewShell" ); - // --> OD 2007-07-02 #i78921# - make code robust, according to provided patch + // #i78921# - make code robust, according to provided patch // There could be no <ViewShell> instance in the case of loading a binary // StarOffice file format containing an embedded Writer document. if ( !pVsh ) @@ -2324,7 +2324,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true ); } OSL_ENSURE( pOut, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice" ); - // --> OD 2007-07-02 #i78921# - make code robust, according to provided patch + // #i78921# - make code robust, according to provided patch if ( !pOut ) { return; @@ -2366,7 +2366,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) else { // new determination of last line height - take actually height of last line - // --> OD 2008-05-06 #i89000# + // #i89000# // assure same results, if paragraph is undersized if ( IsUndersized() ) { @@ -2397,20 +2397,20 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) if ( pLineLayout ) { SwTwips nAscent, nDescent, nDummy1, nDummy2; - // --> OD 2005-05-20 #i47162# - suppress consideration of + // #i47162# - suppress consideration of // fly content portions and the line portion. pLineLayout->MaxAscentDescent( nAscent, nDescent, nDummy1, nDummy2, 0, true ); // <-- - // --> OD 2006-11-22 #i71281# + // #i71281# // Suppress wrong invalidation of printing area, if method is // called recursive. // Thus, member <mnHeightOfLastLine> is only set directly, if // no recursive call is needed. // mnHeightOfLastLine = nAscent + nDescent; const SwTwips nNewHeightOfLastLine = nAscent + nDescent; - // --> OD 2005-05-20 #i47162# - if last line only contains + // #i47162# - if last line only contains // fly content portions, <mnHeightOfLastLine> is zero. // In this case determine height of last line by the font if ( nNewHeightOfLastLine == 0 ) @@ -2428,7 +2428,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) } // <-- } - // --> OD 2006-11-13 #i71281# + // #i71281# // invalidate printing area, if height of last line changes if ( mnHeightOfLastLine != mnOldHeightOfLastLine ) { @@ -2622,7 +2622,7 @@ void SwTxtFrm::RecalcAllLines() (pPrv->IsInTab() || pPrv->IsInDocBody() != IsInDocBody()) ) pPrv = pPrv->GetPrevCntntFrm(); - // --> FME 2007-06-22 #i78254# Restart line numbering at page change: + // #i78254# Restart line numbering at page change // First body content may be in table! if ( bRestart && pPrv && pPrv->FindPageFrm() != FindPageFrm() ) pPrv = 0; diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 8ad815c94612..252a60db1e66 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1022,7 +1022,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const const IDocumentSettingAccess* pIDSA = pFrm->GetTxtNode()->getIDocumentSettingAccess(); SwFont *pNumFnt = new SwFont( pParSet, pIDSA ); - // --> FME 2005-02-17 #i37142# + // #i37142# // Underline style of paragraph font should not be considered // Overline style of paragraph font should not be considered // Weight style of paragraph font should not be considered @@ -1354,7 +1354,7 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf, SwFmtFtn& rFtn = (SwFmtFtn&)pTxtFtn->GetFtn(); const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc(); - // --> OD 2009-01-29 #i98418# + // #i98418# if ( bApplyGivenScriptType ) { pFnt->SetActual( nGivenScriptType ); @@ -1427,7 +1427,7 @@ SwFtnPortion::SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrame, , pFrm(pFrame) , pFtn(pFootn) , nOrigHeight( nReal ) - // --> OD 2009-01-29 #i98418# + // #i98418# , mbPreferredScriptTypeSet( false ) , mnPreferredScriptType( SW_LATIN ) // <-- @@ -1452,7 +1452,7 @@ sal_Bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, XubString &rTxt ) const sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf ) { - // --> OD 2009-01-29 #i98418# + // #i98418# // SwFtnSave aFtnSave( rInf, pFtn ); SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); // <-- @@ -1476,7 +1476,7 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf ) void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const { - // --> OD 2009-01-29 #i98418# + // #i98418# // SwFtnSave aFtnSave( rInf, pFtn ); SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); // <-- @@ -1490,14 +1490,14 @@ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const { - // --> OD 2009-01-29 #i98418# + // #i98418# // SwFtnSave aFtnSave( rInfo, pFtn ); SwFtnSave aFtnSave( rInfo, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); // <-- return SwExpandPortion::GetTxtSize( rInfo ); } -// --> OD 2009-01-29 #i98418# +// #i98418# void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType ) { mbPreferredScriptTypeSet = true; diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index d4edea3cc0e7..3b1a9ce02e05 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -386,7 +386,7 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess ) sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const { - // --> FME 2004-06-24 #i16816# tagged pdf support + // #i16816# tagged pdf support const sal_Unicode cChar = rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() && SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut() ) ? diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 6d74f36eeaa6..4dc4f1b00e4e 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -42,7 +42,7 @@ #include "itrform2.hxx" #include "txtfrm.hxx" #include <numrule.hxx> -// --> OD 2008-06-05 #i89179# +// #i89179# #include <porfld.hxx> // <-- @@ -100,7 +100,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) // #i24363# tab stops relative to indent // nTabLeft: The absolute value, the tab stops are relative to: Tabs origin. // - // --> OD 2008-07-01 #i91133# + // #i91133# const bool bTabsRelativeToIndent = pFrm->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); const SwTwips nTabLeft = bRTL @@ -394,13 +394,13 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) const bool bTabCompat = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT); // Die Mindestbreite eines Tabs ist immer mindestens ein Blank - // --> FME 2004-11-25 #i37686# In compatibility mode, the minimum width + // #i37686# In compatibility mode, the minimum width // should be 1, even for non-left tab stops. sal_uInt16 nMinimumTabWidth = 1; // <-- if ( !bTabCompat ) { - // --> OD 2008-06-05 #i89179# + // #i89179# // tab portion representing the list tab of a list label gets the // same font as the corresponding number portion std::auto_ptr< SwFontSave > pSave( 0 ); @@ -589,7 +589,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const } #endif - // --> OD 2008-06-05 #i89179# + // #i89179# // tab portion representing the list tab of a list label gets the // same font as the corresponding number portion std::auto_ptr< SwFontSave > pSave( 0 ); diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index 55ec68509498..3532ec7e0778 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -491,7 +491,7 @@ sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine ) MSHORT nNeed = 1; // frueher: nWidLines - rLine.GetLineNr(); // Special case: Master cannot give lines to follow - // --> FME 2008-09-16 #i91421# + // #i91421# if ( !pMaster->GetIndPrev() ) { sal_uLong nLines = pMaster->GetThisLines(); diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 3ae878c5a2c2..beb5abbce5cb 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -335,7 +335,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# SwFormToken aToken(TOKEN_TAB_STOP); aToken.nTabStopPosition = 0; - // --> FME 2004-12-10 #i36870# right aligned tab for all + // #i36870# right aligned tab for all aToken.cTabFillChar = '.'; aToken.eTabAlign = SVX_TAB_ADJUST_END; // <-- @@ -463,7 +463,7 @@ void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237 { const SvxTabStop& rTab = (*pTabStops)[nTab]; - // --> FME 2004-12-16 #i29178# + // #i29178# // For Word import, we do not want to replace exising tokens, // we insert new tabstop tokens without a tabstop character: if ( bInsertNewTapStops ) diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 4f6488e570ea..f50e3ed9c2d1 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -207,7 +207,7 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // GetReferenz-Felder aktualisieren if( RES_GETREFFLD == GetFld()->GetTyp()->Which() ) { - // --> OD 2007-09-06 #i81002# + // #i81002# // ((SwGetRefField*)GetFld())->UpdateField(); dynamic_cast<SwGetRefField*>(GetFld())->UpdateField( pTxtAttr ); // <-- diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 4a7319993d0a..261d2166745d 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -273,7 +273,7 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) // 7922: Wir muessen dafuer sorgen, dass der Inhalt des FlyInCnt // nach seiner Konstruktion stramm durchformatiert wird. - // --> OD 2004-11-09 #i26945# - Use new object formatter to format Writer + // #i26945# - Use new object formatter to format Writer // fly frame and its content. SwObjectFormatter::FormatObj( *pFly, const_cast<SwFrm*>(pCurrFrm), pCurrFrm->FindPageFrm() ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index b866f3b4973e..5690f726818e 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2166,7 +2166,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) xub_StrLen nLastIdx = nIdx; const xub_StrLen nEnd = rInf.GetIdx() + rInf.GetLen(); - // --> OD 2009-12-29 #i105901# + // #i105901# // skip character cells for all script types if ( pBreakIt->GetBreakIter().is() ) // <-- diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index a00679ea870f..a8a781b9467e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1455,7 +1455,7 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const xub_StrLen nTxtStartIdx, |* wird angehaengt *************************************************************************/ -// --> OD 2008-11-18 #i96213# +// #i96213# // introduction of new optional parameter to control, if all attributes have to be copied. void SwTxtNode::CopyText( SwTxtNode *const pDest, const SwIndex &rStart, @@ -1466,7 +1466,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, CopyText( pDest, aIdx, rStart, nLen, bForceCopyOfAllAttrs ); } -// --> OD 2008-11-18 #i96213# +// #i96213# // introduction of new optional parameter to control, if all attributes have to be copied. void SwTxtNode::CopyText( SwTxtNode *const pDest, const SwIndex &rDestStart, @@ -1494,7 +1494,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, if( HasSwAttrSet() ) { // alle, oder nur die CharAttribute ? - // --> OD 2008-11-18 #i96213# + // #i96213# if ( !bForceCopyOfAllAttrs && ( nDestStart || pDest->HasSwAttrSet() || @@ -1541,7 +1541,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, if( HasSwAttrSet() ) { // alle, oder nur die CharAttribute ? - // --> OD 2008-11-18 #i96213# + // #i96213# if ( !bForceCopyOfAllAttrs && ( nDestStart || pDest->HasSwAttrSet() || @@ -2229,7 +2229,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount, !(IDocumentContentOperations::INS_EMPTYEXPAND & nMode) && ( (RES_TXTATR_TOXMARK == nWhich) || (RES_TXTATR_REFMARK == nWhich) || - // --> FME 2006-03-03 #i62668# Ruby text attribute must be + // #i62668# Ruby text attribute must be // treated just like toxmark and refmarks (RES_TXTATR_CJK_RUBY == nWhich) ) ) // <-- @@ -2426,7 +2426,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, { /* hartes PageBreak/PageDesc/ColumnBreak aus AUTO-Set ignorieren */ SwAttrSet* pNewAttrSet = 0; - // --> OD 2007-07-10 #i75353# + // #i75353# bool bClearHardSetNumRuleWhenFmtCollChanges( false ); // <-- if( HasSwAttrSet() ) @@ -2479,7 +2479,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, pNewAttrSet->ClearItem(RES_PARATR_NUMRULE); else { - // --> OD 2007-07-10 #i75353# + // #i75353# // No clear of hard set numbering rule at an outline paragraph at this point. // Only if the paragraph style changes - see below. bClearHardSetNumRuleWhenFmtCollChanges = true; @@ -2510,7 +2510,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, const SwNumRule* pRule = GetNumRule(); if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) // #115901# { - // --> OD 2005-10-18 #i55459# + // #i55459# // - correction: parameter <bNext> has to be checked, as it was in the // previous implementation. if ( !bNext && !IsCountedInList() ) @@ -2530,11 +2530,11 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, return pNode; SwTxtFmtColl *pNextColl = &pColl->GetNextTxtFmtColl(); - // --> OD 2009-08-12 #i101870# + // #i101870# // perform action on different paragraph styles before applying the new paragraph style if (pNextColl != pColl) { - // --> OD 2007-07-10 #i75353# + // #i75353# if ( bClearHardSetNumRuleWhenFmtCollChanges ) { std::vector<sal_uInt16> aClearWhichIds; @@ -2698,7 +2698,7 @@ long SwTxtNode::GetLeftMarginWithNum( sal_Bool bTxtLeft ) const if ( AreListLevelIndentsApplicable() ) { nRet = rFmt.GetIndentAt(); - // --> OD 2008-06-06 #i90401# + // #i90401# // Only negative first line indents have consider for the left margin if ( !bTxtLeft && rFmt.GetFirstLineIndent() < 0 ) @@ -2803,7 +2803,7 @@ SwTwips SwTxtNode::GetAdditionalIndentForStartingNewList() const return nAdditionalIndent; } -// --> OD 2008-12-02 #i96772# +// #i96772# void SwTxtNode::ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpaceItem ) const { if ( AreListLevelIndentsApplicable() ) @@ -2821,7 +2821,7 @@ void SwTxtNode::ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpac } } -// --> OD 2008-07-01 #i91133# +// #i91133# long SwTxtNode::GetLeftMarginForTabCalculation() const { long nLeftMarginForTabCalc = 0; @@ -2918,7 +2918,7 @@ void SwTxtNode::Replace0xFF( XubString& rTxt, xub_StrLen& rTxtStt, * SwTxtNode::GetExpandTxt * Expand fields *************************************************************************/ -// --> OD 2007-11-15 #i83479# - handling of new parameters +// #i83479# - handling of new parameters XubString SwTxtNode::GetExpandTxt( const xub_StrLen nIdx, const xub_StrLen nLen, const bool bWithNum, @@ -3376,7 +3376,7 @@ namespace { rTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); bNumRuleSet = true; } - // --> OD 2008-12-17 #i70748# + // #i70748# // The new list style set at the paragraph. const SwNumRule* pNumRuleAtTxtNode = rTxtNode.GetNumRule(); if ( pNumRuleAtTxtNode ) @@ -3403,7 +3403,7 @@ namespace { aResetAttrsArray.Insert( RES_PARATR_LIST_RESTARTVALUE ); aResetAttrsArray.Insert( RES_PARATR_LIST_ISCOUNTED ); SwPaM aPam( rTxtNode ); - // --> OD 2008-11-28 #i96644# + // #i96644# // suppress side effect "send data changed events" rTxtNode.GetDoc()->ResetAttrs( aPam, sal_False, &aResetAttrsArray, @@ -3418,7 +3418,7 @@ namespace { if ( sNumRule == String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ) ) { - // --> OD 2008-09-10 #i70748# + // #i70748# OSL_ENSURE( rTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle(), "<HandleModifyAtTxtNode()> - text node with outline style, but its paragraph style is not assigned to outline style." ); int nNewListLevel = @@ -3443,13 +3443,13 @@ namespace { aResetAttrsArray.Insert( RES_PARATR_LIST_RESTARTVALUE ); aResetAttrsArray.Insert( RES_PARATR_LIST_ISCOUNTED ); SwPaM aPam( rTxtNode ); - // --> OD 2008-11-28 #i96644# + // #i96644# // suppress side effect "send data changed events" rTxtNode.GetDoc()->ResetAttrs( aPam, sal_False, &aResetAttrsArray, false ); // <-- - // --> OD 2008-11-19 #i70748# + // #i70748# if ( dynamic_cast<const SfxUInt16Item &>(rTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, sal_False )).GetValue() > 0 ) { rTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr(); @@ -3611,7 +3611,7 @@ void SwTxtNode::SetAttrOutlineLevel(int nLevel) } //<-end -// --> OD 2008-11-19 #i70748# +// #i70748# bool SwTxtNode::IsEmptyListStyleDueToSetOutlineLevelAttr() { return mbEmptyListStyleSetDueToSetOutlineLevelAttr; @@ -3709,7 +3709,7 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const const SwNumRule* pRule = GetNum() ? GetNum()->GetNumRule() : 0L; if ( pRule && IsCountedInList()) { - // --> OD 2008-03-19 #i87154# + // #i87154# // Correction of #newlistlevelattrs#: // The numbering type has to be checked for bullet lists. const SwNumFmt& rFmt = pRule->Get( static_cast<sal_uInt16>(GetActualListLevel() )); @@ -4093,7 +4093,7 @@ void SwTxtNode::CalcHiddenCharFlags() const SwScriptInfo::GetBoundsOfHiddenRange( *this, 0, nStartPos, nEndPos ); } -// --> FME 2004-06-08 #i12836# enhanced pdf export +// #i12836# enhanced pdf export bool SwTxtNode::IsHidden() const { if ( HasHiddenParaField() || HasHiddenCharAttribute( true ) ) @@ -4150,7 +4150,7 @@ namespace { bool mbUpdateListLevel; bool mbUpdateListRestart; bool mbUpdateListCount; - // --> OD 2008-11-19 #i70748# + // #i70748# bool mbOutlineLevelSet; // <-- }; @@ -4162,7 +4162,7 @@ namespace { mbUpdateListLevel( false ), mbUpdateListRestart( false ), mbUpdateListCount( false ), - // --> OD 2008-11-19 #i70748# + // #i70748# mbOutlineLevelSet( false ) // <-- { @@ -4178,7 +4178,7 @@ namespace { if ( pNumRuleItem.GetValue().Len() > 0 ) { mbAddTxtNodeToList = true; - // --> OD 2010-05-12 #i105562# + // #i105562# // mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); // <-- @@ -4256,7 +4256,7 @@ namespace { } break; - // --> OD 2008-11-19 #i70748# + // #i70748# // handle RES_PARATR_OUTLINELEVEL case RES_PARATR_OUTLINELEVEL: { @@ -4280,7 +4280,7 @@ namespace { mbUpdateListLevel( false ), mbUpdateListRestart( false ), mbUpdateListCount( false ), - // --> OD 2008-11-19 #i70748# + // #i70748# mbOutlineLevelSet( false ) // <-- { @@ -4295,7 +4295,7 @@ namespace { if ( pNumRuleItem->GetValue().Len() > 0 ) { mbAddTxtNodeToList = true; - // --> OD 2008-11-19 #i70748# + // #i70748# mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); // <-- } @@ -4365,7 +4365,7 @@ namespace { } } - // --> OD 2008-11-19 #i70748# + // #i70748# // handle RES_PARATR_OUTLINELEVEL if ( rItemSet.GetItemState( RES_PARATR_OUTLINELEVEL, sal_False, &pItem ) == SFX_ITEM_SET ) { @@ -4410,7 +4410,7 @@ namespace { } } - // --> OD 2008-11-19 #i70748# + // #i70748# if ( mbOutlineLevelSet ) { if ( mrTxtNode.GetAttrOutlineLevel() == 0 ) @@ -4520,7 +4520,7 @@ namespace { { bRemoveFromList = mrTxtNode.GetpSwAttrSet() && mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; - // --> OD 2008-10-20 #i92898# + // #i92898# mbListStyleOrIdReset = true; // <-- } @@ -4545,7 +4545,7 @@ namespace { !mrTxtNode.IsCountedInList() ); } - // --> OD 2008-11-19 #i70748# + // #i70748# // RES_PARATR_OUTLINELEVEL if ( nWhich1 <= RES_PARATR_OUTLINELEVEL && RES_PARATR_OUTLINELEVEL <= nWhich2 ) { @@ -4565,11 +4565,11 @@ namespace { { bRemoveFromList = mrTxtNode.GetpSwAttrSet() && mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; - // --> OD 2008-10-20 #i92898# + // #i92898# mbListStyleOrIdReset = true; // <-- } - // --> OD 2008-11-19 #i70748# + // #i70748# // RES_PARATR_OUTLINELEVEL else if ( nWhich1 == RES_PARATR_OUTLINELEVEL ) { @@ -4626,11 +4626,11 @@ namespace { bRemoveFromList = bRemoveFromList || ( mrTxtNode.GetpSwAttrSet() && mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET ); - // --> OD 2008-10-20 #i92898# + // #i92898# mbListStyleOrIdReset = true; // <-- } - // --> OD 2008-11-19 #i70748# + // #i70748# // RES_PARATR_OUTLINELEVEL else if ( rWhichArr[ n ] == RES_PARATR_OUTLINELEVEL ) { @@ -4678,7 +4678,7 @@ namespace { { rTxtNode.RemoveFromList(); } - // --> OD 2008-11-19 #i70748# + // #i70748# mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); // <-- } @@ -4692,7 +4692,7 @@ namespace { if ( mrTxtNode.GetNumRule() && mrTxtNode.GetListId().Len() > 0 ) { - // --> OD 2009-01-14 #i96062# + // #i96062# // If paragraph has no list level attribute set and list style // is the outline style, apply outline level as the list level. if ( !mrTxtNode.HasAttrListLevel() && @@ -4709,8 +4709,8 @@ namespace { // <-- mrTxtNode.AddToList(); } - // --> OD 2008-11-19 #i70748# - // --> OD 2010-05-12 #i105562# + // #i70748# + // #i105562# else if ( mrTxtNode.GetpSwAttrSet() && dynamic_cast<const SfxUInt16Item &>(mrTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, sal_False )).GetValue() > 0 ) { diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 3ca7d01e1981..5de5b6fe7def 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -739,13 +739,13 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, { if ( RES_TXTATR_CHARFMT == (*aIter)->Which() ) { - // --> FME 2007-02-16 #i74589# + // #i74589# const SwFmtCharFmt& rOtherCharFmt = (*aIter)->GetCharFmt(); const SwFmtCharFmt& rThisCharFmt = rNewHint.GetCharFmt(); const bool bSameCharFmt = rOtherCharFmt.GetCharFmt() == rThisCharFmt.GetCharFmt(); // <-- - // --> OD 2009-03-24 #i90311# + // #i90311# // Do not remove existing character format hint during XML import if ( !rNode.GetDoc()->IsInXMLImport() && ( !( nsSetAttrMode::SETATTR_DONTREPLACE & nMode ) || @@ -843,8 +843,8 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, SfxItemSet aNewSet( *pCurrentStyle ); aNewSet.Put( *pNewStyle ); - // --> FME 2007-4-11 #i75750# Remove attributes already set at whole paragraph - // --> FME 2007-09-24 #i81764# This should not be applied for no length attributes!!! <-- + // #i75750# Remove attributes already set at whole paragraph + // #i81764# This should not be applied for no length attributes!!! <-- if ( !bNoLengthAttribute && rNode.HasSwAttrSet() && aNewSet.Count() ) { SfxItemIter aIter2( aNewSet ); @@ -881,8 +881,8 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, bool bOptimizeAllowed = true; SfxItemSet* pNewSet = 0; - // --> FME 2007-4-11 #i75750# Remove attributes already set at whole paragraph - // --> FME 2007-09-24 #i81764# This should not be applied for no length attributes!!! <-- + // #i75750# Remove attributes already set at whole paragraph + // #i81764# This should not be applied for no length attributes!!! <-- if ( !bNoLengthAttribute && rNode.HasSwAttrSet() && pNewStyle->Count() ) { SfxItemIter aIter2( *pNewStyle ); @@ -1557,7 +1557,7 @@ void SwTxtNode::DeleteAttributes( const sal_uInt16 nWhich, if ( SFX_ITEM_SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, sal_True, &pItem ) ) SetCalcHiddenCharFlags(); } - // --> FME 2007-03-16 #i75430# Recalc hidden flags if necessary + // #i75430# Recalc hidden flags if necessary else if ( nWhich == RES_TXTATR_AUTOFMT ) { // Check if auto style contains hidden attribute: @@ -1886,7 +1886,7 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, } else // es ist ein Bereich definiert { - // --> FME 2007-03-13 #i75299# + // #i75299# ::std::auto_ptr< std::vector< SwPoolItemEndPair > > pAttrArr; // <-- @@ -2610,7 +2610,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode, ((SwTxtCharFmt*)pHint)->ChgTxtNode( &rNode ); break; } - // --> FME 2007-03-16 #i75430# Recalc hidden flags if necessary + // #i75430# Recalc hidden flags if necessary case RES_TXTATR_AUTOFMT: { // Check if auto style contains hidden attribute: @@ -2856,7 +2856,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode, } else { - // --> FME 2007-11-08 #i82989# Check sort numbers in NoHintAdjustMode + // #i82989# Check sort numbers in NoHintAdjustMode if ( RES_TXTATR_CHARFMT == nWhich ) lcl_CheckSortNumber( *this, *static_cast<SwTxtCharFmt*>(pHint) ); // <-- @@ -2974,9 +2974,8 @@ sal_uInt16 SwTxtNode::GetLang( const xub_StrLen nBegin, const xub_StrLen nLen, nScript = pBreakIt->GetRealScriptOfText( m_Text, nBegin ); } - // --> FME 2008-09-29 #i91465# hennerdrewes: Consider nScript if pSwpHints == 0 + // #i91465# Consider nScript if pSwpHints == 0 const sal_uInt16 nWhichId = GetWhichOfScript( RES_CHRATR_LANGUAGE, nScript ); - // <-- if ( HasHints() ) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 917ae6c83068..c739bdc3a848 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1981,7 +1981,7 @@ SwWrongList* SwTxtNode::GetWrong() return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pWrong : 0; } -// --> OD 2008-05-27 #i71360# +// #i71360# const SwWrongList* SwTxtNode::GetWrong() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pWrong : 0; diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 970403d5cd1f..038f14f8db4e 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1374,7 +1374,7 @@ SwRegHistory::SwRegHistory( const SwNode& rNd, SwHistory* pHst ) void SwRegHistory::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { - // --> OD 2010-10-05 #i114861# + // #i114861# // Do not handle a "noop" modify // - e.g. <SwTxtNode::NumRuleChgd()> uses such a "noop" modify // if ( m_pHistory && ( pOld || pNew ) ) diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 0d585f42aa0e..8d5da2668d55 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -134,7 +134,7 @@ SwUndoFmtAttr::SwUndoFmtAttr( const SfxItemSet& rOldSet, bool bSaveDrawPt ) : SwUndo( UNDO_INSFMTATTR ) , m_pFmt( &rChgFmt ) - // --> OD 2007-07-11 #i56253# + // #i56253# , m_pOldSet( new SfxItemSet( rOldSet ) ) // <-- , m_nNodeIndex( 0 ) @@ -206,7 +206,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext) if ( !m_pOldSet.get() || !m_pFmt || !IsFmtInDoc( &rContext.GetDoc() )) return; - // --> OD 2004-10-26 #i35443# - If anchor attribute has been successfull + // #i35443# - If anchor attribute has been successfull // restored, all other attributes are also restored. // Thus, keep track of its restoration bool bAnchorAttrRestored( false ); @@ -336,7 +336,7 @@ SwFmt* SwUndoFmtAttr::GetFmt( SwDoc& rDoc ) void SwUndoFmtAttr::RedoImpl(::sw::UndoRedoContext & rContext) { - // --> OD 2004-10-26 #i35443# - Because the undo stores the attributes for + // #i35443# - Because the undo stores the attributes for // redo, the same code as for <Undo(..)> can be applied for <Redo(..)> UndoImpl(rContext); // <-- @@ -470,7 +470,7 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt ) m_pOldSet->Put( aAnchor ); } -// --> OD 2004-10-26 #i35443# - Add return value, type <bool>. +// #i35443# - Add return value, type <bool>. // Return value indicates, if anchor attribute is restored. // Note: If anchor attribute is restored, all other existing attributes // are also restored. @@ -491,7 +491,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) static_cast<SwStartNode*>(pNd)->GetStartNodeType()) ) : !pNd->IsTxtNode() ) { - // --> OD 2004-10-26 #i35443# - invalid position. + // #i35443# - invalid position. // Thus, anchor attribute not restored return false; // <-- @@ -505,7 +505,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) if ( aPos.nContent.GetIndex() > static_cast<SwTxtNode*>(pNd)->GetTxt().Len() ) { - // --> OD 2004-10-26 #i35443# - invalid position. + // #i35443# - invalid position. // Thus, anchor attribute not restored return false; // <-- @@ -540,7 +540,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) } const SwFmtAnchor &rOldAnch = pFrmFmt->GetAnchor(); - // --> OD 2006-03-13 #i54336# + // #i54336# // Consider case, that as-character anchored object has moved its anchor position. if (FLY_AS_CHAR == rOldAnch.GetAnchorId()) // <-- @@ -621,7 +621,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) rContext.SetSelections(pFrmFmt, 0); - // --> OD 2004-10-26 #i35443# - anchor attribute restored. + // #i35443# - anchor attribute restored. return true; // <-- } diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 4d17b8fa51a1..dfbadfe70830 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -549,7 +549,7 @@ void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd ) - Bookmarks - Verzeichnisse */ -// --> OD 2007-10-17 #i81002# - extending method: +// #i81002# - extending method // delete certain (not all) cross-reference bookmarks at text node of <rMark> // and at text node of <rPoint>, if these text nodes aren't the same. void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, @@ -776,7 +776,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, for( sal_uInt16 n = 0; n < pMarkAccess->getMarksCount(); ++n ) { - // --> OD 2007-10-17 #i81002# + // #i81002# bool bSavePos = false; bool bSaveOtherPos = false; const ::sw::mark::IMark* pBkmk = (pMarkAccess->getMarksBegin() + n)->get(); @@ -792,7 +792,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, } else { - // --> OD 2009-08-06 #i92125# + // #i92125# bool bKeepCrossRefBkmk( false ); { if ( rMark.nNode == rPoint.nNode && @@ -829,7 +829,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, } // <-- - // --> OD 2007-10-17 #i81002# + // #i81002# const bool bDifferentTxtNodesAtMarkAndPoint( rMark.nNode != rPoint.nNode && rMark.nNode.GetNode().GetTxtNode() && diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 49471cf4501f..5364e0220762 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -83,7 +83,7 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm) if ( pDrawContact ) { pDrawContact->InsertMasterIntoDrawPage(); - // --> OD 2005-01-31 #i40845# - follow-up of #i35635# + // #i40845# - follow-up of #i35635# // move object to visible layer pDrawContact->MoveObjToVisibleLayer( pDrawContact->GetMaster() ); // <-- diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx index 4ba736443dba..8431af1e5fde 100644 --- a/sw/source/core/undo/unfmco.cxx +++ b/sw/source/core/undo/unfmco.cxx @@ -54,7 +54,7 @@ SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange, mbReset( bReset ), mbResetListAttrs( bResetListAttrs ) { - // --> FME 2004-08-06 #i31191# + // #i31191# if ( pColl ) aFmtName = pColl->GetName(); // <-- @@ -110,7 +110,7 @@ SwRewriter SwUndoFmtColl::GetRewriter() const { SwRewriter aResult; - // --> FME 2004-08-06 #i31191# Use stored format name instead of + // #i31191# Use stored format name instead of // pFmtColl->GetName(), because pFmtColl does not have to be available // anymore. aResult.AddRule(UNDO_ARG1, aFmtName ); diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index c775da164d01..065b20fe34c3 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -143,7 +143,7 @@ void SwUndoInsNum::RedoImpl(::sw::UndoRedoContext & rContext) } else { - // --> OD 2005-02-25 #i42921# - adapt to changed signature + // #i42921# - adapt to changed signature rDoc.SetNumRule(rPam, aNumRule, false); // <-- } @@ -163,7 +163,7 @@ void SwUndoInsNum::RepeatImpl(::sw::RepeatContext & rContext) { if( !sReplaceRule.Len() ) { - // --> OD 2005-02-25 #i42921# - adapt to changed signature + // #i42921# - adapt to changed signature rDoc.SetNumRule(rContext.GetRepeatPaM(), aNumRule, false); // <-- } diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 1b72dba58572..511a2adee27d 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -106,7 +106,7 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext) SwTableNode* pTblNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode(); - // --> 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 ); // <-- @@ -131,7 +131,7 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext) } // 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( rDoc.GetNodes(), nIdx, nIdx + 1 ); @@ -183,7 +183,7 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext) SwTableNode* pTblNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode(); - // --> 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 ); // <-- @@ -212,7 +212,7 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext) } // 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( rDoc.GetNodes(), nIdx, nIdx + 1 ); diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index d2fc151e5e5c..8f40f246d736 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -258,7 +258,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->registerInMark(*this, m_pImpl->m_pDoc->getIDocumentMarkAccess()->makeMark( aPam, m_pImpl->m_sMarkName, eType)); - // --> OD 2007-10-23 #i81002# + // #i81002# // Check, if bookmark has been created. // E.g., the creation of a cross-reference bookmark is suppress, // if the PaM isn't a valid one for cross-reference bookmarks. diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index d653e5f782dc..c50f47e58973 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -434,7 +434,7 @@ static void GetFormatAndCreateCursorFromRangeRep( SwTable *pTable = pTblFmt ? SwTable::FindTable( pTblFmt ) : 0; // create new SwUnoCrsr spanning the specified range //! see also SwXTextTable::GetRangeByName - // --> OD 2007-08-03 #i80314# + // #i80314# // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTblBox(..)> const SwTableBox* pTLBox = pTable ? pTable->GetTblBox( aStartCell, true ) : 0; @@ -449,7 +449,7 @@ static void GetFormatAndCreateCursorFromRangeRep( SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); pUnoCrsr->Move( fnMoveForward, fnGoNode ); pUnoCrsr->SetRemainInSection( sal_False ); - // --> OD 2007-08-03 #i80314# + // #i80314# // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTblBox(..)> const SwTableBox* pBRBox = pTable->GetTblBox( aEndCell, true ); // <-- diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index e5db9e65f472..0f46b1f03d4d 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1091,18 +1091,18 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) const SwSpzFrmFmts* const pFmts = pDoc->GetSpzFrmFmts(); if(!pFmts->Count()) return; - // --> OD 2009-09-10 #i104937# + // #i104937# // const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()]; const sal_uInt16 nSize = pFmts->Count(); // <-- ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin()); - // --> OD 2009-09-10 #i104937# + // #i104937# SwFrmFmt* pFmt( 0 ); for( sal_uInt16 i = 0; i < nSize; ++i ) // for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt) // <-- { - // --> OD 2009-09-10 #i104937# + // #i104937# pFmt = (*pFmts)[i]; // <-- if(pFmt->Which() != RES_FLYFRMFMT) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index e23cf3c9d4eb..fbf1c1c1e067 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -893,7 +893,7 @@ SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) if( !pObject ) { SwDoc *pDoc = pFmt->GetDoc(); - // --> OD 2005-08-08 #i52858# - method name changed + // #i52858# - method name changed SdrModel *pDrawModel = pDoc->GetOrCreateDrawModel(); // <-- SwFlyDrawContact* pContactObject @@ -1011,7 +1011,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } } } - // --> OD 2009-07-13 #i73249# + // #i73249# // Attribute AlternativeText was never published. // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances // else if( FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID && eType != FLYCNTTYPE_FRM ) @@ -1061,7 +1061,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: UnoActionContext aAction(pFmt->GetDoc()); SfxItemSet* pSet = 0; - // --> OD 2004-08-13 #i31771#, #i25798# - No adjustment of + // #i31771#, #i25798# - No adjustment of // anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ), // if document is currently in reading mode. if ( !pFmt->GetDoc()->IsInReading() ) @@ -1341,7 +1341,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: aSet.Put(aAnchor); } - // --> OD 2004-08-13 #i31771#, #i25798# - No adjustment of + // #i31771#, #i25798# - No adjustment of // anchor ( no call of method <::lcl_ChkAndSetNewAnchor(..)> ), // if document is currently in reading mode. if ( !pFmt->GetDoc()->IsInReading() ) @@ -1520,7 +1520,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { aAny <<= OUString(SwStyleNameMapper::GetProgName(pFmt->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) ); } - // --> OD 2009-07-13 #i73249# + // #i73249# // Attribute AlternativeText was never published. // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances // else if(eType != FLYCNTTYPE_FRM && @@ -1802,7 +1802,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) } } } - // --> OD 2009-07-13 #i73249# + // #i73249# // Attribute AlternativeText was never published. // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances // else if( eType != FLYCNTTYPE_FRM && FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID ) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index c73b565cc18e..83145c44a472 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -218,7 +218,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE ); xWrt->SetAsciiOptions( aOpt ); xWrt->bUCS2_WithStartChar = sal_False; - // --> FME #i68522# + // #i68522# const sal_Bool bOldShowProgress = xWrt->bShowProgress; xWrt->bShowProgress = sal_False; // <-- @@ -562,7 +562,7 @@ throw (lang::IllegalArgumentException) lcl_SetNodeNumStart( rPam, rValue ); break; case FN_UNO_NUM_LEVEL: - // --> OD 2008-07-14 #i91601# + // #i91601# case FN_UNO_LIST_ID: // <-- case FN_UNO_IS_NUMBER: @@ -577,7 +577,7 @@ throw (lang::IllegalArgumentException) pTxtNd->SetAttrListLevel(nLevel); } } - // --> OD 2008-07-14 #i91601# + // #i91601# else if (FN_UNO_LIST_ID == rEntry.nWID) { ::rtl::OUString sListId; @@ -2011,7 +2011,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER, 0L )); } - // --> OD 2006-07-12 #i63870# + // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSet ); // <-- } @@ -2026,7 +2026,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (!pSetParent.get()) { pSetParent.reset( pSet->Clone( sal_False ) ); - // --> OD 2006-07-12 #i63870# + // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSetParent, sal_True, sal_False ); // <-- diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 7d7aac27aae9..0c2550685053 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -374,7 +374,7 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam, //<-end,zhaojianwei } -// --> OD 2006-07-12 #i63870# +// #i63870# // split third parameter <bCurrentAttrOnly> into new parameters <bOnlyTxtAttr> // and <bGetFromChrFmt> to get better control about resulting <SfxItemSet> void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam, diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 04bbd54c893b..f50c7b6a2132 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -32,7 +32,7 @@ #include <unoport.hxx> #include <IMark.hxx> -// --> OD 2007-10-23 #i81002# +// #i81002# #include <crossrefbookmark.hxx> // <-- #include <doc.hxx> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 21b663281869..58039ed533b4 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1221,7 +1221,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : sal_uInt16 nIndex = #endif rDoc.MakeNumRule( sCreatedNumRuleName, 0, sal_False, - // --> OD 2008-06-06 #i89178# + // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); // <-- #if OSL_DEBUG_LEVEL > 1 diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index fba37f34809d..ce9f24480ce6 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1985,7 +1985,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) if( bBrowseModeChanged ) { - // --> FME 2005-03-16 #i44963# Good occasion to check if page sizes in + // #i44963# Good occasion to check if page sizes in // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import) pDoc->CheckDefaultPageFmt(); // <-- diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index c32437f242f1..5b961077f664 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -334,14 +334,14 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // the static pool default. pDoc->SetDefault( SwFmtFollowTextFlow( sal_False ) ); -// --> collapsing borders FME 2005-05-27 #i29550# +// #i29550# pDoc->SetDefault( SfxBoolItem( RES_COLLAPSING_BORDERS, sal_True ) ); // <-- collapsing //#i16874# AutoKerning as default for new documents pDoc->SetDefault( SvxAutoKernItem( sal_True, RES_CHRATR_AUTOKERN ) ); - // --> OD 2005-02-10 #i42080# - Due to the several calls of method <SetDefault(..)> + // #i42080# - Due to the several calls of method <SetDefault(..)> // at the document instance, the document is modified. Thus, reset this // status here. Note: In method <SubInitNew()> this is also done. pDoc->ResetModified(); diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index a3a52d95edf2..f052df95809e 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -864,7 +864,7 @@ sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily, } case SFX_STYLE_FAMILY_PARA: { - // --> OD 2007-11-06 #i62675# + // #i62675# // clear also list attributes at affected text nodes, if paragraph // style has the list style attribute set. pSh->SetTxtFmtColl( pStyle->GetCollection(), true ); @@ -1004,7 +1004,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr pCurrWrtShell->StartAllAction(); pCurrWrtShell->GetFlyFrmAttr( aSet ); - // --> OD 2009-12-28 #i105535# + // #i105535# // no update of anchor attribute aSet.ClearItem( RES_ANCHOR ); // <-- diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index a27ecdecfaec..e2e9de525a05 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -1282,7 +1282,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, if( rDoc.FindPageDescByName( pDesc->GetName(), &nPgDscPos )) { pNewDsc = new SwPageDesc( *pDesc ); - // --> OD 2005-05-09 #i48949# - no undo actions for the + // #i48949# - no undo actions for the // copy of the page style ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983# @@ -2167,7 +2167,7 @@ void SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource, pTargetFmt->ResetFmtAttr( RES_PAGEDESC, RES_FRMATR_END-1 ); else { - // --> OD 2007-01-25 #i73790# - method renamed + // #i73790# - method renamed pTargetFmt->ResetAllFmtAttr(); // <-- } diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index a4715c842e16..22a4d4d8682a 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -555,7 +555,7 @@ void SwSidebarWin::SetPosAndSize() { if (IsFollow() && !HasChildPathFocus()) { - // --> OD 2010-06-03 #i111964# + // #i111964# if ( mpAnchor ) { mpAnchor->SetAnchorState(AS_END); @@ -564,14 +564,14 @@ void SwSidebarWin::SetPosAndSize() } else { - // --> OD 2010-06-03 #i111964# + // #i111964# if ( mpAnchor ) { mpAnchor->SetAnchorState(AS_ALL); } // <-- SwSidebarWin* pWin = GetTopReplyNote(); - // --> OD 2010-06-03 #i111964# + // #i111964# if ( pWin && pWin->Anchor() ) // <-- { @@ -1127,7 +1127,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) { mpAnchor->SetAnchorState(AS_ALL); SwSidebarWin* pWin = GetTopReplyNote(); - // --> OD 2010-06-03 #i111964# + // #i111964# if ( pWin && pWin->Anchor() ) // <-- { @@ -1160,7 +1160,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) SwSidebarWin* pTopWinActive = mrMgr.HasActiveSidebarWin() ? mrMgr.GetActiveSidebarWin()->GetTopReplyNote() : 0; - // --> OD 2010-06-03 #i111964# + // #i111964# if ( pTopWinSelf && ( pTopWinSelf != pTopWinActive ) && pTopWinSelf->Anchor() ) // <-- diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 2fc5a877319b..af4bb1329ed0 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -76,7 +76,7 @@ #include <PostItMgr.hxx> #include <fmtfld.hxx> -// --> OD 2009-08-18 #i104300# +// #i104300# #include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> // <-- diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index dcd3da028195..2e44c396a673 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -47,7 +47,7 @@ #include <fldui.hrc> #include <fldtdlg.hrc> #include <globals.hrc> -// --> OD 2007-11-14 #i83479# +// #i83479# #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> @@ -60,7 +60,7 @@ SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) #define REFFLDFLAG_BOOKMARK 0x4800 #define REFFLDFLAG_FOOTNOTE 0x5000 #define REFFLDFLAG_ENDNOTE 0x6000 -// --> OD 2007-11-09 #i83479# +// #i83479# #define REFFLDFLAG_HEADING 0x7100 #define REFFLDFLAG_NUMITEM 0x7200 // <-- @@ -77,7 +77,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : aTypeLB (this, SW_RES(LB_REFTYPE)), aSelectionFT (this, SW_RES(FT_REFSELECTION)), aSelectionLB (this, SW_RES(LB_REFSELECTION)), - // --> OD 2007-11-21 #i83479# + // #i83479# aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ), // <-- aFormatFT (this, SW_RES(FT_REFFORMAT)), @@ -90,7 +90,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : sBookmarkTxt (SW_RES(STR_REFBOOKMARK)), sFootnoteTxt (SW_RES(STR_REFFOOTNOTE)), sEndnoteTxt (SW_RES(STR_REFENDNOTE)), - // --> OD 2007-11-09 #i83479# + // #i83479# sHeadingTxt (SW_RES(STR_REFHEADING)), sNumItemTxt (SW_RES(STR_REFNUMITEM)), maOutlineNodes(), @@ -109,7 +109,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : aSelectionLB.SetDoubleClickHdl (LINK(this, SwFldRefPage, InsertHdl)); aFormatLB.SetDoubleClickHdl (LINK(this, SwFldRefPage, InsertHdl)); - // --> OD 2007-11-21 #i83479# + // #i83479# aSelectionToolTipLB.SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) ); aSelectionToolTipLB.SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) ); aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL ); @@ -122,7 +122,7 @@ SwFldRefPage::~SwFldRefPage() { } -// --> OD 2007-11-22 #i83479# +// #i83479# void SwFldRefPage::SaveSelectedTxtNode() { mpSavedSelectedTxtNode = 0; @@ -175,7 +175,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) { SavePos(&aTypeLB); - // --> OD 2007-11-22 #i83479# + // #i83479# SaveSelectedTxtNode(); // <-- } @@ -204,7 +204,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) } } - // --> OD 2007-11-09 #i83479# + // #i83479# // entries for headings and numbered items nPos = aTypeLB.InsertEntry(sHeadingTxt); aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_HEADING); @@ -307,7 +307,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) { case REF_BOOKMARK: { - // --> OD 2007-11-14 #i83479# + // #i83479# SwGetRefField* pRefFld = dynamic_cast<SwGetRefField*>(GetCurField()); if ( pRefFld && pRefFld->IsRefToHeadingCrossRefBookmark() ) @@ -452,7 +452,7 @@ IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG ) } break; - // --> OD 2007-11-21 #i83479# + // #i83479# case REFFLDFLAG_HEADING: case REFFLDFLAG_NUMITEM: { @@ -487,7 +487,7 @@ void SwFldRefPage::UpdateSubType() const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); String sOldSel; - // --> OD 2007-11-22 #i83479# + // #i83479# if ( aSelectionLB.IsVisible() ) { const sal_uInt16 nSelectionSel = aSelectionLB.GetSelectEntryPos(); @@ -502,7 +502,7 @@ void SwFldRefPage::UpdateSubType() aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); - // --> OD 2007-11-21 #i83479# + // #i83479# aSelectionToolTipLB.SetUpdateMode(sal_False); aSelectionToolTipLB.Clear(); bool bShowSelectionToolTipLB( false ); @@ -552,7 +552,7 @@ void SwFldRefPage::UpdateSubType() sOldSel = aArr[n]->sDlgEntry; } } - // --> OD 2007-11-14 #i83479# + // #i83479# else if ( nTypeId == REFFLDFLAG_HEADING ) { bShowSelectionToolTipLB = true; @@ -653,7 +653,7 @@ void SwFldRefPage::UpdateSubType() sOldSel = pRefFld->GetSetRefName(); } - // --> OD 2007-11-21 #i83479# + // #i83479# aSelectionToolTipLB.Show( bShowSelectionToolTipLB ); aSelectionLB.Show( !bShowSelectionToolTipLB ); if ( bShowSelectionToolTipLB ) @@ -712,7 +712,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) bool bAddCrossRefFormats( false ); switch (nTypeId) { - // --> OD 2007-11-16 #i83479# + // #i83479# case REFFLDFLAG_HEADING: case REFFLDFLAG_NUMITEM: bAddCrossRefFormats = true; @@ -727,7 +727,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) break; default: - // --> OD 2007-11-16 #i83479# + // #i83479# if ( REFFLDFLAG & nTypeId ) { @@ -748,7 +748,7 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, i )); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i ))); } - // --> OD 2007-11-16 #i83479# + // #i83479# if ( bAddCrossRefFormats ) { sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN; @@ -902,7 +902,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); } - // --> OD 2007-11-16 #i83479# + // #i83479# else if ( nTypeId == REFFLDFLAG_HEADING ) { SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index f0b407c36ecf..f929db37891e 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -36,7 +36,7 @@ #include <vcl/edit.hxx> #include "fldpage.hxx" -// --> OD 2007-11-15 #i83479# +// #i83479# #include <IDocumentOutlineNodes.hxx> #include <IDocumentListItems.hxx> #include <FldRefTreeListBox.hxx> @@ -49,7 +49,7 @@ class SwFldRefPage : public SwFldPage ListBox aTypeLB; FixedText aSelectionFT; ListBox aSelectionLB; - // --> OD 2007-11-21 #i83479# + // #i83479# SwFldRefTreeListBox aSelectionToolTipLB; // <-- FixedText aFormatFT; @@ -61,7 +61,7 @@ class SwFldRefPage : public SwFldPage const String sBookmarkTxt; const String sFootnoteTxt; const String sEndnoteTxt; - // --> OD 2007-11-09 #i83479# + // #i83479# const String sHeadingTxt; const String sNumItemTxt; @@ -82,7 +82,7 @@ class SwFldRefPage : public SwFldPage void UpdateSubType(); sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); - // --> OD 2007-12-05 #i83479# + // #i83479# void SaveSelectedTxtNode(); const SwTxtNode* GetSavedSelectedTxtNode() const; sal_uInt16 GetSavedSelectedPos() const; diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index a81aa116aeca..2ecce009b642 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -289,7 +289,7 @@ public: //#i3370# remove quick help to prevent saving of autocorrection suggestions void StopQuickHelp(); - // --> OD 2005-02-18 #i42921# - add parameter <bVerticalMode> + // #i42921# - add parameter <bVerticalMode> sal_Bool RulerMarginDrag( const MouseEvent& rMEvt, const bool bVerticalMode ); // <-- diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 9311c2ca8e1f..5579fe5ec94a 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -189,7 +189,7 @@ public: //Word bzw. Satz selektieren. sal_Bool SelNearestWrd(); sal_Bool SelWrd (const Point * = 0, sal_Bool bProp=sal_False ); - // --> FME 2004-07-30 #i32329# Enhanced selection + // #i32329# Enhanced selection void SelSentence (const Point * = 0, sal_Bool bProp=sal_False ); void SelPara (const Point * = 0, sal_Bool bProp=sal_False ); // <-- @@ -233,7 +233,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); sal_Bool BwdSentence( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); } - // --> FME 2004-07-30 #i20126# Enhanced table selection + // #i20126# Enhanced table selection sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); // <-- sal_Bool SelectTableRow(); @@ -559,7 +559,7 @@ private: SW_DLLPRIVATE sal_Bool _EndWrd(); SW_DLLPRIVATE sal_Bool _NxtWrd(); SW_DLLPRIVATE sal_Bool _PrvWrd(); - // --> OD 2008-08-06 #i92468# + // #i92468# SW_DLLPRIVATE sal_Bool _NxtWrdForDelete(); SW_DLLPRIVATE sal_Bool _PrvWrdForDelete(); // <-- diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c41f72d3ad91..277348bcda65 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1417,7 +1417,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) break; case SID_IMAP: { - // --> OD 2006-11-08 #i59688# + // #i59688# // improve efficiency: // If selected object is protected, item has to disabled. const sal_Bool bProtect = 0 != rSh.IsSelObjProtected(FLYPROTECT_CONTENT|FLYPROTECT_PARENT); @@ -1433,7 +1433,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) const sal_Bool bIsGraphicSelection = rSh.GetSelectionType() == nsSelectionType::SEL_GRF; - // --> OD 2006-11-08 #i59688# + // #i59688# // avoid unnecessary loading of selected graphic. // The graphic is only needed, if the dialog is open. //wenn die Grafik ausgeswappt ist, dann muss der @@ -1512,7 +1512,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) sal_Bool bDisable = sal_False; if( !bHas && !bOk ) bDisable = sal_True; - // --> OD 2006-11-08 #i59688# + // #i59688# // avoid unnecessary loading of selected graphic. // The graphic is only needed, if the dialog is open. // wenn die Grafik ausgeswappt ist, dann muss der Status @@ -1523,7 +1523,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) { if( AddGrfUpdateSlot( nWhich )) rSh.GetGraphic(sal_False); // start the loading - // --> OD 2007-07-04 #i75481# + // #i75481# bDisable = sal_True; // <-- } @@ -1531,7 +1531,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) bDisable = !lcl_UpdateContourDlg( rSh, nSel ); else if( bOk ) { - // --> OD 2007-07-04 #i75481# + // #i75481# // apply fix #i59688# only for selected graphics if ( nSel & nsSelectionType::SEL_GRF ) bDisable = GRAPHIC_NONE == rSh.GetGraphicType(); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index e8b452a46625..135e17aafee1 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -280,7 +280,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); pSh->StartAllAction(); - // --> OD 2004-07-14 #i30451# + // #i30451# pSh->StartUndo(UNDO_INSFMTATTR); pSdrView->SetGeoAttrToMarked(*pOutSet); @@ -363,7 +363,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) rBind.InvalidateAll(sal_False); - // --> OD 2004-07-14 #i30451# + // #i30451# pSh->EndUndo( UNDO_INSFMTATTR ); pSh->EndAllAction(); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 3c9ef5b11193..63168e2c8f20 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -49,7 +49,7 @@ #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <svx/hlnkitem.hxx> -// --> OD 2009-07-07 #i73249# +// #i73249# #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> // <-- @@ -86,7 +86,7 @@ #include <shells.hrc> #include "swabstdlg.hxx" #include "misc.hrc" -// --> OD 2009-07-14 #i73249# +// #i73249# #include <svx/dialogs.hrc> // <-- @@ -741,7 +741,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) rReq.SetReturnValue(SfxBoolItem(nSlot, bMirror)); } break; - // --> OD 2009-07-14 #i73249# + // #i73249# case FN_TITLE_DESCRIPTION_SHAPE: { bUpdateMgr = sal_False; @@ -1015,7 +1015,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) rSet.DisableItem( nWhich ); } break; - // --> OD 2009-07-07 #i73249# + // #i73249# case FN_TITLE_DESCRIPTION_SHAPE: { SwWrtShell &rWrtSh = GetShell(); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 322fb5adb31f..3276ac48e021 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -74,7 +74,7 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST)) TYPEINIT1(SwListShell,SwBaseShell) -// --> FME 2005-01-04 #i35572# Functionality of Numbering/Bullet toolbar +// #i35572# Functionality of Numbering/Bullet toolbar // for outline numbered paragraphs should match the functions for outlines // available in the navigator. Therefore the code in the following // function is quite similar the the code in SwContentTree::ExecCommand. diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index abc579c825d2..23059702e7e7 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -141,7 +141,7 @@ const sal_uInt16 aUITableAttrRange[] = RES_FRAMEDIR, RES_FRAMEDIR, RES_ROW_SPLIT, RES_ROW_SPLIT, FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, -// --> collapsing borders FME 2005-05-27 #i29550# +// #i29550# RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, // <-- collapsing borders 0 @@ -438,7 +438,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, RES_UL_SPACE, RES_SHADOW, RES_FRAMEDIR, - // --> collapsing borders FME 2005-05-27 #i29550# + // #i29550# RES_COLLAPSING_BORDERS, // <-- collapsing borders 0 diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 816da90ec90f..1940bcbb3895 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -1160,7 +1160,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) rSh.ClearMark(); - // --> FME 2007-07-09 #i75891# + // #i75891# // SETATTR_DONTEXPAND does not work if there are already hard attributes. // Therefore we have to restore the font attributes. rSh.SetMark(); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 7ed96063a5a8..026169e2b459 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -977,7 +977,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { rReq.Done( *pSet ); ::SfxToSwPageDescAttr( rWrtSh, *pSet ); - // --> OD 2006-12-06 #i56253# + // #i56253# // enclose all undos. // Thus, check conditions, if actions will be performed. const bool bUndoNeeded( pSet->Count() || @@ -1032,7 +1032,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rWrtSh.SetNodeNumStart(nNumStart); rWrtSh.SetNumRuleStart(sal_False); } - // --> OD 2006-12-06 #i56253# + // #i56253# if ( bUndoNeeded ) { rWrtSh.EndUndo( UNDO_INSATTR ); @@ -1048,7 +1048,7 @@ void SwTextShell::Execute(SfxRequest &rReq) String sContinuedListId; const SwNumRule* pRule = rWrtSh.SearchNumRule( false, true, false, -1, sContinuedListId ); - // --> OD 2009-08-26 #i86492# + // #i86492# // Search also for bullet list if ( !pRule ) { @@ -1648,7 +1648,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) case FN_NUM_CONTINUE: { { - // --> OD 2009-08-26 #i86492# + // #i86492# // Search also for bullet list String aDummy; const SwNumRule* pRule = diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index d321d6f6a019..ad0c0b06462f 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -137,7 +137,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) else { SwNumRule aRule( GetShell().GetUniqueNumRuleName(), - // --> OD 2008-06-06 #i89178# + // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); // <-- SvxNumRule aSvxRule = aRule.MakeSvxNumRule(); @@ -154,7 +154,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) aFmt.SetLSpace(720); aFmt.SetAbsLSpace(n * 720); } - // --> FME 2005-01-21 #i38904# Default alignment for + // #i38904# Default alignment for // numbering/bullet should be rtl in rtl paragraph: if ( bRightToLeft ) { @@ -191,7 +191,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) SwNumRule aSetRule( pCurRule ? pCurRule->GetName() : GetShell().GetUniqueNumRuleName(), - // --> OD 2008-06-06 #i89178# + // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); // <-- aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc()); @@ -210,7 +210,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) rReq.Done(); SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule(); SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(), - // --> OD 2008-06-06 #i89178# + // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); // <-- aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc()); diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index a9d2f0b9b9c0..d375e42fdd5d 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -116,7 +116,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_USE_OLD_PRINTER_METRICS, HANDLE_PROTECT_FORM, HANDLE_TABS_RELATIVE_TO_INDENT, - // --> OD 2008-06-05 #i89181# + // #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, // <-- HANDLE_MODIFYPASSWORDINFO, @@ -174,7 +174,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo() { RTL_CONSTASCII_STRINGPARAM("UseOldPrinterMetrics"), HANDLE_USE_OLD_PRINTER_METRICS, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("TabsRelativeToIndent"), HANDLE_TABS_RELATIVE_TO_INDENT, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("ProtectForm"), HANDLE_PROTECT_FORM, CPPUTYPE_BOOLEAN, 0, 0}, - // --> OD 2008-06-05 #i89181# + // #i89181# { RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, CPPUTYPE_PROPERTYVALUE, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, CPPUTYPE_BOOLEAN, 0, 0}, @@ -664,7 +664,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->set(IDocumentSettingAccess::PROTECT_FORM, bTmp); } break; - // --> OD 2008-06-05 #i89181# + // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); @@ -1019,7 +1019,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; - // --> OD 2008-06-05 #i89181# + // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx index e6d25ae50a7b..3dae837be8c4 100644 --- a/sw/source/ui/uno/unodefaults.cxx +++ b/sw/source/ui/uno/unodefaults.cxx @@ -54,7 +54,7 @@ SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw() // it contains draw model item pool as secondary pool. //SdrModel* pModel = m_pDoc->MakeDrawModel(); //return &pModel->GetItemPool(); - // --> OD 2005-08-08 #i52858# - method name changed + // #i52858# - method name changed m_pDoc->GetOrCreateDrawModel(); // <-- return &(m_pDoc->GetAttrPool()); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 74cda2c34d23..a48988c65d08 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -113,7 +113,7 @@ #include <osl/file.hxx> #include <comphelper/storagehelper.hxx> -// --> FME 2004-06-08 #i12836# enhanced pdf export +// #i12836# enhanced pdf export #include <EnhancedPDFExportHelper.hxx> // <-- #include <numrule.hxx> @@ -1484,7 +1484,7 @@ void SwXTextDocument::InitNewDoc() if(pxXDrawPage) { - // --> OD 2008-07-23 #i91798#, #i91895# + // #i91798#, #i91895# // dispose XDrawPage here. We are the owner and know that it is no longer in a valid condition. uno::Reference<lang::XComponent> xComp( *pxXDrawPage, uno::UNO_QUERY ); xComp->dispose(); @@ -1931,7 +1931,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, // must thus create an SdrModel, if we don't have an // SdrModel and we are leaving the default at false, // we don't need to make an SdrModel and can do nothing - // --> OD 2005-08-08 #i52858# - method name changed + // #i52858# - method name changed pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() ); // <-- pDrawDoc->SetAutoControlFocus ( bAuto ); @@ -1953,14 +1953,14 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, // SdrModel and we are leaving the default at true, // we don't need to make an SdrModel and can do // nothing - // --> OD 2005-08-08 #i52858# - method name changed + // #i52858# - method name changed pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() ); // <-- pDrawDoc->SetOpenInDesignMode ( bMode ); } } break; - // --> FME 2005-02-25 #i42634# New property to set the bInReading + // #i42634# New property to set the bInReading // flag at the document, used during binary import case WID_DOC_LOCK_UPDATES : { @@ -2693,7 +2693,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( uno::Sequence< beans::PropertyValue > aRenderer; if (m_pRenderData) { - // --> TL, OD 2010-09-07 #i114210# + // #i114210# // determine the correct page number from the renderer index // --> OD 2010-10-01 #i114875 // consider brochure print @@ -2925,7 +2925,7 @@ void SAL_CALL SwXTextDocument::render( // should be set for printing as well ... pVwSh->SetPDFExportOption( sal_True ); - // --> FME 2004-06-08 #i12836# enhanced pdf export + // #i12836# enhanced pdf export // // First, we have to export hyperlinks, notes, and outline to pdf. // During this process, additional information required for tagging @@ -2948,7 +2948,7 @@ void SAL_CALL SwXTextDocument::render( else // normal printing and PDF export pVwSh->PrintOrPDFExport( pOut, rSwPrtOptions, nRenderer ); - // --> FME 2004-10-08 #i35176# + // #i35176# // // After printing the last page, we take care for the links coming // from the EditEngine. The links are generated during the painting @@ -3769,7 +3769,7 @@ Reference<XInterface> SwXDocumentPropertyHelper::GetDrawTable(short nWhich) { switch(nWhich) { - // --> OD 2005-08-08 #i52858# + // #i52858# // assure that Draw model is created, if it doesn't exist. case SW_CREATE_DASH_TABLE : if(!xDashTable.is()) diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 8e8a833c66d0..095cc6704ce8 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -153,7 +153,7 @@ ShellResource::ShellResource() aGetRefFld_Up( SW_RES( STR_GETREFFLD_UP ) ), aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ), - // --> OD 2007-09-13 #i81002# + // #i81002# aGetRefFld_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ), // <-- aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ), diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 52ca6af91e93..113aec7a5094 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -203,7 +203,7 @@ long SwWrtShell::DelLeft() if( SwCrsrShell::IsSttPara()) { - // --> FME 2007-02-15 #i4032# Don't actually call a 'delete' if we + // #i4032# Don't actually call a 'delete' if we // changed the table cell, compare DelRight(). const SwStartNode * pSNdOld = pWasInTblNd ? GetSwCrsr()->GetNode()->FindTableBoxStartNode() : @@ -225,7 +225,7 @@ long SwWrtShell::DelLeft() GetSwCrsr()->GetNode()->FindTableBoxStartNode() : 0; - // --> FME 2007-02-15 #i4032# Don't actually call a 'delete' if we + // #i4032# Don't actually call a 'delete' if we // changed the table cell, compare DelRight(). if ( pSNdOld != pSNdNew ) return 0; @@ -329,7 +329,7 @@ long SwWrtShell::DelRight() if ( SwCrsrShell::IsEndPara() ) { - // --> FME 2005-01-28 #i41424# Introduced a couple of + // #i41424# Introduced a couple of // Push()-Pop() pairs here. The reason for this is that a // Right()-Left() combination does not make sure, that // the cursor will be in its initial state, because there @@ -505,9 +505,9 @@ long SwWrtShell::DelNxtWord() EnterStdMode(); SetMark(); if(IsEndWrd() && !IsSttWrd()) - _NxtWrdForDelete(); // --> OD 2008-08-06 #i92468# + _NxtWrdForDelete(); // #i92468# if(IsSttWrd() || IsEndPara()) - _NxtWrdForDelete(); // --> OD 2008-08-06 #i92468# + _NxtWrdForDelete(); // #i92468# else _EndWrd(); @@ -531,11 +531,11 @@ long SwWrtShell::DelPrvWord() EnterStdMode(); SetMark(); if ( !IsSttWrd() || - !_PrvWrdForDelete() ) // --> OD 2008-08-06 #i92468# + !_PrvWrdForDelete() ) // #i92468# { if( IsEndWrd() ) { - if ( _PrvWrdForDelete() ) // --> OD 2008-08-06 #i92468# + if ( _PrvWrdForDelete() ) // #i92468# { // skip over all-1 spaces short n = -1; @@ -547,7 +547,7 @@ long SwWrtShell::DelPrvWord() } } else if( IsSttPara()) - _PrvWrdForDelete(); // --> OD 2008-08-06 #i92468# + _PrvWrdForDelete(); // #i92468# else _SttWrd(); } diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index e07320f14511..a541830c5853 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -881,7 +881,7 @@ long SwWrtShell::EndDrag(const Point * /*pPt*/, sal_Bool ) return 1; } -// --> FME 2004-07-30 #i32329# Enhanced table selection +// #i32329# Enhanced table selection sal_Bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag ) { MV_KONTEXT(this); diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index b1786c42108f..52b43d6e27b4 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -702,7 +702,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); - // --> OD 2005-05-02 #i48419# - action 'UpdateReplacement' doesn't + // #i48419# - action 'UpdateReplacement' doesn't // have to change the modified state of the document. // This is only a workaround for the defect, that this action // modifies a document after load, because unnecessarily the @@ -1135,7 +1135,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) } else { - // --> OD 2009-08-27 #i101234# + // #i101234# // activate outline numbering, because from the precondition // it's known, that <SwEdit::HasNumber()> == sal_False bActivateOutlineRule = true; @@ -1144,7 +1144,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) } else if ( !pNumRule ) { - // --> OD 2009-08-27 #i101234# + // #i101234# // Check, if corresponding list level of the outline numbering // has already a numbering format set. nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei,need further consideration @@ -1261,7 +1261,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) } else { - // --> OD 2009-08-27 #i95907# + // #i95907# const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode( numfunc::GetDefaultPositionAndSpaceMode() ); SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode ); @@ -1269,7 +1269,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) // Zeichenvorlage an die Numerierung haengen SwCharFmt* pChrFmt; SwDocShell* pDocSh = GetView().GetDocShell(); - // --> OD 2008-06-03 #i63395# + // #i63395# // Only apply user defined default bullet font const Font* pFnt = numfunc::IsDefBulletFontUserDefined() ? &numfunc::GetDefBulletFont() @@ -1300,7 +1300,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) if (! bNum) { - // --> OD 2008-06-03 #i63395# + // #i63395# // Only apply user defined default bullet font if ( pFnt ) { @@ -1313,7 +1313,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) aFmt.SetSuffix(::rtl::OUString()); } - // --> OD 2009-08-26 #i95907# + // #i95907# if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { if(bHtml && nLvl) @@ -1329,7 +1329,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) } // <-- - // --> FME 2005-01-21 #i38904# Default alignment for + // #i38904# Default alignment for // numbering/bullet should be rtl in rtl paragraph: if ( bRightToLeft ) { @@ -1340,7 +1340,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) aNumRule.Set( nLvl, aFmt ); } - // --> OD 2009-08-26 #i95907# + // #i95907# if ( pTxtNode && ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT ) { @@ -1349,7 +1349,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) // <-- if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 ) { - // --> OD 2010-05-05 #i111172# + // #i111172# // If text node is already inside a list, assure that the indents // are the same. Thus, adjust the indent change value by subtracting // indents of to be applied list style. @@ -1496,7 +1496,7 @@ SelectionType SwWrtShell::GetSelectionType() const if ( IsTableMode() ) nCnt |= (nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS); - // --> FME 2005-01-12 #i39855# + // #i39855# // Do not pop up numbering toolbar, if the text node has a numbering // of type SVX_NUM_NUMBER_NONE. const SwNumRule* pNumRule = GetCurNumRule(); diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index 9f8ba07ce204..f0269bff4f10 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -153,7 +153,7 @@ sal_Bool SwWrtShell::_PrvWrd() return bRet; } -// --> OD 2008-08-06 #i92468# +// #i92468# // method code of <SwWrtShell::_NxtWrd()> before fix for issue i72162 sal_Bool SwWrtShell::_NxtWrdForDelete() { |