[Libreoffice-commits] .: starmath/source sw/inc sw/source
Katarina Machalkova
bubli at kemper.freedesktop.org
Fri Apr 22 07:08:32 PDT 2011
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 --
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 9
sw/source/core/objectpositioning/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, 1426 deletions(-)
New commits:
commit 6970030c00fdae984e90492aa69189eb30f02090
Author: Júlio Hoffimann <julio.hoffimann at gmail.com>
Date: Fri Apr 22 08:03:02 2011 -0300
left arrow comments removed // <--
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 <stdio.h>
// #i83479#
#include <IDocumentListItems.hxx>
-// <--
#include <doc.hxx>
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( "<SwNodeNum::IsContinuous()> - OD debug" );
}
- // <--
return aResult;
}
@@ -198,7 +195,6 @@ bool SwNodeNum::IsCounted() const
// #i59559#
// <SwTxtNode::IsCounted()> 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( "<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" );
}
- // <--
return bResult;
}
@@ -391,11 +383,9 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
pTxtNode->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<SwTxtNode*>(&rTxtNode) );
- // <--
pPrecedingNodeNum = dynamic_cast<const SwNodeNum*>(
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 <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aIt>.
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 <mItLastValid>, it's needed to
// adjust <mItLastValid> before erasing <aIt>.
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 <mItLastValid>, it's needed to adjust
// <mItLastValid> before erasing <aItBegin>.
SetLastValid(mChildren.end());
- // <--
if (pMyFirst->IsPhantom())
{
@@ -598,7 +589,6 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
}
// assure that unnessary created phantoms at <pChild> 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( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - 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 <parachangetrackinginfo.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
-// <--
#include <comphelper/stlunosequence.hxx> // #i92233#
#include <algorithm>
@@ -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<XAccessibleTextAttributes> aAccTextAttr = this;
aRet <<= aAccTextAttr;
}
- // <--
// #i89175#
// add interface com::sun:star:accessibility::XAccessibleTextMarkup
else if ( rType == ::getCppuType((uno::Reference<XAccessibleTextMarkup> *)0) )
@@ -1059,7 +1055,6 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
uno::Reference<XAccessibleMultiLineText> 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 <rDefAttrSeq>
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 <rRunAttrSeq>
{
@@ -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<const SwTxtFrm*>( 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 <bOnlyTableColumnHeader>, default value <false>
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<const SwTabFrm*>( GetFrm() );
return new SwAccessibleTableData_Impl( *GetMap(), pTabFrm, IsInPagePreview() );
}
-// <--
void SwAccessibleTable::UpdateTableData()
{
// #i77106# - usage of new method <CreateNewTableData()>
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<SwDrawFrmFmt*>(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<SwFlyFrmFmt*>(pOldFmt)->GetObjDescription()
: String() );
- // <--
pOldFmt->DelFrms();
pNewFmt = rDoc.MakeFlyFrmFmt( rDoc.GetUniqueFrameName(),
@@ -1401,7 +1397,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
static_cast<SwFlyFrmFmt*>(pOldFmt)->SetObjTitle( sTitle );
static_cast<SwFlyFrmFmt*>(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<const SwCntntNode*>(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 b6b13ec..d7a9408 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(
@@ -1647,7 +1646,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
= numfunc::GetDefaultPositionAndSpaceMode(); //#i89178#
- // <--
{
sal_Bool bIsModified = IsModified();
@@ -2320,7 +2318,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<const SfxStringItem*>(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 <viewsh.hxx>
#include <txtfrm.hxx>
-// <--
// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
@@ -1162,7 +1161,6 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
}
}
- // <--
pNew = pSct;
}
@@ -1189,7 +1187,6 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
dynamic_cast<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
}
}
- // <--
if ( bInitNewSect )
static_cast<SwSectionFrm*>(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<SwTxtFrm*>(pNew->FindPrevCnt( true )) );
}
}
- // <--
((SwTabFrm*)pNew)->RegistFlys();
}
}
@@ -2442,7 +2438,6 @@ void SwTableNode::DelFrms()
dynamic_cast<SwTxtFrm*>(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<const SfxItemSet>& 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<const SfxItemSet>& 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<const SfxItemSet>& 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<const SfxItemSet>& 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<SwTxtFrm*>(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 <node.hxx>
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 <SwAnchoredObject>
@@ -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<SwAnchoredObject*>(_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 <SwAnchoredDrawObject> only once
const SwAnchoredDrawObject* pAnchoredDrawObj =
static_cast<const SwAnchoredDrawObject*>( GetAnchoredObj( &rObj ) );
- // <--
// OD 2004-04-06 #i26791# - adjust positioning and alignment attributes,
// if positioning of drawing object isn't in progress.
// #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 <pOldBoundRect>.
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<SwAnchoredDrawObject*>(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( "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted -> no connect to layout. Please inform od at 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 <sortedobjs.hxx>
#include <flyfrms.hxx>
-// <--
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<sal_uInt16>(pTxtNode->GetActualListLevel()) );
}
- // <--
// #i42921# - 3rd parameter = false in order to
// suppress setting of num rule at <aPaM>.
// do not apply any list
GetDoc()->SetNumRule( aPaM, aRule, false, String(), sal_False );
- // <--
}
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("<SwGetRefField::UpdateField(..)> - 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,
"<SwGetRefFieldType::FindAnchor(..)> - 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<SwDrawFrmFmt*>(pFmt)->PosAttrSet();
}
- // <--
}
if( bSelectInsert )
pDestDrwView->MarkObj( pNew, pDestPgView );
@@ -1013,7 +1012,6 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
static_cast<SwDrawContact*>(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<SwDrawFrmFmt*>(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
// <CheckCharRectAndTopOfLine()> 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
// <CheckCharRectAndTopOfLine()> 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<const SwLayoutFrm*>(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 <com/sun/star/io/XSeekable.hpp>
// #i73788#
#include <retrieveinputstreamconsumer.hxx>
-// <--
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( "<SwGrfNode::SwapIn(..)> - 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( "<SwGrfNode::DelStreamName()> - 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( "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
- // <--
}
- // <--
}
else
{
@@ -989,15 +971,12 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
}
delete pStrm;
}
- // <--
}
catch ( uno::Exception& )
{
// #i48434#
OSL_FAIL( "<SwapGraphic> - 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 <rAffectedItemSet>
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<SfxPoolItem> 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 <vector>
class SwFrm;
-// <--
// --> #i65250#
#include <swtypes.hxx>
#include <boost/unordered_map.hpp>
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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list