[PATCH 3/7] Remove #refactorlists# comments.
Thomas Arnhold
thomas at arnhold.org
Mon Jan 17 11:49:33 PST 2011
---
sw/source/core/SwNumberTree/SwNodeNum.cxx | 11 --------
sw/source/core/SwNumberTree/SwNumberTree.cxx | 16 ------------
sw/source/core/attr/swatrset.cxx | 4 ---
sw/source/core/bastyp/init.cxx | 9 -------
sw/source/core/crsr/crsrsh.cxx | 5 ----
sw/source/core/doc/docfmt.cxx | 30 ----------------------
sw/source/core/doc/docnew.cxx | 12 ---------
sw/source/core/doc/fmtcol.cxx | 2 -
sw/source/core/doc/swstylemanager.cxx | 4 ---
sw/source/core/doc/swstylemanager.hxx | 4 ---
sw/source/core/docnode/ndtbl.cxx | 3 --
sw/source/core/docnode/nodes.cxx | 3 --
sw/source/core/edit/autofmt.cxx | 2 -
sw/source/core/edit/edattr.cxx | 1 -
sw/source/core/para/paratr.cxx | 3 +-
sw/source/core/txtnode/ndtxt.cxx | 34 +------------------------
sw/source/core/undo/rolbck.cxx | 4 ---
sw/source/core/undo/unfmco.cxx | 4 ---
sw/source/core/undo/unnum.cxx | 4 ---
sw/source/core/unocore/unocrsrhelper.cxx | 8 ------
sw/source/core/unocore/unoobj.cxx | 6 ----
sw/source/core/unocore/unosett.cxx | 4 ---
sw/source/filter/html/htmlnum.cxx | 8 ------
sw/source/filter/html/swhtml.hxx | 2 -
sw/source/filter/ww1/fltshell.cxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 -
sw/source/ui/app/docst.cxx | 1 -
sw/source/ui/shells/textsh1.cxx | 4 ---
sw/source/ui/shells/txtattr.cxx | 2 -
sw/source/ui/shells/txtnum.cxx | 6 ----
sw/source/ui/wrtsh/wrtsh1.cxx | 5 ----
31 files changed, 3 insertions(+), 202 deletions(-)
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index dcb9490..857ae2b 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -42,7 +42,6 @@
#include <doc.hxx>
// <--
-// --> OD 2008-02-19 #refactorlists#
SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode )
: SwNumberTreeNode(),
mpTxtNode( pTxtNode ),
@@ -56,7 +55,6 @@ SwNodeNum::SwNodeNum( SwNumRule* pNumRule )
mpNumRule( pNumRule )
{
}
-// <--
SwNodeNum::~SwNodeNum()
{
@@ -98,16 +96,11 @@ SwPosition SwNodeNum::GetPosition() const
SwNumberTreeNode * SwNodeNum::Create() const
{
- // --> OD 2008-02-19 #refactorlists#
-// SwNodeNum * pResult = new SwNodeNum();
-// pResult->SetNumRule(mpNumRule);
SwNodeNum * pResult = new SwNodeNum( GetNumRule() );
- // <--
return pResult;
}
-// --> OD 2008-02-19 #refactorlists#
void SwNodeNum::PreAdd()
{
OSL_ENSURE( GetTxtNode(),
@@ -307,7 +300,6 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
// // <--
//}
-// --> OD 2008-02-25 #refactorlists#
bool SwNodeNum::IsRestart() const
{
bool bIsRestart = false;
@@ -319,7 +311,6 @@ bool SwNodeNum::IsRestart() const
return bIsRestart;
}
-// <--
//void SwNodeNum::SetStart(SwNumberTree::tSwNumTreeNumber nStart)
//{
@@ -356,9 +347,7 @@ bool SwNodeNum::IsCountPhantoms() const
return bResult;
}
-// --> OD 2008-02-25 #refactorlists#
SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
-//SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStart() const
{
SwNumberTree::tSwNumTreeNumber aResult = 1;
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index d144c41..ec691a0 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -536,14 +536,12 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
*/
- // --> OD 2008-03-13 #refactorlists#
if ( nDepth < 0 )
{
OSL_ENSURE( false,
"<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
return;
}
- // <--
if ( pChild->GetParent() != NULL || pChild->GetChildCount() > 0 )
{
@@ -578,9 +576,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
}
else
{
- // --> OD 2008-02-19 #refactorlists#
pChild->PreAdd();
- // <--
std::pair<tSwNumberTreeChildren::iterator, bool> aResult =
mChildren.insert(pChild);
@@ -717,10 +713,8 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
if (! pRemove->mChildren.empty())
{
pRemove->MoveChildren(*aItPred);
- // --> OD 2008-04-04 #refactorlists#
(*aItPred)->InvalidateTree();
(*aItPred)->NotifyInvalidChildren();
- // <--
}
// --> OD 2006-01-17 #i60652#
@@ -735,20 +729,14 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
mChildren.erase(aRemoveIt);
- // --> OD 2008-04-04 #refactorlists#
-// if (aItPred != mChildren.end())
-// NotifyInvalidChildren();
NotifyInvalidChildren();
- // <--
}
else
{
OSL_ENSURE(false, "RemoveChild: failed!");
}
- // --> OD 2008-02-19 #refactorlists#
pChild->PostRemove();
- // <--
}
void SwNumberTreeNode::RemoveMe()
@@ -928,7 +916,6 @@ bool SwNumberTreeNode::IsFirst() const
return bResult;
}
-// --> OD 2008-03-13 #refactorlists#
void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
{
if ( nLevel < 0 )
@@ -953,7 +940,6 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
}
}
}
-// <--
int SwNumberTreeNode::GetLevelInListTree() const
{
@@ -1370,7 +1356,6 @@ const SwNumberTreeNode* SwNumberTreeNode::GetPrecedingNodeOf(
}
// <--
-// --> OD 2008-04-17 #refactorlists#
void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
{
if ( nListLevel < 0 )
@@ -1406,6 +1391,5 @@ void SwNumberTreeNode::NotifyChildrenOnDepth( const int nDepth )
++aChildIter;
}
}
-// <--
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index c7bf788..e490a55 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -47,9 +47,7 @@
#include <cmdid.h>
#include <istyleaccess.hxx>
#include <numrule.hxx>
-// --> OD 2008-03-19 #refactorlists#
#include <list.hxx>
-// <--
SwAttrPool::SwAttrPool( SwDoc* pD )
@@ -272,7 +270,6 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
}
- // --> OD 2008-03-19 #refactorlists#
// copy list and if needed also the corresponding list style
// for text nodes
if ( pSrcDoc != pDstDoc &&
@@ -322,7 +319,6 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// <--
}
}
- // <--
// JP 04.02.99: Task #61467# Seitenvorlagenwechsel mit kopieren
// Gegenueber dem alten Verhalten, sie zu entfernen
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 43fd630..c3497d3 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -152,7 +152,6 @@ USHORT aBreakSetRange[] = {
0 };
// AttrSet-Range fuer die TxtFmtColl
- // OD 2008-02-27 #refactorlists# :
// list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not
// included in the paragraph style's itemset.
USHORT aTxtFmtCollSetRange[] = {
@@ -176,9 +175,7 @@ USHORT aTxtNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- // --> OD 2008-02-25 #refactorlists#
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
- // <--
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
@@ -335,10 +332,8 @@ SfxItemInfo aSlotTab[] =
{ SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
{ FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
{ SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
- // --> OD 2008-03-04 #refactorlists#
// RES_PARATR_NUMRULE is now poolable
{ SID_ATTR_PARA_NUMRULE, SFX_ITEM_POOLABLE }, // RES_PARATR_NUMRULE
- // <--
{ SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
@@ -349,13 +344,11 @@ SfxItemInfo aSlotTab[] =
{ SID_ATTR_PARA_OUTLINE_LEVEL, SFX_ITEM_POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level,zhaojianwei
- // --> OD 2008-02-19 #refactorlists#
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ID
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_LEVEL
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISRESTART
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_RESTARTVALUE
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISCOUNTED
- // <--
{ 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
{ 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
@@ -571,13 +564,11 @@ void _InitCore()
aAttrTab[ RES_PARATR_OUTLINELEVEL - POOLATTR_BEGIN ] = new SfxUInt16Item( RES_PARATR_OUTLINELEVEL, 0 );//#outline level,zhaojianwei
- // --> OD 2008-02-19 #refactorlists#
aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, aEmptyStr );
aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 );
aAttrTab[ RES_PARATR_LIST_ISRESTART - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISRESTART, FALSE );
aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 );
aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, TRUE );
- // <--
aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] = new SwFmtFillOrder;
aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFmtFrmSize;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 5b92560..9508d0c 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -402,7 +402,6 @@ BOOL SwCrsrShell::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
return bRet;
}
-// --> OD 2008-04-02 #refactorlists#
void SwCrsrShell::MarkListLevel( const String& sListId,
const int nListLevel )
{
@@ -2546,10 +2545,8 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
SwModify( 0 ), pCrsrStk( 0 ), pBlockCrsr( 0 ), pTblCrsr( 0 ),
pBoxIdx( 0 ), pBoxPtr( 0 ), nCrsrMove( 0 ), nBasicActionCnt( 0 ),
eMvState( MV_NONE ),
- // --> OD 2008-04-02 #refactorlists#
sMarkedListId(),
nMarkedListLevel( 0 )
- // <--
{
SET_CURR_SHELL( this );
// Nur die Position vom aktuellen Cursor aus der Copy-Shell uebernehmen
@@ -2577,10 +2574,8 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
SwModify( 0 ), pCrsrStk( 0 ), pBlockCrsr( 0 ), pTblCrsr( 0 ),
pBoxIdx( 0 ), pBoxPtr( 0 ), nCrsrMove( 0 ), nBasicActionCnt( 0 ),
eMvState( MV_NONE ), // state for crsr-travelling - GetCrsrOfst
- // --> OD 2008-04-02 #refactorlists#
sMarkedListId(),
nMarkedListLevel( 0 )
- // <--
{
SET_CURR_SHELL( this );
/*
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c769370..32fefd8 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -209,7 +209,6 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
SwDoc* pDoc = pNode->GetDoc();
- // --> OD 2008-04-14 #refactorlists#
// remove unused attribute RES_LR_SPACE
// add list attributes
SfxItemSet aSet( pDoc->GetAttrPool(),
@@ -220,11 +219,7 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
0 );
const SfxItemSet* pSet = pNode->GetpSwAttrSet();
- // --> OD 2008-04-15 #refactorlists#
-// std::vector<USHORT> aClearWhichIds;
SvUShorts aClearWhichIds;
- // <--
- // --> OD 2008-04-15 #refactorlists#
// restoring all paragraph list attributes
{
SfxItemSet aListAttrSet( pDoc->GetAttrPool(),
@@ -243,7 +238,6 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
}
}
}
- // <--
const SfxPoolItem* pItem;
@@ -277,24 +271,19 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
if( bSave )
{
aSet.Put( *pItem );
- // --> OD 2008-04-15 #refactorlists#
-// aClearWhichIds.push_back( aSavIds[n] );
aClearWhichIds.Insert( aSavIds[n], aClearWhichIds.Count() );
}
}
}
- // --> OD 2008-04-14 #refactorlists#
// do not clear items directly from item set and only clear to be kept
// attributes, if no deletion item set is found.
-// pNode->ClearItemsFromAttrSet( aClearWhichIds );
const bool bKeepAttributes =
!pPara || !pPara->pDelSet || pPara->pDelSet->Count() == 0;
if ( bKeepAttributes )
{
pNode->ResetAttr( aClearWhichIds );
}
- // <--
if( !bLocked )
pNode->UnlockModify();
@@ -305,16 +294,12 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
if( pPara->pDelSet && pPara->pDelSet->Count() )
{
- // --> OD 2008-04-15 #refactorlists#
OSL_ENSURE( !bKeepAttributes,
"<lcl_RstAttr(..)> - certain attributes are kept, but not needed. -> please inform OD" );
- // <--
SfxItemIter aIter( *pPara->pDelSet );
pItem = aIter.FirstItem();
while( TRUE )
{
- // --> OD 2008-04-14 #refactorlists#
- //
if ( ( pItem->Which() != RES_PAGEDESC &&
pItem->Which() != RES_BREAK &&
pItem->Which() != RES_PARATR_NUMRULE ) ||
@@ -322,7 +307,6 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
{
pNode->ResetAttr( pItem->Which() );
}
- // <--
if( aIter.IsAtEnd() )
break;
pItem = aIter.NextItem();
@@ -336,10 +320,8 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
else
pNode->ResetAllAttr();
- // --> OD 2008-04-15 #refactorlists#
// only restore saved attributes, if needed
if ( bKeepAttributes && aSet.Count() )
- // <--
{
pNode->LockModify();
@@ -461,9 +443,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- // --> OD 2008-02-25 #refactorlists#
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
- // <--
RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
@@ -627,9 +607,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
}
if ( isPARATR(nWhich)
- // --> OD 2008-02-25 #refactorlists#
|| isPARATR_LIST(nWhich)
- // <--
|| isFRMATR(nWhich)
|| isGRFATR(nWhich)
|| isUNKNOWNATR(nWhich) )
@@ -654,9 +632,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
SfxItemSet* pTmpOtherItemSet = new SfxItemSet( pDoc->GetAttrPool(),
RES_PARATR_BEGIN, RES_PARATR_END-1,
- // --> OD 2008-02-25 #refactorlists#
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
- // <--
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -1279,9 +1255,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
bCheckSdrDflt = 0 != pSdrPool;
}
else if ( isPARATR(nWhich) ||
- // --> OD 2008-02-25 #refactorlists#
isPARATR_LIST(nWhich) )
- // <--
{
aCallMod.Add( pDfltTxtFmtColl );
bCheckSdrDflt = 0 != pSdrPool;
@@ -1733,7 +1707,6 @@ BOOL lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
lcl_RstAttr( pCNd, pPara );
// --> OD 2007-11-06 #i62675#
- // --> OD 2008-04-15 #refactorlists#
// check, if paragraph style has changed
if ( pPara->bResetListAttrs &&
pFmt != pCNd->GetFmtColl() &&
@@ -1761,7 +1734,6 @@ BOOL lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
if ( bChangeOfListStyleAtParagraph )
{
- // --> OD 2008-04-08 #refactorlists#
std::auto_ptr< SwRegHistory > pRegH;
if ( pPara->pHistory )
{
@@ -1808,11 +1780,9 @@ BOOL SwDoc::SetTxtFmtColl( const SwPaM &rRg,
if( DoesUndo() )
{
ClearRedo();
- // --> OD 2008-04-15 #refactorlists#
SwUndoFmtColl* pUndo = new SwUndoFmtColl( rRg, pFmt,
bReset,
bResetListAttrs );
- // <--
pHst = pUndo->GetHistory();
AppendUndo( pUndo );
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 50fe704..1c8ffd0 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -113,10 +113,8 @@
#include <pausethreadstarting.hxx>
// <--
#include <numrule.hxx>
-// --> OD 2008-03-13 #refactorlists#
#include <list.hxx>
#include <listfunc.hxx>
-// <--
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -255,19 +253,15 @@ SwDoc::SwDoc() :
pURLStateChgd( 0 ),
pNumberFormatter( 0 ),
pNumRuleTbl( new SwNumRuleTbl ),
- // --> OD 2008-03-26 #refactorlists#
maLists(),
maListStyleLists(),
- // <--
pRedlineTbl( new SwRedlineTbl ),
pAutoFmtRedlnComment( 0 ),
pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ),
pPgPViewPrtData( 0 ),
pExtInputRing( 0 ),
pLayouter( 0 ),
- // --> OD 2008-03-07 #refactorlists#
pStyleAccess( 0 ),
- // <--
pLayoutCache( 0 ),
pUnoCallBack(new SwModify(0)),
mpGrammarContact( 0 ),
@@ -446,7 +440,6 @@ SwDoc::SwDoc() :
// create TOXTypes
InitTOXTypes();
- // --> OD 2008-03-07 #refactorlists#
// pass empty item set containing the paragraph's list attributes
// as ignorable items to the stype manager.
{
@@ -455,7 +448,6 @@ SwDoc::SwDoc() :
0 );
pStyleAccess = createStyleManager( &aIgnorableParagraphItems );
}
- // <--
ResetModified();
}
@@ -663,7 +655,6 @@ SwDoc::~SwDoc()
delete pDfltGrfFmtColl;
delete pNumRuleTbl;
- // --> OD 2008-03-26 #refactorlists#
{
for ( std::hash_map< String, SwList*, StringHash >::iterator
aListIter = maLists.begin();
@@ -675,7 +666,6 @@ SwDoc::~SwDoc()
maLists.clear();
}
maListStyleLists.clear();
- // <--
delete pPrtData;
delete pNumberFormatter;
@@ -1067,9 +1057,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- // --> OD 2008-02-25 #refactorlists##
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
- // <--
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 421ce57..b33ee43 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -57,7 +57,6 @@ TYPEINIT1( SwCollCondition, SwClient );
SV_IMPL_PTRARR( SwFmtCollConditions, SwCollConditionPtr );
-// --> OD 2008-03-04 #refactorlists#
namespace TxtFmtCollFunc
{
@@ -370,7 +369,6 @@ BOOL SwTxtFmtColl::IsAtDocNodeSet() const
return FALSE;
}
-// --> OD 2008-03-04 #refactorlists#
BOOL SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
{
const bool bIsNumRuleItem = rAttr.Which() == RES_PARATR_NUMRULE;
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index b43291b..1d86fe1 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -76,7 +76,6 @@ class SwStyleManager : public IStyleAccess
SwStyleCache *mpParaCache;
public:
- // --> OD 2008-03-07 #refactorlists#
// accept empty item set for ignorable paragraph items.
SwStyleManager( SfxItemSet* pIgnorableParagraphItems )
: aAutoCharPool(),
@@ -84,7 +83,6 @@ public:
mpCharCache(0),
mpParaCache(0)
{}
- // <--
virtual ~SwStyleManager();
virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet,
IStyleAccess::SwAutoStyleFamily eFamily );
@@ -159,10 +157,8 @@ void SwStyleManager::getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t>
IStyleAccess::SwAutoStyleFamily eFamily )
{
StylePool& rAutoPool = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? aAutoCharPool : aAutoParaPool;
- // --> OD 2008-03-07 #refactorlists#
// setup <StylePool> iterator, which skips unused styles and ignorable items
IStylePoolIteratorAccess *pIter = rAutoPool.createIterator( true, true );
- // <--
StylePool::SfxItemSet_Pointer_t pStyle = pIter->getNext();
while( pStyle.get() )
{
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index 799ce4e..12d9e98 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.hxx
@@ -29,13 +29,9 @@
#define _SWSTYLEMANAGER_HXX
class IStyleAccess;
-// --> OD 2008-03-07 #refactorlists#
class SfxItemSet;
-// <--
-// --> OD 2008-03-07 #refactorlists#
IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems = 0 );
-// <--
#endif //_SWSTYLEMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0ea7e45..4bcb797 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3715,10 +3715,7 @@ BOOL lcl_SetAFmtBox( const _FndBox*& rpBox, void *pPara )
{
SwTableBox* pSetBox = (SwTableBox*)rpBox->GetBox();
SwDoc* pDoc = pSetBox->GetFrmFmt()->GetDoc();
- // --> OD 2008-02-25 #refactorlists#
-// SfxItemSet aCharSet( pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_END-1 );
SfxItemSet aCharSet( pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
- // <--
SfxItemSet aBoxSet( pDoc->GetAttrPool(), aTableBoxSetRange );
BYTE nPos = pSetPara->nAFmtLine * 4 + pSetPara->nAFmtBox;
pSetPara->rTblFmt.UpdateToSet( nPos, aCharSet,
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 221851a..88f468a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -266,10 +266,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
// Numerierungen auch aktualisiert werden.
pTxtNd->InvalidateNumRule();
- // --> OD 2008-03-13 #refactorlists#
-// pTxtNd->UnregisterNumber();
pTxtNd->RemoveFromList();
- // <--
}
RemoveNode( rDelPos.GetIndex(), 1, FALSE ); // Indizies verschieben !!
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 67e0d4a..0e5cc8a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1665,10 +1665,8 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
pAktTxtNd->SetAttrListLevel(nLvl);
pAktTxtNd->SetNumLSpace( TRUE );
- // --> OD 2008-03-17 #refactorlists#
// start new list
pDoc->SetNumRule( aDelPam, aRule, true );
- // <--
aDelPam.DeleteMark();
aDelPam.GetPoint()->nContent.Assign( pAktTxtNd, 0 );
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 4daf2be..ef75538 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -410,7 +410,6 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
{
bRet = FALSE;
- // --> OD 2008-03-19 #refactorlists#
if ( rTNd.IsInList() )
{
OSL_ENSURE( rTNd.GetNumRule(),
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index e03f770..4825f5c 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -259,9 +259,8 @@ SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const
int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
- // --> OD 2008-03-04 #refactorlists# - removed <pDefinedIn>
+
return GetValue() == ((SwNumRuleItem&)rAttr).GetValue();
- // <--
}
bool SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 296e629..9828a16 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2607,7 +2607,6 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
SwNodeIndex aIdx( rPos.nNode, 1 );
SwTxtNode* pNew = _MakeNewTxtNode( aIdx, TRUE );
- // --> OD 2008-05-14 #refactorlists#
// reset list attributes at appended text node
pNew->ResetAttr( RES_PARATR_LIST_ISRESTART );
pNew->ResetAttr( RES_PARATR_LIST_RESTARTVALUE );
@@ -2622,7 +2621,6 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos )
{
AddToList();
}
- // <--
if( GetDepends() )
MakeFrms( *pNew );
@@ -3325,7 +3323,6 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen,
SwModify::Modify( 0, &aHint );
}
-// --> OD 2008-03-27 #refactorlists#
namespace {
// Helper method for special handling of modified attributes at text node.
// The following is handled:
@@ -3532,12 +3529,10 @@ void SwTxtNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
(SwTxtFmtColl*)((SwFmtChg*)pNewValue)->pChangedFmt );
}
- // --> OD 2008-03-27 #refactorlists#
if ( !mbInSetOrResetAttr )
{
HandleModifyAtTxtNode( *this, pOldValue, pNewValue );
}
- // <--
SwCntntNode::Modify( pOldValue, pNewValue );
@@ -3569,8 +3564,6 @@ SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
{
SetCalcHiddenCharFlags();
SwCntntNode::ChgFmtColl( pNewColl );
- // --> OD 2008-03-27 #refactorlists#
-// NumRuleChgd();
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( !mbInSetOrResetAttr,
"DEBUG OSL_ENSURE(ON - <SwTxtNode::ChgFmtColl(..)> called during <Set/ResetAttr(..)>" );
@@ -3581,7 +3574,6 @@ SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
SwFmtChg aTmp2( pNewColl );
HandleModifyAtTxtNode( *this, &aTmp1, &aTmp2 );
}
- // <--
}
// nur wenn im normalen Nodes-Array
@@ -3599,9 +3591,7 @@ SwNodeNum* SwTxtNode::CreateNum() const
{
if ( !mpNodeNum )
{
- // --> OD 2008-02-19 #refactorlists#
mpNodeNum = new SwNodeNum( const_cast<SwTxtNode*>(this) );
- // <--
}
return mpNodeNum;
}
@@ -3691,7 +3681,6 @@ void SwTxtNode::ResetEmptyListStyleDueToResetOutlineLevelAttr()
// <--
-// --> OD 2008-02-27 #refactorlists#
void SwTxtNode::SetAttrListLevel( int nLevel )
{
if ( nLevel < 0 || nLevel >= MAXLEVEL )
@@ -3705,15 +3694,13 @@ void SwTxtNode::SetAttrListLevel( int nLevel )
static_cast<INT16>(nLevel) );
SetAttr( aNewListLevelItem );
}
-// <--
-// --> OD 2008-02-27 #refactorlists#
+
bool SwTxtNode::HasAttrListLevel() const
{
return GetpSwAttrSet() &&
GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_LEVEL, FALSE ) == SFX_ITEM_SET;
}
-// <--
-// --> OD 2008-02-27 #refactorlists#
+
int SwTxtNode::GetAttrListLevel() const
{
int nAttrListLevel = 0;
@@ -3724,14 +3711,12 @@ int SwTxtNode::GetAttrListLevel() const
return nAttrListLevel;
}
-// <--
int SwTxtNode::GetActualListLevel() const
{
return GetNum() ? GetNum()->GetLevelInListTree() : -1;
}
-// --> OD 2008-02-25 #refactorlists#
void SwTxtNode::SetListRestart( bool bRestart )
{
// CreateNum()->SetRestart(bRestart);
@@ -3749,7 +3734,6 @@ void SwTxtNode::SetListRestart( bool bRestart )
}
}
-// --> OD 2008-02-25 #refactorlists#
bool SwTxtNode::IsListRestart() const
{
// return GetNum() ? GetNum()->IsRestart() : false;
@@ -3758,7 +3742,6 @@ bool SwTxtNode::IsListRestart() const
return aIsRestartItem.GetValue() ? true : false;
}
-// <--
/** Returns if the paragraph has a visible numbering or bullet.
This includes all kinds of numbering/bullet/outlines.
@@ -3786,7 +3769,6 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const
return bRet;
}
-// --> OD 2008-02-25 #refactorlists#
void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber )
{
// CreateNum()->SetStart(nNumber);
@@ -3808,15 +3790,12 @@ void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber
}
}
}
-// <--
-// --> OD 2008-02-27 #refactorlists#
bool SwTxtNode::HasAttrListRestartValue() const
{
return GetpSwAttrSet() &&
GetpSwAttrSet()->GetItemState( RES_PARATR_LIST_RESTARTVALUE, FALSE ) == SFX_ITEM_SET;
}
-// <--
SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const
{
OSL_ENSURE( HasAttrListRestartValue(),
@@ -3827,7 +3806,6 @@ SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const
return static_cast<SwNumberTree::tSwNumTreeNumber>(aListRestartValueItem.GetValue());
}
-// --> OD 2008-02-25 #refactorlists#
SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
{
// return GetNum() ? GetNum()->GetStart() : 1;
@@ -3853,7 +3831,6 @@ SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
return nListRestartValue;
}
-// <--
bool SwTxtNode::IsNotifiable() const
{
@@ -3871,7 +3848,6 @@ bool SwTxtNode::IsNotificationEnabled() const
return bResult;
}
-// --> OD 2008-02-27 #refactorlists#
void SwTxtNode::SetCountedInList( bool bCounted )
{
if ( bCounted )
@@ -3886,7 +3862,6 @@ void SwTxtNode::SetCountedInList( bool bCounted )
SetAttr( aIsCountedInListItem );
}
}
-// <--
bool SwTxtNode::IsCountedInList() const
{
@@ -3896,7 +3871,6 @@ bool SwTxtNode::IsCountedInList() const
return aIsCountedInListItem.GetValue() ? true : false;
}
-// --> OD 2008-03-13 #refactorlists#
void SwTxtNode::AddToList()
{
if ( IsInList() )
@@ -3944,7 +3918,6 @@ bool SwTxtNode::IsInList() const
{
return GetNum() != 0 && GetNum()->GetParent() != 0;
}
-// <--
bool SwTxtNode::IsFirstOfNumRule() const
{
@@ -3956,7 +3929,6 @@ bool SwTxtNode::IsFirstOfNumRule() const
return bResult;
}
-// --> OD 2008-02-20 #refactorlists#
void SwTxtNode::SetListId( const String sListId )
{
const SfxStringItem& rListIdItem =
@@ -3996,7 +3968,6 @@ String SwTxtNode::GetListId() const
return sListId;
}
-// <--
/** Determines, if the list level indent attributes can be applied to the
paragraph.
@@ -4183,7 +4154,6 @@ bool SwTxtNode::IsHidden() const
}
// <--
-// --> OD 2008-03-13 #refactorlists#
namespace {
// Helper class for special handling of setting attributes at text node:
// In constructor an instance of the helper class recognize whose attributes
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 4214c1c..aaedfcf 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -184,9 +184,7 @@ SwHistorySetFmt::~SwHistorySetFmt()
}
-// --> OD 2008-02-27 #refactorlists# - removed <rDoc>
SwHistoryResetFmt::SwHistoryResetFmt(const SfxPoolItem* pFmtHt, ULONG nNodeIdx)
-// <--
: SwHistoryHint( HSTRY_RESETFMTHNT )
, m_nNodeIndex( nNodeIdx )
, m_nWhich( pFmtHt->Which() )
@@ -1045,10 +1043,8 @@ SwHistory::~SwHistory()
|*
*************************************************************************/
-// --> OD 2008-02-27 #refactorlists# - removed <rDoc>
void SwHistory::Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
ULONG nNodeIdx )
-// <--
{
OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 555a207..eba1943 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -45,7 +45,6 @@ inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
//--------------------------------------------------
-// --> OD 2008-04-15 #refactorlists#
SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange,
SwFmtColl* pColl,
const bool bReset,
@@ -56,7 +55,6 @@ SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange,
pFmtColl( pColl ),
mbReset( bReset ),
mbResetListAttrs( bResetListAttrs )
-// <--
{
// --> FME 2004-08-06 #i31191#
if ( pColl )
@@ -107,12 +105,10 @@ void SwUndoFmtColl::Repeat( SwUndoIter& rUndoIter )
// ist das Format ueberhaupt noch vorhanden?
if( USHRT_MAX != nPos )
{
- // --> OD 2008-04-15 #refactorlists#
rUndoIter.GetDoc().SetTxtFmtColl( *rUndoIter.pAktPam,
(SwTxtFmtColl*)pFmtColl,
mbReset,
mbResetListAttrs );
- // <--
}
rUndoIter.pLastUndoObj = this;
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 6da4a95..1d058fb 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -156,7 +156,6 @@ void SwUndoInsNum::Redo( SwUndoIter& rUndoIter )
else
{
// --> OD 2005-02-25 #i42921# - adapt to changed signature
- // --> OD 2008-03-18 #refactorlists#
rDoc.SetNumRule( *rUndoIter.pAktPam, aNumRule, false );
// <--
}
@@ -176,7 +175,6 @@ void SwUndoInsNum::Repeat( SwUndoIter& rUndoIter )
if( !sReplaceRule.Len() )
{
// --> OD 2005-02-25 #i42921# - adapt to changed signature
- // --> OD 2008-03-18 #refactorlists#
rUndoIter.GetDoc().SetNumRule( *rUndoIter.pAktPam, aNumRule, false );
// <--
}
@@ -420,7 +418,6 @@ SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt )
SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
if ( pTxtNd )
{
- // --> OD 2008-02-28 #refactorlists#
if ( pTxtNd->HasAttrListRestartValue() )
{
nOldStt = static_cast<USHORT>(pTxtNd->GetAttrListRestartValue());
@@ -429,7 +426,6 @@ SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt )
{
nOldStt = USHRT_MAX; // indicating, that the list restart value is not set
}
- // <--
}
}
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 360b8cc..758244e 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -600,7 +600,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
sal_Int16 IsNodeNumStart(SwPaM& rPam, PropertyState& eState)
{
const SwTxtNode* pTxtNd = rPam.GetNode()->GetTxtNode();
- // --> OD 2008-02-28 #refactorlists#
// correction: check, if restart value is set at the text node and use
// new method <SwTxtNode::GetAttrListRestartValue()> to retrieve the value
if ( pTxtNd && pTxtNd->GetNumRule() && pTxtNd->IsListRestart() &&
@@ -610,7 +609,6 @@ sal_Int16 IsNodeNumStart(SwPaM& rPam, PropertyState& eState)
sal_Int16 nTmp = sal::static_int_cast< sal_Int16 >(pTxtNd->GetAttrListRestartValue());
return nTmp;
}
- // <--
eState = PropertyState_DEFAULT_VALUE;
return -1;
}
@@ -707,19 +705,15 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
SwPaM aPam( *rPam.GetPoint() );
for( sal_uInt16 n = 0; n < aRangeArr.Count(); ++n )
{
- // --> OD 2008-03-17 #refactorlists#
// no start of a new list
pDoc->SetNumRule( aRangeArr.SetPam( n, aPam ), aRule, false );
- // <--
}
pDoc->EndUndo( UNDO_END, NULL );
}
else
{
- // --> OD 2008-03-17 #refactorlists#
// no start of a new list
pDoc->SetNumRule( rPam, aRule, false );
- // <--
}
@@ -730,10 +724,8 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
SwNumRule* pRule = pDoc->FindNumRulePtr( pSwNum->GetCreatedNumRuleName() );
if(!pRule)
throw RuntimeException();
- // --> OD 2008-03-17 #refactorlists#
// no start of a new list
pDoc->SetNumRule( rPam, *pRule, false );
- // <--
}
// --> OD 2009-08-18 #i103817#
// outline numbering
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 3527e3e..2d42782 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -568,11 +568,7 @@ throw (lang::IllegalArgumentException)
{
// multi selection is not considered
SwTxtNode *const pTxtNd = rPam.GetNode()->GetTxtNode();
- // --> OD 2008-05-14 #refactorlists# - check on list style not needed
-// const SwNumRule* pRule = pTxtNd->GetNumRule();
-// if( FN_UNO_NUM_LEVEL == rEntry.nWID && pRule != NULL )
if (FN_UNO_NUM_LEVEL == rEntry.nWID)
- // <--
{
sal_Int16 nLevel = 0;
if (rValue >>= nLevel)
@@ -2331,9 +2327,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
static USHORT g_ParaResetableSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- // --> OD 2008-02-25 #refactorlists#
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
- // <--
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 1d8bc2a..cd4097d 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2181,13 +2181,11 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
pDocRule ? pDocRule->SetRuleType(eNumRuleType) :
pCreatedRule ? pCreatedRule->SetRuleType(eNumRuleType) : pNumRule->SetRuleType(eNumRuleType);
}
- // --> OD 2008-04-23 #refactorlists#
else if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DEFAULT_LIST_ID)))
{
delete pDocRule;
throw IllegalArgumentException();
}
- // <--
else
throw UnknownPropertyException();
@@ -2236,14 +2234,12 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
BOOL bVal = pRule->IsOutlineRule();
aRet.setValue(&bVal, ::getBooleanCppuType());
}
- // --> OD 2008-04-23 #refactorlists#
else if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DEFAULT_LIST_ID)))
{
OSL_ENSURE( pRule->GetDefaultListId().Len() != 0,
"<SwXNumberingRules::getPropertyValue(..)> - no default list id found. Serious defect -> please inform OD." );
aRet <<= OUString(pRule->GetDefaultListId());
}
- // <--
else
throw UnknownPropertyException();
return aRet;
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 10ed0bb..592df23 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -82,7 +82,6 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
pNumRule = const_cast<SwNumRule*>(pTxtNdNumRule);
nDeep = static_cast< sal_uInt16 >(pNumRule ? rTxtNd.GetActualListLevel() + 1 : 0);
bNumbered = rTxtNd.IsCountedInList();
- // --> OD 2008-02-27 #refactorlists#
// --> OD 2005-11-16 #i57919#
// correction of refactoring done by cws swnumtree:
// <bRestart> has to be set to <true>, if numbering is restarted at this
@@ -528,11 +527,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
AppendTxtNode( AM_NOSPACE, sal_False );
bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt!
- // --> OD 2008-04-02 #refactorlists#
-// if( HTML_LISTHEADER_ON==nToken )
-// SetNoNum(&nLevel, TRUE);
const bool bCountedInList( HTML_LISTHEADER_ON==nToken ? false : true );
- // <--
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
@@ -578,9 +573,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
if ( nLevel < MAXLEVEL )
{
- // --> OD 2008-04-02 #refactorlists#
pTxtNode->SetCountedInList( bCountedInList );
- // <--
}
// <--
// --> OD 2005-11-15 #i57919#
@@ -669,7 +662,6 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl,
/* */
-// --> OD 2008-04-02 #refactorlists#
void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
{
SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode();
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 70d5382..3986b9b 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -571,10 +571,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
SwTwips GetCurrentBrowseWidth();
SwHTMLNumRuleInfo& GetNumInfo() { return *pNumRuleInfo; }
- // --> OD 2008-04-02 #refactorlists#
// add parameter <bCountedInList>
void SetNodeNum( sal_uInt8 nLevel, bool bCountedInList );
- // <--
// Verwalten von Absatz-Vorlagen
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 3d746f7..4436d52 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -457,10 +457,8 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry*
aTmpStart, aTmpEnd ) )
{
SwPaM aTmpPam( aTmpStart, aTmpEnd );
- // --> OD 2008-03-17 #refactorlists#
// no start of a new list
pDoc->SetNumRule( aTmpPam, *pRul, false );
- // <--
aTmpStart = aTmpEnd; // Start fuer naechstes Teilstueck
aTmpStart++;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 82b0eab..8ddd27c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2464,10 +2464,8 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
if( pRule && pTxtNd->IsInList() )
{
- // --> OD 2008-03-18 #refactorlists#
OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
"<SwRTFWriter::OutListNum(..)> - text node does not have valid list level. Serious defect -> please inform OD" );
- // <--
const bool bExportNumRule = USHRT_MAX != nNumId;
const SwNumFmt* pFmt = pRule->GetNumFmt( nLvl );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8832cc7..8374fad 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -874,7 +874,6 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily,
case SFX_STYLE_FAMILY_PSEUDO:
{
// reset indent attribute on applying list style
- // --> OD 2008-03-17 #refactorlists#
// continue list of list style
const SwNumRule* pNumRule = pStyle->GetNumRule();
const String sListIdForStyle =pNumRule->GetDefaultListId();
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1b37ac7..4831fdd 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -874,9 +874,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SfxItemSet aCoreSet( GetPool(),
RES_PARATR_BEGIN, RES_PARATR_END - 1,
- // --> OD 2008-02-25 #refactorlists#
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1,
- // <--
RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS,
SID_ATTR_TABSTOP_DEFAULTS, SID_ATTR_TABSTOP_DEFAULTS,
@@ -1049,7 +1047,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
case FN_NUM_CONTINUE:
{
- // --> OD 2008-03-18 #refactorlists#
String sContinuedListId;
const SwNumRule* pRule =
rWrtSh.SearchNumRule( false, true, false, -1, sContinuedListId );
@@ -1064,7 +1061,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
rWrtSh.SetCurNumRule( *pRule, false, sContinuedListId );
}
- // <--
}
break;
case FN_SELECT_PARA:
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 50a682e..4b23b00 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -409,10 +409,8 @@ SET_LINESPACE:
pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
aSetRule.SetSvxRule( aRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
- // --> OD 2008-03-17 #refactorlists#
// no start or continuation of a list - list style is only changed
GetShell().SetCurNumRule( aSetRule, false );
- // <--
}
}
}
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index bfe73d9..fb62953 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -125,11 +125,9 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
aRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, FALSE);
aSet.Put(SvxNumBulletItem(aRule));
- // --> OD 2008-02-29 #refactorlists# - removed <bHasChild>
OSL_ENSURE( GetShell().GetNumLevel() < MAXLEVEL,
"<SwTextShell::ExecEnterNum()> - numbered node without valid list level. Serious defect -> please inform OD." );
USHORT nLevel = GetShell().GetNumLevel();
- // <--
if( nLevel < MAXLEVEL )
{
nLevel = 1<<nLevel;
@@ -198,12 +196,10 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
// <--
aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
- // --> OD 2008-03-17 #refactorlists#
// No start of new list, if an existing list style is edited.
// Otherwise start a new list.
const bool bCreateList = (pCurRule == 0);
GetShell().SetCurNumRule( aSetRule, bCreateList );
- // <--
}
// wenn der Dialog mit OK verlassen wurde, aber nichts ausgewaehlt
// wurde dann muss die Numerierung zumindest eingeschaltet werden,
@@ -219,10 +215,8 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
// <--
aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
- // --> OD 2008-03-17 #refactorlists#
// start new list
GetShell().SetCurNumRule( aSetRule, true );
- // <--
}
}
else if(RET_USER == nRet)
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 839b329..b38053e 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1347,7 +1347,6 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
}
// <--
// reset indent attribute on applying list style
- // --> OD 2008-03-17 #refactorlists#
// start new list
SetCurNumRule( aNumRule, true, String(), true );
}
@@ -1382,10 +1381,8 @@ void SwWrtShell::NumOrBulletOff()
aFmt.SetNumberingType(SVX_NUM_NUMBER_NONE);
aNumRule.Set(nLevel, aFmt);
- // --> OD 2008-03-17 #refactorlists#
// no start or continuation of a list - the outline style is only changed.
SetCurNumRule( aNumRule, false );
- // <--
}
}
else
@@ -1489,9 +1486,7 @@ SelectionType SwWrtShell::GetSelectionType() const
const SwTxtNode* pTxtNd =
GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
- // --> OD 2008-03-19 #refactorlists#
if ( pTxtNd && pTxtNd->IsInList() )
- // <--
{
const SwNumFmt& rFmt = pNumRule->Get(sal::static_int_cast< sal_uInt8, sal_Int32>(pTxtNd->GetActualListLevel()));
if ( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() )
--
1.7.3.5
--------------000301050909050105060206
Content-Type: text/plain;
name="0004-Remove-dates-and-two-sections-of-old-code.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0004-Remove-dates-and-two-sections-of-old-code.patch"
More information about the LibreOffice
mailing list