From 595fed165bfafb097f0b3ffafb0137cc7f3b6029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= Date: Fri, 22 Apr 2011 08:03:02 -0300 Subject: [PATCH] left arrow comments removed // <-- --- starmath/source/node.cxx | 1 - starmath/source/unomodel.cxx | 5 - sw/inc/SwNodeNum.hxx | 1 - sw/inc/anchoredobject.hxx | 1 - sw/inc/fesh.hxx | 1 - sw/inc/reffld.hxx | 2 - sw/inc/swundo.hxx | 1 - sw/inc/viewsh.hxx | 1 - sw/source/core/SwNumberTree/SwNodeNum.cxx | 12 --- sw/source/core/SwNumberTree/SwNumberTree.cxx | 14 --- sw/source/core/access/acccontext.cxx | 3 - sw/source/core/access/acccontext.hxx | 1 - sw/source/core/access/accnotextframe.cxx | 2 - sw/source/core/access/accnotextframe.hxx | 1 - sw/source/core/access/accpara.cxx | 15 --- sw/source/core/access/accpara.hxx | 5 - sw/source/core/access/accportions.cxx | 3 - sw/source/core/access/accportions.hxx | 1 - sw/source/core/access/acctable.cxx | 10 -- sw/source/core/access/acctable.hxx | 1 - sw/source/core/access/acctextframe.cxx | 2 - sw/source/core/access/acctextframe.hxx | 2 - sw/source/core/access/textmarkuphelper.cxx | 5 - sw/source/core/access/textmarkuphelper.hxx | 1 - sw/source/core/bastyp/init.cxx | 1 - sw/source/core/crsr/crsrsh.cxx | 4 - sw/source/core/crsr/crstrvl.cxx | 1 - sw/source/core/crsr/trvltbl.cxx | 1 - sw/source/core/doc/doccomp.cxx | 4 - sw/source/core/doc/doclay.cxx | 6 -- sw/source/core/doc/docnum.cxx | 5 - sw/source/core/doc/docredln.cxx | 3 - sw/source/core/doc/docsort.cxx | 2 - sw/source/core/doc/doctxm.cxx | 2 - sw/source/core/doc/extinput.cxx | 1 - sw/source/core/doc/fmtcol.cxx | 11 --- sw/source/core/doc/htmltbl.cxx | 1 - sw/source/core/doc/notxtfrm.cxx | 5 - sw/source/core/doc/number.cxx | 7 -- sw/source/core/doc/poolfmt.cxx | 3 - sw/source/core/docnode/ndcopy.cxx | 7 -- sw/source/core/docnode/ndnotxt.cxx | 1 - sw/source/core/docnode/ndsect.cxx | 3 - sw/source/core/docnode/ndtbl.cxx | 7 -- sw/source/core/docnode/node.cxx | 8 -- sw/source/core/docnode/nodes.cxx | 1 - sw/source/core/docnode/section.cxx | 2 - sw/source/core/draw/dcontact.cxx | 35 -------- sw/source/core/draw/dpage.cxx | 1 - sw/source/core/draw/dview.cxx | 6 -- sw/source/core/edit/autofmt.cxx | 2 - sw/source/core/edit/edfcol.cxx | 2 - sw/source/core/edit/edfmt.cxx | 1 - sw/source/core/edit/editsh.cxx | 2 - sw/source/core/edit/ednumber.cxx | 6 -- sw/source/core/fields/docufld.cxx | 1 - sw/source/core/fields/reffld.cxx | 7 -- sw/source/core/frmedt/fecopy.cxx | 3 - sw/source/core/frmedt/fefly1.cxx | 3 - sw/source/core/frmedt/feshview.cxx | 13 --- sw/source/core/frmedt/fetab.cxx | 5 - sw/source/core/frmedt/fews.cxx | 1 - sw/source/core/frmedt/tblsel.cxx | 7 -- sw/source/core/graphic/ndgrf.cxx | 24 ----- sw/source/core/inc/UndoAttribute.hxx | 4 - sw/source/core/inc/cellfrm.hxx | 1 - sw/source/core/inc/ftnfrm.hxx | 2 - sw/source/core/inc/layfrm.hxx | 1 - sw/source/core/inc/layouter.hxx | 15 --- sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 3 - sw/source/core/inc/rootfrm.hxx | 2 - sw/source/core/inc/rowfrm.hxx | 1 - sw/source/core/inc/tabfrm.hxx | 4 - sw/source/core/inc/threadmanager.hxx | 1 - sw/source/core/inc/txtfrm.hxx | 1 - sw/source/core/layout/anchoreddrawobject.cxx | 48 ---------- sw/source/core/layout/anchoredobject.cxx | 30 ------- sw/source/core/layout/atrfrm.cxx | 12 --- sw/source/core/layout/calcmove.cxx | 26 ------ sw/source/core/layout/colfrm.cxx | 2 - sw/source/core/layout/findfrm.cxx | 5 - sw/source/core/layout/flowfrm.cxx | 34 ------- sw/source/core/layout/fly.cxx | 47 ---------- sw/source/core/layout/flyincnt.cxx | 4 - sw/source/core/layout/frmtool.cxx | 45 ---------- sw/source/core/layout/ftnfrm.cxx | 23 ----- sw/source/core/layout/hffrm.cxx | 4 - sw/source/core/layout/layact.cxx | 18 ---- sw/source/core/layout/laycache.cxx | 6 -- sw/source/core/layout/layouter.cxx | 12 --- sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 2 - sw/source/core/layout/newfrm.cxx | 4 - sw/source/core/layout/objectformatter.cxx | 15 --- sw/source/core/layout/objectformatterlayfrm.cxx | 7 -- sw/source/core/layout/objectformatterlayfrm.hxx | 1 - sw/source/core/layout/pagechg.cxx | 12 --- sw/source/core/layout/pagedesc.cxx | 1 - sw/source/core/layout/paintfrm.cxx | 26 ------ sw/source/core/layout/sectfrm.cxx | 12 --- sw/source/core/layout/sortedobjsimpl.cxx | 4 - sw/source/core/layout/ssfrm.cxx | 4 - sw/source/core/layout/tabfrm.cxx | 92 -------------------- sw/source/core/layout/trvlfrm.cxx | 8 -- sw/source/core/layout/wsfrm.cxx | 24 ----- .../objectpositioning/anchoredobjectposition.cxx | 1 - .../ascharanchoredobjectposition.cxx | 1 - .../tocntntanchoredobjectposition.cxx | 9 -- .../tolayoutanchoredobjectposition.cxx | 1 - sw/source/core/ole/ndole.cxx | 1 - sw/source/core/table/swtable.cxx | 4 - sw/source/core/text/EnhancedPDFExportHelper.cxx | 2 - sw/source/core/text/atrstck.cxx | 1 - sw/source/core/text/frmform.cxx | 6 -- sw/source/core/text/frmpaint.cxx | 5 - sw/source/core/text/guess.cxx | 2 - sw/source/core/text/inftxt.cxx | 5 - sw/source/core/text/inftxt.hxx | 1 - sw/source/core/text/itradj.cxx | 1 - sw/source/core/text/itrcrsr.cxx | 6 -- sw/source/core/text/itrform2.cxx | 6 -- sw/source/core/text/itrpaint.cxx | 3 - sw/source/core/text/itrtxt.hxx | 2 - sw/source/core/text/porfld.cxx | 3 - sw/source/core/text/porfld.hxx | 1 - sw/source/core/text/porfly.cxx | 3 - sw/source/core/text/porftn.hxx | 2 - sw/source/core/text/porlay.cxx | 5 - sw/source/core/text/pormulti.cxx | 1 - sw/source/core/text/porrst.cxx | 2 - sw/source/core/text/portxt.cxx | 2 - sw/source/core/text/txtfld.cxx | 1 - sw/source/core/text/txtfly.cxx | 64 -------------- sw/source/core/text/txtfrm.cxx | 20 ---- sw/source/core/text/txtftn.cxx | 7 -- sw/source/core/text/txthyph.cxx | 1 - sw/source/core/text/txttab.cxx | 9 -- sw/source/core/tox/tox.cxx | 3 - sw/source/core/txtnode/atrfld.cxx | 2 - sw/source/core/txtnode/atrflyin.cxx | 1 - sw/source/core/txtnode/fntcache.cxx | 1 - sw/source/core/txtnode/ndtxt.cxx | 32 ------- sw/source/core/txtnode/thints.cxx | 8 -- sw/source/core/txtnode/txtedt.cxx | 1 - sw/source/core/undo/rolbck.cxx | 1 - sw/source/core/undo/unattr.cxx | 8 -- sw/source/core/undo/undobj.cxx | 2 - sw/source/core/undo/undobj1.cxx | 1 - sw/source/core/undo/undraw.cxx | 1 - sw/source/core/undo/unfmco.cxx | 2 - sw/source/core/undo/unnum.cxx | 2 - sw/source/core/undo/unsort.cxx | 4 - sw/source/core/unocore/unobkm.cxx | 1 - sw/source/core/unocore/unochart.cxx | 2 - sw/source/core/unocore/unocoll.cxx | 3 - sw/source/core/unocore/unocrsrhelper.cxx | 1 - sw/source/core/unocore/unodraw.cxx | 1 - sw/source/core/unocore/unoframe.cxx | 6 -- sw/source/core/unocore/unoobj.cxx | 5 - sw/source/core/unocore/unoportenum.cxx | 1 - sw/source/core/unocore/unosect.cxx | 1 - sw/source/core/unocore/unosett.cxx | 4 - sw/source/core/unocore/unotextmarkup.cxx | 1 - sw/source/core/view/viewsh.cxx | 1 - sw/source/core/view/vnew.cxx | 1 - sw/source/filter/basflt/shellio.cxx | 2 - sw/source/filter/html/htmlatr.cxx | 2 - sw/source/filter/html/htmlgrin.cxx | 1 - sw/source/filter/html/htmlnum.cxx | 9 -- sw/source/filter/html/svxcss1.cxx | 1 - sw/source/filter/html/swhtml.cxx | 3 - sw/source/filter/inc/fltshell.hxx | 1 - sw/source/filter/rtf/rtffly.cxx | 4 - sw/source/filter/rtf/rtfnum.cxx | 1 - sw/source/filter/rtf/swparrtf.cxx | 1 - sw/source/filter/writer/writer.cxx | 1 - sw/source/filter/ww8/escher.hxx | 1 - sw/source/filter/ww8/writerhelper.cxx | 4 - sw/source/filter/ww8/wrtw8esh.cxx | 10 -- sw/source/filter/ww8/wrtw8nds.cxx | 4 - sw/source/filter/ww8/wrtw8num.cxx | 9 -- sw/source/filter/ww8/wrtww8.cxx | 2 - sw/source/filter/ww8/wrtww8.hxx | 1 - sw/source/filter/ww8/wrtww8gr.cxx | 3 - sw/source/filter/ww8/ww8atr.cxx | 8 -- sw/source/filter/ww8/ww8graf.cxx | 12 --- sw/source/filter/ww8/ww8graf.hxx | 4 - sw/source/filter/ww8/ww8graf2.cxx | 4 - sw/source/filter/ww8/ww8par.cxx | 12 --- sw/source/filter/ww8/ww8par.hxx | 4 - sw/source/filter/ww8/ww8par2.cxx | 12 --- sw/source/filter/ww8/ww8par3.cxx | 9 -- sw/source/filter/ww8/ww8par5.cxx | 4 - sw/source/filter/ww8/ww8par6.cxx | 5 - sw/source/filter/ww8/ww8scan.cxx | 1 - sw/source/filter/xml/swxml.cxx | 9 -- sw/source/filter/xml/wrtxml.cxx | 2 - sw/source/filter/xml/xmlfmt.cxx | 1 - sw/source/filter/xml/xmlfmte.cxx | 1 - sw/source/filter/xml/xmlimp.cxx | 6 -- sw/source/filter/xml/xmltble.cxx | 1 - sw/source/filter/xml/xmltbli.cxx | 4 - sw/source/ui/app/docshini.cxx | 1 - sw/source/ui/app/docst.cxx | 2 - sw/source/ui/app/docstyle.cxx | 2 - sw/source/ui/docvw/SidebarWin.cxx | 5 - sw/source/ui/docvw/edtwin2.cxx | 1 - sw/source/ui/fldui/fldref.cxx | 17 ---- sw/source/ui/fldui/fldref.hxx | 4 - sw/source/ui/frmdlg/frmmgr.cxx | 2 - sw/source/ui/frmdlg/frmpage.cxx | 8 -- sw/source/ui/inc/app.hrc | 1 - sw/source/ui/inc/edtwin.hxx | 1 - sw/source/ui/inc/frmmgr.hxx | 1 - sw/source/ui/inc/frmpage.hxx | 1 - sw/source/ui/inc/numpara.hxx | 1 - sw/source/ui/inc/regionsw.hxx | 4 - sw/source/ui/inc/wrtsh.hxx | 3 - sw/source/ui/index/cnttab.cxx | 2 - sw/source/ui/misc/outline.cxx | 4 - sw/source/ui/misc/outline.src | 1 - sw/source/ui/shells/basesh.cxx | 6 -- sw/source/ui/shells/drwbassh.cxx | 1 - sw/source/ui/shells/drwtxtex.cxx | 1 - sw/source/ui/shells/frmsh.cxx | 4 - sw/source/ui/shells/grfsh.cxx | 3 - sw/source/ui/shells/listsh.cxx | 1 - sw/source/ui/shells/tabsh.cxx | 1 - sw/source/ui/shells/textsh.cxx | 1 - sw/source/ui/shells/textsh1.cxx | 5 - sw/source/ui/shells/txtnum.cxx | 4 - sw/source/ui/uiview/view.src | 1 - sw/source/ui/uiview/viewtab.cxx | 3 - sw/source/ui/uno/SwXDocumentSettings.cxx | 3 - sw/source/ui/uno/unodefaults.cxx | 1 - sw/source/ui/uno/unotxdoc.cxx | 13 --- sw/source/ui/utlui/initui.cxx | 1 - sw/source/ui/wrtsh/delete.cxx | 7 -- sw/source/ui/wrtsh/select.cxx | 1 - sw/source/ui/wrtsh/wrtsh1.cxx | 13 --- sw/source/ui/wrtsh/wrtsh4.cxx | 2 - 240 files changed, 0 insertions(+), 1426 deletions(-) diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index e272ecd..299e420 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -874,7 +874,6 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // between middle and baseline for single letter nFormulaBaseline += aRect.GetBaseline() - aRect.GetAlignM(); } - // <-- } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 7f5990f..fee7558 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -305,10 +305,8 @@ PropertySetInfo * lcl_createModelPropertyInfo () { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, // #i33095# Security Options { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 }, - // <-- // #i972# { RTL_CONSTASCII_STRINGPARAM( "BaseLine"), HANDLE_BASELINE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0}, - // <-- { NULL, 0, 0, NULL, 0, 0 } }; PropertySetInfo *pInfo = new PropertySetInfo ( aModelPropertyInfoMap ); @@ -719,7 +717,6 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pDocSh->SetLoadReadonly( bReadonly ); break; } - // <-- } } @@ -933,7 +930,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu *pValue <<= pDocSh->IsLoadReadonly(); break; } - // <-- // #i972# case HANDLE_BASELINE: { @@ -948,7 +944,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu } } break; - // <-- } } } diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 51964e3..ddd0e6b 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -85,7 +85,6 @@ protected: // --> #i64010# virtual bool HasCountedChildren() const; virtual bool IsCountedForNumbering() const; - // <-- // method called before this tree node has been added to the list tree virtual void PreAdd(); diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 1d6167d..27fe59d 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -181,7 +181,6 @@ class SW_DLLPUBLIC SwAnchoredObject const RndStdIds _eAnchorType, const xub_StrLen _nObjAnchorPos, SwAnchoredObject* _pAnchoredObj ); - // <-- protected: SwAnchoredObject(); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 5cf3e9b..0e13625 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -548,7 +548,6 @@ public: // aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); - // <-- diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 8874639..7226d83 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -61,7 +61,6 @@ enum REFERENCEMARK REF_NUMBER, REF_NUMBER_NO_CONTEXT, REF_NUMBER_FULL_CONTEXT, - // <-- REF_END }; @@ -133,7 +132,6 @@ public: bool IsRefToHeadingCrossRefBookmark() const; bool IsRefToNumItemCrossRefBookmark() const; const SwTxtNode* GetReferencedTxtNode() const; - // <-- // #i85090# String GetExpandedTxtOfReferencedTxtNode() const; diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index 0268c89..70e7b2f 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -161,7 +161,6 @@ enum SwUndoId // --> #i73249# UNDO_FLYFRMFMT_TITLE, // 112 UNDO_FLYFRMFMT_DESCRIPTION, // 113 - // <-- UNDO_STD_END= UNDO_FLYFRMFMT_DESCRIPTION, // UI undo ID's... diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 39df2c9..3c8e449 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -342,7 +342,6 @@ public: const IDocumentListItems* getIDocumentListItemsAccess() const; const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess() const; - // <-- // 1. GetRefDev: Either the printer or the virtual device from the doc // 2. GetWin: Available if we not printing diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index faf7b0c..631add3 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -37,7 +37,6 @@ #include // #i83479# #include -// <-- #include SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode ) @@ -145,7 +144,6 @@ void SwNodeNum::PostRemove() mpNumRule = 0; } } -// <-- bool SwNodeNum::IsNotifiable() const { @@ -184,7 +182,6 @@ bool SwNodeNum::IsContinuous() const { OSL_FAIL( " - OD debug" ); } - // <-- return aResult; } @@ -198,7 +195,6 @@ bool SwNodeNum::IsCounted() const // #i59559# // determines, if a text node is counted for numbering aResult = GetTxtNode()->IsCountedInList(); - // <-- } else aResult = SwNumberTreeNode::IsCounted(); @@ -230,7 +226,6 @@ bool SwNodeNum::HasCountedChildren() const return bResult; } -// <-- // #i64010# bool SwNodeNum::IsCountedForNumbering() const { @@ -240,7 +235,6 @@ bool SwNodeNum::IsCountedForNumbering() const GetTxtNode()->HasNumber() || // text node GetTxtNode()->HasBullet() ); // text node } -// <-- void SwNodeNum::NotifyNode() @@ -265,7 +259,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const // #i83479# - refactoring // simplify comparison by comparing the indexes of the text nodes bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() ) ? true : false; - // <-- } return bResult; @@ -296,7 +289,6 @@ bool SwNodeNum::IsCountPhantoms() const { OSL_FAIL( "GetDoc()->ResetAttrs( aPam, sal_False, &aResetAttrsArray, false ); - // <-- } } } -// <-- // #i81002# const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const @@ -404,7 +394,6 @@ const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) c // #i83479# SwNodeNum aNodeNumForTxtNode( const_cast(&rTxtNode) ); - // <-- pPrecedingNodeNum = dynamic_cast( GetRoot() @@ -413,6 +402,5 @@ const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) c return pPrecedingNodeNum; } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 6f259e8..184f94c 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -140,7 +140,6 @@ void SwNumberTreeNode::ClearObsoletePhantoms() // is referenced by , it's needed to adjust // before erasing . SetLastValid(mChildren.end()); - // <-- delete *aIt; mChildren.erase(aIt); @@ -243,11 +242,9 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons else ++nTmpNumber; } - // <-- (*aIt)->mnNumber = nTmpNumber; } - // <-- SetLastValid(aIt, true); } @@ -282,7 +279,6 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const if ( !(*aIt)->IsCounted() ) // #i65284# nTmpNumber = pPred->GetNumber( pPred->GetParent() != (*aIt)->GetParent() ); - // <-- else { if ( (*aIt)->IsRestart() ) @@ -303,7 +299,6 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const nTmpNumber = GetStartValue(); } } - // <-- (*aIt)->mnNumber = nTmpNumber; } @@ -313,7 +308,6 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const // #i74748# - applied patch from garnier_romain // number tree node has to be validated. SetLastValid( aIt, true ); - // <-- } void SwNumberTreeNode::Validate(const SwNumberTreeNode * pNode) const @@ -406,7 +400,6 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode, // the element, which is referenced by , it's needed to // adjust before erasing . SetLastValid( mChildren.end() ); - // <-- mChildren.erase(aItUpper, mChildren.end()); @@ -415,7 +408,6 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode, { SetLastValid( --(mChildren.end()) ); } - // <-- } #ifdef __SW_NUMBER_TREE_SANITY_CHECK @@ -436,7 +428,6 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest) // which is referenced by , it's needed to adjust // before erasing . SetLastValid(mChildren.end()); - // <-- if (pMyFirst->IsPhantom()) { @@ -598,7 +589,6 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild, } // assure that unnessary created phantoms at are deleted. pChild->ClearObsoletePhantoms(); - // <-- if ((*aPredIt)->IsValid()) SetLastValid(aPredIt); @@ -688,7 +678,6 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild) SetLastValid(mChildren.end()); else SetLastValid(aItPred); - // <-- mChildren.erase(aRemoveIt); @@ -1068,7 +1057,6 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const // #i64311# // root node is no valid predecessor pResult = mpParent->GetParent() ? mpParent : NULL; - // <-- } else { @@ -1237,7 +1225,6 @@ void SwNumberTreeNode::NotifyInvalidChildren() } } - // <-- } if (IsContinuous() && mpParent) @@ -1281,7 +1268,6 @@ const SwNumberTreeNode* SwNumberTreeNode::GetPrecedingNodeOf( return pPrecedingNode; } -// <-- void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel ) { diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 78f18fa..d3b1a90 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -431,7 +431,6 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm, ++aIter; } } -// <-- void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm, sal_Bool bRecursive ) @@ -1255,7 +1254,6 @@ void SwAccessibleContext::InvalidateChildPosOrSize( { OSL_FAIL( " - no accessible shape found." ); } - // <-- } else if ( rChildFrmOrObj.GetWindow() ) { @@ -1361,7 +1359,6 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates ) InvalidateChildrenStates( GetFrm(), _nStates ); } } -// <-- void SwAccessibleContext::InvalidateRelation( sal_uInt16 nType ) { diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 8a35344..c258ed7 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -156,7 +156,6 @@ protected: // #i27301# - use new type definition for <_nStates> void InvalidateChildrenStates( const SwFrm* _pFrm, tAccessibleStates _nStates ); - // <-- // Dispose children of the specified SwFrm. The SwFrm might belong to // the current object or to any other child or grandchild. diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 9b87630..62be2a9 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -84,7 +84,6 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame( msDesc = msTitle; } } - // <-- } SwAccessibleNoTextFrame::~SwAccessibleNoTextFrame() @@ -184,7 +183,6 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) return SwAccessibleFrameBase::getAccessibleName(); } -// <-- OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription (void) throw (uno::RuntimeException) diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index b7459ca..2c206ce 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -60,7 +60,6 @@ public: virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - // <-- /// Return this object's description. virtual ::rtl::OUString SAL_CALL diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index f515494..c84fc47 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -81,7 +81,6 @@ // #i10825# #include #include -// <-- #include // #i92233# #include @@ -312,7 +311,6 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection ) // a table selection has to be returned. if ( pCrsrShell != NULL && ( _bForSelection || !pCrsrShell->IsTableMode() ) ) - // <-- { SwFEShell *pFESh = pCrsrShell->ISA( SwFEShell ) ? static_cast< SwFEShell * >( pCrsrShell ) : 0; @@ -982,7 +980,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground() return SwAccessibleContext::getBackground(); } -// <-- ::rtl::OUString SAL_CALL SwAccessibleParagraph::getImplementationName() throw( uno::RuntimeException ) @@ -1045,7 +1042,6 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) uno::Reference aAccTextAttr = this; aRet <<= aAccTextAttr; } - // <-- // #i89175# // add interface com::sun:star:accessibility::XAccessibleTextMarkup else if ( rType == ::getCppuType((uno::Reference *)0) ) @@ -1059,7 +1055,6 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) uno::Reference aAccMultiLineText = this; aRet <<= aAccMultiLineText; } - // <-- else { aRet = SwAccessibleContext::queryInterface(rType); @@ -1086,7 +1081,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno: pTypes[nIndex++] = ::getCppuType( static_cast< uno::Reference< XAccessibleTextMarkup > * >( 0 ) ); pTypes[nIndex++] = ::getCppuType( static_cast< uno::Reference< XAccessibleMultiLineText > * >( 0 ) ); pTypes[nIndex] = ::getCppuType( static_cast< uno::Reference< XAccessibleHypertext > * >( 0 ) ); - // <-- return aTypes; } @@ -1280,7 +1274,6 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( aCharSet.Put( pTxtNode->GetTxtColl()->GetAttrSet() ); pSet->Put( aCharSet ); } - // <-- // build-up sequence containing the run attributes tAccParaPropValMap aDefAttrSeq; @@ -1327,7 +1320,6 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( aDefAttrSeq[rPropVal.Name] = rPropVal; } } - // <-- // #i73371# // resolve value text::WritingMode2::PAGE of property value entry WritingMode @@ -1378,7 +1370,6 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( } } } - // <-- } if ( aRequestedAttributes.getLength() == 0 ) @@ -1430,7 +1421,6 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( } } } - // <-- uno::Sequence< PropertyValue > aValues( aDefAttrSeq.size() + ( bProvideMMToPixelRatio ? 1 : 0 ) ); @@ -1457,7 +1447,6 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( rPropVal.State = beans::PropertyState_DEFAULT_VALUE; pValues[ aValues.getLength() - 1 ] = rPropVal; } - // <-- return aValues; } @@ -1511,7 +1500,6 @@ void SwAccessibleParagraph::_getRunAttributesImpl( SwUnoCursorHelper::GetCrsrAttr(*pPaM, aCharAttrsAtPaM, sal_True, sal_True); aSet.Put( aCharAttrsAtPaM ); } - // <-- // build-up sequence containing the run attributes { @@ -1609,7 +1597,6 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes( return aValues; } -// <-- awt::Rectangle SwAccessibleParagraph::getCharacterBounds( sal_Int32 nIndex ) @@ -2301,7 +2288,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount() sal_Int32 nCount = 0; // #i77108# - provide hyperlinks also in editable documents. // if( !IsEditableState() ) - // <-- { const SwTxtFrm *pTxtFrm = static_cast( GetFrm() ); SwHyperlinkIter_Impl aIter( pTxtFrm ); @@ -2490,7 +2476,6 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL return pTextMarkupHelper->getTextMarkupAtIndex( nCharIndex, nTextMarkupType ); } -// <-- // #i89175# sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex ) diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index a2ddb5c..0bf4c18 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -149,7 +149,6 @@ class SwAccessibleParagraph : const sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, tAccParaPropValMap& rRunAttrSeq ); - // <-- public: @@ -266,7 +265,6 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); - // <-- //===== XServiceInfo ==================================================== @@ -396,7 +394,6 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - // <-- // #i89175# //===== XAccessibleMultiLineText ======================================== @@ -415,13 +412,11 @@ public: virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() throw (::com::sun::star::uno::RuntimeException); - // <-- // #i63870# //===== XAccesibleTextAttributes ======================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // <-- }; inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index a8881df..d3e59f5 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -182,7 +182,6 @@ void SwAccessiblePortionData::Special( sDisplay = aTmpBuffer.makeStringAndClear(); break; } - // <-- default: sDisplay = rText; break; @@ -348,7 +347,6 @@ void SwAccessiblePortionData::GetBoundaryOfLine( const sal_Int32 nLineNo, { FillBoundary( rLineBound, aLineBreaks, nLineNo ); } -// <-- void SwAccessiblePortionData::GetLastLineBoundary( Boundary& rBound ) const @@ -472,7 +470,6 @@ size_t SwAccessiblePortionData::FindLastBreak( { nResult++; } - // <-- return nResult; } diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 3cdf5ad..06e709f 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -127,7 +127,6 @@ public: sal_Int32 GetLineNo( const sal_Int32 nPos ) const; void GetBoundaryOfLine( const sal_Int32 nLineNo, com::sun::star::i18n::Boundary& rLineBound ); - // <-- /// get the position in the model string for a given /// (accessibility) position diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 2807a91..ed9fbad 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -109,14 +109,12 @@ class SwAccessibleTableData_Impl return !mbOnlyTableColumnHeader || mpTabFrm->IsInHeadline( rFrm ); } - // <-- public: // #i77106# - add third optional parameter , default value SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap, const SwTabFrm *pTabFrm, sal_Bool bIsInPagePreview, bool bOnlyTableColumnHeader = false ); - // <-- const Int32Set_Impl& GetRows() const { return maRows; } const Int32Set_Impl& GetColumns() const { return maColumns; } @@ -849,14 +847,12 @@ SwAccessibleTableData_Impl* SwAccessibleTable::CreateNewTableData() const SwTabFrm* pTabFrm = static_cast( GetFrm() ); return new SwAccessibleTableData_Impl( *GetMap(), pTabFrm, IsInPagePreview() ); } -// <-- void SwAccessibleTable::UpdateTableData() { // #i77106# - usage of new method delete mpTableData; mpTableData = CreateNewTableData(); - // <-- } void SwAccessibleTable::ClearTableData() @@ -927,7 +923,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( } return sRowDesc; - // <-- } OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( @@ -962,7 +957,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( } return sColumnDesc; - // <-- } sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( @@ -1050,7 +1044,6 @@ uno::Reference< XAccessibleTable > SAL_CALL } return xTableColumnHeaders; - // <-- } uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows() @@ -1247,7 +1240,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) { throw lang::IndexOutOfBoundsException(); } - // <-- SwAccessibleChild aCell( GetChild( *(GetMap()), nChildIndex ) ); if ( aCell.GetSwFrm() ) @@ -1286,7 +1278,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( { throw lang::IndexOutOfBoundsException(); } - // <-- SwAccessibleChild aCell( GetChild( *(GetMap()), nChildIndex ) ); if ( aCell.GetSwFrm() ) @@ -1599,7 +1590,6 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( // assure, that child, identified by the given index, is selected. if ( !IsChildSelected( nChildIndex ) ) return; - // <-- const SwTableBox* pBox = GetTableBox( nChildIndex ); DBG_ASSERT( pBox != NULL, "We need the table box." ); diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index fbcfff6..f8f063d 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -325,7 +325,6 @@ public: throw (::com::sun::star::uno::RuntimeException); }; -// <-- #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index bda57ac..003045a 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -150,7 +150,6 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * } } break; - // <-- } } @@ -169,7 +168,6 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) return SwAccessibleFrameBase::getAccessibleName(); } -// <-- OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void) throw (uno::RuntimeException) { diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 0dbdc2b..9e4a0dd 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -41,7 +41,6 @@ private: // #i73249# ::rtl::OUString msTitle; ::rtl::OUString msDesc; - // <-- protected: @@ -59,7 +58,6 @@ public: virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - // <-- /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 597ca89..79400d9 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -88,7 +88,6 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD // #i108125# , mpTxtNode( &rTxtNode ) , mpTextMarkupList( 0 ) - // <-- { } @@ -100,7 +99,6 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD , mpTextMarkupList( &rTextMarkupList ) { } -// <-- sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IllegalArgumentException, @@ -113,7 +111,6 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp mpTextMarkupList ? mpTextMarkupList : getTextMarkupList( *mpTxtNode, nTextMarkupType ); - // <-- if ( pTextMarkupList ) { nTextMarkupCount = pTextMarkupList->Count(); @@ -143,7 +140,6 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp mpTextMarkupList ? mpTextMarkupList : getTextMarkupList( *mpTxtNode, nTextMarkupType ); - // <-- if ( pTextMarkupList ) { const SwWrongArea* pTextMarkup = @@ -191,7 +187,6 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp mpTextMarkupList ? mpTextMarkupList : getTextMarkupList( *mpTxtNode, nTextMarkupType ); - // <-- ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index ca40848..78897be 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -77,7 +77,6 @@ class SwTextMarkupHelper // #i108125# const SwTxtNode* mpTxtNode; const SwWrongList* mpTextMarkupList; - // <-- }; #endif diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index a32f929..d51ba38 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -610,7 +610,6 @@ void _InitCore() // #i35017# - constant name has changed aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); - // <-- // FrmAttr-Dummies aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] = new SwFmtAutoFmt( RES_AUTO_STYLE ); aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_STYLE_NAME, aEmptyStr ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index c17ba08..c62c923 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -448,7 +448,6 @@ void SwCrsrShell::UpdateMarkedListLevel() } } } -// <-- sal_Bool SwCrsrShell::UpDown( sal_Bool bUp, sal_uInt16 nCnt ) { @@ -649,7 +648,6 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock ) if ( pTxtNd && !IsTableMode() && // #i37515# No bInFrontOfLabel during selection !pCrsr->HasMark() && - // <-- pTxtNd->HasVisibleNumberingOrBullet() ) { aTmpState.bInFrontOfLabel = sal_True; // #i27615# @@ -1301,7 +1299,6 @@ class SwNotifyAccAboutInvalidTextSelections mrCrsrSh.InvalidateAccessibleParaTextSelection(); } }; -// <-- void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) { SET_CURR_SHELL( this ); @@ -1367,7 +1364,6 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) // --> Make code robust. The table cursor may point // to a table in a currently inactive header. SwTabFrm *pTab = pTblFrm ? pTblFrm->FindTabFrm() : 0; - // <-- if ( pTab && pTab->GetTable()->GetRowsToRepeat() > 0 ) { diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 2b07ab6..990dea1 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1041,7 +1041,6 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, { bRet = sal_True; } - // <-- // #i23726# else if( pTxtNd && SwContentAtPos::SW_NUMLABEL & rCntntAtPos.eCntntAtPos) diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index b733d1b..fa781ba 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -233,7 +233,6 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) pEnd = aCells[ bVert ? (bRow ? 3 : 0) : (bRow ? 1 : 2) ]->GetTabBox(); // will become mark of table cursor } } - // <-- // noch kein Tabellen-Cursor vorhanden, dann erzeuge einen if( !pTblCrsr ) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index e0c4d3b..37a0b2c 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -991,7 +991,6 @@ sal_Bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd { bRet = (SimpleTableToText(rSrcNd) == SimpleTableToText(rDstNd)); } - // <-- } break; @@ -1053,7 +1052,6 @@ sal_Bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd bRet = CompareNode( *rSrcNd.StartOfSectionNode(), *rDstNd.StartOfSectionNode()); } - // <-- break; } @@ -1459,7 +1457,6 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo ) pTmp->GetPoint()->nContent.Assign( pContentNode, (pContentNode) ? pContentNode->Len() : 0 ); } - // <-- rDoc.DeleteRedline( *pTmp, false, USHRT_MAX ); @@ -1492,7 +1489,6 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo ) pTmp->GetPoint()->nContent.Assign( pContentNode, (pContentNode) ? pContentNode->Len() : 0 ); } - // <-- } while( pInsRing != ( pTmp = (SwPaM*)pTmp->GetNext() )); SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_INSERT, nAuthor, aTimeStamp, aEmptyStr, 0, 0 ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 45624a2..322eca0 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -315,7 +315,6 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt ) } } } - // <-- //Inhalt Loeschen. if( pCntIdx ) @@ -494,7 +493,6 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource, { static_cast(pDest)->PosAttrSet(); } - // <-- if( pDest->GetAnchor() == rNewAnchor ) { @@ -653,7 +651,6 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, aAnch.SetAnchor( &rAnchPos ); } } - // <-- pFmt->SetFmtAttr( aAnch ); } else @@ -1257,7 +1254,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, const String sDescription( bIsSwFlyFrmFmtInstance ? static_cast(pOldFmt)->GetObjDescription() : String() ); - // <-- pOldFmt->DelFrms(); pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(), @@ -1401,7 +1397,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, static_cast(pOldFmt)->SetObjTitle( sTitle ); static_cast(pOldFmt)->SetObjDescription( sDescription ); } - // <-- } break; @@ -2156,7 +2151,6 @@ void SwDoc::SetAllUniqueFlyNames() { GetFtnIdxs().UpdateAllFtn(); } - // <-- else { SwNodeIndex aTmp( GetNodes() ); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 0e09bf6..0b528d4 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -643,7 +643,6 @@ sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName ) // its number vector will not fit to the searched level. if ( pNd->GetNum() && pNd->GetActualListLevel() == ( nLevel - 1 ) ) - // <-- { const SwNodeNum & rNdNum = *(pNd->GetNum()); SwNumberTree::tNumberVector aLevelVal = rNdNum.GetNumberVector(); @@ -946,7 +945,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam, { ResetAttrs( rPam, sal_False, &aResetAttrsArray ); } - // <-- } if (GetIDocumentUndoRedo().DoesUndo()) @@ -979,7 +977,6 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted) { ResetAttrs( rPam, sal_False, &aResetAttrsArray ); } - // <-- } else { @@ -1080,7 +1077,6 @@ sal_Bool SwDoc::DelNumRule( const String& rName, sal_Bool bBroadcast ) // #i34097# DeleteAndDestroy deletes rName if // rName is directly taken from the numrule. const String aTmpName( rName ); - // <-- pNumRuleTbl->DeleteAndDestroy( nPos ); maNumRuleMap.erase(aTmpName); @@ -1303,7 +1299,6 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM) aListStyleData.sListId = pCNd->GetListId(); aMyNumRuleMap[pRule] = aListStyleData; } - // <-- bFirst = false; } diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 6b21a4f..d722fbb 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -452,7 +452,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) pRedlineTbl->Remove( n ); bDec = true; } - // <-- else if( POS_OVERLAP_BEHIND == eCmpPos ) { *pStt = *pREnd; @@ -908,7 +907,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) // #i97421# // redline w/out extent loops if (*pStt != *pEnd) - // <-- { pNewRedl->PushData( *pRedl, sal_False ); pRedl->SetStart( *pEnd, pRStt ); @@ -3667,7 +3665,6 @@ void SwRedline::MoveFromSection() { pDoc->DeleteSection( &pCntntSect->GetNode() ); } - // <-- delete pCntntSect, pCntntSect = 0; // adjustment of redline table positions must take start and diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 390f324..c422d22 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -554,7 +554,6 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // #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 ); - // <-- // loesche die Frames der Tabelle pTblNd->DelFrms(); @@ -604,7 +603,6 @@ sal_Bool SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // 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 ); - // <-- // TL_CHART2: need to inform chart of probably changed cell names UpdateCharts( pTblNd->GetTable().GetFrmFmt()->GetName() ); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 3a883ff..81b586b 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1779,7 +1779,6 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, aFld.ChangeExpansion( pFrm, dynamic_cast(pTOXSource->pNd), sal_True ); - // <-- //---> #i89791# // continue to support CF_NUMBER // and CF_NUM_TITLE in order to handle ODF 1.0/1.1 @@ -1790,7 +1789,6 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, rTxt.Insert(aFld.GetNumber()); //get the string number without pre/postfix else if ( CF_NUMBER_NOPREPST == aToken.nChapterFormat || CF_NUM_TITLE == aToken.nChapterFormat ) - //<--- { rTxt += aFld.GetNumber(); rTxt += ' '; diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx index 0ad6155..48afc9b 100644 --- a/sw/source/core/doc/extinput.cxx +++ b/sw/source/core/doc/extinput.cxx @@ -82,7 +82,6 @@ SwExtTextInput::~SwExtTextInput() // #i41974# Only set language attribute // for CJK/CTL scripts. bool bLang = true; - // <-- sal_uInt16 nWhich = RES_CHRATR_LANGUAGE; switch(GetI18NScriptTypeOfLanguage(eInputLanguage)) { diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 88f2646..8fdbe60 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -72,7 +72,6 @@ namespace TxtFmtCollFunc // #i73790# if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() && pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() ) - // <-- { if ( !pNewNumRuleItem ) { @@ -90,7 +89,6 @@ namespace TxtFmtCollFunc } } } - // <-- SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl ) { @@ -128,7 +126,6 @@ namespace TxtFmtCollFunc } } } // end of namespace TxtFmtCollFunc -// <-- /* * SwTxtFmtColl TXT @@ -176,7 +173,6 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pNewChgSet->GetChgSet()->GetItemState( RES_PARATR_NUMRULE, sal_False, (const SfxPoolItem**)&pNewNumRuleItem ); } - // <-- break; @@ -227,7 +223,6 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this, pNewNumRuleItem ); } - // <-- int bWeiter = sal_True; @@ -410,7 +405,6 @@ sal_Bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) return bRet; } -// <-- // #i73790# sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr() @@ -424,7 +418,6 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr() const int nAssignedOutlineStyleLevel = IsAssignedToListLevelOfOutlineStyle() ? GetAssignedOutlineStyleLevel() : -1; - // <-- sal_uInt16 nRet = SwFmtColl::ResetAllFmtAttr(); @@ -433,13 +426,11 @@ sal_uInt16 SwTxtFmtColl::ResetAllFmtAttr() { AssignToListLevelOfOutlineStyle( nAssignedOutlineStyleLevel ); } - // <-- mbStayAssignedToListLevelOfOutlineStyle = bOldState; return nRet; } -// <-- bool SwTxtFmtColl::AreListLevelIndentsApplicable() const { @@ -493,7 +484,6 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const return bAreListLevelIndentsApplicable; } -// <-- //FEATURE::CONDCOLL @@ -694,7 +684,6 @@ void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel) pDerivedTxtFmtColl = aIter.Next(); } - // <-- } void SwTxtFmtColl::DeleteAssignmentToListLevelOfOutlineStyle() diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index c99bc95..2b456e3 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -366,7 +366,6 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc ) // Investigation reveals that all calls can handle the case that no browse // width is provided. return GetBrowseWidthByVisArea( rDoc ); - // <-- } sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm( diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index fa2b338..a1ae337 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -631,7 +631,6 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) RES_GRAPHIC_ARRIVED != nWhich && RES_GRF_REREAD_AND_INCACHE != nWhich && RES_LINKED_GRAPHIC_STREAM_ARRIVED != nWhich ) - // <-- { SwCntntFrm::Modify( pOld, pNew ); } @@ -830,7 +829,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons { pGrfNd->UpdateLinkWithInputStream(); } - // <-- // #i85717#, #i90395# - check, if asynchronous retrieval // if input stream for the graphic is possible // else if( GRAPHIC_DEFAULT == rGrfObj.GetType() && @@ -838,7 +836,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons rGrfObj.GetType() == GRAPHIC_NONE ) && pGrfNd->IsLinkedFile() && pGrfNd->IsAsyncRetrieveInputStreamPossible() ) - // <-- { Size aTmpSz; ::sfx2::SvLinkSource* pGrfObj = pGrfNd->GetLink()->GetObj(); @@ -954,7 +951,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons nFormerAntialiasingAtOutput | ANTIALIASING_PIXELSNAPHAIRLINE; pOut->SetAntialiasing( nAntialiasingForChartOLE ); } - // <-- Point aPosition(aAlignedGrfArea.Pos()); Size aSize(aAlignedGrfArea.SSize()); @@ -1004,7 +1000,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons { pOut->SetAntialiasing( nFormerAntialiasingAtOutput ); } - // <-- } } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index fc8d17c..168a431 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -108,7 +108,6 @@ const SwNumFmt* SwNumRule::GetNumFmt( sal_uInt16 i ) const // #i91400# void SwNumRule::SetName( const String & rName, IDocumentListsAccess& rDocListAccess) -// <-- { if ( sName != rName ) { @@ -373,7 +372,6 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc ) { lcl_SetRuleChgd( *(*aIter), i ); } - // <-- bFnd = sal_True; break; } @@ -876,11 +874,9 @@ void SwNumRule::SetInvalidRule(sal_Bool bFlag) { aLists.insert( pList ); } - // <-- } std::for_each( aLists.begin(), aLists.end(), std::mem_fun( &SwList::InvalidateListTree ) ); - // <-- } bInvalidRuleFlag = bFlag; @@ -1164,7 +1160,6 @@ namespace numfunc { msFontname = String::CreateFromAscii("OpenSymbol"); mbUserDefinedFontname = false; - // <-- meFontWeight = WEIGHT_DONTKNOW; meFontItalic = ITALIC_NONE; @@ -1450,8 +1445,6 @@ namespace numfunc return ePosAndSpaceMode; } - // <-- } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index f2834e3..aaf9747 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -253,7 +253,6 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, pColl->SetFmtAttr(aItem); } - // <-- } } pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( @@ -1639,7 +1638,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId ) const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode = numfunc::GetDefaultPositionAndSpaceMode(); //#i89178# - // <-- { sal_Bool bIsModified = IsModified(); @@ -2312,7 +2310,6 @@ sal_Bool SwDoc::IsUsed( const SwNumRule& rRule ) const rRule.GetParagraphStyleListSize() > 0; return bUsed; - // <-- } // Suche die Position vom Vorlagen-Namen. Ist nicht vorhanden diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index acdb9a9..7826c44 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -271,7 +271,6 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const // #i96213# - force copy of all attributes pCpyTxtNd->CopyText( pTxtNd, SwIndex( pCpyTxtNd ), pCpyTxtNd->GetTxt().Len(), true ); - // <-- //FEATURE::CONDCOLL if( RES_CONDTXTFMTCOLL == pColl->Which() ) @@ -841,7 +840,6 @@ bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam ) return bRet; } -// <-- bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, const bool bMakeNewFrms, const bool bCopyAll, @@ -929,7 +927,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, pNumRuleToPropagate = pDoc->SearchNumRule( rPos, false, false, false, 0, aListIdToPropagate, true ); } - // <-- // #i86492# // Do not propagate previous found list, if // - destination is an empty paragraph which is not in a list and @@ -940,7 +937,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, { pNumRuleToPropagate = 0; } - // <-- // Block, damit aus diesem gesprungen werden kann !! do { @@ -1027,7 +1023,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, } } } - // <-- if( !bCopyOk ) { @@ -1173,7 +1168,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos, aListIdItem.SetValue( static_cast(pItem)->GetValue() ); } } - // <-- const bool bEmptyDestNd = 0 == pDestTxtNd->GetTxt().Len(); pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ), @@ -1545,7 +1539,6 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg, SwNodeIndex aIdx( rStartIdx, nOffset ); pNewPos->nNode = aIdx; } - // <-- // die am Zeichen Flys wieder ans das vorgegebene Zeichen setzen if ((FLY_AT_CHAR == aAnchor.GetAnchorId()) && pNewPos->nNode.GetNode().IsTxtNode() ) diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index 7f8e107..953f8f5 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -303,6 +303,5 @@ const String SwNoTxtNode::GetDescription() const return pFlyFmt->GetObjDescription(); } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 1a9a64b..1edb67e 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -65,7 +65,6 @@ // #i27138# #include #include -// <-- // #i21457# - new implementation of local method . @@ -1162,7 +1161,6 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx ) dynamic_cast(pNew->FindPrevCnt( true )) ); } } - // <-- pNew = pSct; } @@ -1189,7 +1187,6 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx ) dynamic_cast(pNew->FindPrevCnt( true )) ); } } - // <-- if ( bInitNewSect ) static_cast(pNew)->Init(); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 540c302..60ee732 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -619,7 +619,6 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx, ++pIdx; } } - // <-- new SwEndNode( aIdx, *pSttNd ); } @@ -1414,7 +1413,6 @@ sal_Bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh ) SwEditShell* pESh = GetEditShell(); if( pESh && pESh->IsTableMode() ) pESh->ClearMark(); - // <-- SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode() ); SwUndoTblToTxt* pUndo = 0; @@ -2225,7 +2223,6 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam ) // #i33394# GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_MERGE, NULL ); - // <-- RedlineMode_t eOld = GetRedlineMode(); SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); @@ -2404,7 +2401,6 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind ) dynamic_cast(pNew->FindPrevCnt( true )) ); } } - // <-- ((SwTabFrm*)pNew)->RegistFlys(); } } @@ -2442,7 +2438,6 @@ void SwTableNode::DelFrms() dynamic_cast(pFrm->FindPrevCnt( true )) ); } } - // <-- pFrm->Cut(); delete pFrm; bAgain = sal_True; @@ -2572,7 +2567,6 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* , const SwCursor aTmpCrsr( aPos, 0, false ); ::GetTblSel( aTmpCrsr, aBoxes, nsSwTblSearchType::TBLSEARCH_COL ); } - // <-- // Make code robust: if ( aDelCheck.HasBeenDeleted() ) @@ -2684,7 +2678,6 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* , // code robust by checking count of rFill. if ( rFill.Count() ) rFill.Remove( 0, 1 ); if ( rFill.Count() ) rFill.Remove( rFill.Count() - 1 , 1 ); - // <-- rFill.SetLastRowAllowedToChange( !pTab->HasFollowFlowLine() ); } diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 7398dfa..1b80f83 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -163,7 +163,6 @@ int Put( boost::shared_ptr& mrpAttrSet, const SwCntntNode& rNo pStyleNames = new SfxItemSet( *aNewSet.GetPool(), RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME ); pStyleNames->Put( aNewSet ); } - // <-- const int nRet = aNewSet.Put( rSet ); @@ -173,7 +172,6 @@ int Put( boost::shared_ptr& mrpAttrSet, const SwCntntNode& rNo aNewSet.Put( *pStyleNames ); delete pStyleNames; } - // <-- if ( nRet ) GetNewAutoStyle( mrpAttrSet, rNode, aNewSet ); @@ -213,7 +211,6 @@ int Put_BC( boost::shared_ptr& mrpAttrSet, pStyleNames = new SfxItemSet( *aNewSet.GetPool(), RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME ); pStyleNames->Put( aNewSet ); } - // <-- // for a correct broadcast, we need to do a SetModifyAtAttr with the items // from aNewSet. The 'regular' SetModifyAtAttr is done in GetNewAutoStyle @@ -228,7 +225,6 @@ int Put_BC( boost::shared_ptr& mrpAttrSet, aNewSet.Put( *pStyleNames ); delete pStyleNames; } - // <-- if ( nRet ) GetNewAutoStyle( mrpAttrSet, rNode, aNewSet ); @@ -890,7 +886,6 @@ sal_uInt8 SwNode::HasPrevNextLayNode() const { --aIdx; } - // <-- if( IsValidNextPrevNd( aIdx.GetNode() )) nRet |= ND_HAS_PREV_LAYNODE; // #i77805# - skip section start and end nodes @@ -1328,7 +1323,6 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode ) dynamic_cast(pNew->FindPrevCnt( true )) ); } } - // <-- } } @@ -1697,7 +1691,6 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich, // the attribute set of the paragraph style, which is valid for the // content node - see file else - // <-- { GetSwAttrSet().GetItemState( nWhich, bInParents, &pFnd ); } @@ -1956,7 +1949,6 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos, return nRet; } -// <-- SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize ) { diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index d12ff9a..05597e6 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -181,7 +181,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz, pOutlineNds->Remove( pSrch ); } } - // <-- BigPtrArray::Move( aDelIdx.GetIndex(), rInsPos.GetIndex() ); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index f4dc409..21f02e4 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -451,7 +451,6 @@ void SwSection::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pNewSet->ClearItem( RES_EDIT_IN_READONLY ); pOldSet->ClearItem( RES_EDIT_IN_READONLY ); } - // <-- if( SFX_ITEM_SET == pNewSet->GetItemState( RES_FTN_AT_TXTEND, sal_False, &pItem ) || @@ -790,7 +789,6 @@ void SwSectionFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) pNewSet->ClearItem( RES_EDIT_IN_READONLY ); pOldSet->ClearItem( RES_EDIT_IN_READONLY ); } - // <-- if( SFX_ITEM_SET == pNewSet->GetItemState( RES_FTN_AT_TXTEND, sal_False, &pItem )) diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 1828117..5f2fedf 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -147,7 +147,6 @@ sal_Bool HasWrap( const SdrObject* pObj ) // #i68520# - change naming SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ) -// <-- { SwRect aRet( pObj->GetCurrentBoundRect() ); // #i68520# - call cache of @@ -160,7 +159,6 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ) aRet = pAnchoredObj->GetObjRectWithSpaces(); } } - // <-- return aRet; } @@ -221,7 +219,6 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj ) // #i46297# - notify background about the arriving of // the object and invalidate its position. const bool bNotify( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) ); - // <-- _MoveObjToLayer( true, _pDrawObj ); @@ -245,7 +242,6 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj ) pAnchoredObj->InvalidateObjPos(); } } - // <-- } /** method to move drawing object to corresponding invisible layer @@ -258,7 +254,6 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) { // #i46297# - notify background about the leaving of the object. const bool bNotify( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) ); - // <-- _MoveObjToLayer( false, _pDrawObj ); @@ -276,7 +271,6 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, sal_True ); } } - // <-- } /** method to move object to visible/invisible layer @@ -659,7 +653,6 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) : pToRegisterIn->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)-> InsertObject( pObj, pObj->GetOrdNumDirect() ); } - // <-- //Controls muessen immer im Control-Layer liegen. Das gilt auch fuer //Gruppenobjekte, wenn diese Controls enthalten. @@ -1079,11 +1072,9 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, SwAnchoredObject* pAnchoredObj = const_cast(_rDrawContact.GetAnchoredObj( &_rObj )); if ( pAnchoredObj && pAnchoredObj->GetAnchorFrm() ) - // <-- { // #i34640# - determine correct page frame SwPageFrm* pPageFrm = pAnchoredObj->FindPageFrmOfAnchor(); - // <-- if( _pOldObjRect && pPageFrm ) { SwRect aOldRect( *_pOldObjRect ); @@ -1091,14 +1082,12 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, { // #i34640# - determine correct page frame SwPageFrm* pOldPageFrm = (SwPageFrm*)::FindPage( aOldRect, pPageFrm ); - // <-- ::Notify_Background( &_rObj, pOldPageFrm, aOldRect, PREP_FLY_LEAVE, sal_True); } } // #i34640# - include spacing for wrapping SwRect aNewRect( pAnchoredObj->GetObjRectWithSpaces() ); - // <-- if( aNewRect.HasArea() && pPageFrm ) { pPageFrm = (SwPageFrm*)::FindPage( aNewRect, pPageFrm ); @@ -1129,7 +1118,6 @@ void SwDrawContact::Changed( const SdrObject& rObj, { return; } - // <-- //Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft. ViewShell *pSh = 0, *pOrg; @@ -1228,7 +1216,6 @@ class NestedUserCallHdl } }; -// <-- // // !!!ACHTUNG!!! The object may commit suicide!!! // @@ -1252,7 +1239,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj, const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) && ( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() ) && !bAnchoredAsChar; - // <-- switch( eType ) { case SDRUSERCALL_DELETE: @@ -1263,14 +1249,12 @@ void SwDrawContact::_Changed( const SdrObject& rObj, // --> #i36181# - background of 'virtual' // drawing objects have also been notified. NotifyBackgrdOfAllVirtObjs( pOldBoundRect ); - // <-- } DisconnectFromLayout( false ); SetMaster( NULL ); delete this; // --> #i65784# Prevent memory corruption aNestedUserCallHdl.DrawContactDeleted(); - // <-- break; } case SDRUSERCALL_INSERTED: @@ -1327,7 +1311,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj, } } // fallthrough intended here - // <-- } case SDRUSERCALL_MOVEONLY: case SDRUSERCALL_RESIZE: @@ -1341,25 +1324,21 @@ void SwDrawContact::_Changed( const SdrObject& rObj, // get instance only once const SwAnchoredDrawObject* pAnchoredDrawObj = static_cast( GetAnchoredObj( &rObj ) ); - // <-- // OD 2004-04-06 #i26791# - adjust positioning and alignment attributes, // if positioning of drawing object isn't in progress. // #i53320# - no adjust of positioning attributes, // if drawing object isn't positioned. if ( !pAnchoredDrawObj->IsPositioningInProgress() && !pAnchoredDrawObj->NotYetPositioned() ) - // <-- { // #i34748# - If no last object rectangle is // provided by the anchored object, use parameter . const Rectangle& aOldObjRect = pAnchoredDrawObj->GetLastObjRect() ? *(pAnchoredDrawObj->GetLastObjRect()) : *(pOldBoundRect); - // <-- // #i79400# // always invalidate object rectangle inclusive spaces pAnchoredDrawObj->InvalidateObjRectWithSpaces(); - // <-- // #i41324# - notify background before // adjusting position if ( bNotify ) @@ -1368,12 +1347,10 @@ void SwDrawContact::_Changed( const SdrObject& rObj, // background of given drawing object. lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect ); } - // <-- // #i31698# - determine layout direction // via draw frame format. SwFrmFmt::tLayoutDir eLayoutDir = pAnchoredDrawObj->GetFrmFmt().GetLayoutDir(); - // <-- // use geometry of drawing object SwRect aObjRect( rObj.GetSnapRect() ); // If drawing object is a member of a group, the adjustment @@ -1462,7 +1439,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj, const_cast(pAnchoredDrawObj) ->AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() ); } - // <-- } } } @@ -1530,7 +1506,6 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // rectangle for notification. aOldRect = maAnchoredDrawObj.GetObjRectWithSpaces().SVRect(); pOldRect = &aOldRect; - // <-- } // re-connect to layout due to anchor format change ConnectToLayout( pNewAnchorFmt ); @@ -1547,7 +1522,6 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // --> #i102752# // assure that a ShapePropertyChangeNotifier exists maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( ::svx::eTextShapeAnchorType ); - // <-- } } } @@ -1605,7 +1579,6 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) NotifyBackgrdOfAllVirtObjs( 0L ); _InvalidateObjs(); } - // <-- else if ( RES_REMOVE_UNO_OBJECT == nWhich ) { // nothing to do @@ -1620,7 +1593,6 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // #i51474# GetAnchoredObj( 0L )->ResetLayoutProcessBools(); - // <-- } // OD 2004-03-31 #i26791# @@ -1643,9 +1615,7 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList ) { pDrawVirtObj->AnchoredObj()->UpdateObjInSortedList(); } - // <-- } - // <-- } // invalidate position of 'master' drawing object @@ -1656,7 +1626,6 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList ) { pAnchoredObj->UpdateObjInSortedList(); } - // <-- } /************************************************************************* @@ -1678,7 +1647,6 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer ) lcl_NotifyBackgroundOfObj( *this, *GetMaster(), &aOldRect ); NotifyBackgrdOfAllVirtObjs( &aOldRect ); } - // <-- // remove 'virtual' drawing objects from writer // layout and from drawing page @@ -1811,7 +1779,6 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch ) OSL_FAIL( " - master drawing object not inserted -> no connect to layout. Please inform od@openoffice.org" ); return; } - // <-- SwFrmFmt* pDrawFrmFmt = (SwFrmFmt*)GetRegisteredIn(); @@ -2266,7 +2233,6 @@ SwDrawVirtObj::SwDrawVirtObj( SdrObject& _rNewObj, maAnchoredDrawObj.SetDrawObj( *this ); // #i35635# - set initial position out of sight NbcMove( Size( -RECT_EMPTY, -RECT_EMPTY ) ); - // <-- } SwDrawVirtObj::~SwDrawVirtObj() @@ -2358,7 +2324,6 @@ void SwDrawVirtObj::AddToDrawingPage() SetOrdNum( GetReferencedObj().GetOrdNum() ); } } - // <-- SetUserCall( &mrDrawContact ); } diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 30be2e2..d9cb1c2 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -213,7 +213,6 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, } } - // <-- if( rEvt.GetMode() & HELPMODE_BALLOON ) { diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 7b5c04f..1f3c7b9 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -64,7 +64,6 @@ // #i28701# #include #include -// <-- using namespace com::sun::star; @@ -144,7 +143,6 @@ sal_Bool SwDrawView::IsAntiAliasing() const { return getOptionsDrawinglayer().IsAntiAliasing(); } -// <-- ////////////////////////////////////////////////////////////////////////////// @@ -630,7 +628,6 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm ? pTmpAnchorFrm->FindFlyFrm() : 0L; - // <-- if ( pTmpParentObj && &(pTmpParentObj->GetFrmFmt()) != pParentFrmFmt ) { @@ -684,7 +681,6 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True ); const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm ? pTmpAnchorFrm->FindFlyFrm() : 0L; - // <-- if ( pTmpParentObj && ( ( pTmpParentObj == pFlyFrm ) || ( pFlyFrm->IsUpperOf( *pTmpParentObj ) ) ) ) @@ -729,7 +725,6 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, _MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs ); } -// <-- /************************************************************************* |* @@ -953,7 +948,6 @@ void SwDrawView::CheckPossibilities() // TODO/LATER: retrieve Aspect - from where?! bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? sal_True : sal_False; - // <-- // #i972: protect position if it is a Math object anchored 'as char' and baseline alignment is activated SwDoc* pDoc = Imp().GetShell()->GetDoc(); diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 62130d6..4765844 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1469,7 +1469,6 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) SwNumRule aRule( pDoc->GetUniqueNumRuleName(), // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); - // <-- const SwNumRule* pCur = 0; if( aFlags.bSetNumRule && 0 != (pCur = pAktTxtNd->GetNumRule()) ) @@ -1513,7 +1512,6 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) { pBullFnt = &numfunc::GetDefBulletFont(); } - // <-- } sal_uInt16 nAbsPos = lBullIndent; diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index b4c8445..c16a165 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -89,7 +89,6 @@ void SwEditShell::SetTxtFmtColl( SwTxtFmtColl *pFmt, GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_SETFMTCOLL, &aRewriter); EndAllAction(); } -// <-- SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const String& rFmtCollName, @@ -113,7 +112,6 @@ void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset) { // #i73790# - method renamed pColl->ResetAllFmtAttr(); - // <-- } SwPaM * pCrsr = GetCrsr(); diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index 2b31f72..9c742fa 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -81,7 +81,6 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset) { // #i73790# - method renamed pCharFmt->ResetAllFmtAttr(); - // <-- } SwPaM* pPam = GetCrsr(); diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 1f84505..70133b6 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -295,10 +295,8 @@ const Graphic* SwEditShell::GetGraphic( sal_Bool bWait ) const #endif } } - // <-- } return pGrf; - // <-- } sal_Bool SwEditShell::IsGrfSwapOut( sal_Bool bOnlyLinked ) const diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 098e914..7c88a4a 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -266,7 +266,6 @@ sal_Bool SwEditShell::NumUpDown( sal_Bool bDown ) // #i54693# Update marked numbering levels if ( IsInFrontOfLabel() ) UpdateMarkedListLevel(); - // <-- CallChgLnk(); @@ -313,7 +312,6 @@ void SwEditShell::ChangeIndentOfAllListLevels( short nDiff ) SwNumRule aRule(*pCurNumRule); // #i90078# aRule.ChangeIndent( nDiff ); - // <-- // no start of new list SetCurNumRule( aRule, false ); @@ -325,7 +323,6 @@ void SwEditShell::ChangeIndentOfAllListLevels( short nDiff ) // #i90078# // Adjust method name void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos) -// <-- { StartAllAction(); @@ -349,13 +346,11 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos) aRule.SetIndent( nIndent, static_cast(pTxtNode->GetActualListLevel()) ); } - // <-- // #i42921# - 3rd parameter = false in order to // suppress setting of num rule at . // do not apply any list GetDoc()->SetNumRule( aPaM, aRule, false, String(), sal_False ); - // <-- } EndAllAction(); @@ -469,7 +464,6 @@ sal_Bool SwEditShell::MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft ) { break; } - // <-- } if( nStt == nIdx || !GetDoc()->GetNodes()[ nIdx ]->IsTxtNode() ) diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 30b2777..0f86411 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2193,7 +2193,6 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst ) // #i31868# // Check if pFrm is not yet connected to the layout. !pFrm->FindPageFrm() ) - // <-- { // einen sdbcx::Index fuers bestimmen vom TextNode anlegen SwNodeIndex aIdx( rTxtNd ); diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 89c02e7..180150f 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -258,7 +258,6 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const sal_uInt16 nDummy = USHRT_MAX; return SwGetRefFieldType::FindAnchor( pDoc, sSetRefName, nSubType, nSeqNo, &nDummy ); } -// <-- // #i85090# String SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const { @@ -464,7 +463,6 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) } } break; - // <-- default: OSL_FAIL(" - unknown format type"); } @@ -544,7 +542,6 @@ String SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, return String(); } -// <-- SwField* SwGetRefField::Copy() const { @@ -598,7 +595,6 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const 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; - // <-- } rAny <<= nPart; } @@ -672,7 +668,6 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) 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; - // <-- default: return false; } SetFormat(nPart); @@ -789,7 +784,6 @@ void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew // #i81002# pGRef->UpdateField( pFld->GetTxtFld() ); - // <-- } } // weiter an die Text-Felder, diese "Expandieren" den Text @@ -864,7 +858,6 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark, " - node marked by cross-reference bookmark isn't a text node --> crash" ); *pEnd = pTxtNd->Len(); } - // <-- } else if(pBkmk->GetOtherMarkPos().nNode == pBkmk->GetMarkPos().nNode) *pEnd = pBkmk->GetMarkEnd().nContent.GetIndex(); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 44f9fda..42e9e5e 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -419,7 +419,6 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, { static_cast(pFmt)->PosAttrSet(); } - // <-- } if( bSelectInsert ) pDestDrwView->MarkObj( pNew, pDestPgView ); @@ -1013,7 +1012,6 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames ) static_cast(pNew->FindContactObj()); pContact->MoveObjToVisibleLayer( pContact->GetMaster() ); } - // <-- SdrObject *pObj = pNew->FindSdrObject(); SwDrawView *pDV = Imp()->GetDrawView(); pDV->MarkObj( pObj, pDV->GetSdrPageView() ); @@ -1023,7 +1021,6 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames ) { static_cast(pNew)->PosAttrSet(); } - // <-- } } } diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 4b8dd3c..2a0d76a 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -567,7 +567,6 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt ) rFmt.GetDoc()->SetAttr( aAnch, rFmt ); delete pHandleAnchorNodeChg; } - // <-- // #i28701# - no call of method // for to-character anchored // Writer fly frame needed. This method call can cause a @@ -575,7 +574,6 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt ) // Instead clear the anchor character rectangle and // the top of line values for all to-character anchored objects. pAnchoredObj->ClearCharRectAndTopOfLine(); - // <-- EndAllAction(); } } @@ -898,7 +896,6 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, // #i89920# rFlyAttrSet.Put( SwFmtSurround( SURROUND_THROUGHT ) ); rDrawObj.SetLayer( getIDocumentDrawModelAccess()->GetHeavenId() ); - // <-- // find anchor position SwPaM aPam( pDoc->GetNodes() ); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 6170faf..453448b 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -133,7 +133,6 @@ extern sal_Bool bNoInterrupt; // in swapp.cxx // --> assure consistent cursor pSh->KillPams(); pSh->ClearMark(); - // <-- pSh->SetCrsr( pSh->Imp()->GetDrawView()->GetAllMarkedRect().TopLeft(), sal_True); } } @@ -515,7 +514,6 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir ) rFmt.GetDoc()->SetAttr( aAnch, rFmt ); delete pHandleAnchorNodeChg; } - // <-- // #i28701# - no call of method // for to-character anchored // Writer fly frame needed. This method call can cause a @@ -749,7 +747,6 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr() // --> assure, that the cursor is consistent. KillPams(); ClearMark(); - // <-- SwPaM *pCrsr = GetCrsr(); pCrsr->GetPoint()->nNode = *pCNode; @@ -816,7 +813,6 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst ) pPage = pAnch->FindPageFrm(); // #i68520# - naming changed aRect = GetBoundRectOfAnchoredObj( pO ); - // <-- } sal_uInt32 nCount = pPage->GetSortedObjs() ? pPage->GetSortedObjs()->Count() : 0; @@ -959,7 +955,6 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId ) const bool bControlObj = ( pContact && pContact->GetMaster() ) ? ::CheckControlLayer( pContact->GetMaster() ) : ::CheckControlLayer( pObj ); - // <-- if ( !bControlObj && pObj->GetLayer() != nLayerId ) { pObj->SetLayer( nLayerId ); @@ -1198,7 +1193,6 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) } } } - // <-- if ( bRet ) { @@ -1783,7 +1777,6 @@ sal_Bool SwFEShell::ImpEndCreate() GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false); // see above // #i52858# - method name changed SdrPage *pPg = getIDocumentDrawModelAccess()->GetOrCreateDrawModel()->GetPage( 0 ); - // <-- if( !pPg ) { SdrModel* pTmpSdrModel = getIDocumentDrawModelAccess()->GetDrawModel(); @@ -1856,15 +1849,12 @@ sal_Bool SwFEShell::ImpEndCreate() // #i36010# - set layout direction of the position pFmt->SetPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); - // <-- // #i44344#, #i44681# - positioning attributes already set pFmt->PosAttrSet(); - // <-- SwDrawContact *pContact = new SwDrawContact( pFmt, &rSdrObj ); // #i35635# pContact->MoveObjToVisibleLayer( &rSdrObj ); - // <-- if( bCharBound ) { OSL_ENSURE( aAnch.GetAnchorId() == FLY_AS_CHAR, "wrong AnchorType" ); @@ -2216,7 +2206,6 @@ sal_Bool SwFEShell::IsGroupSelected() if ( pObj->IsGroupObject() && // --> #i38505# No ungroup allowed for 3d objects !pObj->Is3DObj() && - // <-- FLY_AS_CHAR != ((SwDrawContact*)GetUserCall(pObj))-> GetFmt()->GetAnchor().GetAnchorId() ) { @@ -2525,7 +2514,6 @@ sal_Bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const else rSet.Put( pContact->GetFmt()->GetAttrSet() ); } - // <-- } return sal_True; } @@ -2640,7 +2628,6 @@ void SwFEShell::CheckUnboundObjects() // #i35635# pContact->MoveObjToVisibleLayer( pObj ); - // <-- pContact->ConnectToLayout(); EndAllAction(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 4f11e8e..5de8ee9 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1623,7 +1623,6 @@ const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, break; } } - // <-- else { // used for mouse move of columns/rows @@ -1681,7 +1680,6 @@ const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) con { // #i32329# Enhanced table selection SwTwips nSize = pbCol ? ENHANCED_TABLE_SELECTION_FUZZY : RULER_MOUSE_MARGINWIDTH; - // <-- Size aTmp( nSize, nSize ); aTmp = pOutWin->PixelToLogic( aTmp ); nFuzzy = aTmp.Width(); @@ -1945,7 +1943,6 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag // table cursor: if ( IsTableMode() ) TblCrsrToCursor(); - // <-- if ( pbRow[0] && pbCol[0] ) bRet = SwCrsrShell::SelTbl(); @@ -1964,7 +1961,6 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag return bRet; } -// <-- /************************************************************************* @@ -2109,7 +2105,6 @@ bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, return bRet; } -// <-- /************************************************************************* |* diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 67580dd..6fe4bf0 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -1018,7 +1018,6 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, { aPos.X() = nTop; } - // <-- else { aPos.Y() = nTop; diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index dbd3f3a..6dc1402 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -471,7 +471,6 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd, OSL_FAIL( "Current box has been deleted during GetTblSel()" ); break; } - // <-- i = 0; rBoxes.Remove( i, rBoxes.Count() ); @@ -526,7 +525,6 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, sal_Bool bTblIsValid, bValidChartSel; // #i55421# Reduced value 10 int nLoopMax = 10; //JP 28.06.99: max 100 loops - Bug 67292 - // <-- sal_uInt16 i = 0; do { @@ -1777,7 +1775,6 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart, // --> Made code robust. If pTab does not have a lower, // we would crash here. if ( !pLastCntnt ) return; - // <-- while( !rpEnd->IsCellFrm() ) rpEnd = rpEnd->GetUpper(); @@ -1990,7 +1987,6 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart, } OSL_ENSURE( !pTmpCell || pTmpCell->IsCellFrm(), "Lower of rowframe != cellframe?!" ); } - // <-- const SwLayoutFrm* pFirst = pTmpCell ? static_cast(pTmpCell) : @@ -2330,7 +2326,6 @@ void _FndBox::DelFrms( SwTable &rTable ) // flag set although there is not more follow flow // line associated with pUp. pPrev->SetFollowFlowLine( sal_False ); - // <-- } else if ( pFollow ) ::UnsetFollow( pFollow ); @@ -2466,7 +2461,6 @@ void _FndBox::MakeFrms( SwTable &rTable ) // IsInSplitTableRow() should be checked. ( pLineBehind && pSibling->IsInFollowFlowRow() ) || (!pLineBehind && pSibling->IsInSplitTableRow() ) ) ) - // <-- { pSibling = aIter.Next(); } @@ -2589,7 +2583,6 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber, // check IsInFollowFlowRow instead of IsInSplitTableRow. ( ( !pLineBefore && pSibling->IsInFollowFlowRow() ) || ( pLineBefore && pSibling->IsInSplitTableRow() ) ) ) ) - // <-- { pSibling = aIter.Next(); } diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 962da22..2fcffc1 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -62,7 +62,6 @@ #include // #i73788# #include -// <-- using namespace com::sun::star; @@ -79,7 +78,6 @@ SwGrfNode::SwGrfNode( // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) - // <-- { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = @@ -96,7 +94,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) - // <-- { aGrfObj = rGrfObj; aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); @@ -119,7 +116,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, // #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) - // <-- { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); @@ -221,7 +217,6 @@ sal_Bool SwGrfNode::ReRead( // do not load linked graphic, if it isn't a new linked graphic. // else { else if ( bNewGrf ) - // <-- { //TODO refLink->setInputStream(getInputStream()); ((SwBaseLink*)&refLink)->SwapIn(); @@ -292,7 +287,6 @@ sal_Bool SwGrfNode::ReRead( { ((SwBaseLink*)&refLink)->SwapIn(); } - // <-- } } } @@ -317,7 +311,6 @@ SwGrfNode::~SwGrfNode() { // #i73788# mpThreadConsumer.reset(); - // <-- SwDoc* pDoc = GetDoc(); if( refLink.Is() ) @@ -339,7 +332,6 @@ SwGrfNode::~SwGrfNode() // inside one document have to be implemented. // if( !pDoc->IsInDtor() && HasStreamName() ) // DelStreamName(); - // <-- } //#39289# Die Frames muessen hier bereits geloescht weil der DTor der //Frms die Grafik noch fuer StopAnimation braucht. @@ -467,15 +459,12 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData ) nRet = 1; delete pStrm; } - // <-- } catch ( uno::Exception& ) { // #i48434# OSL_FAIL( " - unhandled exception!" ); - // <-- } - // <-- } if( 1 == nRet ) @@ -576,7 +565,6 @@ sal_Bool SwGrfNode::SavePersistentData() // Important note: see also fix for #i40014# // if( HasStreamName() ) // DelStreamName(); - // <-- // Und in TempFile rausswappen return (sal_Bool) SwapOut(); @@ -746,7 +734,6 @@ void SwGrfNode::DelStreamName() { // #i48434# OSL_FAIL( " - unhandled exception!" ); - // <-- } } @@ -813,7 +800,6 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( _aStrmName += aExtStr; } } - // <-- // assure that graphic file exist in the storage. if ( _refPics->hasByName( _aStrmName ) && @@ -873,7 +859,6 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName, OSL_ENSURE( STRING_NOTFOUND == rStrmName.Search( '/' ), "invalid graphic stream name" ); } -// <-- SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const { @@ -897,15 +882,12 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const GraphicFilter::GetGraphicFilter()->ImportGraphic( aTmpGrf, String(), *pStrm ); delete pStrm; } - // <-- } catch ( uno::Exception& ) { // #i48434# OSL_FAIL( " - unhandled exception!" ); - // <-- } - // <-- } else { @@ -989,15 +971,12 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj ) } delete pStrm; } - // <-- } catch ( uno::Exception& ) { // #i48434# OSL_FAIL( " - unhandled exception!" ); - // <-- } - // <-- } } @@ -1175,12 +1154,10 @@ void SwGrfNode::UpdateLinkWithInputStream() // #i88291# mxInputStream.clear(); GetLink()->clearStreamToLoadFrom(); - // <-- mbLinkedInputStreamReady = false; mpThreadConsumer.reset(); } } -// <-- // #i90395# bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const @@ -1200,6 +1177,5 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const return bRet; } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index 22d69b4..24f01b0 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -121,10 +121,8 @@ class SwUndoFmtAttr : public SwUndo // aren't restored. // This situation occurs for undo of styles. bool RestoreFlyAnchor(::sw::UndoRedoContext & rContext); - // <-- // --> OD 2008-02-27 #refactorlists# - removed void Init(); - // <-- public: // register at the Format and save old attributes @@ -132,7 +130,6 @@ public: SwUndoFmtAttr( const SfxItemSet& rOldSet, SwFmt& rFmt, bool bSaveDrawPt = true ); - // <-- SwUndoFmtAttr( const SfxPoolItem& rItem, SwFmt& rFmt, bool bSaveDrawPt = true ); @@ -168,7 +165,6 @@ class SwUndoFmtResetAttr : public SwUndo // old attribute which has been reset - needed for undo. ::std::auto_ptr m_pOldItem; }; -// <-- class SwUndoDontExpandFmt : public SwUndo { diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 5f6a3e9..c0a6ce6 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -55,7 +55,6 @@ public: // #i103961# virtual void Cut(); - // <-- const SwTableBox *GetTabBox() const { return pTabBox; } diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 4388b80..3df2644 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -71,7 +71,6 @@ class SwFtnFrm: public SwLayoutFrm //nicht rueckwaerts fliessen. // #i49383# - control unlock of position of lower anchored objects. bool mbUnlockPosOfLowerObjs : 1; - // <-- #if OSL_DEBUG_LEVEL > 1 protected: virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); @@ -135,7 +134,6 @@ public: { return mbUnlockPosOfLowerObjs; } - // <-- /** search for last content in the current footnote frame OD 2005-12-02 #i27138# diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index c6d17ba..afb61c9 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -137,7 +137,6 @@ public: // --> #i44016# - add parameter <_bUnlockPosOfObjs> to // force an unlockposition call for the lower objects. void NotifyLowerObjs( const bool _bUnlockPosOfObjs = false ); - // <-- //Invalidiert diejenigen innenliegenden Frames, deren Breite und/oder //Hoehe Prozentual berechnet werden. Auch Rahmen, die an this oder an diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 83f8de5..d6333d7 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -41,24 +41,19 @@ class IDocumentLayoutAccess; // --> #i28701# class SwMovedFwdFrmsByObjPos; class SwTxtFrm; -// <-- // --> #i26945# class SwRowFrm; -// <-- // --> #i35911# class SwObjsMarkedAsTmpConsiderWrapInfluence; class SwAnchoredObject; -// <-- // --> #i40155# #include class SwFrm; -// <-- // --> #i65250# #include #include class SwFlowFrm; class SwLayoutFrm; -// <-- #define LOOP_PAGE 1 @@ -71,14 +66,11 @@ class SwLayouter // --> #i28701# SwMovedFwdFrmsByObjPos* mpMovedFwdFrms; - // <-- // --> #i35911# SwObjsMarkedAsTmpConsiderWrapInfluence* mpObjsTmpConsiderWrapInfl; - // <-- // --> #i40155# - data structure to collect frames, which are // marked not to wrap around objects. std::vector< const SwFrm* > maFrmsNotToWrap; - // <-- public: // --> #i65250# @@ -121,7 +113,6 @@ private: boost::unordered_map< const tMoveBwdLayoutInfoKey, sal_uInt16, fMoveBwdLayoutInfoKeyHash, fMoveBwdLayoutInfoKeyEq > maMoveBwdLayoutInfo; - // <-- public: SwLayouter(); ~SwLayouter(); @@ -145,35 +136,29 @@ public: static bool FrmMovedFwdByObjPos( const SwDoc& _rDoc, const SwTxtFrm& _rTxtFrm, sal_uInt32& _ornToPageNum ); - // <-- // --> #i40155# - ummark given frame as to be moved forward. static void RemoveMovedFwdFrm( const SwDoc& _rDoc, const SwTxtFrm& _rTxtFrm ); - // <-- // --> #i26945# static bool DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, const SwRowFrm& _rRowFrm ); - // <-- // --> #i35911# static void ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ); static void InsertObjForTmpConsiderWrapInfluence( const SwDoc& _rDoc, SwAnchoredObject& _rAnchoredObj ); - // <-- // --> #i40155# static void ClearFrmsNotToWrap( const SwDoc& _rDoc ); static void InsertFrmNotToWrap( const SwDoc& _rDoc, const SwFrm& _rFrm ); static bool FrmNotToWrap( const IDocumentLayoutAccess& _rIDLA, const SwFrm& _rFrm ); - // <-- // --> #i65250# static bool MoveBwdSuppressed( const SwDoc& p_rDoc, const SwFlowFrm& p_rFlowFrm, const SwLayoutFrm& p_rNewUpperFrm ); static void ClearMoveBwdLayoutInfo( const SwDoc& p_rDoc ); - // <-- }; diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx index 52ea300..e9469d5 100644 --- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx +++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx @@ -35,7 +35,6 @@ class SwTxtNode; class SwTxtFrm; // --> #i26945# class SwRowFrm; -// <-- typedef std::map< const SwTxtNode*, const sal_uInt32 > NodeMap; typedef std::map< const SwTxtNode*, const sal_uInt32 >::const_iterator NodeMapIter; @@ -56,14 +55,12 @@ class SwMovedFwdFrmsByObjPos // --> #i40155# void Remove( const SwTxtFrm& _rTxtFrm ); - // <-- bool FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm, sal_uInt32& _ornToPageNum ) const; // --> #i26945# bool DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm ) const; - // <-- void Clear() { maMovedFwdFrms.clear(); }; }; diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index a73b28b..0479c8a 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -83,7 +83,6 @@ class SwRootFrm: public SwLayoutFrm sal_uInt16 mnColumns; // the current page layout bases on this number of columns bool mbBookMode; // the current page layout is in book view bool mbSidebarChanged; // the notes sidebar state has changed - // <-- bool mbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!) @@ -349,7 +348,6 @@ public: bool IsLeftToRightViewLayout() const; const SwRect& GetPagesArea() const { return maPagesArea; } void SetSidebarChanged() { mbSidebarChanged = true; } - // <-- }; inline long SwRootFrm::GetBrowseWidth() const diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 90bbb30..a8b298d 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -100,7 +100,6 @@ public: // --> FME 2006-02-10 #131283# Table row keep feature bool ShouldRowKeepWithNext() const; - // <-- // #i4032# NEW TABLES bool IsRowSpanLine() const { return mbIsRowSpanLine; } diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index ab35e36..a00592e 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -90,11 +90,9 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm // screen object for the preparation // of the re-calculation of the // last table row. - // <-- // #i26945# sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean // indicates, if the floating screen objects fits - // <-- sal_Bool bDummy4 :1; //Split() spaltet den Frm an der angegebenen Stelle, es wird ein @@ -182,7 +180,6 @@ public: { bConsiderObjsForMinCellHeight = _bNewConsiderObjsForMinCellHeight; } - // <-- // #i26945# sal_Bool DoesObjsFit() const { @@ -192,7 +189,6 @@ public: { bObjsDoesFit = _bNewObjsDoesFit; } - // <-- bool RemoveFollowFlowLine(); // diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 326447b..e849698 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -64,7 +64,6 @@ class ThreadManager : public IThreadListenerOwner // --> IThreadListenerOwner virtual boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); - // <-- /** initialization diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 4a03a0f..cb740df 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -464,7 +464,6 @@ public: // has to be avoided during painting. Therefore we need to pass the // information that we are currently in the paint process. SwTxtFrm* GetFormatted( bool bForceQuickFormat = false ); - // <-- // wird demnaechst uebertragen inline void SetFtn( const sal_Bool bNew ) { bFtn = bNew; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 7f8308e..203d0c9 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -41,18 +41,14 @@ #include // --> #i32795# #include -// <-- // --> #i32795# // template class #include -// <-- // --> #i28749# #include -// <-- // --> #i44559# #include -// <-- using namespace ::com::sun::star; @@ -72,7 +68,6 @@ class SwPosNotify ~SwPosNotify(); // #i32795# Point LastObjPos() const; - // <-- }; SwPosNotify::SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj ) : @@ -81,7 +76,6 @@ SwPosNotify::SwPosNotify( SwAnchoredDrawObject* _pAnchoredDrawObj ) : maOldObjRect = mpAnchoredDrawObj->GetObjRect(); // --> #i35640# - determine correct page frame mpOldPageFrm = mpAnchoredDrawObj->GetPageFrm(); - // <-- } SwPosNotify::~SwPosNotify() @@ -98,7 +92,6 @@ SwPosNotify::~SwPosNotify() { // --> #i35640# - determine correct page frame SwPageFrm* pNewPageFrm = mpAnchoredDrawObj->GetPageFrm(); - // <-- if( pNewPageFrm ) mpAnchoredDrawObj->NotifyBackground( pNewPageFrm, aNewObjRect, PREP_FLY_ARRIVE ); @@ -116,7 +109,6 @@ SwPosNotify::~SwPosNotify() { mpAnchoredDrawObj->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); } - // <-- // indicate a restart of the layout process mpAnchoredDrawObj->SetRestartLayoutProcess( true ); @@ -148,7 +140,6 @@ Point SwPosNotify::LastObjPos() const { return maOldObjRect.Pos(); } -//<-- // ============================================================================ // #i32795# @@ -231,14 +222,11 @@ SwAnchoredDrawObject::SwAnchoredDrawObject() : mbValidPos( false ), // --> #i34748# mpLastObjRect( 0L ), - // <-- mbNotYetAttachedToAnchorFrame( true ), // --> #i28749# mbNotYetPositioned( true ), - // <-- // --> #i62875# mbCaptureAfterLayoutDirChange( false ) - // <-- { } @@ -246,7 +234,6 @@ SwAnchoredDrawObject::~SwAnchoredDrawObject() { // #i34748# delete mpLastObjRect; - // <-- } // --> #i62875# @@ -264,7 +251,6 @@ void SwAnchoredDrawObject::UpdateLayoutDir() mbCaptureAfterLayoutDirChange = true; } } -// <-- // --> #i62875# bool SwAnchoredDrawObject::IsOutsidePage() const @@ -280,7 +266,6 @@ bool SwAnchoredDrawObject::IsOutsidePage() const return bOutsidePage; } -// <-- // ============================================================================= // #i26791# - implementation of pure virtual method declared in @@ -323,7 +308,6 @@ void SwAnchoredDrawObject::MakeObjPos() { // --> #i35635# pDrawContact->MoveObjToVisibleLayer( DrawObj() ); - // <-- // --> perform conversion of positioning // attributes only for 'master' drawing objects // #i44334#, #i44681# - check, if positioning @@ -333,14 +317,11 @@ void SwAnchoredDrawObject::MakeObjPos() { _SetPositioningAttr(); } - // <-- // --> // - reset internal flag after all needed actions are performed to // avoid callbacks from drawing layer mbNotYetPositioned = false; - // <-- } - // <-- // indicate that positioning is in progress { @@ -382,7 +363,6 @@ void SwAnchoredDrawObject::MakeObjPos() // keep, current object rectangle // --> #i34748# - use new method SetLastObjRect( GetObjRect().SVRect() ); - // <-- // Assure for 'master' drawing object, that it's registered at the correct page. // Perform check not for as-character anchored drawing objects and only if @@ -416,7 +396,6 @@ void SwAnchoredDrawObject::MakeObjPos() mbCaptureAfterLayoutDirChange = false; } - // <-- } /** method for the intrinsic positioning of a at-paragraph|at-character @@ -444,13 +423,11 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() !static_cast( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() && !ConsiderObjWrapInfluenceOnObjPos() && !ConsiderObjWrapInfluenceOfOtherObjs(); - // <-- if ( bFormatAnchor ) { // --> #i50356# GetAnchorFrmContainingAnchPos()->Calc(); - // <-- } bool bOscillationDetected = false; @@ -459,7 +436,6 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() // 'straightforward positioning process' for the frame due to its // overlapping with a previous column. bool bConsiderWrapInfluenceDueToOverlapPrevCol( false ); - // <-- do { // indicate that position will be valid after positioning is performed mbValidPos = true; @@ -484,7 +460,6 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() bOscillationDetected = aObjPosOscCtrl.OscillationDetected(); } } - // <-- // format anchor frame, if requested. // Note: the format of the anchor frame can cause the object position // to be invalid. @@ -492,7 +467,6 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() { // --> #i50356# GetAnchorFrmContainingAnchPos()->Calc(); - // <-- } // --> #i3317# @@ -501,7 +475,6 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() { bConsiderWrapInfluenceDueToOverlapPrevCol = true; } - // <-- } while ( !mbValidPos && !bOscillationDetected && !bConsiderWrapInfluenceDueToOverlapPrevCol ); @@ -513,7 +486,6 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() SetTmpConsiderWrapInfluence( true ); SetRestartLayoutProcess( true ); } - // <-- } /** method for the intrinsic positioning of a at-page|at-frame anchored @@ -547,16 +519,13 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout() DrawObj()->SetAnchorPos( aNewAnchorPos ); // --> #i70122# - missing invalidation InvalidateObjRectWithSpaces(); - // <-- } - // <-- SetCurrRelPos( aObjPositioning.GetRelPos() ); const SwFrm* pAnchorFrm = GetAnchorFrm(); SWRECTFN( pAnchorFrm ); const Point aAnchPos( (pAnchorFrm->Frm().*fnRect->fnGetPos)() ); SetObjLeft( aAnchPos.X() + GetCurrRelPos().X() ); SetObjTop( aAnchPos.Y() + GetCurrRelPos().Y() ); - // <-- } void SwAnchoredDrawObject::_SetDrawObjAnchor() @@ -577,7 +546,6 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor() DrawObj()->Move( aMove ); // --> #i70122# - missing invalidation InvalidateObjRectWithSpaces(); - // <-- } } @@ -603,7 +571,6 @@ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm ) { _pPageFrm->InvalidateFlyLayout(); } - // <-- SwRootFrm* pRootFrm = static_cast(_pPageFrm->GetUpper()); pRootFrm->DisallowTurbo(); @@ -627,7 +594,6 @@ void SwAnchoredDrawObject::InvalidateObjPos() mbValidPos = false; // --> #i68520# InvalidateObjRectWithSpaces(); - // <-- // --> #i44339# - check, if anchor frame exists. if ( GetAnchorFrm() ) @@ -646,7 +612,6 @@ void SwAnchoredDrawObject::InvalidateObjPos() AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() ); } } - // <-- SwPageFrm* pPageFrm = AnchorFrm()->FindPageFrm(); _InvalidatePage( pPageFrm ); @@ -659,7 +624,6 @@ void SwAnchoredDrawObject::InvalidateObjPos() { _InvalidatePage( pPageFrmRegisteredAt ); } - // <-- // #i33751#, #i34060# - method // is replaced by method . It's return value // have to be checked. @@ -667,12 +631,10 @@ void SwAnchoredDrawObject::InvalidateObjPos() if ( pPageFrmOfAnchor && pPageFrmOfAnchor != pPageFrm && pPageFrmOfAnchor != pPageFrmRegisteredAt ) - // <-- { _InvalidatePage( pPageFrmOfAnchor ); } } - // <-- } } @@ -701,7 +663,6 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const { return GetDrawObj()->GetCurrentBoundRect(); } -// <-- // --> #i68520# bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop ) @@ -718,7 +679,6 @@ bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft ) return nDiff != 0; } -// <-- /** adjust positioning and alignment attributes for new anchor frame @@ -734,7 +694,6 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, const Point aAnchorPos = _pNewAnchorFrm->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) ); // --> #i33313# const SwRect aObjRect( _pNewObjRect ? *_pNewObjRect : GetObjRect() ); - // <-- const bool bVert = _pNewAnchorFrm->IsVertical(); const bool bR2L = _pNewAnchorFrm->IsRightToLeft(); if ( bVert ) @@ -762,7 +721,6 @@ const Rectangle* SwAnchoredDrawObject::GetLastObjRect() const { return mpLastObjRect; } -// <-- // --> #i34748# - change return type. // If member is NULL, create one. @@ -774,13 +732,11 @@ void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect ) } *(mpLastObjRect) = _rNewLastRect; } -// <-- void SwAnchoredDrawObject::ObjectAttachedToAnchorFrame() { // --> #i31698# SwAnchoredObject::ObjectAttachedToAnchorFrame(); - // <-- if ( mbNotYetAttachedToAnchorFrame ) { @@ -840,7 +796,6 @@ void SwAnchoredDrawObject::_SetPositioningAttr() } } } - // <-- // --> #i71182# // only change position - do not lose other attributes @@ -852,18 +807,15 @@ void SwAnchoredDrawObject::_SetPositioningAttr() aVert.SetPos( nVertPos ); GetFrmFmt().SetFmtAttr( aVert ); - // <-- // --> #i36010# - set layout direction of the position GetFrmFmt().SetPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); - // <-- } // --> #i65798# - also for as-character anchored objects // --> #i45952# - indicate that position // attributes are set now. static_cast(GetFrmFmt()).PosAttrSet(); - // <-- } void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm, diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 1efe243..16db6ee 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -44,11 +44,9 @@ #include #include #include -// <-- #include // --> #i3317# #include -// <-- // --> #i35911# #include @@ -56,7 +54,6 @@ using namespace ::com::sun::star; -// <-- // ============================================================================ // --> #i28701# - // implementation of helper class @@ -65,23 +62,19 @@ SwObjPositioningInProgress::SwObjPositioningInProgress( SdrObject& _rSdrObj ) : mpAnchoredObj( 0L ), // --> #i52904# mbOldObjPositioningInProgress( false ) - // <-- { mpAnchoredObj = ::GetUserCall( &_rSdrObj )->GetAnchoredObj( &_rSdrObj ); // --> #i52904# mbOldObjPositioningInProgress = mpAnchoredObj->IsPositioningInProgress(); - // <-- mpAnchoredObj->SetPositioningInProgress( true ); } SwObjPositioningInProgress::SwObjPositioningInProgress( SwAnchoredObject& _rAnchoredObj ) : mpAnchoredObj( &_rAnchoredObj ), // --> #i52904# mbOldObjPositioningInProgress( false ) - // <-- { // --> #i52904# mbOldObjPositioningInProgress = mpAnchoredObj->IsPositioningInProgress(); - // <-- mpAnchoredObj->SetPositioningInProgress( true ); } @@ -91,7 +84,6 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress() { // --> #i52904# mpAnchoredObj->SetPositioningInProgress( mbOldObjPositioningInProgress ); - // <-- } } @@ -104,7 +96,6 @@ SwAnchoredObject::SwAnchoredObject() : mpAnchorFrm( 0L ), // --> #i28701# mpPageFrm( 0L ), - // <-- maRelPos(), maLastCharRect(), mnLastTopOfLine( 0L ), @@ -115,20 +106,15 @@ SwAnchoredObject::SwAnchoredObject() : mbPositionLocked( false ), // --> #i40147# mbKeepPositionLockedForSection( false ), - // <-- mbRestartLayoutProcess( false ), - // <-- // --> #i35911# mbClearedEnvironment( false ), - // <-- // --> #i3317# mbTmpConsiderWrapInfluence( false ), - // <-- // --> #i68520# maObjRectWithSpaces(), mbObjRectWithSpacesValid( false ), maLastObjRect() - // <-- { } @@ -313,13 +299,11 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( // paragraph portion information. // --> #i26945# - use new method const SwTxtFrm& aAnchorCharFrm = *(FindAnchorCharFrm()); - // <-- if ( !_bCheckForParaPorInf || aAnchorCharFrm.HasPara() ) { _CheckCharRect( rAnch, aAnchorCharFrm ); _CheckTopOfLine( rAnch, aAnchorCharFrm ); } - // <-- } } } @@ -382,7 +366,6 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch, { UnlockPosition(); } - // <-- InvalidateObjPos(); } } @@ -421,7 +404,6 @@ void SwAnchoredObject::_CheckTopOfLine( const SwFmtAnchor& _rAnch, { UnlockPosition(); } - // <-- InvalidateObjPos(); } // keep new top of line value @@ -533,7 +515,6 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const bRet = true; } else if ( rObjFmt.getIDocumentSettingAccess()->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) ) - // <-- { const SwFmtAnchor& rAnchor = rObjFmt.GetAnchor(); if ( ((rAnchor.GetAnchorId() == FLY_AT_CHAR) || @@ -544,7 +525,6 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const // objects in the layer Hell - see the text formatting. // Thus, it hasn't to be checked here. bRet = true; - // <-- } } @@ -630,7 +610,6 @@ void SwAnchoredObject::SetClearedEnvironment( const bool _bClearedEnvironment ) { mbClearedEnvironment = _bClearedEnvironment; } -// <-- /** method to determine, if due to anchored object size and wrapping style, its layout environment is cleared. @@ -651,7 +630,6 @@ bool SwAnchoredObject::HasClearedEnvironment() const !static_cast(GetAnchorFrm())->IsFollow() && static_cast(GetAnchorFrm())->FindPageFrm()->GetPhyPageNum() >= GetPageFrm()->GetPhyPageNum() ) - // <-- { const SwFrm* pTmpFrm = GetVertPosOrientFrm()->Lower(); while ( pTmpFrm && pTmpFrm->IsLayoutFrm() && !pTmpFrm->IsTabFrm() ) @@ -698,7 +676,6 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const // use bounding rectangle of anchored objects. // maObjRectWithSpaces = GetObjRect(); maObjRectWithSpaces = GetObjBoundRect(); - // <-- const SwFrmFmt& rFmt = GetFrmFmt(); const SvxULSpaceItem& rUL = rFmt.GetULSpace(); const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); @@ -734,7 +711,6 @@ void SwAnchoredObject::SetObjLeft( const SwTwips _nLeft) mbObjRectWithSpacesValid = false; } } -// <-- /** method to update anchored object in the lists @@ -805,7 +781,6 @@ bool SwAnchoredObject::InvalidationOfPosAllowed() const // --> Check, if page frame layout is in progress, // isn't needed, because of anchored object, whose are moved forward. return !PositionLocked(); - // <-- } /** method to determine the page frame, on which the 'anchor' of @@ -829,7 +804,6 @@ SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor() { // --> #i26945# - use new method pRetPageFrm = GetAnchorFrmContainingAnchPos()->FindPageFrm(); - // <-- } return pRetPageFrm; @@ -861,7 +835,6 @@ SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm() GetFrmAtOfst( rAnch.GetCntntAnchor()->nContent.GetIndex() )); } } - // <-- return pAnchorCharFrm; } @@ -889,14 +862,12 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrmFmt().GetDoc()), *this ); } - // <-- } bool SwAnchoredObject::IsTmpConsiderWrapInfluence() const { return mbTmpConsiderWrapInfluence; } -// <-- void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ) { @@ -1018,7 +989,6 @@ Point SwAnchoredObject::GetRelPosToPageFrm( const bool _bFollowTextFlow, { aRelPos -= pFrm->Frm().Pos(); } - // <-- return aRelPos; } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e747d73..455b160 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -210,7 +210,6 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) // is deleted on below made method call DeleteSection(pNode)> // SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 ); SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 0 ); - // <-- //Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das //ParkCrsr einer (beliebigen) Shell gerufen werden. pNode = & aIdx.GetNode(); @@ -2607,7 +2606,6 @@ SdrObject* SwFrmFmt::FindSdrObject() // duplicated code. SwContact* pFoundContact = FindContactObj(); return pFoundContact ? pFoundContact->GetMaster() : 0; - // <-- } SdrObject* SwFrmFmt::FindRealSdrObject() @@ -2687,7 +2685,6 @@ void SwFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir ) { // empty body, because default implementation does nothing } -// <-- // #i28749# sal_Int16 SwFrmFmt::GetPositionLayoutDir() const @@ -2698,7 +2695,6 @@ void SwFrmFmt::SetPositionLayoutDir( const sal_Int16 ) { // empty body, because default implementation does nothing } -// <-- String SwFrmFmt::GetDescription() const { return SW_RES(STR_FRAME); @@ -2766,7 +2762,6 @@ void SwFlyFrmFmt::MakeFrms() pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode(); } if ( pCNd ) - // <-- { if( SwIterator::FirstElement( *pCNd ) ) { @@ -2775,7 +2770,6 @@ void SwFlyFrmFmt::MakeFrms() } // #i105535# if ( pModify == 0 ) - // <-- { const SwNodeIndex &rIdx = aAnchorAttr.GetCntntAnchor()->nNode; SwSpzFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts(); @@ -2822,7 +2816,6 @@ void SwFlyFrmFmt::MakeFrms() { // #i50432# - adjust synopsis of pPage->PlaceFly( 0, this ); - // <-- break; } pPage = (SwPageFrm*)pPage->GetNext(); @@ -2858,7 +2851,6 @@ void SwFlyFrmFmt::MakeFrms() MakeFrms(); return; } - // <-- } if( pFrm->GetDrawObjs() ) @@ -3017,7 +3009,6 @@ const String SwFlyFrmFmt::GetObjDescription() const return pMasterObject->GetDescription(); } -// <-- /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657# @@ -3146,7 +3137,6 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg() mrFlyFrmFmt.MakeFrms(); } } -// <-- // class SwDrawFrmFmt // Implementierung teilweise inline im hxx @@ -3183,7 +3173,6 @@ void SwDrawFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) { meLayoutDir = _eLayoutDir; } -// <-- // #i28749# sal_Int16 SwDrawFrmFmt::GetPositionLayoutDir() const @@ -3206,7 +3195,6 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) } } } -// <-- String SwDrawFrmFmt::GetDescription() const { diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 49cc01b..0389431 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -63,7 +63,6 @@ #include // #i36347# #include -// <-- #include @@ -213,7 +212,6 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool return _WouldFit( nSpace, pNewUpper, nMoveAnyway == 2, bObjsInNewUpper ); - // <-- } //Bei einem spaltigen Bereichsfrischling kann _WouldFit kein //brauchbares Ergebnis liefern, also muessen wir wirklich @@ -278,7 +276,6 @@ bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm ) !rFrm.GetUpper()->IsFooterFrm() && // #i23129#, #i36347# - no format of upper Writer fly frame !rFrm.GetUpper()->IsFlyFrm() && - // <-- !( rFrm.GetUpper()->IsTabFrm() && rFrm.GetUpper()->GetUpper()->IsInTab() ) && !( rFrm.IsTabFrm() && rFrm.GetUpper()->IsInTab() ); } @@ -396,7 +393,6 @@ void SwFrm::OptPrepareMake() // #i23129#, #i36347# - no format of upper Writer fly frame if ( GetUpper() && !GetUpper()->IsFooterFrm() && !GetUpper()->IsFlyFrm() ) - // <-- { GetUpper()->Calc(); OSL_ENSURE( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." ); @@ -606,7 +602,6 @@ void SwFrm::MakePos() { GetUpper()->Calc(); } - // <-- pPrv = lcl_Prev( this, sal_False ); if ( !bUseUpper && pPrv ) { @@ -694,7 +689,6 @@ void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot ) else nTmp = pObj->GetObjRect().Bottom(); nMax = Max( nTmp, nMax ); - // <-- } ++nMax; //Unterkante vs. Hoehe! rBot = Max( rBot, nMax ); @@ -817,14 +811,12 @@ void SwPageFrm::MakeAll() // exists, the first page doesn't have to fulfill the // visible area. if ( !GetPrev() && !GetNext() ) - // <-- { nBot = Max( nBot, pSh->VisArea().Height() ); } // #i35143# - Assure, that the page // doesn't exceed the defined browse height. Frm().Height( Min( nBot, BROWSE_HEIGHT ) ); - // <-- } Prt().Left ( pAttrs->CalcLeftLine() + aBorder.Width() ); Prt().Top ( nTop ); @@ -1049,7 +1041,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) bFly ? rFmt.GetFrmSize().GetWidth() : pObj->GetObjRect().Width() ); } - // <-- } const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() ); @@ -1131,7 +1122,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) #define STOP_FLY_FORMAT 10 // - loop prevention const int cnStopFormat = 15; -// <-- inline void ValidateSz( SwFrm *pFrm ) { @@ -1167,7 +1157,6 @@ void SwCntntFrm::MakeAll() long nFormatCount = 0; // - loop prevention int nConsequetiveFormatsWithoutChange = 0; - // <-- PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 ) #if OSL_DEBUG_LEVEL > 1 @@ -1250,7 +1239,6 @@ void SwCntntFrm::MakeAll() { dynamic_cast(this)->JoinFrm(); } - // <-- // #i28701# - move master forward, if it has to move, // because of its object positioning. @@ -1274,9 +1262,7 @@ void SwCntntFrm::MakeAll() bMovedFwd = sal_True; MoveFwd( bMakePage, sal_False ); } - // <-- } - // <-- //Wenn ein Follow neben seinem Master steht und nicht passt, kann er //gleich verschoben werden. @@ -1322,7 +1308,6 @@ void SwCntntFrm::MakeAll() // - loop prevention SwRect aOldFrm_StopFormat( Frm() ); SwRect aOldPrt_StopFormat( Prt() ); - // <-- if ( sal_True == (bMoveable = IsMoveable()) ) { SwFrm *pPre = GetIndPrev(); @@ -1375,14 +1360,12 @@ void SwCntntFrm::MakeAll() } (Frm().*fnRect->fnSetWidth)( nNewFrmWidth ); - // <-- } if ( !bValidPrtArea ) { const long nOldW = (Prt().*fnRect->fnGetWidth)(); // #i34730# - keep current frame height const SwTwips nOldH = (Frm().*fnRect->fnGetHeight)(); - // <-- MakePrtArea( rAttrs ); if ( nOldW != (Prt().*fnRect->fnGetWidth)() ) Prepare( PREP_FIXSIZE_CHG ); @@ -1409,9 +1392,7 @@ void SwCntntFrm::MakeAll() Prepare( PREP_ADJUST_FRM ); bValidSize = sal_False; } - // <-- } - // <-- } //Damit die Witwen- und Waisen-Regelung eine Change bekommt muss der @@ -1460,7 +1441,6 @@ void SwCntntFrm::MakeAll() OSL_FAIL( "debug assertion: - format of text frame suppressed by fix b6448963" ); } #endif - // <-- } //Wenn ich der erste einer Kette bin koennte ich mal sehen ob @@ -1554,7 +1534,6 @@ void SwCntntFrm::MakeAll() if ( bFtn && nFormatCount <= STOP_FLY_FORMAT && !GetDrawObjs() ) - // <-- { bValidPos = sal_False; MakePos(); @@ -1575,7 +1554,6 @@ void SwCntntFrm::MakeAll() nConsequetiveFormatsWithoutChange = 0; } } - // <-- //Wieder ein Wert ungueltig? - dann nochmal das ganze... if ( !bValidPos || !bValidSize || !bValidPrtArea ) @@ -1781,11 +1759,9 @@ void SwCntntFrm::MakeAll() // --> FME 2005-01-26 #118572# ( bFtn && !FindFtnFrm()->GetRef()->IsInSct() ) || - // <-- // #i33887# ( IsInSct() && bKeep ) - // <-- // ... add your conditions here ... @@ -1888,7 +1864,6 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace, SwLayoutFrm *pNewUpper, sal_Bool bTstMove, const bool bObjsInNewUpper ) -// <-- { //Damit die Fussnote sich ihren Platz sorgsam waehlt, muss //sie in jedem Fall gemoved werden, wenn zwischen dem @@ -2079,7 +2054,6 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace, { return sal_True; } - // <-- if ( !pNxt->IsValid() ) MakeNxt( pFrm, pNxt ); diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index c4c1c2e..1ad377c 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -213,7 +213,6 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, { return; } - // <-- sal_uInt16 nNewNum, nOldNum = 1; if( Lower() && Lower()->IsColumnFrm() ) @@ -365,7 +364,6 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut // we may use the values returned by CalcColWidth: const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0; long nGutter = 0; - // <-- for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i ) { diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index d117946..29c8130 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -171,7 +171,6 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const SwLayoutFrm *pLayLeaf = this; // --> OD 2006-02-01 #130797# const bool bNoFtn = IsSctFrm() && !_bInvestigateFtnForSections; - // <-- do { while ( ( (!pLayLeaf->IsSctFrm() && !pLayLeaf->IsTabFrm()) @@ -872,7 +871,6 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) { // #i27138# if ( bBody || ( bFtn && !_bInSameFtn ) ) - // <-- { // handling for environments 'footnotes' and 'document body frames': while ( pNxtCnt ) @@ -916,7 +914,6 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) return 0L; } } - // <-- else if ( pThis->IsInFly() ) // handling for environments 'unlinked fly frame' and // 'group of linked fly frames': @@ -1051,7 +1048,6 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) pPrevCntntFrm = pMasterFtnFrmOfCurr->FindLastCntnt(); } while ( !pPrevCntntFrm && pMasterFtnFrmOfCurr->GetMaster() ); - // <-- } else { @@ -1724,7 +1720,6 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const !pTab->HasFollowFlowLine() || !pTab->GetFollow() ) return NULL; - // <-- // skip headline const SwRowFrm* pFollowRow = pTab->GetFollow()->GetFirstNonHeadlineRow(); diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c93692e..2c4f38d 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -235,7 +235,6 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK if ( pThisSection != pNextSection ) bKeep = sal_False; } - // <-- if ( bKeep ) { @@ -413,7 +412,6 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) if( pTmp ) pTmp->Prepare( PREP_QUOVADIS ); } - // <-- //Nur fix auschneiden und zwar so, dass klare Verhaeltnisse bei den //Verlassenen herrschen. Die Pointer der ausgeschnittenen Kette zeigen @@ -600,7 +598,6 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) { pPre->_InvalidatePrt(); } - // <-- pPre->InvalidatePage(); } else @@ -623,7 +620,6 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) ( pOldParent->IsInSct() && !(pSct = pOldParent->FindSctFrm())->ContainsCntnt() && !pSct->ContainsAny( true ) ) ) - // <-- { pSct->DelEmpty( sal_False ); } @@ -844,7 +840,6 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd ) if ( bInSct ) return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf( eMakePage ); - // <-- return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage ); } @@ -997,7 +992,6 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) // Do not consider page descriptions in browse mode (since // MoveBwd ignored them) !(pSh && pSh->GetViewOptions()->getBrowseMode() ) ) - // <-- { if( WrongPageDesc( pNew ) ) { @@ -1154,7 +1148,6 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const if ( pObj->GetFrmFmt().GetDoc()->IsVisibleLayerId( pObj->GetDrawObj()->GetLayer() ) && pObj->GetFrmFmt().GetFollowTextFlow().GetValue() ) - // <-- { const SwLayoutFrm* pVertPosOrientFrm = pObj->GetVertPosOrientFrm(); if ( pVertPosOrientFrm && @@ -1165,7 +1158,6 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const } } } - // <-- } return sal_False; } @@ -1459,7 +1451,6 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bPrevLineSpacingPorportional ); - // <-- if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) ) { nUpper = nPrevLowerSpace + pAttrs->GetULSpace().GetUpper(); @@ -1499,7 +1490,6 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, { nAdd = Max( nAdd, static_cast(rThis).GetLineSpace( true ) ); } - // <-- } nUpper += nAdd; } @@ -1546,7 +1536,6 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, { nAdd = Max( nAdd, static_cast(rThis).GetLineSpace( true ) ); } - // <-- } nUpper += nAdd; } @@ -1653,7 +1642,6 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const // #i102458# bool bDummy = false; GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy ); - // <-- if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 ) { const IDocumentSettingAccess* pIDSA = rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess(); @@ -1727,12 +1715,10 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const if ( ( ( rThis.IsTabFrm() && rThis.GetUpper()->IsInTab() ) || // --> OD 2004-11-16 #115759# - no lower spacing, if frame has a follow ( rThis.IsInTab() && !GetFollow() ) ) && - // <-- !rThis.GetIndNext() ) { nLowerSpace += CalcAddLowerSpaceAsLastInTableCell( _pAttrs ); } - // <-- delete pAttrAccess; @@ -1977,7 +1963,6 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // in SwSectionFrm::Format, which can cause loops. const bool bForceSimpleFormat = pSect && pSect->HasFollow() && !pSect->ContainsAny(); - // <-- if ( pNewBoss != pOldBoss ) { @@ -2009,7 +1994,6 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b { pOldSct = static_cast(rThis.GetUpper()); } - // <-- MoveSubTree( pNewUpper, pNewUpper->Lower() ); @@ -2027,14 +2011,12 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // for these. pOldSct->SimpleFormat(); } - // <-- // #i26831# if ( bForceSimpleFormat ) { pSect->SimpleFormat(); } - // <-- if ( bFtnMoved && !bSamePage ) { @@ -2071,7 +2053,6 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b { SwFrm::CheckPageDescs( pNewPage, sal_False ); } - // <-- } } return bSamePage; @@ -2114,7 +2095,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) pUpperFrm = pUpperFrm->GetUpper(); } } - // <-- SwFtnBossFrm * pOldBoss = rThis.FindFtnBossFrm(); SwPageFrm * const pOldPage = pOldBoss->FindPageFrm(); @@ -2140,7 +2120,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) } if( !pRef ) pRef = pFtn->GetRef(); - // <-- OSL_ENSURE( pRef, "MoveBwd: Endnote for an empty section?" ); @@ -2215,7 +2194,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) bCheckPageDescOfNextPage = true; } } - // <-- bCheckPageDescs = sal_True; } @@ -2265,7 +2243,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) pNewUpper = pNewNextUpper; } } - // <-- } else { @@ -2320,7 +2297,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) { pNewUpper = pNewNextUpper; } - // <-- } } else @@ -2371,16 +2347,13 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // #i47697# - refine condition - see above if ( pAnchoredObj->RestartLayoutProcess() && !pAnchoredObj->IsTmpConsiderWrapInfluence() ) - // <-- { pNewUpper = 0; break; } } } - // <-- } - // <-- //Fuer Follows ist das zurueckfliessen nur dann erlaubt wenn in der //neuen Umgebung kein Nachbar existiert (denn dieses waere der Master). @@ -2440,7 +2413,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // --> OD 2006-02-01 #130797# - correct fix #126020# if ( pSectFrm && !pSectFrm->IsColLocked() && !pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) ) - // <-- { pSectFrm->DelEmpty( sal_True ); delete pSectFrm; @@ -2484,7 +2456,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) pNewUpper = 0L; } } - // <-- } // #i65250# @@ -2505,7 +2476,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) if ( pNextNewUpper && ( pNextNewUpper == rThis.GetUpper() || pNextNewUpper->GetType() != rThis.GetUpper()->GetType() ) ) - // <-- { pNewUpper = 0L; #if OSL_DEBUG_LEVEL > 1 @@ -2513,7 +2483,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) #endif } } - // <-- OSL_ENSURE( pNewUpper != rThis.GetUpper(), " - moving backward to the current upper frame!? -> Please inform OD." ); @@ -2581,7 +2550,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // optimization: format section, if its size is invalidated and if it's // the new parent of moved backward frame. bool bFormatSect( false ); - // <-- if( bUnlock ) { pSect->ColUnlock(); @@ -2591,7 +2559,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // - optimization if ( pSect == pNewUpper ) bFormatSect = true; - // <-- } } @@ -2599,7 +2566,6 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) // - optimization if ( bFormatSect ) pSect->Calc(); - // <-- SwPageFrm *pNewPage = rThis.FindPageFrm(); if( pNewPage != pOldPage ) diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 7a8d347..c75eedb 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -263,7 +263,6 @@ void SwFlyFrm::InsertCnt() { return; } - // <-- const SwFmtCol &rCol = GetFmt()->GetCol(); if ( rCol.GetNumCols() > 1 ) @@ -414,7 +413,6 @@ sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) // of method to avoid a recalculation of the order number, // which isn't intended. nOrdNum = pContact->GetMaster()->GetOrdNumDirect(); - // <-- } return nOrdNum; @@ -443,11 +441,9 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact ) pContact->GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )-> InsertObject( pDrawObj, _GetOrdNumForNewRef( pContact ) ); } - // <-- // #i38889# - assure, that new instance // is in a visible layer. pContact->MoveObjToVisibleLayer( pDrawObj ); - // <-- return pDrawObj; } @@ -466,7 +462,6 @@ void SwFlyFrm::InitDrawObj( sal_Bool bNotify ) // #i52858# - method name changed pContact = new SwFlyDrawContact( (SwFlyFrmFmt*)GetFmt(), pIDDMA->GetOrCreateDrawModel() ); - // <-- } OSL_ENSURE( pContact, "InitDrawObj failed" ); // OD 2004-03-22 #i26791# @@ -760,7 +755,6 @@ sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) aFrm.Width ( aFrm.Width() - nDiffWidth ); // #i68520# InvalidateObjRectWithSpaces(); - // <-- aPrt.Height( aPrt.Height() - nDiffHeight ); aPrt.Width ( aPrt.Width() - nDiffWidth ); ChgLowersProp( aOldSz ); @@ -817,14 +811,12 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) _InvalidatePos(); // #i68520# InvalidateObjRectWithSpaces(); - // <-- } if ( nInvFlags & 0x02 ) { _InvalidateSize(); // #i68520# InvalidateObjRectWithSpaces(); - // <-- } if ( nInvFlags & 0x04 ) _InvalidatePrt(); @@ -843,12 +835,10 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) // update sorted object lists, the Writer fly frame is registered at. UpdateObjInSortedList(); } - // <-- } // #i51474# - reset flags for the layout process ResetLayoutProcessBools(); - // <-- } void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, @@ -1211,7 +1201,6 @@ void SwFlyFrm::_Invalidate( SwPageFrm *pPage ) ClearVertPosOrientFrm(); } } - // <-- } /************************************************************************* @@ -1251,7 +1240,6 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) aVert.SetVertOrient( text::VertOrientation::NONE ); aVert.SetRelationOrient( text::RelOrientation::FRAME ); } - // <-- else if ( IsFlyAtCntFrm() || text::VertOrientation::NONE != aVert.GetVertOrient() ) { if( text::RelOrientation::CHAR == aVert.GetRelationOrient() && IsAutoPos() ) @@ -1306,7 +1294,6 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) aHori.SetRelationOrient( text::RelOrientation::FRAME ); aHori.SetPosToggle( sal_False ); } - // <-- else if ( IsFlyAtCntFrm() || text::HoriOrientation::NONE != aHori.GetHoriOrient() ) { aHori.SetHoriOrient( text::HoriOrientation::NONE ); @@ -1361,7 +1348,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) Frm().Pos().X() = Frm().Pos().Y() = 0; // #i68520# InvalidateObjRectWithSpaces(); - // <-- } //Breite der Spalten pruefen und ggf. einstellen. @@ -1415,7 +1401,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) // the fly frame doesn't become invalid anymore. // if( !nRemaining ) // nRemaining = nOldHeight - nUL; - // <-- } if ( GetDrawObjs() ) { @@ -1463,7 +1448,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) { InvalidateObjRectWithSpaces(); } - // <-- bValidSize = sal_True; } else @@ -1482,7 +1466,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) { InvalidateObjRectWithSpaces(); } - // <-- } if ( !bFormatHeightOnly ) @@ -1515,7 +1498,6 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) { InvalidateObjRectWithSpaces(); } - // <-- } } ColUnlock(); @@ -1647,7 +1629,6 @@ void CalcCntnt( SwLayoutFrm *pLay, pLay->IsAnLower( pTmpPrev ) && pTmpPrevFlowFrm->IsKeep( *pTmpPrev->GetAttrSet() ) && pTmpPrevFlowFrm->IsKeepFwdMoveAllowed(); - // <-- // format floating screen objects anchored to the frame. bool bRestartLayoutProcess = false; @@ -1673,7 +1654,6 @@ void CalcCntnt( SwLayoutFrm *pLay, // anchored object needed - causes loops for as-character // anchored objects. //pAnchoredObj->InvalidateObjPos(); - // <-- SwRect aRect( pAnchoredObj->GetObjRect() ); if ( !SwObjectFormatter::FormatObj( *pAnchoredObj, pFrm, pPageFrm ) ) { @@ -1687,7 +1667,6 @@ void CalcCntnt( SwLayoutFrm *pLay, bRestartLayoutProcess = true; break; } - // <-- if ( aRect != pAnchoredObj->GetObjRect() ) { @@ -1752,7 +1731,6 @@ void CalcCntnt( SwLayoutFrm *pLay, { pFrm->Calc(); } - // <-- if ( bAgain ) { @@ -1868,14 +1846,12 @@ void SwFlyFrm::MakeObjPos() // #i58280# // update relative position SetCurrRelPos( aObjPositioning.GetRelPos() ); - // <-- SWRECTFN( GetAnchorFrm() ); aFrm.Pos( aObjPositioning.GetRelPos() ); aFrm.Pos() += (GetAnchorFrm()->Frm().*fnRect->fnGetPos)(); // #i69335# InvalidateObjRectWithSpaces(); - // <-- } } @@ -1956,7 +1932,6 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) { bFormatHeightOnly = sal_True; } - // <-- static_cast(this)->SetNoMoveOnCheckClip( true ); ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll(); static_cast(this)->SetNoMoveOnCheckClip( false ); @@ -1965,8 +1940,6 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) { bFormatHeightOnly = bOldFormatHeightOnly; } - // <-- - // <-- } else MakeAll(); @@ -2017,7 +1990,6 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { InvalidateObjRectWithSpaces(); } - // <-- nHeight = (Prt().*fnRect->fnGetHeight)(); (Prt().*fnRect->fnSetHeight)( nHeight - nVal ); _InvalidatePos(); @@ -2055,7 +2027,6 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { bFormatHeightOnly = sal_True; } - // <-- static_cast(this)->SetNoMoveOnCheckClip( true ); ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll(); static_cast(this)->SetNoMoveOnCheckClip( false ); @@ -2064,8 +2035,6 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { bFormatHeightOnly = bOldFormatHeightOnly; } - // <-- - // <-- } else MakeAll(); @@ -2118,7 +2087,6 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) } } } - // <-- if ( aAdjustedNewSize != Frm().SSize() ) { SwFrmFmt *pFmt = GetFmt(); @@ -2129,7 +2097,6 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) // call, if equals the current attribute. // if ( Abs(aAdjustedNewSize.Height() - aSz.GetHeight()) > 1 ) aSz.SetHeight( aAdjustedNewSize.Height() ); - // <-- // uebers Doc fuers Undo! pFmt->GetDoc()->SetAttr( aSz, *pFmt ); return aSz.GetSize(); @@ -2246,7 +2213,6 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove ) } } } - // <-- pDrawObjs->Remove( *pToRemove ); if ( !pDrawObjs->Count() ) @@ -2312,7 +2278,6 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj ) } } } - // <-- // no direct positioning needed, but invalidate the drawing object position _rNewObj.InvalidateObjPos(); @@ -2372,7 +2337,6 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, // in order to check, if anchored object is registered at the same // page. const SwPageFrm* pPageFrm = FindPageFrm(); - // <-- // #i28701# - re-factoring sal_uInt32 i = 0; for ( ; i < GetDrawObjs()->Count(); ++i ) @@ -2404,9 +2368,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, { pAnchoredObj->UnlockPosition(); } - // <-- } - // <-- // #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. @@ -2417,7 +2379,6 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, pAnchoredObj->UnlockPosition(); pAnchoredObj->SetClearedEnvironment( false ); } - // <-- // distinguish between writer fly frames and drawing objects if ( pAnchoredObj->ISA(SwFlyFrm) ) { @@ -2464,7 +2425,6 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) // for at-character/as-character anchored objects the anchor character // text frame is taken. const SwFrm* pAnchorFrm = pObj->GetAnchorFrmContainingAnchPos(); - // <-- if ( pObj->ISA(SwFlyFrm) ) { SwFlyFrm* pFly = static_cast(pObj); @@ -2480,7 +2440,6 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) // at a different page registered as its anchor frame is on. const bool bLow = IsAnLower( pAnchorFrm ); if ( bLow || pAnchorFrm->FindPageFrm() != pPageFrm ) - // <-- { pFly->_Invalidate( pPageFrm ); if ( !bLow || pFly->IsFlyAtCntFrm() ) @@ -2490,7 +2449,6 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) { pFly->UnlockPosition(); } - // <-- pFly->_InvalidatePos(); } else @@ -2506,14 +2464,12 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs ) // at a different page registered as its anchor frame is on. if ( IsAnLower( pAnchorFrm ) || pAnchorFrm->FindPageFrm() != pPageFrm ) - // <-- { // #i44016# if ( _bUnlockPosOfObjs ) { pObj->UnlockPosition(); } - // <-- pObj->InvalidateObjPos(); } } @@ -2786,7 +2742,6 @@ void SwFlyFrm::InvalidateObjPos() InvalidatePos(); // #i68520# InvalidateObjRectWithSpaces(); - // <-- } SwFrmFmt& SwFlyFrm::GetFrmFmt() @@ -2813,7 +2768,6 @@ const SwRect SwFlyFrm::GetObjBoundRect() const { return GetObjRect(); } -// <-- // #i68520# bool SwFlyFrm::_SetObjTop( const SwTwips _nTop ) @@ -2832,7 +2786,6 @@ bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft ) return bChanged; } -// <-- /** method to assure that anchored object is registered at the correct page frame diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 22eace2..0df8f92 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -76,7 +76,6 @@ SwFlyInCntFrm::~SwFlyInCntFrm() // #i28701# TYPEINIT1(SwFlyInCntFrm,SwFlyFrm); -// <-- /************************************************************************* |* |* SwFlyInCntFrm::SetRefPoint(), @@ -99,7 +98,6 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint, (Frm().*fnRect->fnSetPos)( rPoint + rRelPos ); // #i68520# InvalidateObjRectWithSpaces(); - // <-- if( pNotify ) { InvalidatePage(); @@ -218,7 +216,6 @@ void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid ) if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid ) AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() ); } -// <-- /************************************************************************* |* |* SwFlyInCntFrm::NotifyBackground() @@ -330,7 +327,6 @@ void SwFlyInCntFrm::MakeAll() bWidthClipped = sal_True; } } - // <-- } Unlock(); } diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 24a5dce..3f45ff7 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -276,7 +276,6 @@ SwFrmNotify::~SwFrmNotify() // --> OD 2004-12-08 #115759# const bool bAnchoredAsChar = pContact->ObjAnchoredAsChar(); if ( !bAnchoredAsChar ) - // <-- { // Notify object, which aren't anchored as-character: @@ -363,7 +362,6 @@ SwFrmNotify::~SwFrmNotify() { pFlyFrm->_InvalidatePos(); } - // <-- pFlyFrm->_Invalidate(); } else if ( pObj->ISA(SwAnchoredDrawObject) ) @@ -374,7 +372,6 @@ SwFrmNotify::~SwFrmNotify() { pObj->InvalidateObjPos(); } - // <-- } else { @@ -399,7 +396,6 @@ SwFrmNotify::~SwFrmNotify() // #i35879# Do not trust the inf flags. pFrm does not // necessarily have to have an upper! if ( !pFrm->IsFlyFrm() && 0 != ( pFly = pFrm->ImplFindFlyFrm() ) ) - // <-- { // #i61999# // no invalidation of columned Writer fly frames, because automatic @@ -424,11 +420,9 @@ SwFrmNotify::~SwFrmNotify() { pFly->InvalidatePos(); } - // <-- pFly->InvalidateSize(); } } - // <-- } } @@ -478,7 +472,6 @@ SwLayNotify::~SwLayNotify() { return; } - // <-- SwLayoutFrm *pLay = GetLay(); SWRECTFN( pLay ) @@ -632,15 +625,12 @@ SwLayNotify::~SwLayNotify() { bUnlockPosOfObjs = static_cast(pLay)->IsUnlockPosOfLowerObjs(); } - // <-- // #i51303# - no unlock of object positions for sections else if ( bUnlockPosOfObjs && pLay->IsSctFrm() ) { bUnlockPosOfObjs = false; } - // <-- pLay->NotifyLowerObjs( bUnlockPosOfObjs ); - // <-- } if ( bPos && pLay->IsFtnFrm() && pLay->Lower() ) { @@ -659,7 +649,6 @@ SwFlyNotify::SwFlyNotify( SwFlyFrm *pFlyFrm ) : // --> OD 2004-11-24 #115759# - keep correct page frame - the page frame // the Writer fly frame is currently registered at. pOldPage( pFlyFrm->GetPageFrm() ), - // <-- aFrmAndSpace( pFlyFrm->GetObjRectWithSpaces() ) { } @@ -673,7 +662,6 @@ SwFlyNotify::~SwFlyNotify() { return; } - // <-- SwFlyFrm *pFly = GetFly(); if ( pFly->IsNotifyBack() ) @@ -692,7 +680,6 @@ SwFlyNotify::~SwFlyNotify() { pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); } - // <-- } pFly->ResetNotifyBack(); } @@ -730,7 +717,6 @@ SwFlyNotify::~SwFlyNotify() { pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); } - // <-- } // OD 2004-05-13 #i28701# @@ -739,13 +725,11 @@ SwFlyNotify::~SwFlyNotify() if ( pFly->ConsiderObjWrapInfluenceOnObjPos() && ( !pFly->ISA(SwFlyFreeFrm) || !static_cast(pFly)->IsNoMoveOnCheckClip() ) ) - // <-- { // #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 ) - // <-- { // indicate a restart of the layout process pFly->SetRestartLayoutProcess( true ); @@ -810,7 +794,6 @@ SwCntntNotify::~SwCntntNotify() { return; } - // <-- SwCntntFrm *pCnt = GetCnt(); if ( bSetCompletePaintOnInvalidate ) @@ -1012,7 +995,6 @@ SwCntntNotify::~SwCntntNotify() { pCnt->InvalidateObjs( true ); } - // <-- // #i43255# - move code to invalidate at-character // anchored objects due to a change of its anchor character from @@ -1037,7 +1019,6 @@ SwCntntNotify::~SwCntntNotify() } } } - // <-- } /*************************************************************************/ @@ -1348,10 +1329,8 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // it is possible, that the one of its upper frames // isn't inserted into the layout. pFrm->InvalidateInfFlags(); - // <-- } } - // <-- // OD 12.08.2003 #i17969# - consider horizontal/vertical layout // for setting position at newly inserted frame lcl_SetPos( *pFrm, *pLay ); @@ -1395,7 +1374,6 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, dynamic_cast(pFrm->FindPrevCnt( true )) ); } } - // <-- if ( bObjsDirect && pTbl->Count() ) ((SwTabFrm*)pFrm)->RegistFlys(); // OD 12.08.2003 #i17969# - consider horizontal/vertical layout @@ -1447,7 +1425,6 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // building up a table, the upper of pPrv may be a cell // frame, but the cell frame does not have an upper yet. if( pPrv && 0 != pPrv->ImplFindFtnFrm() ) - // <-- { if( pPrv->IsSctFrm() ) pPrv = ((SwSectionFrm*)pPrv)->ContainsCntnt(); @@ -1472,7 +1449,6 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, dynamic_cast(pFrm->FindPrevCnt( true )) ); } } - // <-- pFrm->CheckDirChange(); // OD 12.08.2003 #i17969# - consider horizontal/vertical layout @@ -1861,7 +1837,6 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) // #i96772# // LRSpaceItem is copied due to the possibility that it is adjusted - see below rLR ( rAttrSet.GetLRSpace() ), - // <-- rBox ( rAttrSet.GetBox() ), rShadow ( rAttrSet.GetShadow() ), aFrmSize( rAttrSet.GetFrmSize().GetSize() ) @@ -2396,10 +2371,8 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) // --> OD 2004-11-29 #115759# - reset member, at which the anchored // object orients its vertical position pObj->ClearVertPosOrientFrm(); - // <-- // #i43913# pObj->ResetLayoutProcessBools(); - // <-- // --> OD 2004-11-29 #115759# - remove also lower objects of as-character // anchored Writer fly frames from page if ( pObj->ISA(SwFlyFrm) ) @@ -2412,7 +2385,6 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) { ::lcl_RemoveObjsFromPage( pFlyFrm ); } - // <-- SwCntntFrm* pCnt = pFlyFrm->ContainsCntnt(); while ( pCnt ) @@ -2427,7 +2399,6 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) pFlyFrm->GetPageFrm()->RemoveFlyFromPage( pFlyFrm ); } } - // <-- // --> OD 2004-11-29 #115759# - remove also drawing objects from page else if ( pObj->ISA(SwAnchoredDrawObject) ) { @@ -2437,7 +2408,6 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) *(static_cast(pObj)) ); } } - // <-- } } @@ -2565,7 +2535,6 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) // --> OD 2004-11-29 #115759# - unlock position of anchored object // in order to get the object's position calculated. pObj->UnlockPosition(); - // <-- // --> OD 2004-11-29 #115759# - add also lower objects of as-character // anchored Writer fly frames from page if ( pObj->ISA(SwFlyFrm) ) @@ -2585,7 +2554,6 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) { ::lcl_AddObjsToPage( pFlyFrm, _pPage ); } - // <-- SwCntntFrm *pCnt = pFlyFrm->ContainsCntnt(); while ( pCnt ) @@ -2595,7 +2563,6 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) pCnt = pCnt->GetNextCntntFrm(); } } - // <-- // --> OD 2004-11-29 #115759# - remove also drawing objects from page else if ( pObj->ISA(SwAnchoredDrawObject) ) { @@ -2606,7 +2573,6 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) *(static_cast(pObj)) ); } } - // <-- } } @@ -2795,9 +2761,7 @@ void MA_FASTCALL lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) if ( pObj->GetPageFrm() ) pObj->GetPageFrm()->RemoveDrawObjFromPage( *pObj ); pPage->AppendDrawObjToPage( *pObj ); - // <-- } - // <-- } const SwFlyFrm* pFly = pAnch->FindFlyFrm(); @@ -2866,7 +2830,6 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, { pFly->NotifyBackground( pPageFrm, aFrm, PREP_FLY_ARRIVE ); } - // <-- if ( rOld.Left() != aFrm.Left() ) { @@ -2948,13 +2911,11 @@ void MA_FASTCALL lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, // #i35640# - use given rectangle instead // of current bound rectangle if ( aCntPrt.IsOver( rRect ) ) - // <-- pCnt->Prepare( PREP_FLY_ATTR_CHG ); } // #i23129# - only invalidate, if the text frame // printing area overlaps with the given rectangle. else if ( aCntPrt.IsOver( rRect ) ) - // <-- pCnt->Prepare( eHint, (void*)&aCntPrt._Intersection( rRect ) ); if ( pCnt->GetDrawObjs() ) { @@ -3031,7 +2992,6 @@ void Notify_Background( const SdrObject* pObj, { pCnt = pArea->ContainsCntnt(); } - // <-- } SwFrm *pLastTab = 0; @@ -3047,7 +3007,6 @@ void Notify_Background( const SdrObject* pObj, if ( pCell->IsCellFrm() && ( pCell->Frm().IsOver( pObj->GetLastBoundRect() ) || pCell->Frm().IsOver( rRect ) ) ) - // <-- { const SwFmtVertOrient &rOri = pCell->GetFmt()->GetVertOrient(); if ( text::VertOrientation::NONE != rOri.GetVertOrient() ) @@ -3062,7 +3021,6 @@ void Notify_Background( const SdrObject* pObj, // of the bounding rectangle isn't intended here. if ( pTab->Frm().IsOver( pObj->GetLastBoundRect() ) || pTab->Frm().IsOver( rRect ) ) - // <-- { if ( !pFlyFrm || !pFlyFrm->IsLowerOf( pTab ) ) pTab->InvalidatePrt(); @@ -3085,7 +3043,6 @@ void Notify_Background( const SdrObject* pObj, // } // --> OD 2007-07-24 #128702# - make code robust if ( pPage && pPage->GetSortedObjs() ) - // <-- { pObj->GetOrdNum(); const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); @@ -3153,7 +3110,6 @@ void Notify_Background( const SdrObject* pObj, { pSh->InvalidateWindows( rRect ); } - // <-- } /************************************************************************* @@ -3424,7 +3380,6 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1 { SwObjectFormatter::FormatObj( *pFlyFrm ); } - // <-- pTmpFrm->Calc(); } diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index bc0f4d3..8eb2418 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -498,7 +498,6 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt bBackMoveLocked( sal_False ), // #i49383# mbUnlockPosOfLowerObjs( true ) - // <-- { nType = FRMC_FTN; } @@ -1786,7 +1785,6 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify* pFtnFrmNotitfy = new SwLayNotify( pNew ); - // <-- SwCntntFrm *pCnt = pNew->ContainsCntnt(); while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) { @@ -1802,7 +1800,6 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) continue; } } - // <-- pCnt = (SwCntntFrm*)pCnt->FindNextCnt(); } // #i49383# @@ -1813,20 +1810,17 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. pNew->UnlockPosOfLowerObjs(); - // <-- pNew->Calc(); // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // pNew->UnlockPosOfLowerObjs(); // delete pFtnFrmNotitfy; - // <-- if ( !bOldFtnFrmLocked && !pNew->GetLower() && !pNew->IsColLocked() && !pNew->IsBackMoveLocked() ) { pNew->Cut(); delete pNew; } - // <-- } pMyPage->UpdateFtnNum(); } @@ -2229,7 +2223,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify aFtnFrmNotitfy( pFtn ); - // <-- while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) { @@ -2246,7 +2239,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) continue; } } - // <-- if( pCnt->IsSctFrm() ) { // Wenn es sich um einen nichtleeren Bereich handelt, // iterieren wir auch ueber seinen Inhalt @@ -2278,7 +2270,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) pFtn->UnlockPosOfLowerObjs(); pFtn->Calc(); // pFtn->UnlockPosOfLowerObjs(); - // <-- } // #i57914# - adjust fix #i49383# // no extra notify for footnote frame @@ -2286,7 +2277,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) // { // aFtnFrmNotitfy.FrmDeleted(); // } - // <-- } } else @@ -2322,7 +2312,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // SwLayNotify aFtnFrmNotitfy( pNextFtn ); - // <-- while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) { @@ -2339,7 +2328,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) continue; } } - // <-- if( pCnt->IsSctFrm() ) { // Wenn es sich um einen nichtleeren Bereich handelt, // iterieren wir auch ueber seinen Inhalt @@ -2362,7 +2350,6 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) pNextFtn->UnlockPosOfLowerObjs(); pNextFtn->Calc(); // pNextFtn->UnlockPosOfLowerObjs(); - // <-- } } } @@ -2443,7 +2430,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, SwObjectFormatter::FormatObjsAtFrm( *pCntnt, *(pCntnt->FindPageFrm()) ); } - // <-- if( bUnlock ) pFirst->UnlockBackMove(); } @@ -2464,7 +2450,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, // SwLayNotify* pFtnFrmNotify( 0L ); // footnote frame needs to be locked, if isn't set. bool bUnlockLastFtnFrm( false ); - // <-- do { if( !bStart ) @@ -2492,7 +2477,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, // pLastFtnFrm->UnlockPosOfLowerObjs(); // no extra notify for footnote frame // delete pFtnFrmNotify; - // <-- if ( !bLock && bUnlockLastFtnFrm && !pLastFtnFrm->GetLower() && !pLastFtnFrm->IsColLocked() && @@ -2513,9 +2497,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, // #i57914# - adjust fix #i49383# // no extra notify for footnote frame // pFtnFrmNotify = new SwLayNotify( pLastFtnFrm ); - // <-- } - // <-- // OD 30.10.2002 #97265# - invalidate position of footnote // frame, if it's below its footnote container, in order to // assure its correct position, probably calculating its previous @@ -2545,7 +2527,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, continue; } } - // <-- if( bUnlock ) { pFtnFrm->UnlockBackMove(); @@ -2560,7 +2541,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, // no extra notify for footnote frame // pFtnFrmNotify->FrmDeleted(); // delete pFtnFrmNotify; - // <-- pFtnFrm->Cut(); delete pFtnFrm; } @@ -2581,7 +2561,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, continue; } } - // <-- } } SwSectionFrm *pDel = NULL; @@ -2639,7 +2618,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, // pLastFtnFrm->UnlockPosOfLowerObjs(); // no extra notify for footnote frame // delete pFtnFrmNotify; - // <-- if ( !bLock && bUnlockLastFtnFrm && !pLastFtnFrm->GetLower() && !pLastFtnFrm->IsColLocked() && @@ -2649,7 +2627,6 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, delete pLastFtnFrm; } } - // <-- } } diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 60bcce0..e52b518 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -50,7 +50,6 @@ #include // #i43771# #include -// <-- extern sal_Bool bObjsDirect; //frmtool.cxx @@ -261,7 +260,6 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) // use the position of the footer printing area to control invalidation // of the first footer content. Point aOldFooterPrtPos; - // <-- do { @@ -274,7 +272,6 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) pFrm->_InvalidatePos(); aOldFooterPrtPos = Frm().Pos() + Prt().Pos(); } - // <-- while( pFrm ) { pFrm->Calc(); @@ -297,7 +294,6 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) continue; } } - // <-- pFrm = pFrm->GetNext(); } nRemaining = 0; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 6686dfa..337d5ab 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -91,7 +91,6 @@ #include #include -// <-- //#pragma optimize("ity",on) /************************************************************************* @@ -559,7 +558,6 @@ class NotifyLayoutOfPageInProgress _UnlockPositionOfObjs(); } }; -// <-- void SwLayAction::InternalAction() { @@ -713,7 +711,6 @@ void SwLayAction::InternalAction() // #i28701# pPage->ValidateFlyLayout(); pPage->ValidateFlyCntnt(); - // <-- if ( !FormatCntnt( pPage ) ) { XCHECKPAGE; @@ -722,7 +719,6 @@ void SwLayAction::InternalAction() // #i28701# pPage->InvalidateFlyLayout(); pPage->InvalidateFlyCntnt(); - // <-- if ( IsBrowseActionStop() ) bInput = sal_True; } @@ -845,7 +841,6 @@ void SwLayAction::InternalAction() // the move of a form control object, which is represented by a window. while ( pPg && ( pPg->Frm().Top() < nBottom || ( IsIdle() && pPg == pPage ) ) ) - // <-- { // #i26945# - follow-up of #i28701# NotifyLayoutOfPageInProgress aLayoutOfPageInProgress( *pPg ); @@ -870,14 +865,12 @@ void SwLayAction::InternalAction() XCHECKPAGE; // #i50432# - format also at-page anchored objects SwObjectFormatter::FormatObjsAtFrm( *pPg, *pPg, this ); - // <-- // #i50432# if ( !pPg->GetSortedObjs() ) { pPg->ValidateFlyLayout(); pPg->ValidateFlyCntnt(); } - // <-- // FME 2007-08-30 #i81146# new loop control sal_uInt16 nLoopControlRuns_3 = 0; @@ -902,14 +895,12 @@ void SwLayAction::InternalAction() if ( mbFormatCntntOnInterrupt && ( pPg->IsInvalidCntnt() || ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) ) - // <-- { pPg->ValidateFlyInCnt(); pPg->ValidateCntnt(); // #i26945# - follow-up of fix #117736# pPg->ValidateFlyLayout(); pPg->ValidateFlyCntnt(); - // <-- if ( ++nLoopControlRuns_2 > nLoopControlMax ) { @@ -927,7 +918,6 @@ void SwLayAction::InternalAction() // #i26945# - follow-up of fix #117736# pPg->InvalidateFlyLayout(); pPg->InvalidateFlyCntnt(); - // <-- } // #i46807# - we are statisfied, if the // content is formatted once complete. @@ -935,10 +925,8 @@ void SwLayAction::InternalAction() { break; } - // <-- } } - // <-- pPg = (SwPageFrm*)pPg->GetNext(); } // OD 14.04.2003 #106346# - reset flag for special interrupt content formatting. @@ -1155,7 +1143,6 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, } return 0; } -// <-- sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { @@ -1343,7 +1330,6 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) } } } - // <-- } } } @@ -1833,7 +1819,6 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) _FormatCntnt( pCntnt, pPage ); // #i26945# - reset before format objects bPaint = bOldPaint; - // <-- // OD 2004-05-10 #i28701# - format floating screen object at content frame. // No format, if action flag is set or action is interrupted. @@ -1846,7 +1831,6 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) pCntnt->IsTxtFrm() && !SwObjectFormatter::FormatObjsAtFrm( *(const_cast(pCntnt)), *(pCntnt->FindPageFrm()), this ) ) - // <-- { return sal_False; } @@ -2054,13 +2038,11 @@ sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) !SwObjectFormatter::FormatObjsAtFrm( *(const_cast(pCntnt)), *(pCntnt->FindPageFrm()), this ) ) - // <-- { // restart format with first content pCntnt = pFly->ContainsCntnt(); continue; } - // <-- if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) { diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index de11892..5a111fe 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -71,7 +71,6 @@ using namespace ::com::sun::star; -// <-- SV_IMPL_PTRARR( SwPageFlyCache, SwFlyCachePtr ) @@ -636,7 +635,6 @@ sal_Bool SwLayHelper::CheckInsertPage() SwFlowFrm::CastFlowFrm( rpFrm )->IsFollow() ? 0 : rDesc.GetPageDesc(); - // <-- sal_Bool bBrk = nParagraphCnt > nMaxParaPerPage || rbBreakAfter; rbBreakAfter = rBrk.GetBreak() == SVX_BREAK_PAGE_AFTER || @@ -751,7 +749,6 @@ void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage ) } } } -// <-- /* * SwLayHelper::CheckInsert @@ -885,7 +882,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) SwTabFrm* pTab = (SwTabFrm*)rpFrm; // #i33629#, #i29955# ::RegistFlys( pTab->FindPageFrm(), pTab ); - // <-- SwFrm *pRow = pTab->Lower(); SwTabFrm *pFoll = new SwTabFrm( *pTab ); @@ -952,7 +948,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) { lcl_ApplyWorkaroundForB6375613( rpFrm ); } - // <-- _CheckFlyCache( pLastPage ); if( rpPrv && rpPrv->IsTxtFrm() && !rpPrv->GetValidSizeFlag() ) rpPrv->Frm().Height( rpPrv->GetUpper()->Prt().Height() ); @@ -1153,7 +1148,6 @@ sal_Bool SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) ? pPage->GetPrev() : pPage->GetNext() ); } - // <-- if( pPage ) { rpPage = pPage; diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 2496815..ba09484 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -40,10 +40,8 @@ // #i28701# #include -// <-- // #i35911# #include -// <-- #define LOOP_DETECT 250 @@ -230,10 +228,8 @@ SwLayouter::SwLayouter() pLooping( NULL ), // #i28701# mpMovedFwdFrms( 0L ), - // <-- // #i35911# mpObjsTmpConsiderWrapInfl( 0L ) - // <-- { } @@ -244,11 +240,9 @@ SwLayouter::~SwLayouter() // #i28701# delete mpMovedFwdFrms; mpMovedFwdFrms = 0L; - // <-- // #i35911# delete mpObjsTmpConsiderWrapInfl; mpObjsTmpConsiderWrapInfl = 0L; - // <-- } void SwLayouter::_CollectEndnotes( SwSectionFrm* pSect ) @@ -382,7 +376,6 @@ void SwLayouter::RemoveMovedFwdFrm( const SwDoc& _rDoc, _rDoc.GetLayouter()->mpMovedFwdFrms->Remove( _rTxtFrm ); } } -// <-- bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc, const SwTxtFrm& _rTxtFrm, @@ -404,7 +397,6 @@ bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc, FrmMovedFwdByObjPos( _rTxtFrm, _ornToPageNum ); } } -// <-- // #i26945# bool SwLayouter::DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, const SwRowFrm& _rRowFrm ) @@ -423,7 +415,6 @@ bool SwLayouter::DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, mpMovedFwdFrms->DoesRowContainMovedFwdFrm( _rRowFrm ); } } -// <-- // #i35911# void SwLayouter::ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ) @@ -451,7 +442,6 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence( _rDoc.GetLayouter()->mpObjsTmpConsiderWrapInfl->Insert( _rAnchoredObj ); } -// <-- // #i40155# void SwLayouter::ClearFrmsNotToWrap( const SwDoc& _rDoc ) { @@ -500,7 +490,6 @@ bool SwLayouter::FrmNotToWrap( const IDocumentLayoutAccess& _rDLA, return bFrmNotToWrap; } } -// <-- void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm ) { @@ -560,6 +549,5 @@ void SwLayouter::ClearMoveBwdLayoutInfo( const SwDoc& _rDoc ) if ( _rDoc.GetLayouter() ) const_cast(_rDoc).GetLayouter()->maMoveBwdLayoutInfo.clear(); } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx index 2b63d7e..39f20f3 100644 --- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx +++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx @@ -92,7 +92,6 @@ bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm // --> OD 2004-12-03 #115759# - assure that found text frame // is the first one. if ( _rRowFrm.IsAnLower( pTxtFrm ) && !pTxtFrm->GetIndPrev() ) - // <-- { bDoesRowContainMovedFwdFrm = true; break; @@ -103,6 +102,5 @@ bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm return bDoesRowContainMovedFwdFrm; } -// <-- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 8afe162..f85f350 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -357,7 +357,6 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft; // #i65250# sal_uInt32 SwFrm::mnLastFrmId=0; -// <-- TYPEINIT1(SwFrm,SwClient); //rtti fuer SwFrm TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm @@ -486,7 +485,6 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : mbBookMode( false ), mbSidebarChanged( false ), mbNeedGrammarCheck( false ), - // <-- nBrowseWidth( MM50*4 ), //2cm Minimum pTurbo( 0 ), pLastPage( 0 ), @@ -536,7 +534,6 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, sal_True, sal_False ); // --> FME 2005-05-25 #123067# pNode = 0 can really happen: SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0; - // <-- //PageDesc besorgen (entweder vom FrmFmt des ersten Node oder den //initialen.) @@ -585,7 +582,6 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); pFieldsAccess->UpdatePageFlds( &aMsgHnt ); } - // <--- pTimerAccess->StartIdling(); bCallbackActionEnabled = sal_True; diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 9407f82..ca1ab4c 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -91,7 +91,6 @@ class SwPageNumAndTypeOfAnchors { pNewEntry->mnPageNumOfAnchor = 0; } - // <-- // --> #i26945# - collect type of anchor SwTxtFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm(); if ( pAnchorCharFrm ) @@ -102,7 +101,6 @@ class SwPageNumAndTypeOfAnchors { pNewEntry->mbAnchoredAtMaster = true; } - // <-- maObjList.push_back( pNewEntry ); } @@ -142,7 +140,6 @@ class SwPageNumAndTypeOfAnchors return bAnchoredAtMaster; } - // <-- inline sal_uInt32 Count() const { @@ -162,7 +159,6 @@ SwObjectFormatter::SwObjectFormatter( const SwPageFrm& _rPageFrm, mpLayAction( _pLayAction ), // --> #i26945# mpPgNumAndTypeOfAnchors( _bCollectPgNumOfAnchors ? new SwPageNumAndTypeOfAnchors() : 0L ) - // <-- { } @@ -249,7 +245,6 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj, // format given floating screen object // --> #i40147# - check for moved forward anchor frame bSuccess = pObjFormatter->DoFormatObj( _rAnchoredObj, true ); - // <-- } delete pObjFormatter; @@ -312,7 +307,6 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj ) !SwObjectFormatter::FormatObjsAtFrm( *pCntnt, *(pCntnt->FindPageFrm()), GetLayAction() ) ) - // <-- { // restart format with first content pCntnt = rFlyFrm.ContainsCntnt(); @@ -354,7 +348,6 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) { static_cast(rFlyFrm).SetNoMakePos( false ); } - // <-- // #i81146# new loop control sal_uInt16 nLoopControlRuns = 0; @@ -370,7 +363,6 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) { break; } - // <-- } else { @@ -382,13 +374,11 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) { static_cast(rFlyFrm).SetNoMakePos( true ); } - // <-- // #i23129#, #i36347# - pass correct page frame // to the object formatter SwObjectFormatter::FormatObjsAtFrm( rFlyFrm, *(rFlyFrm.FindPageFrm()), mpLayAction ); - // <-- if ( mpLayAction ) { mpLayAction->_FormatFlyCntnt( &rFlyFrm ); @@ -398,7 +388,6 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) { break; } - // <-- } else { @@ -419,7 +408,6 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) } while ( !rFlyFrm.IsValid() && !_rAnchoredObj.RestartLayoutProcess() && rFlyFrm.GetAnchorFrm() == &GetAnchorFrm() ); - // <-- } else if ( _rAnchoredObj.ISA(SwAnchoredDrawObject) ) { @@ -452,7 +440,6 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) { pAnchorFrm = &GetAnchorFrm(); } - // <-- if ( !pAnchorFrm->GetDrawObjs() ) { // nothing to do, if no floating screen object is registered at the anchor frame. @@ -485,7 +472,6 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) { continue; } - // <-- // #i33751#, #i34060# - method // is replaced by method . It's return value // have to be checked. @@ -494,7 +480,6 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) " - missing page frame." ); // --> #i26945# if ( pPageFrmOfAnchor && pPageFrmOfAnchor == &mrPageFrm ) - // <-- { // if format of object fails, stop formatting and pass fail to // calling method via the return value. diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index e52c7e9..79b7d60 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -36,7 +36,6 @@ // --> OD 2005-07-13 #124218# #include -// <-- // ============================================================================= // implementation of class @@ -89,14 +88,12 @@ SwFrm& SwObjectFormatterLayFrm::GetAnchorFrm() // Not relevant for objects anchored at layout frame. bool SwObjectFormatterLayFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool ) -// <-- { _FormatObj( _rAnchoredObj ); // --> OD 2005-07-13 #124218# - consider that the layout action has to be // restarted due to a deleted page frame. return GetLayAction() ? !GetLayAction()->IsAgain() : true; - // <-- } bool SwObjectFormatterLayFrm::DoFormatObjs() @@ -139,7 +136,6 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage() { return false; } - // <-- SwPageFrm& rPageFrm = static_cast(GetAnchorFrm()); @@ -163,7 +159,6 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage() { continue; } - // <-- // #i33751#, #i34060# - method // is replaced by method . It's return value // have to be checked. @@ -175,8 +170,6 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage() if ( pPageFrmOfAnchor && // #i35911# pPageFrmOfAnchor->GetPhyPageNum() < rPageFrm.GetPhyPageNum() ) - // <-- - // <-- { // if format of object fails, stop formatting and pass fail to // calling method via the return value. diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index 7a3fbf4..ba47df6 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -70,7 +70,6 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter // Not relevant for objects anchored at layout frame. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool _bCheckForMovedFwd = false ); - // <-- virtual bool DoFormatObjs(); static SwObjectFormatterLayFrm* CreateObjFormatter( diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 81219b3..04edc6c 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -509,7 +509,6 @@ void SwPageFrm::PreparePage( sal_Bool bFtn ) { ::lcl_FormatLay( this ); } - // <-- //Flys und DrawObjekte die noch am Dokument bereitstehen. //Fussnotenseiten tragen keine Seitengebundenen Flys! @@ -916,7 +915,6 @@ void SwPageFrm::Cut() pFly->_InvalidatePos(); } } - // <-- } } //Window aufraeumen @@ -1021,7 +1019,6 @@ void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) pCnt = pCnt->GetNextCntntFrm(); } } - // <-- } } } @@ -1481,7 +1478,6 @@ void SwRootFrm::RemoveSuperfluous() { bOnlySuperfluosObjs = false; } - // <-- } bExistEssentialObjs = !bOnlySuperfluosObjs; } @@ -1500,7 +1496,6 @@ void SwRootFrm::RemoveSuperfluous() // but I'm not fully sure, since ContainsAny() also returns // SectionFrames. Therefore I prefer to do it the safe way: ( pBody->Lower() && pBody->Lower()->IsTabFrm() ) ) ) ) - // <-- { if ( pPage->IsFtnPage() ) { @@ -1842,7 +1837,6 @@ void SwRootFrm::ImplCalcBrowseWidth() //aktuelle Groesse bestimmt werden. nWidth = pAnchoredObj->GetObjRect().Right() - pAnchoredObj->GetDrawObj()->GetAnchorPos().X(); - // <-- } break; default: /* do nothing */; @@ -1927,7 +1921,6 @@ void SwRootFrm::UnoRemoveAllActions() } pSh->SetRestoreActions(nRestore); } - // <-- pSh->LockView(sal_True); pSh = (ViewShell*)pSh->GetNext(); @@ -2017,7 +2010,6 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) } } } - // <-- } else if ( pAnchoredObj->ISA(SwAnchoredDrawObject) ) { @@ -2036,7 +2028,6 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) // #i92511# // cache for object rectangle inclusive spaces has to be invalidated. pAnchoredObj->InvalidateObjRectWithSpaces(); - // <-- } } @@ -2085,7 +2076,6 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi { return; } - // <-- if ( !pVisArea ) { @@ -2416,7 +2406,6 @@ bool SwRootFrm::IsLeftToRightViewLayout() const const SwPageFrm& rPage = dynamic_cast(Lower())->GetFormatPage(); return !rPage.IsRightToLeft() && !rPage.IsVertical(); - // <-- } const SwPageFrm& SwPageFrm::GetFormatPage() const @@ -2445,7 +2434,6 @@ const SwPageFrm& SwPageFrm::GetFormatPage() const } OSL_ENSURE( pRet, " - inconsistent layout: empty page without previous and next page frame --> crash." ); - // <-- } return *pRet; } diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index fdf8997..3ddfb05 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -155,7 +155,6 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft ) // #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 3b64c28..57eb040 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -323,7 +323,6 @@ class SwSavePaintStatics SwSubsRects *pSSubsLines; // --> OD 2005-07-04 #123196# SwSubsRects* pSSpecSubsLines; - // <-- SfxProgress *pSProgress; long nSPixelSzW, nSPixelSzH, @@ -350,7 +349,6 @@ SwSavePaintStatics::SwSavePaintStatics() : pSSubsLines ( pSubsLines ), // --> OD 2005-07-04 #123196# pSSpecSubsLines ( pSpecSubsLines ), - // <-- pSProgress ( pProgress ), nSPixelSzW ( nPixelSzW ), nSPixelSzH ( nPixelSzH ), @@ -376,7 +374,6 @@ SwSavePaintStatics::SwSavePaintStatics() : pSubsLines = 0; // --> OD 2005-07-04 #123196# pSpecSubsLines = 0L; - // <-- pProgress = 0; } @@ -392,7 +389,6 @@ SwSavePaintStatics::~SwSavePaintStatics() pSubsLines = pSSubsLines; // --> OD 2005-07-04 #123196# pSpecSubsLines = pSSpecSubsLines; - // <-- pProgress = pSProgress; nPixelSzW = nSPixelSzW; nPixelSzH = nSPixelSzH; @@ -812,7 +808,6 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) { // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); - // <-- // OD 2004-04-23 #116347# pOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR ); @@ -930,7 +925,6 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, { // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); - // <-- //Alle Hilfslinien, die sich fast decken entfernen (Tabellen) for ( sal_uInt16 i = 0; i < Count(); ++i ) @@ -1693,7 +1687,6 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, // #i68953# - also during print load graphic directly. if ( (rSh).GetViewOptions()->IsPDFExport() || rSh.GetOut()->GetOutDevType() == OUTDEV_PRINTER ) - // <-- { ((SvxBrushItem*)pBrush)->PurgeMedium(); ((SvxBrushItem*)pBrush)->SetDoneLink( Link() ); @@ -1831,7 +1824,6 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, Size( aPaintOffset.X(), aPaintOffset.Y() ), NULL, GRFMGR_DRAW_STANDARD, ::std::max( 128, static_cast( sqrt(sqrt( Abitmap)) + .5 ) ) ); - // <-- } // reset clipping at output device pOutDev->Pop(); @@ -1919,7 +1911,6 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, { pOutDev->SetDrawMode( 0 ); } - // <-- /// OD 06.08.2002 #99657# - if background region have to be drawn /// transparent, set only the RGB values of the background color as @@ -1938,7 +1929,6 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, // #i75614# // restore draw mode pOutDev->SetDrawMode( nOldDrawMode ); - // <-- /// OD 02.09.2002 #99657# if ( bDrawTransparent ) @@ -2257,7 +2247,6 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons { // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev ); - // <-- const SwFrm* pTmpFrm = &mrTabFrm; const bool bVert = pTmpFrm->IsVertical(); @@ -2805,7 +2794,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const } while ( bPerformLayoutAction && pTmpViewShell != pSh ); } if ( bPerformLayoutAction ) - // <-- { ((SwRootFrm*)this)->ResetTurbo(); SwLayAction aAction( (SwRootFrm*)this, pSh->Imp() ); @@ -2846,7 +2834,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // #i84659# // while ( pPage && !::IsShortCut( aRect, pPage->Frm() ) ) while ( pPage ) - // <-- { // Paint right shadow in single page mode, or if we're on last page of // the doc, or if ???Lower()??? or if we're on a page with no right @@ -2866,7 +2853,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const SwPageFrm::GetBorderAndShadowBoundRect( pPage->Frm(), pSh, aPaintRect, bRightSidebar ); if ( aRect.IsOver( aPaintRect ) ) - // <-- { if ( pSh->GetWin() ) { @@ -2892,13 +2878,11 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const aPageRectRegion.Exclude( aPaintRect.SVRect() ); pSh->GetWin()->Invalidate( aPageRectRegion, INVALIDATE_CHILDREN ); } - // <-- // #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()) ); - // <-- // #i68597# // moved paint pre-process for DrawingLayer overlay here since the above @@ -3156,7 +3140,6 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // #i16816# tagged pdf support Frm_Info aFrmInfo( *this ); SwTaggedPDFHelper aTaggedPDFHelper( 0, &aFrmInfo, 0, *pSh->GetOut() ); - // <-- const SwFrm *pFrm = Lower(); if ( !pFrm ) @@ -3495,7 +3478,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // and margin paint. // paint complete background for Writer text fly frames bool bPaintCompleteBack( !pNoTxt ); - // <-- // paint complete background for transparent graphic and contour, // if own background color exists. const bool bIsGraphicTransparent = pNoTxt ? pNoTxt->IsTransparent() : false; @@ -3563,7 +3545,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // non-transparent graphics. if ( bPaintMarginOnly || ( pNoTxt && !bIsGraphicTransparent ) ) - // <-- { //Was wir eigentlich Painten wollen ist der schmale Streifen //zwischen PrtArea und aeusserer Umrandung. @@ -3580,7 +3561,6 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // also applied for the PDF export. ViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !pOut->GetConnectMetaFile() || !pSh || !pSh->GetWin() ) - // <-- { pOut->SetClipRegion( aPoly ); } @@ -4619,7 +4599,6 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, if ( pTabFrm->GetTable()->IsNewModel() && ( !IsCellFrm() || IsCoveredCell() ) ) return; } - // <-- const bool bLine = rAttrs.IsLine() ? true : false; const bool bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; @@ -5298,7 +5277,6 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *_pViewShell->GetOut() ); - // <-- static BitmapEx aPageTopRightShadow; static BitmapEx aPageBottomRightShadow; @@ -5549,7 +5527,6 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut ); - // <-- // OD 2004-04-23 #116347# pOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR ); @@ -5612,7 +5589,6 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); - // <-- const SvxBrushItem* pItem; /// OD 05.09.2002 #102912# @@ -6326,7 +6302,6 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); - // <-- for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) { @@ -6443,7 +6418,6 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, !pOpt->IsReadonly() && // --> FME 2004-06-29 #114856# Formular view !pOpt->IsFormView() && - // <-- SwViewOption::IsIndexShadings() && !pOpt->IsPDFExport() && pSh->GetOut()->GetOutDevType() != OUTDEV_PRINTER ) diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index f2a28d1..b7e6c9e 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -207,7 +207,6 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) dynamic_cast(FindPrevCnt( true )) ); } } - // <-- _Cut( bRemove ); } if( IsFollow() ) @@ -358,7 +357,6 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) pSect = 0; } } - // <-- SWRECTFN( pParent ) if( pSect && HasToBreak( pSect ) ) @@ -1138,7 +1136,6 @@ void SwSectionFrm::SimpleFormat() // // assure notifications on position changes. const SwLayNotify aNotify( this ); - // <-- (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), sal_False ); bValidPos = sal_True; } @@ -1222,7 +1219,6 @@ class ExtraFormatToPositionObjs } } } - // <-- void FormatSectionToPositionObjs() { @@ -1244,7 +1240,6 @@ class ExtraFormatToPositionObjs { return; } - // <-- mpSectFrm->ChgLowersProp( aOldSectPrtSize ); // format column frames and its body and footnote container @@ -1267,7 +1262,6 @@ class ExtraFormatToPositionObjs // can still be on the former page. // Thus, initialize objects via lower-relationship InitObjs( *mpSectFrm ); - // <-- // format content - first with collecting its foot-/endnotes before content // format, second without collecting its foot-/endnotes. @@ -1364,7 +1358,6 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { aExtraFormatToPosObjs.FormatSectionToPositionObjs(); } - // <-- // Column widths have to be adjusted before calling _CheckClipping. // _CheckClipping can cause the formatting of the lower frames @@ -1410,12 +1403,10 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { FormatWidthCols( *pAttr, nRemaining, MINLAY ); } - // <-- // --> OD 2006-01-04 #126020# - adjust check for empty section // --> OD 2006-02-01 #130797# - correct fix #126020# while( HasFollow() && !GetFollow()->ContainsCntnt() && !GetFollow()->ContainsAny( true ) ) - // <-- { SwFrm* pOld = GetFollow(); GetFollow()->DelEmpty( sal_False ); @@ -1835,7 +1826,6 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) { return pCol; } - // <-- { SwFrm *pPrv; @@ -2102,7 +2092,6 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst ) { InvalidateNextPos(); } - // <-- } return nGrow; } @@ -2286,7 +2275,6 @@ SwFrm* SwFrm::_GetIndPrev() const // frame has no direct previous frame or only empty section frames as // previous frames. OSL_ENSURE( /*!pPrev &&*/ IsInSct(), "Why?" ); - // <-- const SwFrm* pSct = GetUpper(); if( !pSct ) return NULL; diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx index 568704f..479784a 100644 --- a/sw/source/core/layout/sortedobjsimpl.cxx +++ b/sw/source/core/layout/sortedobjsimpl.cxx @@ -158,7 +158,6 @@ struct ObjAnchorOrder return false; } } - // <-- // objects anchored at the same content and at the same content anchor // node position with the same anchor type @@ -195,12 +194,10 @@ struct ObjAnchorOrder // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) != pWrapInfluenceOnObjPosNew->GetWrapInfluenceOnObjPos( true ) ) - // <-- { // #i35017# - constant name has changed if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ) - // <-- return true; else return false; @@ -303,7 +300,6 @@ sal_uInt32 SwSortedObjsImpl::ListPosOf( const SwAnchoredObject& _rAnchoredObj ) std::vector< SwAnchoredObject* >::difference_type nPos = aIter - maSortedObjLst.begin(); nRetLstPos = sal_uInt32( nPos ); - // <-- } return nRetLstPos; diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index f1918d4..2d3e07c 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -311,7 +311,6 @@ void SwFrm::CheckDirChange() ::setContextWritingMode( pAnchoredObj->DrawObj(), pAnchoredObj->GetAnchorFrmContainingAnchPos() ); pAnchoredObj->UpdateLayoutDir(); } - // <-- } } } @@ -522,7 +521,6 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode ) dynamic_cast(pFrm->FindPrevCnt( true )) ); } } - // <-- if( pFrm->HasFollow() ) pFrm->GetFollow()->_SetIsFollow( pFrm->IsFollow() ); if( pFrm->IsFollow() ) @@ -601,7 +599,6 @@ SwLayoutFrm::~SwLayoutFrm() { pFrm->GetDrawObjs()->Remove( *pAnchoredObj ); } - // <-- } pFrm->Remove(); delete pFrm; @@ -633,7 +630,6 @@ SwLayoutFrm::~SwLayoutFrm() { GetDrawObjs()->Remove( *pAnchoredObj ); } - // <-- } } else diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 4b6f443..52cb14b 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -98,7 +98,6 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ): // #i26945# bConsiderObjsForMinCellHeight = sal_True; bObjsDoesFit = sal_True; - // <-- bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen. nType = FRMC_TAB; @@ -131,7 +130,6 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) : // #i26945# bConsiderObjsForMinCellHeight = sal_True; bObjsDoesFit = sal_True; - // <-- bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen. nType = FRMC_TAB; @@ -210,14 +208,12 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ); sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells = false ); -// <-- // OD 2004-02-18 #106629# - correct type of 1st parameter // #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 ); -// <-- SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& ); /************************************************************************* @@ -325,7 +321,6 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, ->Prepare( PREP_FLY_ATTR_CHG, &(pAnchoredObj->GetFrmFmt()) ); } - // <-- if ( pAnchoredObj->ISA(SwFlyFrm) ) { SwFlyFrm *pFly = static_cast(pAnchoredObj); @@ -345,7 +340,6 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, pLowerFrm = pLowerFrm->GetNext(); } } -// <-- // // Local helper function to shrink all lowers of rRow to 0 height // @@ -366,7 +360,6 @@ void lcl_ShrinkCellsAndAllContent( SwRowFrm& rRow ) lcl_ArrangeLowers( &rToAdjust, (rToAdjust.*fnRect->fnGetPrtTop)(), sal_False ); - // <-- // TODO: Optimize number of frames which are set to 0 height // we have to start with the last lower frame, otherwise // the shrink will not shrink the current cell @@ -435,7 +428,6 @@ void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) // cannot be found. In this case, we have to move the complete // row. SwRowFrm* pTmpDestRow = (SwRowFrm*)pCurrDestCell->Lower(); - // <-- if ( pTmpSourceRow->IsFollowFlowRow() && pTmpDestRow ) { @@ -519,7 +511,6 @@ void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, SwTwips nCurrentHeight = lcl_CalcMinRowHeight( pTmpLastLineRow, rTab.IsConsiderObjsForMinCellHeight() ); - // <-- while ( pTmpLastLineRow && pTmpLastLineRow->GetNext() && nTmpCut > nCurrentHeight ) { nTmpCut -= nCurrentHeight; @@ -528,7 +519,6 @@ void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, nCurrentHeight = lcl_CalcMinRowHeight( pTmpLastLineRow, rTab.IsConsiderObjsForMinCellHeight() ); - // <-- } // @@ -677,13 +667,11 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, rTab.SetRebuildLastLine( sal_True ); // #i26945# rTab.SetDoesObjsFit( sal_True ); - // <-- SWRECTFN( rTab.GetUpper() ) // #i26945# - invalidate and move floating screen // objects 'out of range' ::lcl_InvalidateLowerObjs( rLastLine, true ); - // <-- // // manipulate row and cell sizes // @@ -692,7 +680,6 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, rTab.SetConsiderObjsForMinCellHeight( sal_False ); ::lcl_ShrinkCellsAndAllContent( rLastLine ); rTab.SetConsiderObjsForMinCellHeight( sal_True ); - // <-- // // invalidate last line @@ -724,7 +711,6 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // get the correct height. rLastLine.InvalidateSize(); rLastLine.Calc(); - // <-- // // Unlock this tab frame and its follow @@ -756,7 +742,6 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, (rTab.Frm().*fnRect->fnBottomDist)( (rTab.GetUpper()->*fnRect->fnGetPrtBottom)()); if ( nDistanceToUpperPrtBottom < 0 || !rTab.DoesObjsFit() ) bRet = false; - // <-- // // 2. Check if each cell in the last line has at least one content frame. @@ -824,7 +809,6 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, rTab.SetRebuildLastLine( sal_False ); // #i26945# rTab.SetDoesObjsFit( sal_True ); - // <-- return bRet; } @@ -984,7 +968,6 @@ bool lcl_FindSectionsInRow( const SwRowFrm& rRow ) { // #i26945# - search only for sections bRet = pTmpFrm->IsSctFrm(); - // <-- } if ( bRet ) @@ -1014,9 +997,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee // #i43913# - correction // call method with first lower. lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true ); - // <-- } - // <-- //Um die Positionen der Zellen mit der CutPos zu vergleichen muessen sie //ausgehend von der Tabelle nacheinander berechnet werden. Sie koennen @@ -1069,7 +1050,6 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee { bTryToSplit = false; } - // <-- // #i29771# // To avoid loops, we do some checks before actually trying to split @@ -1191,7 +1171,6 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee { return false; } - // <-- } // @@ -1419,7 +1398,6 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) ::SwInvalidatePositions( ((SwLayoutFrm*)pFrm)->Lower(), nBottom); // #i26945# ::lcl_InvalidateLowerObjs( *(static_cast(pFrm)) ); - // <-- } } else @@ -1534,7 +1512,6 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, // #i26945# - no extra invalidation of floating // screen objects needed. // Thus, delete call of method - // <-- pCnt->Calc(); // OD 2004-05-11 #i28701# - usage of new method <::FormatObjsAtFrm(..)> // to format the floating screen objects @@ -1550,7 +1527,6 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, // the object formatter if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) - // <-- { if ( pCnt->GetRegisteredIn() == pLoopControlCond ) ++nLoopControlRuns; @@ -1574,7 +1550,6 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, } pCnt->GetUpper()->Calc(); } - // <-- if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) break; pCnt = pCnt->GetNextCntntFrm(); @@ -1599,13 +1574,11 @@ sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, // if only row and cell frames are formatted. if ( pFrm->IsLayoutFrm() && ( !_bOnlyRowsAndCells || pFrm->IsRowFrm() || pFrm->IsCellFrm() ) ) - // <-- { // --> FME 2006-02-23 #130744# An invalid locked table frame will // not be calculated => It will not become valid => // Loop in lcl_RecalcRow(). Therefore we do not consider them for bRet. bRet |= !pFrm->IsValid() && ( !pFrm->IsTabFrm() || !static_cast(pFrm)->IsJoinLocked() ); - // <-- pFrm->Calc(); if( static_cast(pFrm)->Lower() ) bRet |= lcl_InnerCalcLayout( static_cast(pFrm)->Lower(), nBottom); @@ -1639,7 +1612,6 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) pPageFrm->SetLayoutInProgress( true ); else pPageFrm = 0L; - // <-- // FME 2007-08-30 #i81146# new loop control sal_uInt16 nLoopControlRuns_1 = 0; @@ -1676,7 +1648,6 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) // --> OD 2004-11-23 #115759# - force another format of the // lowers, if at least one of it was invalid. bCheck = SwCntntFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true ); - // <-- // NEW TABLES // First we calculate the cells with row span of < 1, afterwards @@ -1726,7 +1697,6 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) // #i26945# if ( pPageFrm ) pPageFrm->SetLayoutInProgress( false ); - // <-- } void MA_FASTCALL lcl_RecalcTable( SwTabFrm& rTab, @@ -1776,7 +1746,6 @@ bool lcl_NoPrev( const SwFrm& rFrm ) { return true; } - // <-- // I do not have a direct prev, but I have an indirect prev. // In section frames I have to check if I'm located inside @@ -1995,7 +1964,6 @@ void SwTabFrm::MakeAll() // reset after forward move to assure that follows // can be joined, if further space is available. bSplit = sal_False; - // <-- } Point aOldPos( (Frm().*fnRect->fnGetPos)() ); @@ -2027,7 +1995,6 @@ void SwTabFrm::MakeAll() // reset after forward move to assure that follows // can be joined, if further space is available. bSplit = sal_False; - // <-- } } @@ -2132,7 +2099,6 @@ void SwTabFrm::MakeAll() { bValidPos = sal_False; } - // <-- } } } @@ -2299,7 +2265,6 @@ void SwTabFrm::MakeAll() // Thus, find next content, table or section and, if a section // is found, get its first content. const SwFrm* pTmpNxt = lcl_FormatNextCntntForKeep( this ); - // <-- pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); @@ -2393,7 +2358,6 @@ void SwTabFrm::MakeAll() { bTryToSplit = false; } - // <-- // 1. Try: bTryToSplit = true => Try to split the row. // 2. Try: bTryToSplit = false => Split the table between the rows. @@ -2431,7 +2395,6 @@ void SwTabFrm::MakeAll() if ( pTmpRow && !static_cast(pTmpRow)->IsRowSplitAllowed() ) continue; } - // <-- sal_uInt16 nMinNumOfLines = nRepeat; @@ -2490,7 +2453,6 @@ void SwTabFrm::MakeAll() // we do not want to have 'empty' follow tables. if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() ) Join(); - // <-- // We want to restore the situation before the failed @@ -2504,7 +2466,6 @@ void SwTabFrm::MakeAll() bTryToSplit = false; continue; } - // <-- bTryToSplit = !bSplitError; @@ -2522,7 +2483,6 @@ void SwTabFrm::MakeAll() { GetFollow()->GetLower()->InvalidatePos(); } - // <-- SWRECTFNX( GetFollow() ) static sal_uInt8 nStack = 0; @@ -2543,7 +2503,6 @@ void SwTabFrm::MakeAll() // its content. const bool bOldJoinLock = GetFollow()->IsJoinLocked(); GetFollow()->LockJoin(); - // <-- ::lcl_RecalcRow( static_cast(*GetFollow()->Lower()), (GetFollow()->GetUpper()->Frm().*fnRectX->fnGetBottom)() ); // #i43913# @@ -2551,7 +2510,6 @@ void SwTabFrm::MakeAll() // follow if it wasn't locked before. if ( !bOldJoinLock ) GetFollow()->UnlockJoin(); - // <-- if ( !GetFollow()->GetFollow() ) { @@ -2599,7 +2557,6 @@ void SwTabFrm::MakeAll() // #i29771# Reset bTryToSplit flag on change of upper const SwFrm* pOldUpper = GetUpper(); - // <-- //Mal sehen ob ich irgenwo Platz finde... if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) ) @@ -2611,7 +2568,6 @@ void SwTabFrm::MakeAll() bTryToSplit = true; nUnSplitted = 5; } - // <-- SWREFRESHFN( this ) bMovedFwd = bCalcLowers = sal_True; @@ -2661,7 +2617,6 @@ void SwTabFrm::MakeAll() OSL_FAIL( "debug assertion: - format of table lowers suppressed by fix i44910" ); } #endif - // <-- } } //while ( !bValidPos || !bValidSize || !bValidPrtArea ) @@ -2704,7 +2659,6 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, const IDocumentSettingAccess* pIDSA = GetFmt()->getIDocumentSettingAccess(); const bool bWrapAllowed = pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) || ( !IsInFtn() && 0 == FindFooterOrHeader() ); - // <-- if ( pPage->GetSortedObjs() && bWrapAllowed ) { @@ -2744,7 +2698,6 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, // #i46807# - do not consider invalid // Writer fly frames. pFly->IsValid() && - // <-- // fly anchored at character pFly->IsFlyAtCntFrm() && // fly overlaps with corresponding table rectangle @@ -2763,7 +2716,6 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, ( ( !pMyFly || pMyFly->IsAnLower( pFly ) ) && pMyFly == pFly->GetAnchorFrmContainingAnchPos()->FindFlyFrm() ) && - // <-- // anchor frame not on following page pPage->GetPhyPageNum() >= pFly->GetAnchorFrm()->FindPageFrm()->GetPhyPageNum() && @@ -2783,11 +2735,9 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, // the table is located in the body: ( !bConsiderWrapOnObjPos || 0 != pThisHeaderFooterFrm || !pFlyHeaderFooterFrm->IsHeaderFrm() ) ) bConsiderFly = false; - // <-- } if ( bConsiderFly ) - // <-- { const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); const SwFmtHoriOrient &rHori= pFly->GetFmt()->GetHoriOrient(); @@ -3047,7 +2997,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) { nLower += pAttrs->GetULSpace().GetLower(); } - // <-- (this->*fnRect->fnSetYMargins)( nUpper, nLower ); if( (nMax - MINLAY) < (nLeftSpacing + nRightSpacing) ) (this->*fnRect->fnSetXMargins)( 0, 0 ); @@ -3166,7 +3115,6 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { InvalidateNextPos(); } - // <-- _InvalidateAll(); InvalidatePage( pPage ); SetComplete(); @@ -3529,7 +3477,6 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r const SwTwips nTmpSpace = (aRect.*fnRectX->fnGetHeight)(); if ( (pNewUpper->Prt().*fnRectX->fnGetHeight)() > 0 || nTmpSpace <= 0 ) nSpace = nTmpSpace; - // <-- const ViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) @@ -3557,7 +3504,6 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r { return sal_False; } - // <-- SwTwips nTmpHeight = CalcHeightOfFirstContentLine(); // --> FME 2005-01-17 #118840# @@ -3566,7 +3512,6 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r // This obviously results in problems with table frames in // sections. Remember: Every twip is sacred. return nTmpHeight <= nSpace; - // <-- } } return sal_False; @@ -3644,7 +3589,6 @@ void SwTabFrm::Cut() if ( !pUp->Lower() && pUp->IsInSct() && !(pSct = pUp->FindSctFrm())->ContainsCntnt() && !pSct->ContainsAny( true ) ) - // <-- { if ( pUp->GetUpper() ) { @@ -3827,7 +3771,6 @@ void SwRowFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) // #i35063# // Invalidation required is pRow is last row if ( bInFirstNonHeadlineRow || !GetNext() ) - // <-- { if ( bInFirstNonHeadlineRow ) pTab = pTab->FindMaster(); @@ -3894,7 +3837,6 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) pObjs = pTmp->GetDrawObjs(); } if ( pObjs ) - // <-- { for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { @@ -3906,7 +3848,6 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) { continue; } - // <-- // #i26945# - consider also drawing objects { // OD 30.09.2003 #i18732# - only objects, which follow @@ -3948,11 +3889,9 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) (pFrm->Frm().*fnRect->fnGetBottom)() ); nHeight = Max( nHeight, nDistOfFlyBottomToAnchorTop2 ); - // <-- } } } - // <-- } } if( !pFrm->IsSctFrm() ) @@ -4017,7 +3956,6 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, // #i26945# nHeight += ::lcl_CalcMinRowHeight( static_cast(pLow), _bConsiderObjs ); - // <-- } else { @@ -4029,7 +3967,6 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, nFlyAdd = Max( 0L, nFlyAdd - nLowHeight ); nFlyAdd = Max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) ); } - // <-- } pLow = pLow->GetNext(); @@ -4284,14 +4221,12 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) // invalid and thus can't provide correct border values. if ( pRow->GetTabLine() == pPrevTabLine && !pRow->IsRepeatedHeadline() ) - // <-- { pPreviousRow = pRow; break; } } } - // <-- sal_uInt16 nTopPrtMargin = nTopSpace; if ( pPreviousRow ) @@ -4345,7 +4280,6 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) // #i26945# : ::lcl_CalcMinRowHeight( this, FindTabFrm()->IsConsiderObjsForMinCellHeight() ) ); - // <-- if ( nDiff ) { bFixSize = sal_False; @@ -4512,7 +4446,6 @@ void SwRowFrm::Cut() } } } - // <-- SwLayoutFrm::Cut(); } @@ -4624,7 +4557,6 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) // #i26945# OSL_ENSURE( FindTabFrm(), " - no table frame -> crash." ); const bool bConsiderObjs( FindTabFrm()->IsConsiderObjsForMinCellHeight() ); - // <-- nMinHeight = lcl_CalcMinRowHeight( this, bConsiderObjs ); } @@ -4829,7 +4761,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) { continue; } - // <-- // #i52904# - distinguish between anchored // objects, whose vertical position depends on its anchor // frame and whose vertical position is independent @@ -4860,7 +4791,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) WEIT_WECH != pFly->Frm().Top() && bVertPosDepOnAnchor && !pFly->ConsiderObjWrapInfluenceOnObjPos(); - // <-- if ( bDirectMove ) { (pFly->Frm().*fnRect->fnSubTop)( -lDiff ); @@ -4870,10 +4800,8 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) // instance, which represents the Writer fly frame in // the drawing layer pFly->GetVirtDrawObj()->SetChanged(); - // <-- // #i58280# pFly->InvalidateObjRectWithSpaces(); - // <-- } if ( pFly->IsFlyInCntFrm() ) @@ -4885,7 +4813,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) { pAnchoredObj->SetCurrRelPos( Point( 0, 0 ) ); } - // <-- } else if( pFly->IsAutoPos() ) { @@ -4905,7 +4832,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) !( pTabFrm->IsFollow() && pTabFrm->FindMaster()->IsRebuildLastLine() ) && pFly->IsFlyFreeFrm() ) - // <-- { SwPageFrm* pPageFrm = pFly->GetPageFrm(); SwPageFrm* pPageOfAnchor = pFrm->FindPageFrm(); @@ -4918,7 +4844,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) pPageOfAnchor->AppendFlyToPage( pFly ); } } - // <-- // OD 2004-05-11 #i28701# - Because of the introduction // of new positionings and alignments (e.g. aligned at // page area, but anchored at-character), the position @@ -4932,7 +4857,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) ::lcl_ArrangeLowers( pFly, (pFly->*fnRect->fnGetPrtTop)(), bInva ) ) - // <-- { pFly->SetCompletePaint(); } @@ -4982,9 +4906,7 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) } // #i58280# pAnchoredObj->InvalidateObjRectWithSpaces(); - // <-- } - // <-- pAnchoredObj->InvalidateObjPos(); } else @@ -5014,7 +4936,6 @@ sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) ( !pFrm->IsTxtFrm() || !static_cast(pFrm)->IsUndersized() ) ) || pFrm->IsInSplitTableRow() ) ) - // <-- { pFrm->InvalidatePos(); } @@ -5064,7 +4985,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) long nRemaining = GetTabBox()->getRowSpan() >= 1 ? ::lcl_CalcMinCellHeight( this, pTab->IsConsiderObjsForMinCellHeight(), pAttrs ) : 0; - // <-- if ( !bValidSize ) { bValidSize = sal_True; @@ -5189,10 +5109,8 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( !FindTabFrm()->IsRebuildLastLine() && text::VertOrientation::NONE != rOri.GetVertOrient() && // --> OD 2008-07-16 #158225# no vertical alignment of covered cells !IsCoveredCell() && - // <-- // --> FME 2004-06-29 #116532# Do not consider vertical alignment in grid mode !(pPg = FindPageFrm())->HasGrid() ) - // <-- { if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() ) { @@ -5205,7 +5123,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) // 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) ); - // <-- //Keine Ausrichtung wenn Rahmen mit Umlauf in die Zelle ragen. if ( pPg->GetSortedObjs() ) { @@ -5241,7 +5158,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) !IsAnLower( pAnch ) || pAnchoredObj->IsTmpConsiderWrapInfluence() || !rAnchoredObjFrmFmt.GetFollowTextFlow().GetValue() ) - // <-- { bVertDir = sal_False; break; @@ -5397,7 +5313,6 @@ void SwCellFrm::Cut() SwLayoutFrm::Cut(); } -// <-- // // Helper functions for repeated headlines: @@ -5481,7 +5396,6 @@ sal_uInt16 SwTabFrm::GetBottomLineSize() const // --> FME 2005-12-07 #124755# Try to make code robust: if ( !pTmp ) return 0; - // <-- return static_cast(pTmp)->GetBottomLineSize(); } @@ -5537,7 +5451,6 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) const SwRowFrm* pTmpSourceRow = (SwRowFrm*)pCurrSourceCell->Lower(); nTmpHeight = lcl_CalcHeightOfFirstContentLine( *pTmpSourceRow ); } - // <-- if ( pTmp->IsTabFrm() ) { nTmpHeight = ((SwTabFrm*)pTmp)->CalcHeightOfFirstContentLine(); @@ -5574,7 +5487,6 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) if ( pLast && pLast->IsFlowFrm() && ( !pLast->IsTxtFrm() || !static_cast(pLast)->GetFollow() ) ) - // <-- { nReal += SwFlowFrm::CastFlowFrm(pLast)->CalcAddLowerSpaceAsLastInTableCell(); } @@ -5588,7 +5500,6 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcUpperSpace( NULL, pLast); nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcLowerSpace(); } - // <-- // --> OD 2004-11-25 #115759# - consider additional lower // space of , if contains only one line. // In this case it would be the new last text frame, which @@ -5600,7 +5511,6 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp) ->CalcAddLowerSpaceAsLastInTableCell(); } - // <-- if ( nReal > 0 ) nTmpHeight -= nReal; } @@ -5618,7 +5528,6 @@ SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcUpperSpace(); nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcLowerSpace(); } - // <-- } } @@ -5743,7 +5652,6 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const // a formatting of the row frame (via the GetFormatted()). We don't // want this formatting if the row does not have a height. else if ( 0 != nFirstLineHeight ) - // <-- { const bool bOldJoinLock = IsJoinLocked(); ((SwTabFrm*)this)->LockJoin(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index cacb1d5..90a4ec4 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -125,7 +125,6 @@ sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, const SwRect aPaintRect( bCntntCheck ? pFrm->UnionFrm() : pFrm->PaintArea() ); - // <-- if ( aPaintRect.IsInside( rPoint ) && ( bCntntCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) ) @@ -320,7 +319,6 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, pPage = dynamic_cast(pPage->GetNext()); } } - // <-- if ( pPage ) { pPage->SwPageFrm::GetCrsrOfst( pPos, rPoint, pCMS ); @@ -1450,7 +1448,6 @@ class DisableCallbackAction mrRootFrm.SetCallbackActionEnabled( mbOldCallbackActionState ); } }; -// <-- //!!!!! Es wird nur der vertikal naechstliegende gesucht. //JP 11.10.2001: only in tables we try to find the right column - Bug 72294 @@ -1460,7 +1457,6 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, sal_Bool bNext ) cons // event during processing of this method. Needed because formatting is // triggered by this method. DisableCallbackAction aDisableCallbackAction( *this ); - // <-- //Ersten CntntFrm und seinen Nachfolger im Body-Bereich suchen //Damit wir uns nicht tot suchen (und vor allem nicht zuviel formatieren) //gehen wir schon mal von der richtigen Seite aus. @@ -1848,7 +1844,6 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) const SwLayoutFrm* pEnd = pTmpEndFrm ? pTmpEndFrm->GetUpper() : 0; OSL_ENSURE( pStart && pEnd, "MakeTblCrsrs: Good to have the code robust here!" ); - // <-- /* #109590# Only change table boxes if the frames are valid. Needed because otherwise the table cursor after moving @@ -1981,7 +1976,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) SwRegionRects aRegion( pSh && !pSh->GetViewOptions()->IsPDFExport() ? pSh->VisArea() : Frm() ); -// <-- if( !pStartPos->nNode.GetNode().IsCntntNode() || !pStartPos->nNode.GetNode().GetCntntNode()->getLayoutFrm(this) || ( pStartPos->nNode != pEndPos->nNode && @@ -2465,7 +2459,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) OSL_ENSURE( pCntnt, " - no content frame. This is a serious defect -> please inform OD" ); while ( pCntnt && pCntnt != pEndFrm ) - // <-- { if ( pCntnt->IsInFly() ) { @@ -2505,7 +2498,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) // --> OD 2006-01-24 #123908# OSL_ENSURE( pCntnt, " - no content frame. This is a serious defect -> please inform OD" ); - // <-- } if ( aPrvRect.HasArea() ) Sub( aRegion, aPrvRect ); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 5a39bfb..bbd36c6 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -91,7 +91,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : SwClient( pMod ), // #i65250# mnFrmId( SwFrm::mnLastFrmId++ ), - // <-- mpRoot( pSib ? pSib->getRootFrm() : 0 ), pUpper( 0 ), pNext( 0 ), @@ -236,7 +235,6 @@ void SwCellFrm::CheckDirection( sal_Bool bVert ) // Check if the item is set, before actually // using it. Otherwise the dynamic pool default is used, which may be set // to LTR in case of OOo 1.0 documents. - // <-- if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, sal_True, &pItem ) ) { const SvxFrameDirectionItem* pFrmDirItem = static_cast(pItem); @@ -403,13 +401,11 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const SwPageFrm* pPageFrmOfAnchor = const_cast(pFlyFrm)->FindPageFrmOfAnchor(); if ( pPageFrmOfAnchor && pPageFrmOfAnchor != pPage ) - // <-- { InvalidatePage( pPageFrmOfAnchor ); } } } - // <-- } if ( pPage && pPage->GetUpper() ) @@ -925,7 +921,6 @@ void SwCntntFrm::Cut() { pFrm->InvalidatePrt(); } - // <-- } SwFrm *pNxt = FindNextCnt(); @@ -1014,7 +1009,6 @@ void SwCntntFrm::Cut() pMasterTab->SetRemoveFollowFlowLinePending( sal_True ); } } - // <-- } } //Erst removen, dann Upper Shrinken. @@ -1031,19 +1025,16 @@ void SwCntntFrm::Cut() // except from a temporary empty table frame. // This can happen due to the new cell split feature. !pUp->IsCellFrm() && - // <-- // --> OD 2006-01-04 #126020# - adjust check for empty section // --> OD 2006-02-01 #130797# - correct fix #126020# !(pSct = pUp->FindSctFrm())->ContainsCntnt() && !pSct->ContainsAny( true ) ) ) ) - // <-- { if ( pUp->GetUpper() ) { // // prevent delete of footnote frame if ( pUp->IsFtnFrm() && !pUp->IsColLocked()) - // <-- { if( pUp->GetNext() && !pUp->GetPrev() ) { @@ -1059,7 +1050,6 @@ void SwCntntFrm::Cut() // if ( pSct->IsColLocked() || !pSct->IsInFtn() || ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) - // <-- { pSct->DelEmpty( sal_False ); // Wenn ein gelockter Bereich nicht geloescht werden darf, @@ -1797,7 +1787,6 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() pCnt = pCnt->GetNextCntntFrm(); } while ( ((SwLayoutFrm*)this)->IsAnLower( pCnt ) ); } - // <-- } } else if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE ) @@ -1896,7 +1885,6 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { InvalidateNextPos(); } - // <-- } return 0; } @@ -1965,7 +1953,6 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) InvalidateNextPos(); } } - // <-- return nReal; } @@ -2335,7 +2322,6 @@ SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt, SwFrm* pSib ): // #i28701# TYPEINIT1(SwLayoutFrm,SwFrm); -// <-- /*-------------------------------------------------- * SwLayoutFrm::InnerHeight() * --------------------------------------------------*/ @@ -2754,7 +2740,6 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // #i10826# Section frames without columns should not // invalidate all lowers! IsSctFrm() ) ) - // <-- { // Determine page frame the body frame resp. the section frame belongs to. SwPageFrm *pPage = FindPageFrm(); @@ -2867,10 +2852,8 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) pSectFrm->_InvalidateSize(); pSectFrm->InvalidatePage( pPage ); } - // <-- } } - // <-- } return; } // end of { special case } @@ -3465,7 +3448,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // to the calculated maximum height. (Frm().*fnRect->fnAddBottom)( nMaximum - (Frm().*fnRect->fnGetHeight)() ); - // <-- if( nTop > nMaximum ) nTop = nMaximum; (this->*fnRect->fnSetYMargins)( nTop, 0 ); @@ -3504,7 +3486,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, } } } - // <-- do { //Kann eine Weile dauern, deshalb hier auf Waitcrsr pruefen. @@ -3522,7 +3503,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // Simply setting the column width based on the values returned by // CalcColWidth does not work for automatic column width. AdjustColumns( &rCol, sal_False ); - // <-- for ( sal_uInt16 i = 0; i < nNumCols; ++i ) { @@ -3654,7 +3634,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // a column. Thus, decrease optimization here. //nMaxFree >= nMinDiff && nMaxFree > 0 && - // <-- ( !nAllFree || nMinimum < nPrtHeight - nMinDiff ) ) { @@ -3683,7 +3662,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, { dynamic_cast(this)->InvalidateObjRectWithSpaces(); } - // <-- (this->*fnRect->fnSetYMargins)( nTop, nBorder - nTop ); ChgLowersProp( aOldSz ); NotifyLowerObjs(); @@ -3705,7 +3683,6 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, } } } - // <-- //Es muss geeignet invalidiert werden, damit //sich die Frms huebsch ausbalancieren //- Der jeweils erste ab der zweiten Spalte bekommt @@ -3955,7 +3932,6 @@ void SwRootFrm::InvalidateAllObjPos() pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); else pAnchoredObj->InvalidateObjPos(); - // <-- } } diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index b60233a..041e960 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -449,7 +449,6 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc { // #i31805# - consider value of <_bCheckBottom> if ( !bVertL2R ) - // <-- { if ( bCheckBottom && nTopOfAnch - nAdjustedRelPosY - aObjSize.Width() < diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index ed71321..e06f7c6 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -294,7 +294,6 @@ void SwAsCharAnchoredObjectPosition::CalcPosition() SwAnchoredDrawObject& rAnchoredDrawObj = static_cast( GetAnchoredObj() ); rAnchoredDrawObj.SetLastObjRect( rAnchoredDrawObj.GetObjRect().SVRect() ); - // <-- } else { diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 00da8a0..3eee736 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -282,7 +282,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() ? rLR.GetLeft() : rLR.GetRight() ) : rUL.GetLower(); - // <-- switch ( aVert.GetVertOrient() ) { case text::VertOrientation::CHAR_BOTTOM: @@ -580,7 +579,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() maOffsetToFrmAnchorPos.X() = nVertOffsetToFrmAnchorPos; else maOffsetToFrmAnchorPos.Y() = nVertOffsetToFrmAnchorPos; - // <-- // #i11860# - use new method <_GetTopForObjPos> // to get top of frame for object positioning. const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrmForVertPos, fnRect, bVert ); @@ -651,7 +649,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() { pLayoutFrmToGrow->Grow( nRelPosY - nAvail ); } - // <-- nRelPosY = 0; } else @@ -754,7 +751,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() GetAnchoredObj().SetObjLeft( nTopOfAnch + ( aRelPos.X() - nRelDiff ) ); } - // <-- } else { @@ -810,7 +806,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() { pLayoutFrmToGrow->Grow( -nDist ); } - // <-- } if ( DoesObjFollowsTextFlow() && @@ -864,7 +859,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() { GetAnchoredObj().SetObjLeft( nTopOfAnch + aRelPos.X() ); } - // <-- } else { @@ -955,7 +949,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() GetAnchoredObj().SetObjLeft( nTopOfAnch + aRelPos.X() ); } - // <-- } else GetAnchoredObj().SetObjTop( nTopOfAnch + @@ -1018,7 +1011,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() { GetAnchoredObj().SetObjLeft( nTopOfAnch + aRelPos.X() ); } - // <-- } else GetAnchoredObj().SetObjTop( nTopOfAnch + aRelPos.Y() ); @@ -1079,7 +1071,6 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() { GetAnchoredObj().SetObjLeft( nTopOfAnch + aRelPos.X() ); } - // <-- GetAnchoredObj().SetObjTop( rAnchorTxtFrm.Frm().Top() + aRelPos.Y() ); } diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 2a9a192..090b65e 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -214,7 +214,6 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin // --> OD 2009-09-04 #mongolianlayout# if( bVert || bVertL2R ) - // <-- { aRelPos.Y() = nRelPosX; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 298a942..7a8e977 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -637,7 +637,6 @@ bool SwOLENode::IsChart() const return bIsChart; } -// <-- SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) : pOLENd( 0 ), diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index faebd03..ea65630 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1442,7 +1442,6 @@ sal_uInt16 SwTable::_GetBoxNum( String& rStr, sal_Bool bFirstPart, } return nRet; } -// <-- // #i80314# // add 2nd parameter and its handling @@ -1527,7 +1526,6 @@ SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx ) // --> FME 2007-3-26 #144862# Better handling of table in table: if ( pTblNd && pTblNd->GetTable().GetFrmFmt() ) pModify = pTblNd->GetTable().GetFrmFmt(); - // <-- SwFrm* pFrm = SwIterator::FirstElement( *pModify ); while ( pFrm && !pFrm->IsCellFrm() ) @@ -1654,7 +1652,6 @@ void SwTableLine::ChgFrmFmt( SwTableLineFmt *pNewFmt ) pTab->SetRemoveFollowFlowLinePending( sal_True ); pTab->InvalidatePos(); } - // <-- } } @@ -1874,7 +1871,6 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt ) pRow->_InvalidateSize(); pRow->_InvalidatePrt(); } - // <-- } } diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 0581633..ce72ede 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1742,7 +1742,6 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // #i44368# Links in Header/Footer if ( bHeaderFooter ) MakeHeaderFooterLinks( *pPDFExtOutDevData, *pTNd, rLinkRect, nDestId, aURL, bIntern ); - // <-- } } } @@ -1901,7 +1900,6 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() const String aDummy; MakeHeaderFooterLinks( *pPDFExtOutDevData, *pTNd, rLinkRect, nDestId, aDummy, true ); } - // <-- } } } diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 14714d7..3488199 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -257,7 +257,6 @@ bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, return false; } - // <-- // // 2. case: diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 05d91b8..051684b 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -491,7 +491,6 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit ) if ( IsInTab() && ( GetUpper()->Lower() == this || GetUpper()->Lower()->IsValid() ) ) - // <-- { long nAdd = (*fnRect->fnYDiff)( (GetUpper()->Lower()->Frm().*fnRect->fnGetTop)(), (GetUpper()->*fnRect->fnGetPrtTop)() ); @@ -682,7 +681,6 @@ SwCntntFrm *SwTxtFrm::JoinFrm() this ); } } - // <-- pFoll->Cut(); delete pFoll; pFollow = pNxt; @@ -722,7 +720,6 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) this ); } } - // <-- // Wenn durch unsere Aktionen Fussnoten in pNew landen, // so muessen sie umgemeldet werden. @@ -1344,12 +1341,10 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, // of ) would not trigger a reformatting of the previous line. Adding 1 // to the result of FindBrk() does not solve the problem in all cases, // nevertheless it should be sufficient. - // <-- sal_Bool bPrev = rLine.GetPrev() && ( FindBrk( rString, rLine.GetStart(), rReformat.Start() + 1 ) // #i46560# + 1 - // <-- >= rReformat.Start() || rLine.GetCurr()->IsRest() ); if( bPrev ) @@ -1921,7 +1916,6 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) if( pPre && // #i10826# It's the first, it cannot keep! pPre->GetIndPrev() && - // <-- pPre->GetAttrSet()->GetKeep().GetValue() ) { pPre->InvalidatePos(); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 7c747d1..b5c7732 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -60,7 +60,6 @@ // #i12836# enhanced pdf export #include -// <-- #include #include @@ -73,7 +72,6 @@ namespace numfunc extern const String& GetDefBulletFontname(); extern bool IsDefBulletFontUserDefined(); } -// <-- #define REDLINE_DISTANCE 567/4 @@ -334,7 +332,6 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); - // <-- SwExtraPainter aExtra( this, pSh, rLineInf, rRect, eHor, bLineNum ); @@ -613,7 +610,6 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const Frm_Info aFrmInfo( *this ); SwTaggedPDFHelper aTaggedPDFHelperParagraph( 0, &aFrmInfo, 0, *pSh->GetOut() ); - // <-- if( !IsEmpty() || !PaintEmpty( rRect, sal_True ) ) { @@ -634,7 +630,6 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // #i29062# pass info that we are currently // painting. ((SwTxtFrm*)this)->GetFormatted( true ); - // <-- if( IsEmpty() ) { PaintEmpty( rRect, sal_False ); diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index c3b60ac..a4ef47c 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -123,7 +123,6 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, // #i46524# LineBreak bug with italics if ( nLineWidth < 0 ) nLineWidth = 0; - // <-- } // first check if everything fits to line @@ -144,7 +143,6 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, // #i48035# Needed for CalcFitToContent // if first line ends with a manual line break rInf.GetTxt().GetChar( nCutPos ) == CH_BREAK ) ) - // <-- nBreakWidth = nBreakWidth + nItalic; // save maximum width for later use diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index b970ca6..872fd6e 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -75,7 +75,6 @@ #include // #i12836# enhanced pdf export #include -// <-- #include @@ -108,7 +107,6 @@ namespace numfunc extern const String& GetDefBulletFontname(); extern bool IsDefBulletFontUserDefined(); } -// <-- #if OSL_DEBUG_LEVEL > 1 // Test2: WYSIWYG++ @@ -697,7 +695,6 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo aDrawInf.SetNumberOfBlanks( rPor.InTxtGrp() ? static_cast(rPor).GetSpaceCnt( *this, nCharCnt ) : 0 ); - // <-- } aDrawInf.SetSpace( nSpaceAdd ); @@ -1227,7 +1224,6 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pTmpOut ); - // <-- pTmpOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); @@ -1600,7 +1596,6 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart, const xub_Unicode cThousandSep = ',' == cTabDec ? '.' : ','; // #i45951# German (Switzerland) uses ' as thousand separator const xub_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\''; - // <-- bool bNumFound = false; const bool bTabCompat = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT); diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 763028e..ef427b4 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -536,7 +536,6 @@ class SwTxtFormatInfo : public SwTxtPaintInfo SwTwips nLeft; // linker Rand SwTwips nRight; // rechter Rand SwTwips nFirst; // EZE - // <-- KSHORT nRealWidth; // "echte" Zeilenbreite KSHORT nWidth; // "virtuelle" Zeilenbreite KSHORT nLineHeight; // endgueltige Hoehe nach CalcLine diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 59fce31..d11dc5e 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -307,7 +307,6 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent, // #i49277# const sal_Bool bDoNotJustifyLinesWithManualBreak = GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK); - // <-- SwLinePortion *pPos = pCurrent->GetPortion(); diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 3c21259..26e092d 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -58,7 +58,6 @@ #include // SwMultiPortion // #i111284# #include -// <-- // Nicht reentrant !!! // wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet. @@ -164,7 +163,6 @@ namespace { return bRet; } } // end of anonymous namespace -// <-- /************************************************************************* * SwTxtMargin::CtorInitTxtMargin() @@ -182,7 +180,6 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) // #i111284# const bool bListLevelIndentsApplicableAndLabelAlignmentActive( AreListLevelIndentsApplicableAndLabelAlignmentActive( *(pFrm->GetTxtNode()) ) ); - // <-- // // Carefully adjust the text formatting ranges. @@ -246,7 +243,6 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) ( pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) || !pFrm->IsInTab() || !nLMWithNum ) ) - // <-- { nLeft = pFrm->Prt().Left() + pFrm->Frm().Left(); if( nLeft >= nRight ) // z.B. bei grossen Absatzeinzuegen in schmalen Tabellenspalten @@ -354,7 +350,6 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) // #i91133# mnTabLeft = pNode->GetLeftMarginForTabCalculation(); - // <-- #if OSL_DEBUG_LEVEL > 1 static sal_Bool bOne = sal_False; @@ -1630,7 +1625,6 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, aDrawInf.SetNumberOfBlanks( pPor->InTxtGrp() ? static_cast(pPor)->GetSpaceCnt( aSizeInf, nCharCnt ) : 0 ); - // <-- } if ( pPor->InFldGrp() && pCMS && pCMS->pSpecialPos ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 7f7fd40..72e0a0d 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -348,7 +348,6 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf, // #i112181# rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() ); - // <-- } else { @@ -786,7 +785,6 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) pPor->Height( pLast->Height() ); pPor->SetAscent( pLast->GetAscent() ); } - // <-- else { const SwLinePortion *pLast = rInf.GetLast(); @@ -1239,7 +1237,6 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) // #i42734# // No multi portion if there is a hook character waiting: ( !rInf.GetRest() || '\0' == rInf.GetHookChar() ) ) - // <-- { // We open a multiportion part, if we enter a multi-line part // of the paragraph. @@ -1358,7 +1355,6 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) static_cast(pLastTabPortion)->SetWidthOfPortionsUpToDecimalPosition( nWidthOfPortionsUpToDecimalPosition ); rInf.SetTabDecimal( 0 ); } - // <-- else rInf.SetFull( rInf.GetLastTab()->Format( rInf ) ); } @@ -1856,7 +1852,6 @@ void SwTxtFormatter::FeedInf( SwTxtFormatInfo &rInf ) const SwTwips nTmpLeft = Left(); SwTwips nTmpRight = Right(); SwTwips nTmpFirst = FirstLeft(); - // <-- if ( nTmpLeft > USHRT_MAX || nTmpRight > USHRT_MAX || @@ -2075,7 +2070,6 @@ namespace { else nReformat = txtFmtInfo.GetLineStart(); } - // <-- // Weird situation: Our line used to end with a hole portion // and we delete some characters at the end of our line. We have diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index bde5c45..8310947 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -52,7 +52,6 @@ // #i12836# enhanced pdf export #include -// <-- #include "flyfrms.hxx" @@ -401,7 +400,6 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, // #i16816# tagged pdf support Por_Info aPorInfo( *pPor, *this ); SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, &aPorInfo, *pOut ); - // <-- if( pPor->IsMultiPortion() ) PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor ); @@ -430,7 +428,6 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, ( GetInfo().GetVsh() && GetInfo().GetVsh()->GetViewOptions()->IsPDFExport() && pNext && pNext->IsHolePortion() ) ? - // <-- pNext : 0; } diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index aad7aec..1aa55ec 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -151,7 +151,6 @@ private: MSHORT nAdjust; // #i91133# SwTwips mnTabLeft; - // <-- protected: // fuer FormatQuoVadis @@ -186,7 +185,6 @@ public: { return mnTabLeft; } - // <-- // DropCaps inline MSHORT GetDropLines() const { return nDropLines; } inline void SetDropLines( const MSHORT nNew ) { nDropLines = nNew; } diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index fc79f5a..34e8e48 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -764,7 +764,6 @@ static sal_Char const sDoubleSpace[] = " "; const Point aNewPos( aInf.GetPos().X(), rInf.GetUnderFnt()->GetPos().Y() ); rInf.GetUnderFnt()->SetPos( aNewPos ); } - // <-- pThis->Width( nOldWidth - nSpaceOffs + 12 ); { @@ -867,7 +866,6 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf ) SetLen( 0 ); } Width( nFixWidth + nFollowedByWidth ); - // <-- const sal_Bool bFull = rInf.Width() < rInf.X() + Width(); const sal_Bool bFly = rInf.GetFly() || ( rInf.GetLast() && rInf.GetLast()->IsFlyPortion() ); @@ -891,7 +889,6 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf ) long nDiff = mbLabelAlignmentPosAndSpaceModeActive ? 0 : rInf.Left() - rInf.First() + rInf.ForcedLeftMargin(); - // <-- // Ein Vorschlag von Juergen und Volkmar: // Der Textteil hinter der Numerierung sollte immer // mindestens beim linken Rand beginnen. diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index de34b27..e3ec908 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -75,7 +75,6 @@ public: inline sal_Bool HasFont() const { return 0 != pFnt; } // #i89179# - made public inline const SwFont *GetFont() const { return pFnt; } - // <-- inline const XubString &GetExp() const { return aExpand; } virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const; diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 4fc253c..4c545c8 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -195,7 +195,6 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, xub_StrLen nStart, xub_StrLen nEnd --i; } } - // <-- } } } @@ -329,7 +328,6 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm, // #i40333# - follow-up of #i35635# // move object to visible layer pDrawContact->MoveObjToVisibleLayer( pDrawContact->GetMaster() ); - // <-- } nLineLength = 1; nFlags |= AS_CHAR_ULSPACE | AS_CHAR_INIT; @@ -377,7 +375,6 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase, { GetDrawContact()->GetAnchoredObj( pSdrObj )->MakeObjPos(); } - // <-- } else { diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx index cd69c6c..ec4957a 100644 --- a/sw/source/core/text/porftn.hxx +++ b/sw/source/core/text/porftn.hxx @@ -45,7 +45,6 @@ class SwFtnPortion : public SwFldPortion // #i98418# bool mbPreferredScriptTypeSet; sal_uInt8 mnPreferredScriptType; - // <-- public: SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrm, SwTxtFtn *pFtn, KSHORT nOrig = KSHRT_MAX ); @@ -58,7 +57,6 @@ public: // #i98418# void SetPreferredScriptType( sal_uInt8 nPreferredScriptType ); - // <-- const SwTxtFtn* GetTxtFtn() const { return pFtn; }; OUTPUT_OPERATOR diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 17b63ac..c5369b5 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -421,7 +421,6 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) bool bHasBlankPortion = false; bool bHasOnlyBlankPortions = true; - // <-- if( pPortion ) { @@ -482,7 +481,6 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) continue; } } - // <-- bHasOnlyBlankPortions = false; @@ -629,7 +627,6 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) { bHasBlankPortion = true; } - // <-- } // #i3952# @@ -641,7 +638,6 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) SetAscent( nTmpAscent ); Height( nTmpHeight ); } - // <-- // Robust: if( nLineWidth < Width() ) @@ -1006,7 +1002,6 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL ) } nChg = Min( nChg, nNextCTLScriptStart ); } - // <-- // special case for dotted circle since it can be used with complex // before a mark, so we want it associated with the mark's script diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 2b7b854..1a31cf4 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -569,7 +569,6 @@ sal_Bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* pCurr, // instead we want to insert a new first value: std::vector* pVec = pCurr->GetpLLSpaceAdd(); pVec->insert( pVec->begin(), nMultiSpace ); - // <-- bRet = sal_True; } } diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 9416783..4988817 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -182,7 +182,6 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const rInf.CalcRect( *this, &aClipRect, 0 ); SwSaveClip aClip( (OutputDevice*)rInf.GetOut() ); aClip.ChgClip( aClipRect, 0 ); - // <-- rInf.DrawText( aTxtDouble, *this, 0, 2, sal_True ); } } @@ -372,7 +371,6 @@ sal_Bool SwTxtFrm::FormatEmpty() // to assure that objects anchored at the empty paragraph are // correctly visible resp. invisible. HideAndShowObjects(); - // <-- return sal_True; } } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index f2cdcb7..a9fcdf3 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -396,7 +396,6 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) else if ( ( IsFtnPortion() && rInf.IsFakeLineStart() && // rInf.IsOtherThanFtnInside() ) || - // <-- ( rInf.GetLast() && rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT) && rInf.GetLast()->InTabGrp() && @@ -742,7 +741,6 @@ void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const const XubString aTxt( ' ' ); rInf.DrawText( aTxt, *this, 0, 1, false ); } - // <-- } /************************************************************************* diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index c976fdb..ed0e30a 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -513,7 +513,6 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const pNumFnt, bLeft, bCenter, nMinDist, bLabelAlignmentPosAndSpaceModeActive ); - // <-- } else { diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index de0b19d..9332e22 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -60,7 +60,6 @@ #include // #i28701# #include -// <-- #include #include #include @@ -775,17 +774,14 @@ void SwTxtFly::CtorInitTxtFly( const SwTxtFrm *pFrm ) mbIgnoreContour = sal_False; // --> OD 2004-12-17 #118809# mbIgnoreObjsInHeaderFooter = sal_False; - // <-- pPage = pFrm->FindPageFrm(); const SwFlyFrm* pTmp = pFrm->FindFlyFrm(); // #i68520# mpCurrAnchoredObj = pTmp; - // <-- pCurrFrm = pFrm; pMaster = pCurrFrm->IsFollow() ? NULL : pCurrFrm; // #i68520# mpAnchoredObjList = NULL; - // <-- // Wenn wir nicht von einem Frame ueberlappt werden, oder wenn // es gar keine FlyCollection gibt, dann schaltet wir uns fuer immer ab. // Aber es koennte sein, dass waehrend der Formatierung eine Zeile @@ -885,7 +881,6 @@ sal_Bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const // #i68520# if( mpCurrAnchoredObj != pObj && aBound.IsOver( aRect ) ) - // <-- return sal_True; } } @@ -948,13 +943,11 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) const sal_uInt32 nCurrOrd = mpCurrAnchoredObj ? mpCurrAnchoredObj->GetDrawObj()->GetOrdNum() : SAL_MAX_UINT32; - // <-- OSL_ENSURE( !bTopRule, "DrawTextOpaque: Wrong TopRule" ); // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) - // <-- { MSHORT nHellId = pPage->getRootFrm()->GetCurrShell()->getIDocumentDrawModelAccess()->GetHellId(); for( MSHORT i = 0; i < nCount; ++i ) @@ -963,11 +956,9 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) const SwAnchoredObject* pTmpAnchoredObj = (*mpAnchoredObjList)[i]; if( dynamic_cast(pTmpAnchoredObj) && mpCurrAnchoredObj != pTmpAnchoredObj ) - // <-- { // #i68520# const SwFlyFrm* pFly = dynamic_cast(pTmpAnchoredObj); - // <-- if( aRegion.GetOrigin().IsOver( pFly->Frm() ) ) { const SwFrmFmt *pFmt = pFly->GetFmt(); @@ -982,7 +973,6 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) ( !rSur.IsAnchorOnly() || // #i68520# GetMaster() == pFly->GetAnchorFrm() || - // <-- ((FLY_AT_PARA != rAnchor.GetAnchorId()) && (FLY_AT_CHAR != rAnchor.GetAnchorId()) ) @@ -990,7 +980,6 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) // #i68520# pTmpAnchoredObj->GetDrawObj()->GetLayer() != nHellId && nCurrOrd < pTmpAnchoredObj->GetDrawObj()->GetOrdNum() - // <-- ) { //Ausser der Inhalt ist Transparent @@ -1059,7 +1048,6 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) - // <-- { MSHORT nHellId = pPage->getRootFrm()->GetCurrShell()->getIDocumentDrawModelAccess()->GetHellId(); for( MSHORT i = 0; i < nCount; ++i ) @@ -1068,37 +1056,31 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, const SwAnchoredObject* pAnchoredObjTmp = (*mpAnchoredObjList)[i]; if( mpCurrAnchoredObj != pAnchoredObjTmp && dynamic_cast(pAnchoredObjTmp) ) - // <-- { // #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 fly frame area // #i68520# const SwFlyFrm* pFly = dynamic_cast(pAnchoredObjTmp); - // <-- // #i47804# - consider transparent graphics // and OLE objects. bool bClipFlyArea = ( ( SURROUND_THROUGHT == rSur.GetSurround() ) // #i68520# ? (pAnchoredObjTmp->GetDrawObj()->GetLayer() != nHellId) - // <-- : !rSur.IsContour() ) && !pFly->IsBackgroundTransparent() && !pFly->IsShadowTransparent() && ( !pFly->Lower() || !pFly->Lower()->IsNoTxtFrm() || !static_cast(pFly->Lower())->IsTransparent() ); - // <-- if ( bClipFlyArea ) { // #i68520# SwRect aFly( pAnchoredObjTmp->GetObjRect() ); - // <-- // OD 24.01.2003 #106593# ::SwAlignRect( aFly, pPage->getRootFrm()->GetCurrShell() ); if( aFly.Width() > 0 && aFly.Height() > 0 ) @@ -1127,16 +1109,13 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, const sal_Bool bInFtn, const sal_Bool bInFooterOrHeader ) -// <-- { // #i68520# // is set, if is inside a fly frame if( _pAnchoredObj != mpCurrAnchoredObj ) - // <-- { // #i26945# const SdrObject* pNew = _pAnchoredObj->GetDrawObj(); - // <-- // #102344# Ignore connectors which have one or more connections if(pNew && pNew->ISA(SdrEdgeObj)) { @@ -1152,7 +1131,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #i26945# const SwFrmFmt& rFrmFmt = _pAnchoredObj->GetFrmFmt(); const SwFmtAnchor& rNewA = rFrmFmt.GetAnchor(); - // <-- if (FLY_AT_PAGE == rNewA.GetAnchorId()) { if ( bInFtn ) @@ -1190,15 +1168,12 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // innerhalb von verketteten Flys wird nur Lowern ausgewichen // #i68520# const SwFmtChain &rChain = mpCurrAnchoredObj->GetFrmFmt().GetChain(); - // <-- if ( !rChain.GetPrev() && !rChain.GetNext() ) { // #i26945# const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor(); - // <-- // #i68520# const SwFmtAnchor& rCurrA = mpCurrAnchoredObj->GetFrmFmt().GetAnchor(); - // <-- // If is anchored as character, its content // does not wrap around pNew @@ -1239,7 +1214,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // rCurrA.GetCntntAnchor()->nNode.GetIndex(); else return sal_False; - // <-- } } @@ -1248,14 +1222,12 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // ausgewichen werden. // #i68520# bEvade &= ( mpCurrAnchoredObj->GetDrawObj()->GetOrdNum() < pNew->GetOrdNum() ); - // <-- if( bEvade ) { // #i68520# SwRect aTmp( _pAnchoredObj->GetObjRectWithSpaces() ); if ( !aTmp.IsOver( mpCurrAnchoredObj->GetObjRectWithSpaces() ) ) bEvade = sal_False; - // <-- } } @@ -1263,7 +1235,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, { // #i26945# const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor(); - // <-- OSL_ENSURE( FLY_AS_CHAR != rNewA.GetAnchorId(), "Don't call GetTop with a FlyInCntFrm" ); if (FLY_AT_PAGE == rNewA.GetAnchorId()) @@ -1276,14 +1247,12 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // pCurrFrm ist der Anker von pNew? // #i26945# const SwFrm* pTmp = _pAnchoredObj->GetAnchorFrm(); - // <-- if( pTmp == pCurrFrm ) return sal_True; if( pTmp->IsTxtFrm() && ( pTmp->IsInFly() || pTmp->IsInFtn() ) ) { // #i26945# Point aPos = _pAnchoredObj->GetObjRect().Pos(); - // <-- pTmp = GetVirtualUpper( pTmp, aPos ); } // #i26945# @@ -1295,7 +1264,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, pTmp = const_cast(_pAnchoredObj) ->GetAnchorFrmContainingAnchPos()->GetUpper(); } - // <-- // #i28701# - consider all objects in same context, // if wrapping style is considered on object positioning. // Thus, text will wrap around negative positioned objects. @@ -1314,7 +1282,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, { return sal_True; } - // <-- const SwFrm* pHeader = 0; if ( pCurrFrm->GetNext() != pTmp && @@ -1324,7 +1291,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, 0 != ( pHeader = pTmp->FindFooterOrHeader() ) && !pHeader->IsFooterFrm() && pCurrFrm->IsInDocBody() ) ) ) - // <-- { if( pHeader || FLY_AT_FLY == rNewA.GetAnchorId() ) return sal_True; @@ -1409,7 +1375,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() OSL_ENSURE( pCurrFrm, "InitFlyList: No Frame, no FlyList" ); // #i68520# OSL_ENSURE( !mpAnchoredObjList, "InitFlyList: FlyList already initialized" ); - // <-- SWAP_IF_SWAPPED( pCurrFrm ) @@ -1423,7 +1388,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() const sal_Bool bWrapAllowed = ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) || ( !pCurrFrm->IsInFtn() && !bFooterHeader ) ) && !SwLayouter::FrmNotToWrap( *pCurrFrm->GetTxtNode()->getIDocumentLayoutAccess(), *pCurrFrm ); - // <-- bOn = sal_False; @@ -1431,7 +1395,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() { // #i68520# mpAnchoredObjList = new SwAnchoredObjList(); - // <-- // #i28701# - consider complete frame area for new // text wrapping @@ -1488,7 +1451,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() // instead of only the instance of the // anchored object if ( GetTop( pAnchoredObj, pCurrFrm->IsInFtn(), bFooterHeader ) ) - // <-- { // OD 11.03.2003 #107862# - adjust insert position: // overlapping objects should be sorted from left to right and @@ -1550,13 +1512,11 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() mpAnchoredObjList->insert( aInsPosIter, pAnchoredObj ); } - // <-- const SwFmtSurround &rFlyFmt = pAnchoredObj->GetFrmFmt().GetSurround(); // #i68520# if ( rFlyFmt.IsAnchorOnly() && pAnchoredObj->GetAnchorFrm() == GetMaster() ) - // <-- { const SwFmtVertOrient &rTmpFmt = pAnchoredObj->GetFrmFmt().GetVertOrient(); @@ -1580,16 +1540,13 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() { // #i68520# mpAnchoredObjList = new SwAnchoredObjList(); - // <-- } UNDO_SWAP( pCurrFrm ) // #i68520# return mpAnchoredObjList; - // <-- } -// <-- SwTwips SwTxtFly::CalcMinBottom() const { @@ -1721,7 +1678,6 @@ const SwRect SwContourCache::CalcBoundRect( const SwAnchoredObject* pAnchoredObj return aRet; } -// <-- const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, const SdrObject* pObj, const SwTxtFrm* pFrm, const SwRect &rLine, @@ -1940,7 +1896,6 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid // #i68520# SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 ); if ( bOn && nCount > 0 ) - // <-- { for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i ) { @@ -1948,7 +1903,6 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid const SwAnchoredObject* pAnchoredObj = (*mpAnchoredObjList)[i]; SwRect aRect( pAnchoredObj->GetObjRectWithSpaces() ); - // <-- // Optimierung SWRECTFN( pCurrFrm ) @@ -1956,12 +1910,10 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid break; // #i68520# if ( mpCurrAnchoredObj != pAnchoredObj && aRect.IsOver( rRect ) ) - // <-- { // #i68520# const SwFmt* pFmt( &(pAnchoredObj->GetFrmFmt()) ); const SwFmtSurround &rSur = pFmt->GetSurround(); - // <-- if( bAvoid ) { // Wenn der Text drunter durchlaeuft, bleibt die @@ -1972,7 +1924,6 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid ( !rSur.IsAnchorOnly() || // #i68520# GetMaster() == pAnchoredObj->GetAnchorFrm() || - // <-- ((FLY_AT_PARA != rAnchor.GetAnchorId()) && (FLY_AT_CHAR != rAnchor.GetAnchorId())) ) ) || aRect.Top() == WEIT_WECH ) @@ -1990,13 +1941,11 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid if ( mbIgnoreCurrentFrame && GetMaster() == pAnchoredObj->GetAnchorFrm() ) continue; - // <-- if( pRect ) { // #i68520# SwRect aFly = AnchoredObjToRect( pAnchoredObj, rRect ); - // <-- if( aFly.IsEmpty() || !aFly.IsOver( rRect ) ) continue; if( !bRet || ( @@ -2039,7 +1988,6 @@ SwAnchoredObjList::size_type SwTxtFly::GetPos( const SwAnchoredObject* pAnchored ++nRet; return nRet; } -// <-- /************************************************************************* * SwTxtFly::CalcRightMargin() @@ -2060,7 +2008,6 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, SWRECTFN( pCurrFrm ) // --> OD 2004-12-14 #118796# - correct determination of right of printing area SwTwips nRight = (pCurrFrm->*fnRect->fnGetPrtRight)(); - // <-- SwTwips nFlyRight = (rFly.*fnRect->fnGetRight)(); SwRect aLine( rLine ); (aLine.*fnRect->fnSetRight)( nRight ); @@ -2074,16 +2021,13 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, // 3301: pNext->Frm().IsOver( rLine ) ist noetig // #i68520# SwSurround eSurroundForTextWrap; - // <-- sal_Bool bStop = sal_False; // #i68520# SwAnchoredObjList::size_type nPos = 0; - // <-- // #i68520# while( nPos < mpAnchoredObjList->size() && !bStop ) - // <-- { if( nPos == nFlyPos ) { @@ -2097,7 +2041,6 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, eSurroundForTextWrap = _GetSurroundForTextWrap( pNext ); if( SURROUND_THROUGHT == eSurroundForTextWrap ) continue; - // <-- const SwRect aTmp( SwContourCache::CalcBoundRect ( pNext, aLine, pCurrFrm, nFlyRight, sal_True ) ); @@ -2144,7 +2087,6 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, } (rFly.*fnRect->fnSetRight)( nRight ); } -// <-- /************************************************************************* * SwTxtFly::CalcLeftMargin() @@ -2164,7 +2106,6 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, SWRECTFN( pCurrFrm ) // --> OD 2004-12-14 #118796# - correct determination of left of printing area SwTwips nLeft = (pCurrFrm->*fnRect->fnGetPrtLeft)(); - // <-- const SwTwips nFlyLeft = (rFly.*fnRect->fnGetLeft)(); if( nLeft > nFlyLeft ) @@ -2183,12 +2124,10 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, // #i68520# SwAnchoredObjList::size_type nMyPos = nFlyPos; while( ++nFlyPos < mpAnchoredObjList->size() ) - // <-- { // #i68520# const SwAnchoredObject* pNext = (*mpAnchoredObjList)[ nFlyPos ]; const SwRect aTmp( pNext->GetObjRectWithSpaces() ); - // <-- if( (aTmp.*fnRect->fnGetLeft)() >= nFlyLeft ) break; } @@ -2204,7 +2143,6 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, SwSurround eSurroundForTextWrap = _GetSurroundForTextWrap( pNext ); if( SURROUND_THROUGHT == eSurroundForTextWrap ) continue; - // <-- const SwRect aTmp( SwContourCache::CalcBoundRect ( pNext, aLine, pCurrFrm, nFlyLeft, sal_False ) ); @@ -2216,14 +2154,12 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly, SwTwips nTmpRight = (aTmp.*fnRect->fnGetRight)(); if ( nLeft <= nTmpRight ) nLeft = nTmpRight; - // <-- break; } } (rFly.*fnRect->fnSetLeft)( nLeft ); } -// <-- /************************************************************************* * SwTxtFly::FlyToRect() diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index e317c27..cb32c19 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -562,7 +562,6 @@ bool lcl_HideObj( const SwTxtFrm& _rFrm, return bRet; } -// <-- /************************************************************************* * SwTxtFrm::HideAndShowObjects() *************************************************************************/ @@ -599,7 +598,6 @@ void SwTxtFrm::HideAndShowObjects() { pContact->MoveObjToInvisibleLayer( pObj ); } - // <-- } } else @@ -620,7 +618,6 @@ void SwTxtFrm::HideAndShowObjects() SwContact* pContact = static_cast(pObj->GetUserCall()); // --> OD 2005-03-30 #120729# - determine anchor type only once const RndStdIds eAnchorType( pContact->GetAnchorId() ); - // <-- if (eAnchorType == FLY_AT_PARA) { @@ -637,7 +634,6 @@ void SwTxtFrm::HideAndShowObjects() // under certain conditions if ( nHiddenStart != STRING_LEN && bShouldBeHidden && lcl_HideObj( *this, eAnchorType, nObjAnchorPos, (*GetDrawObjs())[i] ) ) - // <-- pContact->MoveObjToInvisibleLayer( pObj ); else pContact->MoveObjToVisibleLayer( pObj ); @@ -693,7 +689,6 @@ xub_StrLen SwTxtFrm::FindBrk( const XubString &rTxt, return nFound <= STRING_LEN ? static_cast(nFound) : STRING_LEN; - // <-- } /************************************************************************* @@ -1071,7 +1066,6 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { pViewSh->InvalidateAccessibleParaAttrs( *this ); } - // <-- } break; case RES_OBJECTDYING: @@ -1328,7 +1322,6 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { pViewSh->InvalidateAccessibleParaAttrs( *this ); } - // <-- } break; @@ -1562,7 +1555,6 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid, // #i28701# - consider anchored objects if ( GetDrawObjs() ) break; - // <-- return; } @@ -2167,7 +2159,6 @@ SwTwips SwTxtFrm::CalcFitToContent() // fairly reasonable value: if ( IsLocked() ) return Prt().Width(); - // <-- SwParaPortion* pOldPara = GetPara(); SwParaPortion *pDummy = new SwParaPortion(); @@ -2190,7 +2181,6 @@ SwTwips SwTxtFrm::CalcFitToContent() // #i31490# SwTxtFrmLocker aLock( this ); - // <-- SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True ); aInf.SetIgnoreFly( sal_True ); @@ -2200,7 +2190,6 @@ SwTwips SwTxtFrm::CalcFitToContent() // #i54031# - assure mininum of MINLAY twips. const SwTwips nMax = Max( (SwTwips)MINLAY, aLine._CalcFitToContent() + 1 ); - // <-- Frm().Width( nOldFrmWidth ); Prt().Width( nOldPrtWidth ); @@ -2305,7 +2294,6 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) // #i71281# // invalidate printing area, if height of last line changes const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine ); - // <-- // determine output device ViewShell* pVsh = getRootFrm()->GetCurrShell(); OSL_ENSURE( pVsh, " - no ViewShell" ); @@ -2329,7 +2317,6 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) { return; } - // <-- // determine height of last line @@ -2402,7 +2389,6 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) pLineLayout->MaxAscentDescent( nAscent, nDescent, nDummy1, nDummy2, 0, true ); - // <-- // #i71281# // Suppress wrong invalidation of printing area, if method is // called recursive. @@ -2421,12 +2407,9 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) { mnHeightOfLastLine = nNewHeightOfLastLine; } - // <-- - // <-- } } } - // <-- } // #i71281# // invalidate printing area, if height of last line changes @@ -2434,7 +2417,6 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) { InvalidatePrt(); } - // <-- } /************************************************************************* @@ -2626,7 +2608,6 @@ void SwTxtFrm::RecalcAllLines() // First body content may be in table! if ( bRestart && pPrv && pPrv->FindPageFrm() != FindPageFrm() ) pPrv = 0; - // <-- nNewNum = pPrv ? ((SwTxtFrm*)pPrv)->GetAllLines() : 0; } @@ -2782,7 +2763,6 @@ void SwTxtFrm::CalcBaseOfstForFly() // --> OD 2004-12-17 #118809# - ignore objects in page header|footer for // text frames not in page header|footer aTxtFly.SetIgnoreObjsInHeaderFooter( sal_True ); - // <-- SwTwips nRet1 = lcl_CalcFlyBasePos( *this, aFlyRect, aTxtFly ); aTxtFly.SetIgnoreCurrentFrame( sal_False ); SwTwips nRet2 = lcl_CalcFlyBasePos( *this, aFlyRect, aTxtFly ); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 9606086..cf36dc5 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1036,7 +1036,6 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const pNumFnt->SetWeight( WEIGHT_NORMAL, SW_LATIN ); pNumFnt->SetWeight( WEIGHT_NORMAL, SW_CJK ); pNumFnt->SetWeight( WEIGHT_NORMAL, SW_CTL ); - // <-- pNumFnt->SetDiffFnt(&rSet, pIDSA ); pNumFnt->SetVertical( pNumFnt->GetOrientation(), pFrm->IsVertical() ); @@ -1365,7 +1364,6 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf, String aTmpStr( rFtn.GetViewNumStr( *pDoc ) ); pFnt->SetActual( SwScriptInfo::WhichFont( 0, &aTmpStr, 0 ) ); } - // <-- const SwEndNoteInfo* pInfo; if( rFtn.IsEndNote() ) @@ -1430,7 +1428,6 @@ SwFtnPortion::SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrame, // #i98418# , mbPreferredScriptTypeSet( false ) , mnPreferredScriptType( SW_LATIN ) - // <-- { SetLen(1); SetWhichPor( POR_FTN ); @@ -1455,7 +1452,6 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf ) // #i98418# // SwFtnSave aFtnSave( rInf, pFtn ); SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); - // <-- // the idx is manipulated in SwExpandPortion::Format // this flag indicates, that a footnote is allowed to trigger // an underflow during SwTxtGuess::Guess @@ -1479,7 +1475,6 @@ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const // #i98418# // SwFtnSave aFtnSave( rInf, pFtn ); SwFtnSave aFtnSave( rInf, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); - // <-- rInf.DrawViewOpt( *this, POR_FTN ); SwExpandPortion::Paint( rInf ); } @@ -1493,7 +1488,6 @@ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const // #i98418# // SwFtnSave aFtnSave( rInfo, pFtn ); SwFtnSave aFtnSave( rInfo, pFtn, mbPreferredScriptTypeSet, mnPreferredScriptType ); - // <-- return SwExpandPortion::GetTxtSize( rInfo ); } @@ -1503,7 +1497,6 @@ void SwFtnPortion::SetPreferredScriptType( sal_uInt8 nPreferredScriptType ) mbPreferredScriptTypeSet = true; mnPreferredScriptType = nPreferredScriptType; } -// <-- /************************************************************************* * class SwQuoVadisPortion diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 8705d2b..b41f1bc 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -392,7 +392,6 @@ sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut() ) ? 0xad : '-'; - // <-- rTxt = cChar; return sal_True; diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index b2e8404..ea69550 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -44,7 +44,6 @@ #include // #i89179# #include -// <-- /************************************************************************* @@ -108,7 +107,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) ( bTabsRelativeToIndent ? GetTabLeft() : 0 ) : pFrm->Frm().Left() + ( bTabsRelativeToIndent ? GetTabLeft() : 0 ); - // <-- // // nLinePos: The absolute position, where we started the line formatting. @@ -204,7 +202,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) nNextPos = nCount < 0 || (!nCount && nSearchPos <= 0)? nCount * nDefTabDist :( nCount + 1 ) * nDefTabDist ; // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips: const SwTwips nMinimumTabWidth = pFrm->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT) ? 0 : 50; - // <-- if( ( bRTL && nTabLeft - nNextPos >= nCurrentAbsPos - nMinimumTabWidth ) || ( !bRTL && nNextPos + nTabLeft <= nCurrentAbsPos + nMinimumTabWidth ) ) { @@ -290,7 +287,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) if ( SVX_TAB_ADJUST_DECIMAL == eAdj && // --> FME 2005-12-19 #127428# 1 == aLineInf.NumberOfTabStops() ) - // <-- pTabPor = new SwAutoTabDecimalPortion( nNewTabPos, cDec, cFill ); } else @@ -397,7 +393,6 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) // #i37686# In compatibility mode, the minimum width // should be 1, even for non-left tab stops. sal_uInt16 nMinimumTabWidth = 1; - // <-- if ( !bTabCompat ) { // #i89179# @@ -412,7 +407,6 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) static_cast(rInf.GetLast())->GetFont(); pSave.reset( new SwFontSave( rInf, const_cast(pNumberPortionFont) ) ); } - // <-- XubString aTmp( ' ' ); SwTxtSizeInfo aInf( rInf, aTmp ); nMinimumTabWidth = aInf.GetTxtSize().Width(); @@ -470,7 +464,6 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) // --> FME 2005-01-19 #119175# TabStop should be forced to current // line if there is a fly reducing the line width: !rInf.GetFly() ) - // <-- { PrtWidth( static_cast(rInf.Width() - rInf.X()) ); SetFixWidth( PrtWidth() ); @@ -532,7 +525,6 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf ) nPorWidth = nPrePorWidth - 1; } } - // <-- if( POR_TABCENTER == nWhich ) { @@ -606,7 +598,6 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const pSave.reset( new SwFontSave( rInf, const_cast(pNumberPortionFont) ) ); } } - // <-- rInf.DrawBackBrush( *this ); // do we have to repaint a post it portion? diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 2a86aa8..71dfadd 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -338,7 +338,6 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# // #i36870# right aligned tab for all aToken.cTabFillChar = '.'; aToken.eTabAlign = SVX_TAB_ADJUST_END; - // <-- aTokens.push_back(aToken); aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS)); @@ -479,7 +478,6 @@ void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237 aCurrentPattern.push_back(aToken); } } - // <-- else { aIt = find_if(aIt, aCurrentPattern.end(), @@ -500,7 +498,6 @@ void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237 break; // no more tokens to replace } } - // <-- if(bChanged) SetPattern(nLevel, aCurrentPattern); // #i21237# diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 74d5408..90f8574 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -210,7 +210,6 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // #i81002# // ((SwGetRefField*)GetFld())->UpdateField(); dynamic_cast(GetFld())->UpdateField( pTxtAttr ); - // <-- } break; case RES_DOCPOS_UPDATE: @@ -332,7 +331,6 @@ void SwTxtFld::Expand() const // during formatting, therefore an invalidation of the text frame // has to be triggered even if aNewExpand == aExpand: ( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast(pFld)->GetSubType() ) && - // <-- ( RES_GETEXPFLD != nWhich || ((SwGetExpField*)pFld)->IsInBodyTxt() ) ) { // BP: das muesste man noch optimieren! diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 7534268..c4c6ddc 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -277,7 +277,6 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) // fly frame and its content. SwObjectFormatter::FormatObj( *pFly, const_cast(pCurrFrm), pCurrFrm->FindPageFrm() ); - // <-- return pFly; } diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 5ee2a38..381e8fa 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2169,7 +2169,6 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) // #i105901# // skip character cells for all script types if ( pBreakIt->GetBreakIter().is() ) - // <-- { aLang = rInf.GetFont()->GetLanguage(); bSkipCharacterCells = true; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 84c2283..c173f23 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1499,7 +1499,6 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, ( nDestStart || pDest->HasSwAttrSet() || nLen != pDest->GetTxt().Len() ) ) - // <-- { SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1, @@ -1546,7 +1545,6 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, ( nDestStart || pDest->HasSwAttrSet() || nLen != pDest->GetTxt().Len() ) ) - // <-- { SfxItemSet aCharSet( pDest->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1, @@ -2232,7 +2230,6 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount, // #i62668# Ruby text attribute must be // treated just like toxmark and refmarks (RES_TXTATR_CJK_RUBY == nWhich) ) ) - // <-- || ( (nHintStart < nEndIdx) && pHt->HasDummyChar() ) ) @@ -2428,7 +2425,6 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, SwAttrSet* pNewAttrSet = 0; // #i75353# bool bClearHardSetNumRuleWhenFmtCollChanges( false ); - // <-- if( HasSwAttrSet() ) { pNewAttrSet = new SwAttrSet( *GetpSwAttrSet() ); @@ -2483,7 +2479,6 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, // No clear of hard set numbering rule at an outline paragraph at this point. // Only if the paragraph style changes - see below. bClearHardSetNumRuleWhenFmtCollChanges = true; - // <-- } bRemoveFromCache = sal_True; } @@ -2515,7 +2510,6 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, // previous implementation. if ( !bNext && !IsCountedInList() ) SetCountedInList(true); - // <-- } // jetzt kann es sein, das durch die Nummerierung dem neuen Node eine @@ -2545,9 +2539,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext, SetInCache( sal_False ); } } - // <-- } - // <-- ChgFmtColl( pNextColl ); return pNode; @@ -3448,13 +3440,11 @@ namespace { rTxtNode.GetDoc()->ResetAttrs( aPam, sal_False, &aResetAttrsArray, false ); - // <-- // #i70748# if ( dynamic_cast(rTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, sal_False )).GetValue() > 0 ) { rTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr(); } - // <-- } } } @@ -3495,7 +3485,6 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVal SwDoc * pDoc = GetDoc(); // --> OD 2005-11-02 #125329# - assure that text node is in document nodes array if ( pDoc && !pDoc->IsInDtor() && &pDoc->GetNodes() == &GetNodes() ) - // <-- { pDoc->GetNodes().UpdateOutlineNode(*this); } @@ -3634,7 +3623,6 @@ void SwTxtNode::ResetEmptyListStyleDueToResetOutlineLevelAttr() mbEmptyListStyleSetDueToSetOutlineLevelAttr = false; } } -// <-- void SwTxtNode::SetAttrListLevel( int nLevel ) @@ -3718,7 +3706,6 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const { bRet = true; } - // <-- } return bRet; @@ -4105,7 +4092,6 @@ bool SwTxtNode::IsHidden() const return false; } -// <-- namespace { // Helper class for special handling of setting attributes at text node: @@ -4152,7 +4138,6 @@ namespace { bool mbUpdateListCount; // #i70748# bool mbOutlineLevelSet; - // <-- }; HandleSetAttrAtTxtNode::HandleSetAttrAtTxtNode( SwTxtNode& rTxtNode, @@ -4164,7 +4149,6 @@ namespace { mbUpdateListCount( false ), // #i70748# mbOutlineLevelSet( false ) - // <-- { switch ( pItem.Which() ) { @@ -4181,7 +4165,6 @@ namespace { // #i105562# // mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); - // <-- } } break; @@ -4268,7 +4251,6 @@ namespace { } } break; - // <-- } } @@ -4282,7 +4264,6 @@ namespace { mbUpdateListCount( false ), // #i70748# mbOutlineLevelSet( false ) - // <-- { const SfxPoolItem* pItem = 0; // handle RES_PARATR_NUMRULE @@ -4297,7 +4278,6 @@ namespace { mbAddTxtNodeToList = true; // #i70748# mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); - // <-- } } @@ -4376,7 +4356,6 @@ namespace { mbOutlineLevelSet = true; } } - // <-- } HandleSetAttrAtTxtNode::~HandleSetAttrAtTxtNode() @@ -4428,7 +4407,6 @@ namespace { } } } - // <-- } // End of class } @@ -4522,7 +4500,6 @@ namespace { mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; // #i92898# mbListStyleOrIdReset = true; - // <-- } if ( !bRemoveFromList ) @@ -4551,7 +4528,6 @@ namespace { { mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } - // <-- } else { @@ -4567,7 +4543,6 @@ namespace { mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET; // #i92898# mbListStyleOrIdReset = true; - // <-- } // #i70748# // RES_PARATR_OUTLINELEVEL @@ -4575,7 +4550,6 @@ namespace { { mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } - // <-- if ( !bRemoveFromList ) { @@ -4628,7 +4602,6 @@ namespace { mrTxtNode.GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_ID, sal_False ) == SFX_ITEM_SET ); // #i92898# mbListStyleOrIdReset = true; - // <-- } // #i70748# // RES_PARATR_OUTLINELEVEL @@ -4636,7 +4609,6 @@ namespace { { mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } - // <-- if ( !bRemoveFromList ) { @@ -4680,7 +4652,6 @@ namespace { } // #i70748# mrTxtNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); - // <-- } HandleResetAttrAtTxtNode::~HandleResetAttrAtTxtNode() @@ -4706,7 +4677,6 @@ namespace { mrTxtNode.SetAttrListLevel( nNewListLevel ); } } - // <-- mrTxtNode.AddToList(); } // #i70748# @@ -4716,7 +4686,6 @@ namespace { { mrTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr(); } - // <-- } if ( mrTxtNode.IsInList() ) @@ -4785,7 +4754,6 @@ sal_uInt16 SwTxtNode::ResetAllAttr() return nRet; } -// <-- // sw::Metadatable ::sfx2::IXmlIdRegistry& SwTxtNode::GetRegistry() diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 859eee5..f8754fc 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -743,7 +743,6 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, const SwFmtCharFmt& rOtherCharFmt = (*aIter)->GetCharFmt(); const SwFmtCharFmt& rThisCharFmt = rNewHint.GetCharFmt(); const bool bSameCharFmt = rOtherCharFmt.GetCharFmt() == rThisCharFmt.GetCharFmt(); - // <-- // #i90311# // Do not remove existing character format hint during XML import @@ -751,7 +750,6 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, ( !( nsSetAttrMode::SETATTR_DONTREPLACE & nMode ) || bNoLengthAttribute || bSameCharFmt ) ) - // <-- { // Remove old hint Delete( *aIter ); @@ -864,7 +862,6 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, } while (!aIter2.IsAtEnd() && 0 != (pItem = aIter2.NextItem())); } - // <-- // Remove old hint Delete( pCurrentAutoStyle ); @@ -917,7 +914,6 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, delete pNewSet; } } - // <-- // Create new AutoStyle // If there is no current hint and start and end of rNewHint @@ -1565,7 +1561,6 @@ void SwTxtNode::DeleteAttributes( const sal_uInt16 nWhich, if ( pHiddenItem ) SetCalcHiddenCharFlags(); } - // <-- xub_StrLen const * const pEndIdx = pTxtHt->GetEnd(); @@ -1888,7 +1883,6 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, { // #i75299# ::std::auto_ptr< std::vector< SwPoolItemEndPair > > pAttrArr; - // <-- const sal_uInt16 coArrSz = static_cast(RES_TXTATR_WITHEND_END) - static_cast(RES_CHRATR_BEGIN); @@ -2619,7 +2613,6 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode, rNode.SetCalcHiddenCharFlags(); break; } - // <-- case RES_TXTATR_INETFMT: static_cast(pHint)->InitINetFmt(rNode); break; @@ -2859,7 +2852,6 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode, // #i82989# Check sort numbers in NoHintAdjustMode if ( RES_TXTATR_CHARFMT == nWhich ) lcl_CheckSortNumber( *this, *static_cast(pHint) ); - // <-- SwpHintsArray::Insert( pHint ); NoteInHistory( pHint, true ); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 2551780..af88482 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1986,7 +1986,6 @@ const SwWrongList* SwTxtNode::GetWrong() const { return m_pParaIdleData_Impl ? m_pParaIdleData_Impl->pWrong : 0; } -// <-- void SwTxtNode::SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete ) { diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 6a5bbd2..bb780f4 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1380,7 +1380,6 @@ void SwRegHistory::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) // if ( m_pHistory && ( pOld || pNew ) ) if ( m_pHistory && ( pOld || pNew ) && pOld != pNew ) - // <-- { if ( pNew->Which() < POOLATTR_END ) { diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 1d1081a..b4ab7dc 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -136,7 +136,6 @@ SwUndoFmtAttr::SwUndoFmtAttr( const SfxItemSet& rOldSet, , m_pFmt( &rChgFmt ) // #i56253# , m_pOldSet( new SfxItemSet( rOldSet ) ) - // <-- , m_nNodeIndex( 0 ) , m_nFmtWhich( rChgFmt.Which() ) , m_bSaveDrawPt( bSaveDrawPt ) @@ -228,7 +227,6 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoRedoContext & rContext) } if ( !bAnchorAttrRestored ) - // <-- { SwUndoFmtAttrHelper aTmp( *m_pFmt, m_bSaveDrawPt ); m_pFmt->SetFmtAttr( *m_pOldSet ); @@ -339,7 +337,6 @@ void SwUndoFmtAttr::RedoImpl(::sw::UndoRedoContext & rContext) // #i35443# - Because the undo stores the attributes for // redo, the same code as for can be applied for UndoImpl(rContext); - // <-- } void SwUndoFmtAttr::RepeatImpl(::sw::RepeatContext & rContext) @@ -494,7 +491,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) // #i35443# - invalid position. // Thus, anchor attribute not restored return false; - // <-- } SwPosition aPos( *pNd ); @@ -508,7 +504,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) // #i35443# - invalid position. // Thus, anchor attribute not restored return false; - // <-- } } aNewAnchor.SetAnchor( &aPos ); @@ -543,7 +538,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) // #i54336# // Consider case, that as-character anchored object has moved its anchor position. if (FLY_AS_CHAR == rOldAnch.GetAnchorId()) - // <-- { //Bei InCntnt's wird es spannend: Das TxtAttribut muss vernichtet //werden. Leider reisst dies neben den Frms auch noch das Format mit @@ -623,7 +617,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) // #i35443# - anchor attribute restored. return true; - // <-- } // ----------------------------------------------------- @@ -660,7 +653,6 @@ void SwUndoFmtResetAttr::RedoImpl(::sw::UndoRedoContext &) m_pChangedFormat->ResetFmtAttr( m_nWhichId ); } } -// <-- // ----------------------------------------------------- diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 6298563..15327f8 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -827,14 +827,12 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, } } } - // <-- // #i81002# const bool bDifferentTxtNodesAtMarkAndPoint( rMark.nNode != rPoint.nNode && rMark.nNode.GetNode().GetTxtNode() && rPoint.nNode.GetNode().GetTxtNode() ); - // <-- if( !bSavePos && !bSaveOtherPos && bDifferentTxtNodesAtMarkAndPoint && dynamic_cast< const ::sw::mark::CrossRefBookmark* >(pBkmk)) { diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index e097f15..3b34bb2 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -86,7 +86,6 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm) // #i40845# - follow-up of #i35635# // move object to visible layer pDrawContact->MoveObjToVisibleLayer( pDrawContact->GetMaster() ); - // <-- } } diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 79284e7..792bece 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -558,7 +558,6 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext) { static_cast(rSave.pFmt)->PosAttrSet(); } - // <-- } rContext.SetSelections(0, pMarkLst); } diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx index a230acb..9576320 100644 --- a/sw/source/core/undo/unfmco.cxx +++ b/sw/source/core/undo/unfmco.cxx @@ -57,7 +57,6 @@ SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange, // #i31191# if ( pColl ) aFmtName = pColl->GetName(); - // <-- } @@ -114,7 +113,6 @@ SwRewriter SwUndoFmtColl::GetRewriter() const // pFmtColl->GetName(), because pFmtColl does not have to be available // anymore. aResult.AddRule(UNDO_ARG1, aFmtName ); - // <-- return aResult; } diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 3c3db37..463e272 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -145,7 +145,6 @@ void SwUndoInsNum::RedoImpl(::sw::UndoRedoContext & rContext) { // #i42921# - adapt to changed signature rDoc.SetNumRule(rPam, aNumRule, false); - // <-- } } } @@ -165,7 +164,6 @@ void SwUndoInsNum::RepeatImpl(::sw::RepeatContext & rContext) { // #i42921# - adapt to changed signature rDoc.SetNumRule(rContext.GetRepeatPaM(), aNumRule, false); - // <-- } } else diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 5e8fc07..6f0f59b 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -109,7 +109,6 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext) // #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 ); - // <-- pTblNd->DelFrms(); const SwTable& rTbl = pTblNd->GetTable(); @@ -135,7 +134,6 @@ void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext) // 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 ); - // <-- } else { @@ -186,7 +184,6 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext) // #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 ); - // <-- pTblNd->DelFrms(); const SwTable& rTbl = pTblNd->GetTable(); @@ -216,7 +213,6 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext) // 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 ); - // <-- } else { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 597fbae..646c257 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -268,7 +268,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) " - could not create Mark."); throw lang::IllegalArgumentException(); } - // <-- } void SwXBookmark::attachToRange( diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index f23f574..7e5a3dd 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -438,7 +438,6 @@ static void GetFormatAndCreateCursorFromRangeRep( // perform validation check. Thus, pass as 2nd parameter to const SwTableBox* pTLBox = pTable ? pTable->GetTblBox( aStartCell, true ) : 0; - // <-- if(pTLBox) { // hier muessen die Actions aufgehoben werden @@ -452,7 +451,6 @@ static void GetFormatAndCreateCursorFromRangeRep( // #i80314# // perform validation check. Thus, pass as 2nd parameter to const SwTableBox* pBRBox = pTable->GetTblBox( aEndCell, true ); - // <-- if(pBRBox) { pUnoCrsr->SetMark(); diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 361a9c8..11c7b90 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1094,17 +1094,14 @@ SwXFrameEnumeration::SwXFrameEnumeration(const SwDoc* const pDoc) // #i104937# // const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()]; const sal_uInt16 nSize = pFmts->Count(); - // <-- ::std::insert_iterator pInserter = ::std::insert_iterator(m_aFrames, m_aFrames.begin()); // #i104937# SwFrmFmt* pFmt( 0 ); for( sal_uInt16 i = 0; i < nSize; ++i ) // for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt) - // <-- { // #i104937# pFmt = (*pFmts)[i]; - // <-- if(pFmt->Which() != RES_FLYFRMFMT) continue; const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index a2732a7..21ade05 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -290,7 +290,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry { *pAny <<= OUString(); } - // <-- else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/ *pAny <<= false; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index d0cd3de..2ea0438 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -944,7 +944,6 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) : OSL_ENSURE( mxShape.is(), " - no XShape found at " ); } - // <-- } xShape = 0; m_refCount++; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 08539f2..d4ad785 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -895,7 +895,6 @@ SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) SwDoc *pDoc = pFmt->GetDoc(); // #i52858# - method name changed SdrModel *pDrawModel = pDoc->GetOrCreateDrawModel(); - // <-- SwFlyDrawContact* pContactObject = new SwFlyDrawContact( pFmt, pDrawModel ); pObject = pContactObject->GetMaster(); @@ -1052,7 +1051,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: GetOrCreateSdrObject( pFlyFmt ); pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), sDescription ); } - // <-- else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID) { SwFrmFmt *pFrmFmt = lcl_GetFrmFmt( aValue, pFmt->GetDoc() ); @@ -1085,7 +1083,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } } } - // <-- pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, sal_False ); delete pSet; @@ -1360,7 +1357,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } } } - // <-- pFmt->GetDoc()->SetFlyFrmAttr( *pFmt, aSet ); } @@ -1553,7 +1549,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) GetOrCreateSdrObject( pFlyFmt ); aAny <<= OUString(pFlyFmt->GetObjDescription()); } - // <-- else if(eType == FLYCNTTYPE_GRF && (rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_ACTUAL_SIZE)))) { @@ -1835,7 +1830,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) GetOrCreateSdrObject( pFlyFmt ); pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), aEmptyStr ); } - // <-- else { SwDoc* pDoc = pFmt->GetDoc(); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 5688e5c..3881da7 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -221,7 +221,6 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) // #i68522# const sal_Bool bOldShowProgress = xWrt->bShowProgress; xWrt->bShowProgress = sal_False; - // <-- long lLen; if( !IsError( aWriter.Write( xWrt ) ) && @@ -564,7 +563,6 @@ throw (lang::IllegalArgumentException) case FN_UNO_NUM_LEVEL: // #i91601# case FN_UNO_LIST_ID: - // <-- case FN_UNO_IS_NUMBER: { // multi selection is not considered @@ -586,7 +584,6 @@ throw (lang::IllegalArgumentException) pTxtNd->SetListId( sListId ); } } - // <-- else if (FN_UNO_IS_NUMBER == rEntry.nWID) { sal_Bool bIsNumber(sal_False); @@ -2013,7 +2010,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSet ); - // <-- } pStates[i] = ( pSet->Count() ) @@ -2029,7 +2025,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) // #i63870# SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSetParent, sal_True, sal_False ); - // <-- } pStates[i] = ( (pSetParent)->Count() ) diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index cc9d3a2..51286e0 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -34,7 +34,6 @@ #include // #i81002# #include -// <-- #include #include #include diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index df43031..b09abb5 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -1579,7 +1579,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) } } break; - // <-- case FN_UNO_ANCHOR_TYPES: case FN_UNO_TEXT_WRAP: diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 2c88ab1..8792753 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1223,7 +1223,6 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : rDoc.MakeNumRule( sCreatedNumRuleName, 0, sal_False, // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); - // <-- #if OSL_DEBUG_LEVEL > 1 (void)nIndex; #endif @@ -1548,7 +1547,6 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( // adjust conversion due to type mismatch between and awt::Size aAwtSize(TWIP_TO_MM100(aSize.Width()), TWIP_TO_MM100(aSize.Height())); pData = new PropValData((void*)&aAwtSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0)); - // <-- aPropertyValues.Insert(pData, aPropertyValues.Count()); const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation(); @@ -1930,7 +1928,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( SvxUnoFontDescriptor::ConvertToFont( *pDesc, aFont ); aFmt.SetBulletFont(&aFont); } - // <-- } else bWrongArg = sal_True; @@ -2276,7 +2273,6 @@ OUString SwXNumberingRules::getName() throw( RuntimeException ) aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True ); return OUString ( aString ); } - // <-- else return sCreatedNumRuleName; } diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 533f96f..366beee 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -430,7 +430,6 @@ void SwXTextMarkup::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem* /*pN // therefore I remove the assertion in SwModify::_Remove() if ( GetRegisteredIn() ) GetRegisteredInNonConst()->Remove( this ); - // <-- SolarMutexGuard aGuard; mpTxtNode = 0; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 6536adf..fae44c9 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1988,7 +1988,6 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) // #i44963# Good occasion to check if page sizes in // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import) pDoc->CheckDefaultPageFmt(); - // <-- CheckBrowseView( sal_True ); } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index cd3c810..a0109ff 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -175,7 +175,6 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, // #i38810# Do not reset modified state of document, if it's already been modified. const bool bIsDocModified( pDoc->IsModified() ); - // <-- pDoc->acquire(); pOutput = pOut; Init( pNewOpt ); diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 032d457..942d864 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -379,7 +379,6 @@ sal_uLong SwReader::Read( const Reader& rOptions ) // SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): // ATM still with Update pDoc->UpdateLinks( sal_True ); - // <-- // not insert: set the redline mode read from settings.xml eOld = static_cast( @@ -876,7 +875,6 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) // #i37248# - Modifications are only allowed at a new document. // contains a new document, if is set - see above. if ( pDoc && !pOutDoc->getPrinter( false ) ) - // <-- { const SwPageDesc& rPgDsc = const_cast(pOutDoc)->GetPageDesc( 0 ); //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 4b1ce0e..3b2e18d 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -628,7 +628,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, { nNumStart = static_cast< sal_uInt16 >(pTxtNd->GetActualListStartValue()); } - // <-- DBG_ASSERT( rHWrt.nLastParaToken == 0, "
 wurde nicht vor 
  •  beendet." );
         }
@@ -2410,7 +2409,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     // because the outline numbering isn't exported as a numbering - see 
     if ( pNd->IsOutline() &&
          pNd->GetNumRule() == pNd->GetDoc()->GetOutlineNumRule() )
-    // <--
     {
         aOutlineTxt = pNd->GetNumString();
         nOffset = nOffset + aOutlineTxt.Len();
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 10935a2..5a5160d 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1377,7 +1377,6 @@ void SwHTMLParser::StripTrailingPara()
                         const SwPaM aPaM(aNewPos);
                         pMarkAccess->repositionMark(ppMark->get(), aPaM);
                     }
-                    // <--
                 }
                 else if( nBookNdIdx > nNodeIdx )
                     break;
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 36cde4e..47c48b2 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -88,9 +88,7 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
         // Start value  indicates, that at this text node the numbering
         // is restarted with the value given at the corresponding level.
         bRestart = rTxtNd.IsListRestart() && !rTxtNd.HasAttrListRestartValue();
-        // <--
     }
-    // <--
     else
     {
         pNumRule = 0;
@@ -151,7 +149,6 @@ void SwHTMLParser::NewNumBulList( int nToken )
             {
                 aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
             }
-            // <--
             aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aNumFmt.SetBulletChar( cBulletChar );		// das Bulletzeichen !!
             nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL;
@@ -357,7 +354,6 @@ void SwHTMLParser::NewNumBulList( int nToken )
                 pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
                 bChangeNumFmt = sal_False;
             }
-            // <--
 
             DoPositioning( aItemSet, aPropInfo, pCntxt );
 
@@ -434,7 +430,6 @@ void SwHTMLParser::EndNumBulList( int nToken )
                         {
                             aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
                         }
-                        // <--
                         aNumFmt.SetBulletChar( cBulletChar );
                     }
                     aNumFmt.SetAbsLSpace( (i+1) * HTML_NUMBUL_MARGINLEFT );
@@ -458,7 +453,6 @@ void SwHTMLParser::EndNumBulList( int nToken )
         {
             // the next paragraph not numbered first
             SetNodeNum( rInfo.GetLevel(), false );
-            // <--
         }
     }
 
@@ -543,7 +537,6 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
         {
             aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
         }
-        // <--
         aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
         aNumFmt.SetBulletChar( cBulletChar );	// das Bulletzeichen !!
         aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
@@ -570,7 +563,6 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     {
         pTxtNode->SetCountedInList( bCountedInList );
     }
-    // <--
     // #i57919#
     // correction of refactoring done by cws swnumtree
     // -  contains the start value, if the numbering has to be restarted
@@ -581,7 +573,6 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
         pTxtNode->SetListRestart( true );
         pTxtNode->SetAttrListRestartValue( nStart );
     }
-    // <--
 
     if( GetNumInfo().GetNumRule() )
         GetNumInfo().GetNumRule()->SetInvalidRule( sal_True );
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index e1c7567..fd6d1f0 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1662,7 +1662,6 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr,
         aLSItem.SetLineHeight( nHeight );
         // interpret  attribute as minimum line height
         aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_MIN;
-        // <--
         aLSItem.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
         rItemSet.Put( aLSItem );
     }
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4f7f945..47e25b4 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -186,7 +186,6 @@ String HTMLReader::GetTemplateName() const
         // no OpenDocument Writer/Web template found.
         // search for OpenOffice.org Writer/Web template
         sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") );
-        // <--
         bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
     }
 #endif
@@ -302,7 +301,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     // #i83625#
     nContextStMin( 0 ),
     nContextStAttrMin( 0 ),
-    // <--
     nOpenParaToken( 0 ),
     eJumpTo( JUMPTO_NONE ),
 #if OSL_DEBUG_LEVEL > 1
@@ -518,7 +516,6 @@ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
         // wurde der Import vom SFX abgebrochen?
         eState = SVPAR_ERROR;
     }
-    // <--
 
     GetAsynchCallLink().Call(0);
     return 0;
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 2c43abd..0ed84da 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -403,7 +403,6 @@ public:
     {
         // #i73790# - method renamed
         pColl->ResetAllFmtAttr();
-        // <--
         pColl->SetAuto(sal_False); // nach Empfehlung JP
     }
     void Derived(SwTxtFmtColl* pBase)
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 3e02399..eb59eae 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -66,7 +66,6 @@
 #include 
 // #i27767#
 #include 
-// <--
 #include 
 #include 
 #include "dcontact.hxx"
@@ -506,7 +505,6 @@ void SwRTFParser::SetFlysInDoc()
                 new SwFlyDrawContact( pFmt,
                                       pFmt->GetDoc()->GetOrCreateDrawModel() );
         pContact->GetMaster()->SetOrdNum( n );
-        // <--
 
         delete pFlySave;
     }
@@ -557,7 +555,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
     SwFmtAnchor aAnchor( FLY_AT_PARA );
     SwFmtHoriOrient aHori( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME );
     SwFmtVertOrient aVert( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME );
-    // <--
 
     SvxFrameDirectionItem aFrmDir( FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
 
@@ -949,7 +946,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
     // #i35017# - constant name has changed
     pSet->Put( SwFmtWrapInfluenceOnObjPos(
                     text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ));
-    // <--
 
     SwFmtFollowTextFlow aFollowTextFlow( sal_False );
     pSet->Put( aFollowTextFlow );
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 60d5724..dc280fd 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -634,7 +634,6 @@ void SwRTFParser::ReadListOverrideTable()
                     }
                 }
             }
-            // <--
 
             pStyle->aAttrSet.ClearItem( FN_PARAM_NUM_LEVEL );
 
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 1b5c076..6391764 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -471,7 +471,6 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() )
                             }
                         }
                     }
-                    // <--
 
                     if ( !bAnchoredObjs )
                         DelLastNode();
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index bd3a78c..4c83ddd 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -427,7 +427,6 @@ void Writer::PutNumFmtFontsInAttrPool()
     const SwNumFmt* pFmt;
     const Font* pFont;
     const Font* pDefFont = &numfunc::GetDefBulletFont();
-    // <--
     sal_Bool bCheck = sal_False;
 
     for( sal_uInt16 nGet = rListTbl.Count(); nGet; )
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 55de32d..076fd3b 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -36,7 +36,6 @@ class SwFrmFmt;
 // #i30669#
 class SwFmtHoriOrient;
 class SwFmtVertOrient;
-// <--
 
 class WinwordAnchoring : public EscherExClientRecord_Base
 {
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 61534be..224f4c1 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -112,10 +112,8 @@ namespace
             }
 
             return bResult;
-            // <--
        }
     };
-    // <--
 
     bool IsValidSlotWhich(sal_uInt16 nSlotId, sal_uInt16 nWhichId)
     {
@@ -195,7 +193,6 @@ namespace sw
                         }
                         maLayoutSize = aRect.GetSize();
                     }
-                    // <--
                     switch (rNd.GetNodeType())
                     {
                         case ND_GRFNODE:
@@ -210,7 +207,6 @@ namespace sw
                             meWriterType = eTxtBox;
                             // #i43447# - Size equals layout size for text boxes
                             maSize = maLayoutSize;
-                            // <--
                             break;
                     }
                     mpStartFrameContent = &rNd;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 7d1248a..c1dd892 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -170,14 +170,12 @@ void WW8Export::DoComboBox(uno::Reference xPropSet)
         try 
         {        
             uno::Any aTmp = xPropSet->getPropertyValue(C2U("HelpText"));
-            // <--
             const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
             if (pStr)
                 sHelp = *pStr;
         }
         catch( uno::Exception& )
         {}
-        // <--
     }
 
     rtl::OUString sToolTip;
@@ -486,7 +484,6 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
             // Most positions are converted, if layout information exists.
             const bool bPosConverted =
                 WinwordAnchoring::ConvertPosition( rHOr, rVOr, rFmt );
-            // <--
 
             Point aObjPos;
             if (RES_FLYFRMFMT == rFmt.Which())
@@ -504,7 +501,6 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
                     const SwRect aSizeRect(rFmt.FindLayoutRect());
                     if ( aSizeRect.Width() > aLayRect.Width() )
                         aLayRect.Width( aSizeRect.Width() );
-                    // <--
 
                     aRect = aLayRect.SVRect();
                 }
@@ -542,7 +538,6 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
                     aObjPos.X() = rHOr.GetPos();
                 aRect.SetPos( aObjPos );
             }
-            // <--
 
             sal_Int32 nThick = aIter->mnThick;
 
@@ -2090,7 +2085,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
     {
         return false;
     }
-    // <--
 
     bool bConverted( false );
 
@@ -2115,7 +2109,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
             bConvDueToAnchoredAtColBreakPara = true;
         }
     }
-    // <--
 
     // convert horizontal position, if needed
     {
@@ -2178,7 +2171,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
                     OSL_FAIL( " - unknown horizontal relation" );
             }
         }
-        // <--
         if ( eHoriConv != NO_CONV )
         {
             _iorHoriOri.SetHoriOrient( text::HoriOrientation::NONE );
@@ -2196,7 +2188,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
                     {
                         _iorHoriOri.SetRelationOrient( text::RelOrientation::PAGE_PRINT_AREA );
                     }
-                    // <--
                 }
                 else if ( eHoriConv == CONV2COL )
                 {
@@ -2308,7 +2299,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
                     {
                         _iorVertOri.SetRelationOrient( text::RelOrientation::PAGE_PRINT_AREA );
                     }
-                    // <--
                 }
                 else if ( eVertConv == CONV2PARA )
                 {
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 833e12f..59b8e0a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2101,7 +2101,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             {
                 aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetAbsLSpace() );
             }
-            // <--
 
             if( rNode.IsNumbered() && rNode.IsCountedInList() )
             {
@@ -2114,7 +2113,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                     else
                         aLR.SetTxtFirstLineOfst(GetWordFirstLineOffset(*pFmt));
                 }
-                // <--
 
                 // correct fix for issue i94187
                 if (SFX_ITEM_SET !=
@@ -2216,7 +2214,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 // put back the new item
                 pTmpSet->Put( aLRSpace );
             }
-            // <--
 
             // assure that numbering rule is in 
             if (SFX_ITEM_SET != pTmpSet->GetItemState(RES_PARATR_NUMRULE, false) )
@@ -2307,7 +2304,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 }
             }
         }
-        // <--
 
         const SfxItemSet* pNewSet = pTmpSet ? pTmpSet : rNode.GetpSwAttrSet();
         if( pNewSet )
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index c54ca77..dcb9090 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -109,7 +109,6 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
             SwNumRule* pR = (SwNumRule*)pDoc->GetOutlineNumRule();
             pUsedNumTbl->Insert( pR, pUsedNumTbl->Count() );
         }
-        // <--
     }
     SwNumRule* p = (SwNumRule*)&rNumRule;
     sal_uInt16 nRet = pUsedNumTbl->GetPos(p);
@@ -124,7 +123,6 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
             nRet = (*aResult).second;
         }
     } while ( aResult != aRuleDuplicates.end() );
-    // <--
 
     return nRet;
 }
@@ -355,7 +353,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                     }
                 }
             }
-            // <--
 
             // Build the NumString for this Level
             String sNumStr;
@@ -393,7 +390,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                                 rFmt.GetCharTextDistance() == 0 )
                               ? 2 : 0;     // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
                 }
-                // <--
             }
             else
             {
@@ -403,7 +399,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                     // the numbering string has to be restrict
                     // to the level currently working on.
                     sNumStr = rRule.MakeNumString(aNumVector, false, true, nLvl);
-                    // <--
 
                     // now search the nums in the string
                     for( sal_uInt8 i = 0; i <= nLvl; ++i )
@@ -427,7 +422,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                                     rFmt.GetCharTextDistance() == 0 )
                                   ? 2 : 0;     // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
                     }
-                    // <--
                 }
 
                 if( rFmt.GetPrefix().Len() )
@@ -629,7 +623,6 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
         if (GetWordFirstLineOffset(rFmt) < 0)
             nb |= 0x8;          // number will be displayed using a hanging indent
     }
-    // <--
     ByteToSVBT8(nb, rAnlv.aBits1);
 
     if (1 < rCharLen)
@@ -691,7 +684,6 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
         ShortToSVBT16( 0, rAnlv.dxaIndent );
         ShortToSVBT16( 0, rAnlv.dxaSpace );
     }
-    // <--
 }
 
 void MSWordExportBase::SubstituteBullet( String& rNumStr,
@@ -830,7 +822,6 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
         ShortToSVBT16( 0, rAnlv.dxaIndent );
         ShortToSVBT16( 0, rAnlv.dxaSpace );
     }
-    // <--
 }
 
 void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 3f950ff..c7abbfa 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2693,7 +2693,6 @@ void WW8Export::WriteFkpPlcUsw()
             (pDoc->getExternalData(::sw::STTBF_ASSOC).get());
 
         if ( pSttbfAssoc )                      // #i106057#
-        // <--
         {
         ::std::vector aStrings;
 
@@ -2717,7 +2716,6 @@ void WW8Export::WriteFkpPlcUsw()
           (pDoc->getExternalData(::sw::FIB).get());
     
     if ( pFibData )
-    // <--
     {
     pFib->fReadOnlyRecommended = 
         pFibData->getReadOnlyRecommended() ? 1 : 0;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a6e8ae6..70bd0fb 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -527,7 +527,6 @@ public:
     SwEscherEx* pEscher;            // escher export class
     // #i43447# - removed
 //    SwTwips nFlyWidth, nFlyHeight;  // Fuer Anpassung Graphic
-    // <--
 
     sal_uInt8 nTxtTyp;
 
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3f07ea8..ac4b148 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -427,7 +427,6 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
         OutputField( 0, ww::eINCLUDEPICTURE, sStr,
                    WRITEFIELD_START | WRITEFIELD_CMD_START | WRITEFIELD_CMD_END );
     }
-    // <--
 
     WriteChar( (char)1 );   // Grafik-Sonderzeichen in Haupttext einfuegen
 
@@ -499,7 +498,6 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
     if ( !rFrame.IsInline() &&
          ( ((eAn == FLY_AT_PARA) && ( bWrtWW8 || !bIsInTable )) ||
            (eAn == FLY_AT_PAGE)) )
-    // <--
     {
         WriteChar( (char)0x0d ); // umgebenden Rahmen mit CR abschliessen
 
@@ -520,7 +518,6 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
     {
         OutputField( 0, ww::eINCLUDEPICTURE, String(), WRITEFIELD_CLOSE );
     }
-    // <--
 }
 
 GraphicDetails& GraphicDetails::operator=(const GraphicDetails &rOther)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9a51005..ffd6a2e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -470,7 +470,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                     }
                 }
             }
-            // <--
 
             bBreakSet = true;
 
@@ -494,7 +493,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
                     {
                         bNewPageDesc = SetAktPageDescFromNode( rNd );
                     }
-                    // <--
                 }
                 if ( !bNewPageDesc )
                     AttrOutput().OutputItem( *pItem );
@@ -738,7 +736,6 @@ bool WW8Export::DisallowInheritingOutlineNumbering(const SwFmt &rFmt)
 
     return bRet;
 }
-// <--
 
 void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpFmt, bool bFlyFmt )
 {
@@ -797,7 +794,6 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                         com::sun::star::i18n::ScriptType::LATIN, mbExportModeRTF);
                     bCallOutSet = false;
                 }
-                // <--
             }
         }
         break;
@@ -1842,7 +1838,6 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
             // insert hyperlink character including attributes and data.
             InsertSpecialChar( *this, 0x01, &aLinkStr );
         }
-        // <--
     }
     if (WRITEFIELD_CMD_END & nMode)
     {
@@ -3608,7 +3603,6 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
                 {
                     bCheckForFollowPageDesc = true;
                 }
-                // <--
                 break;
 
             default:
@@ -3629,7 +3623,6 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
             {
                 SectionBreak( nC );
             }
-            // <--
         }
     }
 }
@@ -4952,7 +4945,6 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
         ParaTabStopDelAdd( m_rWW8Export, aTabs, 0, rTabStops, 0 );
         return;
     }
-    // <--
 
     // StyleDef -> "einfach" eintragen || keine Style-Attrs -> dito
     const SvxTabStopItem* pStyleTabs = 0;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 3ee02ae..83cdba3 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1985,7 +1985,6 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
             // #i47277# - contour is already in unit of the
             // graphic prefered unit. Thus, call method 
             pNd->SetContour(&aPoly);
-            // <--
         }
     }
 }
@@ -2186,7 +2185,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
             // - inside -> text::HoriOrientation::LEFT and outside -> text::HoriOrientation::RIGHT
             text::HoriOrientation::LEFT,   // inside
             text::HoriOrientation::RIGHT   // outside
-            // <--
         };
 
 
@@ -2253,7 +2251,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
             pFSPA->nXaLeft = 0;
             pFSPA->nXaRight = nWidth;
         }
-        // <--
 
         // #i24255# - position of floating screen objects in
         // R2L layout are given in L2R layout, thus convert them of all
@@ -2269,7 +2266,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
                 pFSPA->nXaRight = pFSPA->nXaLeft + nWidth;
             }
         }
-        // <--
 
         // if the object is anchored inside a table cell, is horizontal aligned
         // at frame|character and has wrap through, but its attribute
@@ -2282,7 +2278,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
         {
             eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
         }
-        // <--
 
         SwFmtHoriOrient aHoriOri(MakeSafePositioningValue(pFSPA->nXaLeft),
             eHoriOri, eHoriRel);
@@ -2361,7 +2356,6 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
                      nLayoutInTableCell & 0x80008000 ||
                      ( nLayoutInTableCell & 0x02000000 &&
                        !(nLayoutInTableCell & 0x80000000 ) ) )
-                // <--
                 {
                     bIsObjectLayoutInTableCell = true;
                 }
@@ -2380,7 +2374,6 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable
 
     return bIsObjectLayoutInTableCell;
 }
-// <--
 
 SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 {
@@ -2564,7 +2557,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
     const bool bLayoutInTableCell =
         nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
-    // <--
 
     // #i18732# - Switch on 'follow text flow', if object is laid out
     // inside table cell and its wrapping isn't 'SURROUND_THROUGH'
@@ -2635,7 +2627,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
                 //  pass information, if object is in page header|footer to method.
                 pWWZOrder->InsertEscherObject( pObject, pF->nSpId,
                                                bIsHeader || bIsFooter );
-                // <--
             }
             else
             {
@@ -2671,7 +2662,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     {
         static_cast(pRetFrmFmt)->PosAttrSet();
     }
-    // <--
     if (!IsInlineEscherHack())
         MapWrapIntoFlyFmt(pRecord, pRetFrmFmt);
 
@@ -2972,7 +2962,6 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
             // One of the two conditions have to be true to insert the graphic
             // as a linked graphic -
             if (GRAPHIC_NONE == eType || CanUseRemoteLink(aGrfName))
-            // <--
             {
                 pRetFrmFmt = rDoc.Insert(*pPaM, aGrfName, aEmptyStr, 0,
                     &rFlySet, &aGrSet, NULL);
@@ -3026,7 +3015,6 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
             // pass information, if object is in page header|footer to method.
             pWWZOrder->InsertEscherObject( rpOurNewObject, pF->nSpId,
                                            bIsHeader || bIsFooter );
-            // <--
         }
     }
     return pRetFrmFmt;
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index 6af8c30..d24b014 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -45,7 +45,6 @@ struct EscherShape
           mnNoInlines(0),
           mbInHeaderFooter( _bInHeaderFooter )
     {}
-    // <--
 };
 
 class wwZOrderer
@@ -58,7 +57,6 @@ private:
     //No of objects in doc before starting (always 0 unless using file->insert
     //and probably 0 then as well
     std::vector maEscherLayer;
-    // <--
     typedef std::vector::iterator myeiter;
 
     std::vector maDrawHeight;
@@ -79,7 +77,6 @@ private:
     // that object is in header or footer
     sal_uLong GetEscherObjectPos( sal_uLong nSpId,
                               const bool _bInHeaderFooter );
-    // <--
     sal_uLong GetDrawingObjectPos(short nWwHeight);
     bool InsertObject(SdrObject *pObject, sal_uLong nPos);
 public:
@@ -95,7 +92,6 @@ public:
     void InsertEscherObject( SdrObject* pObject,
                              sal_uLong nSpId,
                              const bool _bInHeaderFooter );
-    // <--
     void InsideEscher(sal_uLong nIndex);
     void OutsideEscher();
 };
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 4a3ea59..bfc40b0 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -86,7 +86,6 @@ void wwZOrderer::InsertEscherObject( SdrObject* pObject,
                                      const bool _bInHeaderFooter )
 {
     sal_uLong nInsertPos = GetEscherObjectPos( nSpId, _bInHeaderFooter );
-// <--
     InsertObject(pObject, nInsertPos + mnNoInitialObjects + mnInlines);
 }
 
@@ -151,7 +150,6 @@ sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId,
             ++aIter;
         }
     }
-    // <--
     while (aIter != aEnd)
     {
         // insert object in page header|footer
@@ -160,7 +158,6 @@ sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId,
         {
             break;
         }
-        // <--
         if ( aIter->mnEscherShapeOrder > nFound )
             break;
         nRet += aIter->mnNoInlines+1;
@@ -169,7 +166,6 @@ sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId,
     maEscherLayer.insert(aIter, EscherShape( nFound, _bInHeaderFooter ) );
     return nRet;
 }
-// <--
 
 // InsertObj() fuegt das Objekt in die Sw-Page ein und merkt sich die Z-Pos in
 // einem VarArr
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f1f2745..86012c7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -385,7 +385,6 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
     {
         return 0L;
     }
-    // <--
 
     SdrObject* pRet = 0;
     String sStorageName;
@@ -1067,7 +1066,6 @@ void SyncIndentWithList( SvxLRSpaceItem &rLR,
         }
     }
 }
-// <--
 
 const SwNumFmt* SwWW8FltControlStack::GetNumFmtFromStack(const SwPosition &rPos,
     const SwTxtNode &rTxtNode)
@@ -1141,7 +1139,6 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
                             SyncIndentWithList( aNewLR, *pNum,
                                                 bFirstLineIndentSet,
                                                 bLeftIndentSet );
-                            // <--
                         }
 
                         if (aNewLR == aOldLR)
@@ -1890,7 +1887,6 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
     {
         pFrmObj->SetOrdNum( 0L );
     }
-    // <--
     MoveInsideFly(pFrame);
 
     const SwNodeIndex* pHackIdx = pFrame->GetCntnt().GetCntntIdx();
@@ -3530,7 +3526,6 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
                 {
                     AppendTxtNode(*pPaM->GetPoint());
                 }
-                // <--
                 rDoc.InsertPoolItem(*pPaM,
                     SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK), 0);
                 bFirstParaOfPage = true;//xushanchuan add for issue106569
@@ -5117,7 +5112,6 @@ void SwWW8ImplReader::SetOutLineStyles()
     // But at the end of the method  has to be set to
     // , because  will be destroyed.
     mpChosenOutlineNumRule = &aOutlineRule;
-    // <--
 
     sw::ParaStyles aOutLined(sw::util::GetParaStyles(rDoc));
     // #i98791# - sorting algorithm adjusted
@@ -5134,7 +5128,6 @@ void SwWW8ImplReader::SetOutLineStyles()
         // #i70748# - backward iteration needed due to the outline level attribute
         sw::ParaStyles::reverse_iterator aEnd = aOutLined.rend();
         for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
-        // <--
         {
             if ((*aIter)->IsAssignedToListLevelOfOutlineStyle())
                 nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
@@ -5184,7 +5177,6 @@ void SwWW8ImplReader::SetOutLineStyles()
                 mpChosenOutlineNumRule = pCollA[ aIter->first ].pOutlineNumrule;
             }
         }
-        // <--
 
         OSL_ENSURE(mpChosenOutlineNumRule, "Impossible");
         if (mpChosenOutlineNumRule)
@@ -5195,7 +5187,6 @@ void SwWW8ImplReader::SetOutLineStyles()
             // #i70748# - backward iteration needed due to the outline level attribute
             sw::ParaStyles::reverse_iterator aEnd = aOutLined.rend();
             for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
-            // <--
             {
                 if((*aIter)->IsAssignedToListLevelOfOutlineStyle())
                     (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle();	//<-end
@@ -5279,7 +5270,6 @@ void SwWW8ImplReader::SetOutLineStyles()
     {
         mpChosenOutlineNumRule = rDoc.GetOutlineNumRule();
     }
-    // <--
 }
 
 const String* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
@@ -5594,7 +5584,6 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName,
 
                 rReader.pPlcxMan->RestoreAllPLCFx( aSave );
             }
-            // <--
         }
         rReader.pStrm->Seek( nOldPos );
     }
@@ -5632,7 +5621,6 @@ bool SwWW8ImplReader::InEqualOrHigherApo(int nLvl) const
     {
         return false;
     }
-    // <--
     mycApoIter aIter = std::find(maApos.begin() + nLvl, maApos.end(), true);
     if (aIter != maApos.end())
         return true;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index e666861..0ab33fc 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -572,7 +572,6 @@ private:
                                   const Rectangle& rVisArea,
                                   const int _nCalledByGroup,
                                   sal_Int64 nAspect ) const;
-    // <--
 
     //No copying
     SwMSDffManager(const SwMSDffManager&);
@@ -1150,7 +1149,6 @@ private:
     void NewAttr( const SfxPoolItem& rAttr,
                   const bool bFirstLineOfStSet = false,
                   const bool bLeftIndentSet = false );
-    // <--
 
     bool GetFontParams(sal_uInt16, FontFamily&, String&, FontPitch&,
         rtl_TextEncoding&);
@@ -1403,7 +1401,6 @@ private:
     // #i84783#
     // determine object attribute "Layout in Table Cell"
     bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const;
-    // <--
     bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
     //No copying
     SwWW8ImplReader(const SwWW8ImplReader &);
@@ -1614,7 +1611,6 @@ void SyncIndentWithList( SvxLRSpaceItem &rLR,
                          const SwNumFmt &rFmt,
                          const bool bFirstLineOfStSet,
                          const bool bLeftIndentSet );
-// <--
 long GetListFirstLineIndent(const SwNumFmt &rFmt);
 String BookmarkToWriter(const String &rBookmark);
 bool RTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index d4f7cb2..077cb24 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -593,7 +593,6 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
                         pTableDesc->GetAktCol() == 0 &&
                         ( !pTableDesc->IsValidCell( pTableDesc->GetAktCol() ) ||
                           pTableDesc->InFirstParaInCell() );
-                    // <--
                 }
             }
         }
@@ -782,7 +781,6 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
     // #i86652#
     sal_uInt16 nRul = rDoc.MakeNumRule( aName, 0, sal_False,
                                     SvxNumberFormat::LABEL_ALIGNMENT );
-    // <--
     pStyles->pStyRule = rDoc.GetNumRuleTbl()[nRul];
     // Auto == false-> Nummerierungsvorlage
     pStyles->pStyRule->SetAutoRule(false);
@@ -1005,7 +1003,6 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
             pNumRule = rDoc.GetNumRuleTbl()[
                             rDoc.MakeNumRule( sNumRule, 0, sal_False,
                                               SvxNumberFormat::LABEL_ALIGNMENT ) ];
-            // <--
         }
         if (pTableDesc)
         {
@@ -2656,7 +2653,6 @@ void WW8TabDesc::MergeCells()
                             else
                                 break;
                         pActMGroup->nGroupWidth = nSizCell;
-                        // <--
 
                         // locked previously created merge groups,
                         // after determining the size for the new merge group.
@@ -2669,7 +2665,6 @@ void WW8TabDesc::MergeCells()
                         {
                             (*pMergeGroups)[ nMGrIdx ]->bGroupLocked = true;
                         }
-                        // <--
 
                         // 3. und in Gruppen-Array eintragen
                         pMergeGroups->Insert(pActMGroup, pMergeGroups->Count());
@@ -3334,7 +3329,6 @@ SwTableBox* WW8TabDesc::UpdateTableMergeGroup(  WW8_TCell&     rCell,
            rCell.bMerged ||
            rCell.bVertMerge ||
            rCell.bVertRestart ) )
-    // <--
     {
         // passende Merge-Gruppe ermitteln
         WW8SelBoxInfo* pTheMergeGroup = 0;
@@ -3414,7 +3408,6 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
     // only at-character, if absolute position object attributes are available.
     // Thus, default anchor type is as-character anchored.
     RndStdIds eAnchor( FLY_AS_CHAR );
-    // <--
     if ( nInTable )
     {
         WW8_TablePos* pNestedTabPos( 0L );
@@ -3447,7 +3440,6 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
             }
         }
     }
-    // <--
 
     pTableDesc = new WW8TabDesc( this, nStartCp );
 
@@ -3475,7 +3467,6 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
                                                       pTableDesc->pParentPos, &aItemSet);
             OSL_ENSURE( pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
                    "Not the anchor type requested!" );
-            // <--
             MoveInsideFly(pTableDesc->pFlyFmt);
         }
         pTableDesc->CreateSwTable();
@@ -3499,11 +3490,9 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
                 pTableDesc->pFlyFmt->SetFmtAttr(aHori);
                 pTableDesc->pFlyFmt->SetFmtAttr( SwFmtSurround( SURROUND_NONE ) );
             }
-            // <--
             // #i33818# - The nested table doesn't have to leave
             // the table cell. Thus, the Writer fly frame has to follow the text flow.
             pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( sal_True ) );
-            // <--
         }
         else
             pTableDesc->SetSizePosition(0);
@@ -3515,7 +3504,6 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
     // #i33818#
     delete pTableWFlyPara;
     delete pTableSFlyPara;
-    // <--
 
     bool bSuccess = (0 != pTableDesc);
     if (bSuccess)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index cdf6491..5eae82b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -666,7 +666,6 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
                 }
             }
         }
-        // <--
     }
     //
     // 3. ggfs. CHPx einlesen und
@@ -797,7 +796,6 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
             ++aIter;
         }
     }
-    // <--
 
     sal_uInt8 nUpperLevel = 0;  // akt. Anzeigetiefe fuer den Writer
     for(nLevelB = 0; nLevelB < nMaxLevel; ++nLevelB)
@@ -1058,7 +1056,6 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
     sal_uInt16 nRul =
             rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, sal_False,
                               SvxNumberFormat::LABEL_ALIGNMENT );
-    // <--
     SwNumRule* pMyNumRule = rDoc.GetNumRuleTbl()[nRul];
     pMyNumRule->SetAutoRule(false);
     pMyNumRule->SetContinusNum(bSimple);
@@ -1632,7 +1629,6 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
         {
             return bRes;
         }
-        // <--
 
         SwNumRule * pNumRule = pTxtNode->GetNumRule(); // #i27610#
 
@@ -1677,7 +1673,6 @@ void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt)
         rStyle.pFmt->SetFmtAttr(aLR);
         rStyle.bListReleventIndentSet = true;
     }
-    // <--
 }
 
 void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt)
@@ -1809,7 +1804,6 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
             // correct condition according to the above given comment.
             if ( pTxtNd->GetNumRule() == rDoc.GetOutlineNumRule() &&
                  pRule == mpChosenOutlineNumRule )
-            // <--
             {
                 bUnchangedOutlineNumbering = true;
             }
@@ -1835,7 +1829,6 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
             {
                 pTxtNd->SetCountedInList( true );
             }
-            // <--
 
             // #i99822#
             // Direct application of the list level formatting no longer
@@ -1891,7 +1884,6 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
                     pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LR_SPACE);
                 }
             }
-            // <--
         }
     }
 }
@@ -2015,7 +2007,6 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
                         pTxtNode->SetAttr(
                             SwNumRuleItem( rDoc.GetOutlineNumRule()->GetName() ) );
                     }
-                    // <--
                 }
 
                 pCtrlStck->NewAttr(*pPaM->GetPoint(), SvxLRSpaceItem(RES_LR_SPACE));
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 691fef9..e237c51 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -594,7 +594,6 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL
     {
         sParams.SearchAndReplace(CREATE_CONST_ASC("YY"), CREATE_CONST_ASC("YYYY"));
     }
-    // <--
     return sParams;
 }
 
@@ -1112,7 +1111,6 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
         {
             aStr.EraseAllChars( 0x01 );
         }
-        // <--
 
         eF_ResT eRes = (this->*aWW8FieldTab[aF.nId])( &aF, aStr );
         pStrm->Seek( nOldPos );
@@ -3315,7 +3313,6 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
                             }
                             if ( pForm )
                                 pBase->SetTOXForm( *pForm );
-                            // <--
                         }
 
                         if (eCreateFrom)
@@ -3358,7 +3355,6 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
                             aForm.SetTemplate( nLevel,
                                 aOldForm.GetTemplate(nLevel));
                         }
-                        // <--
 
                         pBase->SetTOXForm( aForm );
                     }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 756f757..c491cc1 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -619,7 +619,6 @@ void wwSectionManager::SetPageULSpaceItems(SwFrmFmt &rFmt,
                 const SwTwips nHdLowerSpace( Abs(rSection.maSep.dyaTop) - rData.nSwUp - rData.nSwHLo );
                 pHdFmt->SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, 0, rData.nSwHLo + nHdLowerSpace));
                 aHdUL.SetLower( static_cast< sal_uInt16 >(nHdLowerSpace) );
-                // <--
                 pHdFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, false));
             }
@@ -647,7 +646,6 @@ void wwSectionManager::SetPageULSpaceItems(SwFrmFmt &rFmt,
                 const SwTwips nFtUpperSpace( Abs(rSection.maSep.dyaBottom) - rData.nSwLo - rData.nSwFUp );
                 pFtFmt->SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE, 0, rData.nSwFUp + nFtUpperSpace));
                 aFtUL.SetUpper( static_cast< sal_uInt16 >(nFtUpperSpace) );
-                // <--
                 pFtFmt->SetFmtAttr(SwHeaderAndFooterEatSpacingItem(
                     RES_HEADER_FOOTER_EAT_SPACING, false));
             }
@@ -2025,7 +2023,6 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
         nRiMgn = rWW.nRiMgn;
     }
     else if (rWW.bBorderLines)
-    // <--
     {
         /*
         #i582#
@@ -2630,14 +2627,12 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
                 const SwNode* pNd = &(pPaM->GetPoint()->nNode.GetNode());
                 maTxtNodesHavingFirstLineOfstSet.insert( pNd );
             }
-            // <--
             // #i105414#
             if ( bLeftIndentSet )
             {
                 const SwNode* pNd = &(pPaM->GetPoint()->nNode.GetNode());
                 maTxtNodesHavingLeftIndentSet.insert( pNd );
             }
-            // <--
         }
 
         if (mpPostProcessAttrsInfo && mpPostProcessAttrsInfo->mbCopy)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index fc63edc..00efe9d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5571,7 +5571,6 @@ WW8Fib::WW8Fib(sal_uInt8 nVer)
             fFarEast = false;
             break;
     };
-    // <--
 
     Locale aTempLocale;
     SvxLanguageToLocale( aTempLocale, lid );
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 46f342b..994b061 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -80,7 +80,6 @@
 #include 
 #include 
 #include 
-// <--
 
 #include 
 #include 
@@ -465,7 +464,6 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
         if ( !aOutlineLevelAssigned[ i ] &&
              aCreatedDefaultOutlineStyles[ i ] != 0 &&
              ! aCreatedDefaultOutlineStyles[ i ]->IsAssignedToListLevelOfOutlineStyle() )
-        // <--
         {
             // apply outline level at created default outline style
             aCreatedDefaultOutlineStyles[ i ]->AssignToListLevelOfOutlineStyle(i);//#outline level added by zhaojianwei
@@ -482,7 +480,6 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
     }
 
 }
-// <--
 
 void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc )
 {
@@ -644,7 +641,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
         { "ShapePositionInHoriL2R", sizeof("ShapePositionInHoriL2R")-1, 0,
               &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        // <--
 
         { "BuildId", sizeof("BuildId")-1, 0,
               &::getCppuType( (OUString *)0 ),
@@ -659,7 +655,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
         { "TextDocInOOoFileFormat", sizeof("TextDocInOOoFileFormat")-1, 0,
               &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        // <--
         { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
@@ -870,7 +865,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
                 OUString(RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R")),
                 makeAny( bShapePositionInHoriL2R ) );
     }
-    // <--
     {
         const sal_Bool bTextDocInOOoFileFormat = !bOASIS;
         xInfoSet->setPropertyValue(
@@ -1020,12 +1014,10 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
         {
             lcl_AdjustOutlineStylesForOOo( rDoc );
         }
-        // <--
         // Fix #i58251#: Unfortunately is the static default different to SO7 behaviour,
         // so we have to set a dynamic default after importing SO7
         rDoc.SetDefault( SfxBoolItem( RES_ROW_SPLIT, sal_False ) );
     }
-    // <--
 
     rDoc.PropagateOutlineRule();
 
@@ -1034,7 +1026,6 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
     {
         rDoc.set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, false);
     }
-    // <--
 
     // Convert all instances of  into , because the
     // Writer doesn't support such objects.
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 394be30..e887615 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -174,7 +174,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
         { "OutlineStyleAsNormalListStyle", sizeof("OutlineStyleAsNormalListStyle")-1, 0,
               &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        // <--
         { "TargetStorage", sizeof("TargetStorage")-1,0, &embed::XStorage::static_type(),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 
@@ -278,7 +277,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
                 RTL_CONSTASCII_USTRINGPARAM("OutlineStyleAsNormalListStyle") );
         xInfoSet->setPropertyValue( sOutlineStyleAsNormalListStyle, makeAny( sal_True ) );
     }
-    // <--
 
     // filter arguments
     // - graphics + object resolver for styles + content
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 641ad68..96dd103 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -668,7 +668,6 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
                                    sName,
                                    nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
                                    sal_True);
-    // <--
     SwPageDesc *pPageDesc = pDoc->FindPageDescByName( sName );
     if( !pPageDesc )
     {
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f3445f6..c9f6007 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -327,7 +327,6 @@ void SwXMLAutoStylePoolP::exportStyleAttributes(
                         GetExport().AddAttribute( XML_NAMESPACE_STYLE,
                               sListStyleName,
                               GetExport().EncodeStyleName( sStyleName ) );
-                        // <--
                     }
                     break;
                 case CTF_PAGEDESCNAME:
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 78757d9..790bfa6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -337,7 +337,6 @@ SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext(
                     nPrefix, rLocalName, xAttrList );
     }
 }
-// <--
 
 // #i69629# - new subclass  of class 
 class SwXMLDocStylesContext_Impl : public SwXMLDocContext_Impl
@@ -378,9 +377,7 @@ void SwXMLDocStylesContext_Impl::EndElement()
     SwXMLImport& rSwImport = dynamic_cast( GetImport());
     GetImport().GetTextImport()->SetOutlineStyles(
             (rSwImport.GetStyleFamilyMask() & SFX_STYLE_FAMILY_PARA ) ? sal_True : sal_False);
-    // <--
 }
-// <--
 //----------------------------------------------------------------------------
 
 const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap()
@@ -428,7 +425,6 @@ SvXMLImportContext *SwXMLImport::CreateContext(
         pContext = new SwXMLDocStylesContext_Impl( *this, nPrefix, rLocalName,
                                                    xAttrList );
     }
-    // <--
     else
         pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList );
 
@@ -1387,7 +1383,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
         xProps->setPropertyValue(
             OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotJustifyLinesWithManualBreak")), makeAny( true ) );
     }
-    // <--
 
     // This flag has to be set for all documents < SO8
     if ( !bDoNotResetParaAttrsForNumFont && bDocumentPriorSO8 )
@@ -1427,7 +1422,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
         xProps->setPropertyValue(
             OUString( RTL_CONSTASCII_USTRINGPARAM("UseOldPrinterMetrics") ), makeAny( true ) );
     }
-    // <--
 
     Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
     Reference < XText > xText = xTextDoc->getText();
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 6263292..77a5739 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -997,7 +997,6 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
                     nCol = nOldCol;
                 }
             }
-            // <--
 
             sal_uInt16 nColSpan = nCol - nOldCol + 1U;
 
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index bbe48cc..ee34901 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1813,7 +1813,6 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode( sal_uInt32 nRow,
         // #i95726# - Some fault tolerance
 //        else
         else if ( pPrevCell->GetSubTable() )
-        // <--
             pSttNd = pPrevCell->GetSubTable()->GetLastStartNode();
 
         OSL_ENSURE( pSttNd != 0,
@@ -2293,7 +2292,6 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     OSL_FAIL( "table seems to be corrupt." );
                     break;
                 }
-                // <--
 
                 // Could the table fragment be splitted vertically behind the
                 // current column (uptp the current line?
@@ -2326,7 +2324,6 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                 if( ( !bHasSubTables || ( pCell->GetRowSpan() == (nBottomRow-nTopRow) ) ) &&
                     pCell->GetColSpan() == (nCol+1UL-nStartCol) &&
                     ( pCell->GetStartNode() || pCell->GetSubTable() ) )
-                // <--
                 {
                     // insert new empty cell for covered cells:
                     long nBoxRowSpan = 1;
@@ -2889,7 +2886,6 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
         {
             pDoc = const_cast(pEndNd->GetDoc());
         }
-        // <--
         sal_uInt32 nOffset = pPrevSttNd ? 1UL : 0UL;
         SwNodeIndex aIdx( *pEndNd, nOffset );
         SwTxtFmtColl *pColl =
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 1321795..23943b7 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -345,7 +345,6 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
     // at the document instance, the document is modified. Thus, reset this
     // status here. Note: In method  this is also done.
     pDoc->ResetModified();
-    // <--
 
     return bRet;
 }
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index e774c5c..874a8eb 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -868,7 +868,6 @@ sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily,
             // clear also list attributes at affected text nodes, if paragraph
             // style has the list style attribute set.
             pSh->SetTxtFmtColl( pStyle->GetCollection(), true );
-            // <--
             break;
         }
         case SFX_STYLE_FAMILY_FRAME:
@@ -1007,7 +1006,6 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr
                 // #i105535#
                 // no update of anchor attribute
                 aSet.ClearItem( RES_ANCHOR );
-                // <--
 
                 pFrm->SetFmtAttr( aSet );
 
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 86c6573..2bf690d 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1286,7 +1286,6 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
                     // copy of the page style
                     ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
                     rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983#
-                    // <--
 
                     pFmt = &pNewDsc->GetMaster();
                 }
@@ -2169,7 +2168,6 @@ void  SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
             {
                 // #i73790# - method renamed
                 pTargetFmt->ResetAllFmtAttr();
-                // <--
             }
 
             if( USHRT_MAX != nPgDscPos )
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index ea23bb3..958067c 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -560,7 +560,6 @@ void SwSidebarWin::SetPosAndSize()
             {
                 mpAnchor->SetAnchorState(AS_END);
             }
-            // <--
         }
         else
         {
@@ -569,11 +568,9 @@ void SwSidebarWin::SetPosAndSize()
             {
                 mpAnchor->SetAnchorState(AS_ALL);
             }
-            // <--
             SwSidebarWin* pWin = GetTopReplyNote();
             // #i111964#
             if ( pWin && pWin->Anchor() )
-            // <--                    
             {        
                 pWin->Anchor()->SetAnchorState(AS_END);
             }
@@ -1129,7 +1126,6 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
                 SwSidebarWin* pWin = GetTopReplyNote();
                 // #i111964#
                 if ( pWin && pWin->Anchor() )
-                // <--                        
                 {        
                     pWin->Anchor()->SetAnchorState(AS_END);
                 }
@@ -1163,7 +1159,6 @@ void SwSidebarWin::SetViewState(ViewState bViewState)
                     // #i111964#
                     if ( pTopWinSelf && ( pTopWinSelf != pTopWinActive ) &&
                          pTopWinSelf->Anchor() )
-                    // <--
                     {
                         if ( pTopWinSelf != mrMgr.GetActiveSidebarWin() )
                         {        
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 5213c15..3a39e2c 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -79,7 +79,6 @@
 // #i104300#
 #include 
 #include 
-// <--
 
 /*--------------------------------------------------------------------
     Description:	KeyEvents
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 6f03f35..54957cf 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -51,7 +51,6 @@
 #include 
 #include 
 #include 
-// <--
 
 // sw/inc/expfld.hxx
 SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
@@ -63,7 +62,6 @@ SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
 // #i83479#
 #define REFFLDFLAG_HEADING  0x7100
 #define REFFLDFLAG_NUMITEM  0x7200
-// <--
 
 sal_uInt16	nFldDlgFmtSel		= 0;
 
@@ -79,7 +77,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     aSelectionLB	(this, SW_RES(LB_REFSELECTION)),
     // #i83479#
     aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ),
-    // <--
     aFormatFT		(this, SW_RES(FT_REFFORMAT)),
     aFormatLB		(this, SW_RES(LB_REFFORMAT)),
     aNameFT			(this, SW_RES(FT_REFNAME)),
@@ -97,7 +94,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     maNumItems(),
     mpSavedSelectedTxtNode( 0 ),
     mnSavedSelectedPos( 0 )
-    // <--
 {
     FreeResource();
 
@@ -115,7 +111,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL );
     aSelectionToolTipLB.SetSpaceBetweenEntries(1);
     aSelectionToolTipLB.SetHighlightRange();
-    // <--
 }
 
 SwFldRefPage::~SwFldRefPage()
@@ -168,7 +163,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const
     return mnSavedSelectedPos;
 }
 
-// <--
 
 void SwFldRefPage::Reset(const SfxItemSet& )
 {
@@ -177,7 +171,6 @@ void SwFldRefPage::Reset(const SfxItemSet& )
         SavePos(&aTypeLB);
         // #i83479#
         SaveSelectedTxtNode();
-        // <--
     }
     SetSelectionSel(LISTBOX_ENTRY_NOTFOUND);
     SetTypeSel(LISTBOX_ENTRY_NOTFOUND);
@@ -210,7 +203,6 @@ void SwFldRefPage::Reset(const SfxItemSet& )
     aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_HEADING);
     nPos = aTypeLB.InsertEntry(sNumItemTxt);
     aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_NUMITEM);
-    // <--
 
     // fill up with the sequence types
     SwWrtShell *pSh = GetWrtShell();
@@ -326,7 +318,6 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
                         sName = sBookmarkTxt;
                         nFlag = REFFLDFLAG_BOOKMARK;
                     }
-                    // <--
                 }
                 break;
 
@@ -463,7 +454,6 @@ IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG )
             }
         }
         break;
-        // <--
 
         default:
             if (!IsFldEdit() || aSelectionLB.GetSelectEntryCount())
@@ -496,7 +486,6 @@ void SwFldRefPage::UpdateSubType()
             sOldSel = aSelectionLB.GetEntry(nSelectionSel);
         }
     }
-    // <--
     if (IsFldEdit() && !sOldSel.Len())
         sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 );
 
@@ -506,7 +495,6 @@ void SwFldRefPage::UpdateSubType()
     aSelectionToolTipLB.SetUpdateMode(sal_False);
     aSelectionToolTipLB.Clear();
     bool bShowSelectionToolTipLB( false );
-    // <--
 
     if( REFFLDFLAG & nTypeId )
     {
@@ -613,7 +601,6 @@ void SwFldRefPage::UpdateSubType()
                 }
             }
         }
-        // <--
         else
         {
             aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
@@ -693,7 +680,6 @@ void SwFldRefPage::UpdateSubType()
         if (IsFldEdit() && !aSelectionLB.GetSelectEntryCount()) // in case the reference was already deleted...
             aNameED.SetText(sOldSel);
     }
-    // <--
 }
 
 sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
@@ -717,7 +703,6 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
         case REFFLDFLAG_NUMITEM:
             bAddCrossRefFormats = true;
             // intentional no break here
-        // <--
 
         case TYP_GETREFFLD:
         case REFFLDFLAG_BOOKMARK:
@@ -762,7 +747,6 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
         aFormatLB.SetEntryData( nPos, reinterpret_cast(GetFldMgr().GetFormatId( nTypeId, nFormat )));
         nSize += 3;
     }
-    // <--
 
     // select a certain entry
     if (nSize)
@@ -943,7 +927,6 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
                 }
             }
         }
-        // <--
         else                                // SeqenceFields
         {
             // get fields for Seq-FeldType:
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 2e7c0d9..67aa51a 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -41,7 +41,6 @@
 #include 
 #include 
 class SwTxtNode;
-// <--
 
 class SwFldRefPage : public SwFldPage
 {
@@ -51,7 +50,6 @@ class SwFldRefPage : public SwFldPage
     ListBox			aSelectionLB;
     // #i83479#
     SwFldRefTreeListBox aSelectionToolTipLB;
-    // <--
     FixedText		aFormatFT;
     ListBox			aFormatLB;
     FixedText		aNameFT;
@@ -73,7 +71,6 @@ class SwFldRefPage : public SwFldPage
     const SwTxtNode* mpSavedSelectedTxtNode;
     // fallback, if previously selected text node doesn't exist anymore
     sal_uInt16 mnSavedSelectedPos;
-    // <--
 
     DECL_LINK( TypeHdl, ListBox* pLB = 0 );
     DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
@@ -86,7 +83,6 @@ class SwFldRefPage : public SwFldPage
     void SaveSelectedTxtNode();
     const SwTxtNode* GetSavedSelectedTxtNode() const;
     sal_uInt16 GetSavedSelectedPos() const;
-    // <--
 
 protected:
     virtual sal_uInt16		GetGroup();
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index 80a89d8..4673f21 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -292,7 +292,6 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
 
     // --> OD 2009-09-01 #mongolianlayout#
     if ( bIsInVertical || bIsInVerticalL2R )
-    // <--
     {
         Point aPos(aBoundRect.Pos());
         long nTmp = aPos.X();
@@ -491,7 +490,6 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
     }
     // --> OD 2009-09-01 #mongolianlayout#
     if ( bIsInVertical || bIsInVerticalL2R )
-    // <--
     {
         //restore width/height exchange
         long nTmp = rVal.nWidth;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 5cccb59..6f21bdd 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -500,7 +500,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString
         eStringId = SwFPos::FROMLEFT;
         return eStringId;
     }
-    // <--
     if ( bVertical )
     {
         //exchange horizontal strings with vertical strings and vice versa
@@ -538,7 +537,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString
             {SwFPos::REL_FRM_TOP,    SwFPos::REL_FRM_LEFT },
             {SwFPos::REL_FRM_BOTTOM, SwFPos::REL_FRM_RIGHT }
         };
-        // <--
         sal_uInt16 nIndex;
         for(nIndex = 0; nIndex < sizeof(aHoriIds) / sizeof(StringIdPair_Impl); ++nIndex)
         {
@@ -568,7 +566,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString
                     break;
                 }
             }
-            // <--
         }
     }
     return eStringId;
@@ -675,7 +672,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     bNoModifyHdl(sal_True),
     // --> OD 2009-08-31 #mongolianlayout# - no used
 //    bVerticalChanged(sal_False),
-    // <--
     bIsVerticalFrame(sal_False),
     bIsVerticalL2R(sal_False),
     bIsInRightToLeft(sal_False),
@@ -828,7 +824,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
         // --> OD 2009-08-31 #mongolianlayout#
 //        if ( !bVerticalChanged && pSh->IsFrmVertical(sal_True, bIsInRightToLeft) )
         if ( pSh->IsFrmVertical( sal_True, bIsInRightToLeft, bIsVerticalL2R ) )
-        // <--
         {
             String sHLabel = aHorizontalFT.GetText();
             aHorizontalFT.SetText(aVerticalFT.GetText());
@@ -1323,7 +1318,6 @@ sal_uInt16 SwFrmPage::FillPosLB(const FrmMap* _pMap,
                                                      bIsVerticalFrame,
                                                      bIsVerticalL2R,
                                                      bIsInRightToLeft);
-            // <--
             String sEntry(aFramePosString.GetString(eStrId));
             if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
             {
@@ -1390,7 +1384,6 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap,
                                                                 bIsVerticalFrame,
                                                                 bIsVerticalL2R,
                                                                 bIsInRightToLeft);
-                            // <--
                             String sEntry = aFramePosString.GetString(sStrId1);
                             sal_uInt16 nPos = _rLB.InsertEntry(sEntry);
                             _rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]);
@@ -1456,7 +1449,6 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap,
                                                                 bIsVerticalFrame,
                                                                 bIsVerticalL2R,
                                                                 bIsInRightToLeft);
-                            // <--
                             String sEntry = aFramePosString.GetString(eStrId1);
                             sal_uInt16 nPos = _rLB.InsertEntry(sEntry);
                             _rLB.SetEntryData(nPos, &aRelationMap[nRelPos]);
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 9d017f5..eba33ca 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -120,7 +120,6 @@
 #define STR_DONT_ASK_AGAIN              (RC_APP_BEGIN + 103)
 // --> OD 2008-04-14 #outlinelevel#
 #define STR_OUTLINE_NUMBERING           (RC_APP_BEGIN + 104)
-// <--
 //#outline level,zhaojianwei
 #define STR_FDLG_OUTLINE_LEVEL		    (RC_APP_BEGIN + 105)
 #define STR_FDLG_STYLE				    (RC_APP_BEGIN + 106)
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 3db9f7c..5762cbe 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -292,7 +292,6 @@ public:
     // #i42921# - add parameter 
     sal_Bool RulerMarginDrag( const MouseEvent& rMEvt,
                                      const bool bVerticalMode );
-    // <--
 
     /** #i42732# display status of font size/name depending on either the input
         language or the selection position depending on what has changed lately
diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx
index 15a1f71..e1866ab 100644
--- a/sw/source/ui/inc/frmmgr.hxx
+++ b/sw/source/ui/inc/frmmgr.hxx
@@ -68,7 +68,6 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr
     sal_Bool        bIsInVertical;
     // --> OD 2009-09-01 #mongolianlayout#
     sal_Bool        bIsInVerticalL2R;
-    // <--
 
     // interne Verrechnung fuer Umrandung
     SW_DLLPRIVATE SwTwips 			CalcTopSpace();
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 2cc63a3..e90af86 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -110,7 +110,6 @@ class SwFrmPage: public SfxTabPage
     sal_Bool            bIsVerticalFrame;  //current frame is in vertical environment - strings are exchanged
     // --> OD 2009-08-31 #mongolianlayou#
     sal_Bool            bIsVerticalL2R;
-    // <--
     sal_Bool            bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
     sal_Bool            bHtmlMode;
     sal_uInt16          nHtmlMode;
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx
index 8bde96e..6b2e81d 100644
--- a/sw/source/ui/inc/numpara.hxx
+++ b/sw/source/ui/inc/numpara.hxx
@@ -63,7 +63,6 @@ class SwParagraphNumTabPage : public SfxTabPage
 
     // --> OD 2008-04-14 #outlinelevel#
     const String msOutlineNumbering;
-    // <--
 
     sal_Bool					bModified : 1;
     sal_Bool					bCurNumrule : 1;
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 8133e18..c5ab062 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -98,7 +98,6 @@ class SwEditRegionDlg : public SfxModalDialog
     // --> FME 2004-06-22 #114856# edit in readonly sections
     FixedLine       aPropertiesFL;
     TriStateBox     aEditInReadonlyCB;
-    // <--
 
     OKButton        aOK;
     CancelButton 	aCancel;
@@ -135,7 +134,6 @@ class SwEditRegionDlg : public SfxModalDialog
     DECL_LINK( ChangeHideHdl, TriStateBox * );
     // --> FME 2004-06-22 #114856# edit in readonly sections
     DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * );
-    // <--
     DECL_LINK( ChangeDismissHdl, CheckBox * );
     DECL_LINK( UseFileHdl, CheckBox* );
     DECL_LINK( FileSearchHdl, PushButton* );
@@ -186,7 +184,6 @@ class SwInsertSectionTabPage : public SfxTabPage
     // --> FME 2004-06-22 #114856# edit in readonly sections
     FixedLine       aPropertiesFL;
     CheckBox        aEditInReadonlyCB;
-    // <--
 
     String          m_sFileName;
     String          m_sFilterName;
@@ -201,7 +198,6 @@ class SwInsertSectionTabPage : public SfxTabPage
     DECL_LINK( ChangeHideHdl, CheckBox * );
     // --> FME 2004-06-22 #114856# edit in readonly sections
     DECL_LINK( ChangeEditInReadonlyHdl, CheckBox * );
-    // <--
     DECL_LINK( ChangeProtectHdl, CheckBox * );
     DECL_LINK( ChangePasswdHdl, Button * );
     DECL_LINK( NameEditHdl, Edit * );
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index e6917f2..c936d60 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -192,7 +192,6 @@ public:
     // #i32329# Enhanced selection
     void    SelSentence (const Point * = 0, sal_Bool bProp=sal_False );
     void    SelPara     (const Point * = 0, sal_Bool bProp=sal_False );
-    // <--
     long	SelAll();
 
     //Basiscursortravelling
@@ -235,7 +234,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
 
     // #i20126# Enhanced table selection
     sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
-    // <--
     sal_Bool SelectTableRow();
     sal_Bool SelectTableCol();
     sal_Bool SelectTableCell();
@@ -562,7 +560,6 @@ private:
     // #i92468#
     SW_DLLPRIVATE sal_Bool _NxtWrdForDelete();
     SW_DLLPRIVATE sal_Bool _PrvWrdForDelete();
-    // <--
     SW_DLLPRIVATE sal_Bool _FwdSentence();
     SW_DLLPRIVATE sal_Bool _BwdSentence();
     sal_Bool _FwdPara();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d9b153f..5d2af67 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1773,7 +1773,6 @@ public:
             break;
         }
     }
-//<---
     sal_uInt16 GetChapterInfo() const{ return aFormToken.nChapterFormat;}
 
     void SetOutlineLevel( sal_uInt16 nSet ) { aFormToken.nOutlineLevel = nSet;}//i53420
@@ -2599,7 +2598,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
             aChapterEntryLB.SelectEntryPos(2);
             break;
         }
-//<---
 //i53420
 
         aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index aaabce9..eca8754 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -193,7 +193,6 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
 {
     // --> OD 2008-04-14 #outlinelevel#
     SetText( SW_RES( STR_OUTLINE_NUMBERING ) );
-    // <--
     PushButton* pUserButton = GetUserButton();
     pUserButton->SetText(SW_RES(ST_FORM));
     pUserButton->SetHelpId(HID_OUTLINE_FORM);
@@ -361,7 +360,6 @@ short SwOutlineTabDialog::Ok()
     // encapsulate changes into a action to avoid effects on the current cursor
     // position during the changes.
     rWrtSh.StartAction();
-    // <--
 
     const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule();
 
@@ -1046,7 +1044,6 @@ void    NumberingPreview::Paint( const Rectangle& /*rRect*/ )
                         aNumVector[nLevel] = nPreNum;
                     // --> OD 2005-11-17 #128041#
                     String aText(pActNum->MakeNumString( aNumVector ));
-                    // <--
                     pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
                     nBulletWidth = (sal_uInt16)pVDev->GetTextWidth(aText);
                     nPreNum++;
@@ -1152,7 +1149,6 @@ void    NumberingPreview::Paint( const Rectangle& /*rRect*/ )
                         aNumVector[nLevel] = nPreNum;
                     // --> OD 2005-11-17 #128041#
                     String aText(pActNum->MakeNumString( aNumVector ));
-                    // <--
                     pVDev->DrawText( Point(nXStart, nYStart), aText );
                     nTextOffset = (sal_uInt16)pVDev->GetTextWidth(aText);
                     nTextOffset = nTextOffset + nXStep;
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index f540251..7a427ba 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -106,7 +106,6 @@ TabDialog DLG_TAB_OUTLINE
     // --> OD 2008-04-14 #outlinelevel#
     // dialog title is now given by resource STR_OUTLINE_NUMBERING
 //    Text [ en-US ] = "Outline Numbering" ;
-    // <--
     Moveable = TRUE ;
     TabControl 1
     {
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index e591b92..6351356 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1461,9 +1461,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                             rSet.Put(aBool);
                         }
                     }
-                    // <--
                 }
-                // <--
             }
             break;
             case SID_IMAP_EXEC:
@@ -1525,7 +1523,6 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                             rSh.GetGraphic(sal_False);  // start the loading
                         // #i75481#
                         bDisable = sal_True;
-                        // <--
                     }
                     else if( bHas && bOk )
                         bDisable = !lcl_UpdateContourDlg( rSh, nSel );
@@ -1537,9 +1534,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                             bDisable = GRAPHIC_NONE == rSh.GetGraphicType();
                         else
                             bDisable = GRAPHIC_NONE == rSh.GetIMapGraphic().GetType();
-                        // <--
                     }
-                    // <--
 
                     if( bDisable )
                         rSet.DisableItem( nWhich );
@@ -1857,7 +1852,6 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
                 {
                     nSurround = nOldSurround;
                 }
-                // <--
                 break;
             case FN_FRAME_WRAP_CONTOUR:
                 aWrap.SetContour(!aWrap.IsContour());
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 26032b3..74d6873 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -648,7 +648,6 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam
                 break;
             }
         }
-        // <--
     }
     return nRet;
 }
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index a3fe8af..9901ddc 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -904,7 +904,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
             case SID_CLIPBOARD_FORMAT_ITEMS:
                 rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
                 break;
-            // <--
         }
         nWhich = aIter.NextWhich();
     }
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index c2b46bc..3c07930 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -52,7 +52,6 @@
 // #i73249#
 #include 
 #include 
-// <--
 
 #include 
 #include 
@@ -88,7 +87,6 @@
 #include "misc.hrc"
 // #i73249#
 #include 
-// <--
 
 #include 
 #include 
@@ -773,7 +771,6 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             }
         }
         break;
-        // <--
         default:
             OSL_ENSURE( !this, "wrong dispatcher" );
             return;
@@ -1028,7 +1025,6 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
 
                 }
                 break;
-                // <--
                 default:
                     /* do nothing */;
                     break;
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 2d826fe..d26c801 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -219,7 +219,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     aSet.Put( SvxBrushItem( *pGrfObj, GPOS_LT,
                                             SID_ATTR_GRAF_GRAPHIC ) );
                 }
-                // <--
             }
             aSet.Put( SfxBoolItem( FN_PARAM_GRF_CONNECT, sGrfNm.Len() > 0 ) );
 
@@ -506,7 +505,6 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
                         GetShell().ReRead( aEmptyStr, aEmptyStr,
                                            &aFilterObj.GetGraphic() );
                 }
-                // <--
             }
             break;
 
@@ -679,7 +677,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
                         bDisable = eGraphicType != GRAPHIC_BITMAP;
                     }
                 }
-                // <--
             }
             break;
 
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 966c1c8..b78ae22 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -143,7 +143,6 @@ void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bUp )
         rSh.Pop( sal_False );
     }
 }
-// <--
 
 void SwListShell::Execute(SfxRequest &rReq)
 {
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 52606da..4659551 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -892,7 +892,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
                     ItemSetToTableParam( aSet, rSh );
                     rSh.EndUndo( nUndoId );
                 }
-                // <--
 
                 bCallDone = sal_True;
                 break;
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 2da6ed9..2bddf80 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -1166,7 +1166,6 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             rSh.SetMark();
             rSh.SetAttr( aRestoreSet );
             rSh.ClearMark();
-            // <--
 
             rSh.UpdateAttr();
             aFont = aNewFontItem;
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index ec8f21a..930d518 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -987,7 +987,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 {
                     rWrtSh.StartUndo( UNDO_INSATTR );
                 }
-                // <--
                 if( pSet->Count() )
                 {
                     rWrtSh.StartAction();
@@ -1018,7 +1017,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     // in order to indicate that the restart value of the list
                     // style has to be used on restart.
                     sal_uInt16 nNumStart = USHRT_MAX;
-                    // <--
                     if( SFX_ITEM_SET == pSet->GetItemState(FN_NUMBER_NEWSTART_AT) )
                     {
                         nNumStart = ((SfxUInt16Item&)pSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue();
@@ -1037,7 +1035,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 {
                     rWrtSh.EndUndo( UNDO_INSATTR );
                 }
-                // <--
             }
 
             delete pDlg;
@@ -1054,7 +1051,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 pRule = rWrtSh.SearchNumRule( false, false, false, -1, sContinuedListId );
             }
-            // <--
             if ( pRule )
             {
                 rWrtSh.SetCurNumRule( *pRule, false, sContinuedListId );
@@ -1657,7 +1653,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                     {
                         pRule = rSh.SearchNumRule( false, false, false, -1, aDummy );
                     }
-                    // <--
                     if ( !pRule )
                         rSet.DisableItem(nWhich);
                 }
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index 2a36816..b43c546 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -139,7 +139,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             SwNumRule aRule( GetShell().GetUniqueNumRuleName(),
                              // #i89178#
                              numfunc::GetDefaultPositionAndSpaceMode() );
-                             // <--
             SvxNumRule aSvxRule = aRule.MakeSvxNumRule();
             const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 );
 
@@ -160,7 +159,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                     {
                         aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
                     }
-                    // <--
                     aSvxRule.SetLevel( n, aFmt, sal_False );
                 }
                 aSvxRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, sal_False);
@@ -193,7 +191,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                                         : GetShell().GetUniqueNumRuleName(),
                                     // #i89178#
                                     numfunc::GetDefaultPositionAndSpaceMode() );
-                                    // <--
                 aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc());
                 aSetRule.SetAutoRule( sal_True );
                 // No start of new list, if an existing list style is edited.
@@ -212,7 +209,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                 SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(),
                                     // #i89178#
                                     numfunc::GetDefaultPositionAndSpaceMode() );
-                                    // <--
                 aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc());
                 aSetRule.SetAutoRule( sal_True );
                 // start new list
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index e006ee7..3adcc54 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -142,7 +142,6 @@ String STR_NUM_OUTLINE
 {
     Text [ en-US ] = "Outline ";
 };//<-end,zhaojianwei
-// <--
 String STR_ERROR_NOLANG
 {
     Text [ en-US ] = "No language is selected in the proofed section." ;
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 348907f..4c60bff 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -603,7 +603,6 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             rSh.GetCurAttr( aSet );
             const SvxLRSpaceItem& rLR =
                     static_cast(aSet.Get(RES_LR_SPACE));
-            // <--
 
             SwPosition aPos(*pNumRuleNodeFromDoc);
             // #i90078#
@@ -611,7 +610,6 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             // #i42921# invalidate state of indent in order to get a ruler update.
             aParaMargin.SetWhich( nSlot );
             GetViewFrame()->GetBindings().SetState( aParaMargin );
-            // <--
         }
         else if( pColl && pColl->IsAutoUpdateFmt() )
         {
@@ -1086,7 +1084,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                         // #i42922# Mouse move of numbering label
                                         // has to consider the left indent of the paragraph
                                         pNumRuleNodeFromDoc->GetLeftMarginWithNum( sal_True ) );
-                                       // <--
 
                         short nFLOffset;
                         pNumRuleNodeFromDoc->GetFirstLineOfsWithNum( nFLOffset );
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index faa7a6d..50c9e6e 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -118,7 +118,6 @@ enum SwDocumentSettingsPropertyHandles
     HANDLE_TABS_RELATIVE_TO_INDENT,
     // #i89181#
     HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST,
-    // <--
     HANDLE_MODIFYPASSWORDINFO,
     HANDLE_MATH_BASELINE_ALIGNMENT,
     HANDLE_INVERT_BORDER_SPACING,
@@ -671,7 +670,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
             mpDoc->set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp);
         }
         break;
-        // <--
         case HANDLE_MODIFYPASSWORDINFO:
         {
             uno::Sequence< beans::PropertyValue > aInfo;
@@ -1026,7 +1024,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
             rValue.setValue( &bTmp, ::getBooleanCppuType() );
         }
         break;
-        // <--
         case HANDLE_MODIFYPASSWORDINFO:
         {
             rValue <<= mpDocSh->GetModifyPasswordInfo();
diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx
index 5106eb4..9220477 100644
--- a/sw/source/ui/uno/unodefaults.cxx
+++ b/sw/source/ui/uno/unodefaults.cxx
@@ -56,7 +56,6 @@ SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw()
         //return &pModel->GetItemPool();
         // #i52858# - method name changed
         m_pDoc->GetOrCreateDrawModel();
-        // <--
         return &(m_pDoc->GetAttrPool());
     }
     return 0;
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 41a2837..4af4801 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -115,7 +115,6 @@
 
 // #i12836# enhanced pdf export
 #include 
-// <--
 #include 
 
 #include 
@@ -1488,7 +1487,6 @@ void	SwXTextDocument::InitNewDoc()
         // dispose XDrawPage here. We are the owner and know that it is no longer in a valid condition.
         uno::Reference xComp( *pxXDrawPage, uno::UNO_QUERY );
         xComp->dispose();
-        // <--
         pDrawPage->InvalidateSwDoc();
         delete pxXDrawPage;
         pxXDrawPage = 0;
@@ -1695,7 +1693,6 @@ Reference< XInterface >  SwXTextDocument::createInstance(const OUString& rServic
                 }
                 //hier den Draw - Service suchen
                 Reference< XInterface >  xTmp = SvxFmMSFactory::createInstance(aTmpServiceName);
-                // <--
                 if(bShape)
                 {
                     nIndex = COM_SUN_STAR__DRAWING_LENGTH;
@@ -1933,7 +1930,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
                 // we don't need to make an SdrModel and can do nothing
                 // #i52858# - method name changed
                 pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() );
-                // <--
                 pDrawDoc->SetAutoControlFocus ( bAuto );
             }
         }
@@ -1955,7 +1951,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
                 // nothing
                 // #i52858# - method name changed
                 pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() );
-                // <--
                 pDrawDoc->SetOpenInDesignMode ( bMode );
             }
         }
@@ -1970,7 +1965,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
               pDoc->SetInReading( bBool );
         }
         break;
-        // <--
         case WID_DOC_BUILDID:
             aValue >>= maBuildId;
         break;
@@ -1982,7 +1976,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
             pDocShell->GetDoc()->SetApplyWorkaroundForB6375613( bApplyWorkaroundForB6375613 );
         }
         break;
-        // <--
 
         default:
         {
@@ -2145,7 +2138,6 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
             aAny <<= pDocShell->GetDoc()->ApplyWorkaroundForB6375613();
         }
         break;
-        // <--
 
         default:
         {
@@ -2576,7 +2568,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 
             // --> FME 2005-05-23 #122919# Force field update before PDF export:
             pViewShell->ViewShell::UpdateFlds(sal_True);
-            // <--
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified( sal_True );
 
@@ -2700,7 +2691,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
         const sal_uInt16 nPage = bPrintProspect
                              ? nRenderer + 1
                              : m_pRenderData->GetPagesToPrint()[ nRenderer ];
-        // <--
 
         // get paper tray to use ...
         sal_Int32 nPrinterPaperTray = -1;
@@ -2939,7 +2929,6 @@ void SAL_CALL SwXTextDocument::render(
                     {
                         SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_False );
                     }
-                    // <--
 
                     SwPrintData const& rSwPrtOptions =
                         *m_pRenderData->GetSwPrtOptions();
@@ -2958,7 +2947,6 @@ void SAL_CALL SwXTextDocument::render(
                     {
                         SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages,  sal_True );
                     }
-                    // <--
 
                     pVwSh->SetPDFExportOption( sal_False );
 
@@ -3801,7 +3789,6 @@ Reference SwXDocumentPropertyHelper::GetDrawTable(short nWhich)
                     xMarkerTable = SvxUnoMarkerTable_createInstance( m_pDoc->GetOrCreateDrawModel() );
                 xRet = xMarkerTable;
             break;
-            // <--
             case  SW_CREATE_DRAW_DEFAULTS:
                 if(!xDrawDefaults.is())
                     xDrawDefaults = (cppu::OWeakObject*)new SwSvxUnoDrawPool(m_pDoc);
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 1700b1d..e1c974a 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -155,7 +155,6 @@ ShellResource::ShellResource()
     aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ),
     // #i81002#
     aGetRefFld_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ),
-    // <--
     aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ),
     aStrNone( SW_RES( STR_TEMPLATE_NONE )),
     aFixedStr( SW_RES( STR_FIELD_FIXED )),
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index da13600..b0b59ea 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -37,7 +37,6 @@
 // --> OD 2006-07-10 #134369#
 #include 
 #include 
-// <--
 
 inline void SwWrtShell::OpenMark()
 {
@@ -208,7 +207,6 @@ long SwWrtShell::DelLeft()
         const SwStartNode * pSNdOld = pWasInTblNd ?
                                       GetSwCrsr()->GetNode()->FindTableBoxStartNode() :
                                       0;
-        // <--
 
         /* If the cursor is at the beginning of a paragraph, try to step
            backwards. On failure we are done. */
@@ -229,7 +227,6 @@ long SwWrtShell::DelLeft()
         // changed the table cell, compare DelRight().
         if ( pSNdOld != pSNdNew )
             return 0;
-        // <--
 
         OpenMark();
         SwCrsrShell::Right(1,CRSR_SKIP_CHARS);
@@ -335,7 +332,6 @@ long SwWrtShell::DelRight()
                 // the cursor will be in its initial state, because there
                 // may be a numbering in front of the next paragraph.
                 SwCrsrShell::Push();
-                // <--
 
                 if ( SwCrsrShell::Right(1, CRSR_SKIP_CHARS) )
                 {
@@ -388,7 +384,6 @@ long SwWrtShell::DelRight()
             // --> OD 2006-07-06 #134369#
             OSL_ENSURE( !IsFrmSelected(),
                     " -  should unmark all objects" );
-            // <--
             // --> OD 2006-07-10 #134369#
             // leave draw mode, if necessary.
             {
@@ -402,12 +397,10 @@ long SwWrtShell::DelRight()
                     GetView().LeaveDrawCreate();
                 }
             }
-            // <--
         }
 
         // --> OD 2006-07-07 #134369#
         //  can't be true - see above.
-        // <--
         {
             nSelection = GetSelectionType();
             if ( nsSelectionType::SEL_FRM & nSelection ||
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 64f2832..0eed2a4 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -894,7 +894,6 @@ sal_Bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, boo
     }
     return sal_False;
 }
-// <--
 
 /*------------------------------------------------------------------------
  Beschreibung:  Selektion einer Tabellenzeile / Spalte
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index efe7882..acadba3 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -563,7 +563,6 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
     // --> #i972#
     if ( bStarMath && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) )
         AlignFormulaToBaseline( xRef.GetObject() );
-    // <--
 
     if (pFlyFrmFmt)
         *pFlyFrmFmt = pFmt;
@@ -730,7 +729,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                         GetDoc()->GetDocShell()->EnableSetModified( sal_True );
                     }
                 }
-                // <--
             }
 
             // TODO/LATER: this is only a workaround,
@@ -872,7 +870,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                         : GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, 0, xObj.GetObject() ));
             aArea += rPoint - aRect.Pos(); // adjust area by diff of printing area position in order to keep baseline alignment correct.
         }
-        // <--
         aArea.Width ( _aVisArea.Width() );
         aArea.Height( _aVisArea.Height() );
         RequestObjectResize( aArea, xObj.GetObject() );
@@ -1160,7 +1157,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
                     // turning on outline numbering at current cursor position
                     bContinueFoundNumRule = true;
                 }
-                // <--
             }
             else
             {
@@ -1265,7 +1261,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
         const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
                                     numfunc::GetDefaultPositionAndSpaceMode() );
         SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode );
-        // <--
         // Zeichenvorlage an die Numerierung haengen
         SwCharFmt* pChrFmt;
         SwDocShell* pDocSh = GetView().GetDocShell();
@@ -1274,7 +1269,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
         const Font* pFnt = numfunc::IsDefBulletFontUserDefined()
                            ? &numfunc::GetDefBulletFont()
                            : 0;
-        // <--
 
         if (bNum)
         {
@@ -1327,7 +1321,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
                     aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720);
                 }
             }
-            // <--
 
             // #i38904#  Default alignment for
             // numbering/bullet should be rtl in rtl paragraph:
@@ -1335,7 +1328,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
             {
                 aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
             }
-            // <--
 
             aNumRule.Set( nLvl, aFmt );
         }
@@ -1346,7 +1338,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
         {
 
             const SwTwips nTxtNodeIndent = pTxtNode->GetAdditionalIndentForStartingNewList();
-            // <--
             if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 )
             {
                 // #i111172#
@@ -1362,11 +1353,9 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
                         nIndentChange -= aFmt.GetIndentAt() + aFmt.GetFirstLineIndent();
                     }
                 }
-                // <--
                 aNumRule.ChangeIndent( nIndentChange );
             }
         }
-        // <--
         // reset indent attribute on applying list style
         // start new list
         SetCurNumRule( aNumRule, true, String(), true );
@@ -1414,7 +1403,6 @@ void SwWrtShell::NumOrBulletOff()
         // --> OD 2005-10-24 #126346# - Cursor can not be anymore in front of
         // a label, because numbering/bullet is switched off.
         SetInFrontOfLabel( sal_False );
-        // <--
     }
 }
 // <- #i29560#
@@ -1512,7 +1500,6 @@ SelectionType SwWrtShell::GetSelectionType() const
                 nCnt |= nsSelectionType::SEL_NUM;
         }
     }
-    // <--
 
     return nCnt;
 }
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx
index 7146585..1cfda6c 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/ui/wrtsh/wrtsh4.cxx
@@ -199,7 +199,6 @@ sal_Bool SwWrtShell::_PrvWrdForDelete()
     Combine();
     return sal_True;
 }
-// <--
 
 
 sal_Bool SwWrtShell::_FwdSentence()
@@ -266,7 +265,6 @@ sal_Bool SwWrtShell::_BwdPara()
     {
         SttPara();
     }
-    // <--
 
     ClearMark();
     Combine();
-- 
1.7.0.4