[PATCH 1/7] Remove #newlistlevelattrs# comments.
Thomas Arnhold
thomas at arnhold.org
Mon Jan 17 11:32:43 PST 2011
---
sw/source/core/doc/docfmt.cxx | 1 -
sw/source/core/doc/docnew.cxx | 2 -
sw/source/core/doc/docnum.cxx | 3 +-
sw/source/core/doc/fmtcol.cxx | 1 -
sw/source/core/doc/number.cxx | 4 -
sw/source/core/doc/poolfmt.cxx | 116 +++++++++++++----------------------
sw/source/core/edit/autofmt.cxx | 3 +-
sw/source/core/edit/edattr.cxx | 5 +-
sw/source/core/edit/ednumber.cxx | 8 +--
sw/source/core/inc/txtfrm.hxx | 6 --
sw/source/core/layout/frmtool.cxx | 4 -
sw/source/core/text/frmform.cxx | 2 -
sw/source/core/text/inftxt.cxx | 10 +---
sw/source/core/text/inftxt.hxx | 8 ---
sw/source/core/text/itrcrsr.cxx | 5 --
sw/source/core/text/porfld.cxx | 17 +-----
sw/source/core/text/porfld.hxx | 8 ---
sw/source/core/text/porftn.hxx | 2 -
sw/source/core/text/txtfld.cxx | 8 ---
sw/source/core/text/txtfrm.cxx | 6 --
sw/source/core/text/txttab.cxx | 2 -
sw/source/core/txtnode/ndtxt.cxx | 6 --
sw/source/core/txtnode/thints.cxx | 8 ---
sw/source/core/undo/unattr.cxx | 2 -
sw/source/core/unocore/unosett.cxx | 14 ----
sw/source/filter/html/htmlnum.cxx | 2 -
sw/source/filter/ww8/wrtw8num.cxx | 2 -
sw/source/filter/ww8/ww8par2.cxx | 2 -
sw/source/ui/app/docst.cxx | 6 --
sw/source/ui/inc/num.hxx | 8 ---
sw/source/ui/misc/outline.cxx | 9 ---
sw/source/ui/shells/textsh1.cxx | 2 -
sw/source/ui/shells/txtattr.cxx | 2 -
sw/source/ui/shells/txtnum.cxx | 6 --
sw/source/ui/uiview/viewtab.cxx | 2 -
sw/source/ui/wrtsh/wrtsh1.cxx | 2 -
36 files changed, 51 insertions(+), 243 deletions(-)
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d87b32b..c769370 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1195,7 +1195,6 @@ void SwDoc::SetAttr( const SfxItemSet& rSet, SwFmt& rFmt )
SetModified();
}
-// --> OD 2008-02-12 #newlistlevelattrs#
void SwDoc::ResetAttrAtFormat( const USHORT nWhichId,
SwFmt& rChangedFormat )
{
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 67dd54a..50fe704 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -417,7 +417,6 @@ SwDoc::SwDoc() :
_InitFieldTypes();
// lege (fuer die Filter) eine Default-OutlineNumRule an
- // --> OD 2008-02-11 #newlistlevelattrs#
pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
@@ -831,7 +830,6 @@ void SwDoc::ClearDoc()
pOutlineRule = NULL;
pNumRuleTbl->DeleteAndDestroy( 0, pNumRuleTbl->Count() );
// creation of new outline numbering rule
- // --> OD 2008-02-11 #newlistlevelattrs#
pOutlineRule = new SwNumRule( String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index a38f9ca..2d9b7ca 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -811,8 +811,7 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
rDoc.UpdateNumRule();
}
-// OD 2008-02-08 #newlistlevelattrs# - add handling of parameter <bResetIndentAttrs>
-// --> OD 2008-03-17 #refactorlists#
+// add handling of parameter <bResetIndentAttrs>
void SwDoc::SetNumRule( const SwPaM& rPam,
const SwNumRule& rRule,
const bool bCreateNewList,
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index de62c60..421ce57 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -455,7 +455,6 @@ USHORT SwTxtFmtColl::ResetAllFmtAttr()
}
// <--
-// --> OD 2008-02-13 #newlistlevelattrs#
bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
{
bool bAreListLevelIndentsApplicable( true );
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 504ee06..ee9e9e2 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -87,11 +87,9 @@ const SwNumFmt& SwNumRule::Get( USHORT i ) const
ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
return aFmts[ i ]
? *aFmts[ i ]
- // --> OD 2008-02-11 #newlistlevelattrs#
: ( meDefaultNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION
? *aBaseFmts[ eRuleType ][ i ]
: *aLabelAlignmentBaseFmts[ eRuleType ][ i ] );
- // <--
}
const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
@@ -552,13 +550,11 @@ SwNumRule::~SwNumRule()
for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
delete *ppFmts, *ppFmts = 0;
- // --> OD 2008-02-11 #newlistlevelattrs#
ppFmts = (SwNumFmt**)SwNumRule::aLabelAlignmentBaseFmts;
for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
delete *ppFmts, *ppFmts = 0;
for( n = 0; n < MAXLEVEL; ++n, ++ppFmts )
delete *ppFmts, *ppFmts = 0;
- // <--
}
maTxtNodeList.clear();
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index a00eee9..915adbd 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -230,11 +230,10 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
{
SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
const SwNumFmt& rNFmt = pOutlineRule->Get( nLevel );
- // --> OD 2008-02-01 #newlistlevelattrs#
+
if ( rNFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
( rNFmt.GetAbsLSpace() || rNFmt.GetFirstLineOffset() ) )
- // <--
{
SvxLRSpaceItem aLR( (SvxLRSpaceItem&)pColl->GetFmtAttr( RES_LR_SPACE ) );
aLR.SetTxtFirstLineOfstValue( rNFmt.GetFirstLineOffset() );
@@ -1640,7 +1639,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
- // --> OD 2008-02-11 #newlistlevelattrs#
const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
// --> OD 2008-06-06 #i89178#
= numfunc::GetDefaultPositionAndSpaceMode();
@@ -1648,9 +1646,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
// <--
{
BOOL bIsModified = IsModified();
- // --> OD 2008-02-11 #newlistlevelattrs#
+
n = MakeNumRule( aNm, 0, FALSE, eNumberFormatPositionAndSpaceMode );
- // <--
+
pNewRule = GetNumRuleTbl()[ n ];
pNewRule->SetPoolFmtId( nId );
pNewRule->SetAutoRule( FALSE );
@@ -1671,9 +1669,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_NUM1:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_ARABIC);
aFmt.SetCharFmt( pNumCFmt );
aFmt.SetStart( 1 );
@@ -1698,7 +1694,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -1708,10 +1703,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -1721,7 +1715,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -1752,22 +1746,20 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_ARABIC);
aFmt.SetCharFmt( pNumCFmt );
aFmt.SetIncludeUpperLevels( 1 );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
}
- // <--
+
USHORT nSpace = 0;
for( n = 0; n < MAXLEVEL; ++n )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
@@ -1779,7 +1771,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetIndentAt( nSpace );
aFmt.SetFirstLineIndent( - pArr[ n ] );
}
- // <--
+
aFmt.SetStart( n+1 );
pNewRule->Set( n, aFmt );
}
@@ -1788,15 +1780,14 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_NUM3:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_ARABIC);
aFmt.SetCharFmt( pNumCFmt );
aFmt.SetIncludeUpperLevels( 1 );
USHORT nOffs = GetMetricVal( CM_1 ) * 3;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - nOffs );
@@ -1806,11 +1797,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - nOffs );
}
- // <--
for( n = 0; n < MAXLEVEL; ++n )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( (n+1) * nOffs );
@@ -1820,7 +1809,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( (n+1) * nOffs );
aFmt.SetIndentAt( (n+1) * nOffs );
}
- // <--
+
aFmt.SetStart( n+1 );
pNewRule->Set( n, aFmt );
}
@@ -1829,9 +1818,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_NUM4:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);
aFmt.SetCharFmt( pNumCFmt );
aFmt.SetIncludeUpperLevels( 1 );
@@ -1855,7 +1843,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -1865,11 +1852,11 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
aFmt.SetStart( n + 1 );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -1879,7 +1866,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -1909,21 +1896,18 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr0to2 = aAbsSpace0to2;
#endif
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_ARABIC);
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
aFmt.SetSuffix( aDotStr );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
}
- // <--
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( -pArr0to2[0] ); // == 0.40 cm
@@ -1935,14 +1919,13 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( pArr0to2[1] );
aFmt.SetIndentAt( pArr0to2[1] );
}
- // <--
aFmt.SetCharFmt( pNumCFmt );
pNewRule->Set( 0, aFmt );
aFmt.SetIncludeUpperLevels( 2 );
aFmt.SetStart( 2 );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( -pArr0to2[2] ); // == 0.65 cm
@@ -1954,14 +1937,14 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( pArr0to2[3] );
aFmt.SetIndentAt( pArr0to2[3] );
}
- // <--
+
pNewRule->Set( 1, aFmt );
aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
aFmt.SetSuffix( ')');
aFmt.SetIncludeUpperLevels( 1 );
aFmt.SetStart( 3 );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - pArr0to2[4] ); // == 0.45cm
@@ -1973,7 +1956,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( pArr0to2[5] );
aFmt.SetIndentAt( pArr0to2[5] );
}
- // <--
+
pNewRule->Set( 2, aFmt );
@@ -1986,7 +1969,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
USHORT nOffs = GetMetricVal( CM_01 ) * 4,
nOffs2 = GetMetricVal( CM_1 ) * 2;
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - nOffs );
@@ -1995,12 +1977,12 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
{
aFmt.SetFirstLineIndent( - nOffs );
}
- // <--
+
aFmt.SetSuffix( aEmptyStr );
for( n = 3; n < MAXLEVEL; ++n )
{
aFmt.SetStart( n+1 );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
@@ -2010,7 +1992,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( nOffs2 + ((n-3) * nOffs) );
aFmt.SetIndentAt( nOffs2 + ((n-3) * nOffs) );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -2019,9 +2001,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_BUL1:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
@@ -2049,7 +2030,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -2059,10 +2039,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -2072,7 +2051,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -2080,9 +2059,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_BUL2:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
@@ -2110,7 +2088,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -2120,10 +2097,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -2133,7 +2109,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -2141,9 +2117,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_BUL3:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
+
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
@@ -2153,7 +2129,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
// <--
USHORT nOffs = GetMetricVal( CM_01 ) * 4;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - nOffs );
@@ -2163,12 +2139,11 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - nOffs );
}
- // <--
for( n = 0; n < MAXLEVEL; ++n )
{
aFmt.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( ((n & 1) +1) * nOffs );
@@ -2178,7 +2153,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( ((n & 1) +1) * nOffs );
aFmt.SetIndentAt( ((n & 1) +1) * nOffs );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -2186,9 +2161,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_BUL4:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
@@ -2215,7 +2189,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -2225,7 +2198,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
switch( n )
@@ -2234,7 +2207,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case 1: aFmt.SetBulletChar( 0xE006 ); break;
default: aFmt.SetBulletChar( 0xE004 ); break;
}
- // --> OD 2008-02-11 #newlistlevelattrs#
+
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -2244,7 +2217,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
@@ -2252,9 +2225,8 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
case RES_POOLNUMRULE_BUL5:
{
SwNumFmt aFmt;
- // --> OD 2008-02-11 #newlistlevelattrs#
+
aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- // <--
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
@@ -2282,7 +2254,6 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
const USHORT* pArr = aAbsSpace;
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetFirstLineOffset( - (*pArr) );
@@ -2292,10 +2263,9 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
aFmt.SetFirstLineIndent( - (*pArr) );
}
- // <--
+
for( n = 0; n < MAXLEVEL; ++n, ++pArr )
{
- // --> OD 2008-02-11 #newlistlevelattrs#
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
aFmt.SetAbsLSpace( *pArr );
@@ -2305,7 +2275,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetListtabPos( *pArr );
aFmt.SetIndentAt( *pArr );
}
- // <--
+
pNewRule->Set( n, aFmt );
}
}
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 0b91c3b..67e0d4a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1466,12 +1466,11 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
xub_StrLen nAutoCorrPos = 0;
// falls die Numerierung gesetzt werden, die akt. besorgen
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aRule( pDoc->GetUniqueNumRuleName(),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- // <--
+
const SwNumRule* pCur = 0;
if( aFlags.bSetNumRule && 0 != (pCur = pAktTxtNd->GetNumRule()) )
aRule = *pCur;
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 3192e22..4daf2be 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -71,10 +71,8 @@ const USHORT& getMaxLookup()
return nMaxLookup;
}
-// --> OD 2008-01-16 #newlistlevelattrs#
BOOL SwEditShell::GetCurAttr( SfxItemSet& rSet,
const bool bMergeIndentValuesOfNumRule ) const
-// <--
{
if( GetCrsrCnt() > getMaxLookup() )
{
@@ -143,11 +141,10 @@ BOOL SwEditShell::GetCurAttr( SfxItemSet& rSet,
xub_StrLen nStt = n == nSttNd ? nSttCnt : 0,
nEnd = n == nEndNd ? nEndCnt
: ((SwTxtNode*)pNd)->GetTxt().Len();
- // --> OD 2008-01-16 #newlistlevelattrs#
+
((SwTxtNode*)pNd)->GetAttr( *pSet, nStt, nEnd,
FALSE, TRUE,
bMergeIndentValuesOfNumRule );
- // <--
}
break;
case ND_GRFNODE:
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index af58212..bebf282 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -681,8 +681,7 @@ const SwNumRule* SwEditShell::GetCurNumRule() const
return GetDoc()->GetCurrNumRule( *GetCrsr()->GetPoint() );
}
-// OD 2008-02-08 #newlistlevelattrs# - add handling of parameter <bResetIndentAttrs>
-// --> OD 2008-03-17 #refactorlists#
+// add handling of parameter <bResetIndentAttrs>
void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
const bool bCreateNewList,
const String sContinuedListId,
@@ -699,12 +698,9 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
for( USHORT n = 0; n < aRangeArr.Count(); ++n )
{
aRangeArr.SetPam( n, aPam );
- // --> OD 2008-02-08 #newlistlevelattrs#
- // --> OD 2008-03-17 #refactorlists#
GetDoc()->SetNumRule( aPam, rRule,
bCreateNewList, sContinuedListId,
sal_True, bResetIndentAttrs );
- // <--
GetDoc()->SetCounted( aPam, true );
}
GetDoc()->EndUndo( UNDO_END, NULL );
@@ -713,8 +709,6 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
{
GetDoc()->StartUndo( UNDO_START, NULL );
- // --> OD 2008-02-08 #newlistlevelattrs#
- // --> OD 2008-03-17 #refactorlists#
GetDoc()->SetNumRule( *pCrsr, rRule,
bCreateNewList, sContinuedListId,
sal_True, bResetIndentAttrs );
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 475278a..6190259 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -84,13 +84,11 @@ class SwTxtFrm: public SwCntntFrm
// OD 2004-03-17 #i11860# - re-factoring of #i11859#
// member for height of last line (value needed for proportional line spacing)
SwTwips mnHeightOfLastLine;
- // --> OD 2008-01-31 #newlistlevelattrs#
// member for the additional first line offset, which is caused by the list
// label alignment for list level position and space mode LABEL_ALIGNMENT.
// This additional first line offset is used for the text formatting.
// It is NOT used for the determination of printing area.
SwTwips mnAdditionalFirstLineOffset;
- // <--
xub_StrLen nOfst; //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an.
@@ -502,18 +500,14 @@ public:
line offset for the real text formatting due to the value of label
adjustment attribute of the list level.
- OD 2008-01-31 #newlistlevelattrs#
-
@author OD
*/
void CalcAdditionalFirstLineOffset();
- // --> OD 2008-01-31 #newlistlevelattrs#
inline SwTwips GetAdditionalFirstLineOffset() const
{
return mnAdditionalFirstLineOffset;
}
- // <--
// liefert den zusaetzlichen Zeilenabstand fuer den naechsten Absatz
// OD 07.01.2004 #i11859# - change return data type;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 172368e..19ce248 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2020,13 +2020,11 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
else
nRight += rLR.GetRight();
- // --> OD 2008-01-21 #newlistlevelattrs#
// correction: retrieve left margin for numbering in R2L-layout
if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
{
nRight += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum();
}
- // <--
return nRight;
}
@@ -2051,11 +2049,9 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
nLeft += rLR.GetLeft();
- // --> OD 2008-01-21 #newlistlevelattrs#
// correction: do not retrieve left margin for numbering in R2L-layout
// if ( pCaller->IsTxtFrm() )
if ( pCaller->IsTxtFrm() && !pCaller->IsRightToLeft() )
- // <--
{
nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum();
}
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 930f80c..bde7d70 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1873,9 +1873,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
SWRECTFN( this )
- // --> OD 2008-01-31 #newlistlevelattrs#
CalcAdditionalFirstLineOffset();
- // <--
// Vom Berichtsautopiloten oder ueber die BASIC-Schnittstelle kommen
// gelegentlich TxtFrms mit einer Breite <=0.
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 9477da7..e53c282 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -42,9 +42,7 @@
#include <editeng/brshitem.hxx>
#include <editeng/splwrap.hxx>
#include <editeng/pgrditem.hxx>
-// --> OD 2008-01-17 #newlistlevelattrs#
#include <editeng/tstpitem.hxx>
-// <--
#include <SwSmartTagMgr.hxx>
#include <linguistic/lngprops.hxx>
@@ -148,7 +146,6 @@ sal_Bool SwTxtSizeInfo::IsOptTest8() const { return GetOpt().IsTest8(); }
* SwLineInfo::SwLineInfo()
*************************************************************************/
-// --> OD 2008-01-17 #newlistlevelattrs#
SwLineInfo::SwLineInfo()
: pRuler( 0 ),
pSpace( 0 ),
@@ -165,9 +162,7 @@ SwLineInfo::~SwLineInfo()
}
void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
const SwTxtNode& rTxtNode )
-// <--
{
- // --> OD 2008-01-17 #newlistlevelattrs#
// pRuler = &rAttrSet.GetTabStops();
delete pRuler;
pRuler = new SvxTabStopItem( rAttrSet.GetTabStops() );
@@ -191,8 +186,7 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
}
}
}
- // <--
- // --> OD 2008-02-15 #newlistlevelattrs#
+
if ( !rTxtNode.getIDocumentSettingAccess()->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) )
{
// remove default tab stop at position 0
@@ -206,7 +200,7 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
}
}
}
- // <--
+
pSpace = &rAttrSet.GetLineSpacing();
nVertAlign = rAttrSet.GetParaVertAlign().GetValue();
nDefTabStop = MSHRT_MAX;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 073b9bf..0b3234e 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -99,17 +99,12 @@ class SwLineInfo
const SvxLineSpacingItem *pSpace;
USHORT nVertAlign;
KSHORT nDefTabStop;
- // --> OD 2008-02-04 #newlistlevelattrs#
bool bListTabStopIncluded;
long nListTabStopPosition;
- // <--
- // --> OD 2008-01-17 #newlistlevelattrs#
void CtorInitLineInfo( const SwAttrSet& rAttrSet,
const SwTxtNode& rTxtNode );
- // <--
- // --> OD 2008-01-17 #newlistlevelattrs#
SwLineInfo();
~SwLineInfo();
public:
@@ -133,7 +128,6 @@ public:
USHORT NumberOfTabStops() const;
- // --> OD 2008-02-04 #newlistlevelattrs#
inline bool IsListTabStopIncluded() const
{
return bListTabStopIncluded;
@@ -142,8 +136,6 @@ public:
{
return nListTabStopPosition;
}
- // <--
-
// friend ostream &operator<<( ostream &rOS, const SwLineInfo &rInf );
friend SvStream &operator<<( SvStream &rOS, const SwLineInfo &rInf );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 07f2bdb..312578b 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -201,7 +201,6 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
const int nLMWithNum = pNode->GetLeftMarginWithNum( sal_True );
if ( pFrm->IsRightToLeft() )
{
- // --> OD 2008-01-23 #newlistlevelattrs#
// this calculation is identical this the calculation for L2R layout - see below
nLeft = pFrm->Frm().Left() +
pFrm->Prt().Left() +
@@ -339,13 +338,11 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
pFrm->Prt().Left() );
}
- // --> OD 2008-01-31 #newlistlevelattrs#
// Note: <SwTxtFrm::GetAdditionalFirstLineOffset()> returns a negative
// value for the new list label postion and space mode LABEL_ALIGNMENT
// and label alignment CENTER and RIGHT in L2R layout respectively
// label alignment LEFT and CENTER in R2L layout
nFirst += pFrm->GetAdditionalFirstLineOffset();
- // <--
if( nFirst >= nRight )
nFirst = nRight - 1;
@@ -576,10 +573,8 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
if( bNoTxt )
nTmpFirst = nX;
// 8670: EndPortions zaehlen hier einmal als TxtPortions.
- // --> OD 2008-01-28 #newlistlevelattrs#
// if( pPor->InTxtGrp() || pPor->IsBreakPortion() )
if( pPor->InTxtGrp() || pPor->IsBreakPortion() || pPor->InTabGrp() )
- // <--
{
bNoTxt = sal_False;
nTmpFirst = nX;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index e4d976d..08c20b2 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -539,7 +539,6 @@ sal_Bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt
* class SwNumberPortion
*************************************************************************/
-// --> OD 2008-01-23 #newlistlevelattrs#
SwNumberPortion::SwNumberPortion( const XubString &rExpand,
SwFont *pFont,
const sal_Bool bLft,
@@ -549,9 +548,7 @@ SwNumberPortion::SwNumberPortion( const XubString &rExpand,
: SwFldPortion( rExpand, pFont ),
nFixWidth(0),
nMinDist( nMinDst ),
- // --> OD 2008-01-23 #newlistlevelattrs#
mbLabelAlignmentPosAndSpaceModeActive( bLabelAlignmentPosAndSpaceModeActive )
- // <--
{
SetWhichPor( POR_NUMBER );
SetLeft( bLft );
@@ -569,10 +566,9 @@ SwFldPortion *SwNumberPortion::Clone( const XubString &rExpand ) const
SwFont *pNewFnt;
if( 0 != ( pNewFnt = pFnt ) )
pNewFnt = new SwFont( *pFnt );
- // --> OD 2008-01-23 #newlistlevelattrs#
+
return new SwNumberPortion( rExpand, pNewFnt, IsLeft(), IsCenter(),
nMinDist, mbLabelAlignmentPosAndSpaceModeActive );
- // <--
}
/*************************************************************************
@@ -598,7 +594,7 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
OSL_ENSURE( Height() && nAscent, "NumberPortions without Height | Ascent" );
long nDiff( 0 );
- // --> OD 2008-01-23 #newlistlevelattrs#
+
if ( !mbLabelAlignmentPosAndSpaceModeActive )
{
if ( !rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) &&
@@ -617,7 +613,6 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
}
}
- // <--
// Ein Vorschlag von Juergen und Volkmar:
// Der Textteil hinter der Numerierung sollte immer
// mindestens beim linken Rand beginnen.
@@ -798,7 +793,6 @@ static sal_Char const sDoubleSpace[] = " ";
* class SwBulletPortion
*************************************************************************/
-// --> OD 2008-01-23 #newlistlevelattrs#
SwBulletPortion::SwBulletPortion( const xub_Unicode cBullet,
const XubString& rBulletFollowedBy,
SwFont *pFont,
@@ -809,7 +803,6 @@ SwBulletPortion::SwBulletPortion( const xub_Unicode cBullet,
: SwNumberPortion( XubString( rBulletFollowedBy ).Insert( cBullet, 0 ) ,
pFont, bLft, bCntr, nMinDst,
bLabelAlignmentPosAndSpaceModeActive )
-// <--
{
SetWhichPor( POR_BULLET );
}
@@ -820,7 +813,6 @@ SwBulletPortion::SwBulletPortion( const xub_Unicode cBullet,
#define GRFNUM_SECURE 10
-// --> OD 2008-01-23 #newlistlevelattrs#
SwGrfNumPortion::SwGrfNumPortion(
SwFrm*,
const XubString& rGraphicFollowedBy,
@@ -830,7 +822,6 @@ SwGrfNumPortion::SwGrfNumPortion(
const bool bLabelAlignmentPosAndSpaceModeActive ) :
SwNumberPortion( rGraphicFollowedBy, NULL, bLft, bCntr, nMinDst,
bLabelAlignmentPosAndSpaceModeActive ),
-// <--
pBrush( new SvxBrushItem(RES_BACKGROUND) ), nId( 0 )
{
SetWhichPor( POR_GRFNUM );
@@ -878,7 +869,6 @@ void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
{
SetHide( sal_False );
- // --> OD 2008-01-29 #newlistlevelattrs#
// Width( nFixWidth );
KSHORT nFollowedByWidth( 0 );
if ( mbLabelAlignmentPosAndSpaceModeActive )
@@ -908,7 +898,6 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
}
}
rInf.SetNumDone( sal_True );
- // --> OD 2008-01-23 #newlistlevelattrs#
// long nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
long nDiff = mbLabelAlignmentPosAndSpaceModeActive
? 0
@@ -958,11 +947,9 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
long nTmpWidth = Max( (long)0, (long)(nFixWidth - 2 * GRFNUM_SECURE) );
Size aSize( nTmpWidth, GetGrfHeight() - 2 * GRFNUM_SECURE );
- // --> OD 2008-02-05 #newlistlevelattrs#
const sal_Bool bTmpLeft = mbLabelAlignmentPosAndSpaceModeActive ||
( IsLeft() && ! rInf.GetTxtFrm()->IsRightToLeft() ) ||
( ! IsLeft() && ! IsCenter() && rInf.GetTxtFrm()->IsRightToLeft() );
- // <--
if( nFixWidth < Width() && !bTmpLeft )
{
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index ed18c5d..61f6c8e 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -148,19 +148,15 @@ class SwNumberPortion : public SwFldPortion
protected:
KSHORT nFixWidth; // vgl. Glues
KSHORT nMinDist; // minimaler Abstand zum Text
- // --> OD 2008-01-23 #newlistlevelattrs#
bool mbLabelAlignmentPosAndSpaceModeActive;
- // <--
public:
- // --> OD 2008-01-23 #newlistlevelattrs#
SwNumberPortion( const XubString &rExpand,
SwFont *pFnt,
const sal_Bool bLeft,
const sal_Bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- // <--
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual xub_StrLen GetCrsrOfst( const MSHORT nOfst ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
@@ -179,7 +175,6 @@ public:
class SwBulletPortion : public SwNumberPortion
{
public:
- // --> OD 2008-01-23 #newlistlevelattrs#
SwBulletPortion( const xub_Unicode cCh,
const XubString& rBulletFollowedBy,
SwFont *pFnt,
@@ -187,7 +182,6 @@ public:
const sal_Bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- // <--
OUTPUT_OPERATOR
};
@@ -203,7 +197,6 @@ class SwGrfNumPortion : public SwNumberPortion
SwTwips nGrfHeight;
sal_Int16 eOrient;
public:
- // --> OD 2008-01-23 #newlistlevelattrs#
SwGrfNumPortion( SwFrm *pFrm,
const XubString& rGraphicFollowedBy,
const SvxBrushItem* pGrfBrush,
@@ -213,7 +206,6 @@ public:
const sal_Bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- // <--
~SwGrfNumPortion();
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 606c6c3..4ab1764 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -72,9 +72,7 @@ class SwFtnNumPortion : public SwNumberPortion
{
public:
inline SwFtnNumPortion( const XubString &rExpand, SwFont *pFntL )
- // --> OD 2008-01-23 #newlistlevelattrs#
: SwNumberPortion( rExpand, pFntL, sal_True, sal_False, 0, false )
- // <--
{ SetWhichPor( POR_FTNNUM ); }
OUTPUT_OPERATOR
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 7b422ad..1d9b92a 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -397,16 +397,13 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<USHORT>(pTxtNd->GetActualListLevel()) );
const sal_Bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetNumAdjust();
const sal_Bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetNumAdjust();
- // --> OD 2008-01-23 #newlistlevelattrs#
const bool bLabelAlignmentPosAndSpaceModeActive(
rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT );
const KSHORT nMinDist = bLabelAlignmentPosAndSpaceModeActive
? 0 : rNumFmt.GetCharTextDistance();
- // <--
if( SVX_NUM_BITMAP == rNumFmt.GetNumberingType() )
{
- // --> OD 2008-01-23 #newlistlevelattrs#
pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),
pTxtNd->GetLabelFollowedBy(),
rNumFmt.GetBrush(),
@@ -414,7 +411,6 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
rNumFmt.GetGraphicSize(),
bLeft, bCenter, nMinDist,
bLabelAlignmentPosAndSpaceModeActive );
- // <--
long nTmpA = rInf.GetLast()->GetAscent();
long nTmpD = rInf.GetLast()->Height() - nTmpA;
if( !rInf.IsTest() )
@@ -496,12 +492,10 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
// XubString aTxt( pTxtNd->GetNumString() );
XubString aTxt( pNumRule->MakeNumString( *(pTxtNd->GetNum()) ) );
// <--
- // --> OD 2008-01-23 #newlistlevelattrs#
if ( aTxt.Len() > 0 )
{
aTxt.Insert( pTxtNd->GetLabelFollowedBy() );
}
- // <--
// 7974: Nicht nur eine Optimierung...
// Eine Numberportion ohne Text wird die Breite von 0
@@ -536,11 +530,9 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
// we do not allow a vertical font
pNumFnt->SetVertical( pNumFnt->GetOrientation(), pFrm->IsVertical() );
- // --> OD 2008-01-23 #newlistlevelattrs#
pRet = new SwNumberPortion( aTxt, pNumFnt,
bLeft, bCenter, nMinDist,
bLabelAlignmentPosAndSpaceModeActive );
- // <--
}
}
}
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1a3242c..743de47 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -83,9 +83,7 @@
#include <fmtflcnt.hxx> // SwFmtFlyCnt
#include <fmtcntnt.hxx> // SwFmtCntnt
// <--
-// --> OD 2008-01-31 #newlistlevelattrs#
#include <numrule.hxx>
-// <--
#include <swtable.hxx>
#include <fldupde.hxx>
#include <IGrammarContact.hxx>
@@ -339,9 +337,7 @@ void SwTxtFrm::InitCtor()
mnFtnLine = 0;
// OD 2004-03-17 #i11860#
mnHeightOfLastLine = 0;
- // --> OD 2008-01-31 #newlistlevelattrs#
mnAdditionalFirstLineOffset = 0;
- // <--
nType = FRMC_TXT;
bLocked = bFormatted = bWidow = bUndersized = bJustWidow =
@@ -2181,8 +2177,6 @@ SwTwips SwTxtFrm::CalcFitToContent()
line offset for the real text formatting due to the value of label
adjustment attribute of the list level.
- OD 2008-01-31 #newlistlevelattrs#
-
@author OD
*/
void SwTxtFrm::CalcAdditionalFirstLineOffset()
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a53f8ad..635644f 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -210,7 +210,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
cFill = 0;
eAdj = SVX_TAB_ADJUST_LEFT;
}
- // --> OD 2008-02-07 #newlistlevelattrs#
long nForced = 0;
if ( !bTabsRelativeToIndent )
{
@@ -234,7 +233,6 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
nForced += pPor->Width();
}
- // <--
// --> OD 2009-04-03 #i100732#
// correction of condition, when a tab stop at the left margin can
// be applied:
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5fbea95..296e629 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3762,7 +3762,6 @@ bool SwTxtNode::IsListRestart() const
/** Returns if the paragraph has a visible numbering or bullet.
This includes all kinds of numbering/bullet/outlines.
- OD 2008-02-28 #newlistlevelattrs#
The concrete list label string has to be checked, too.
*/
bool SwTxtNode::HasVisibleNumberingOrBullet() const
@@ -4002,7 +4001,6 @@ String SwTxtNode::GetListId() const
/** Determines, if the list level indent attributes can be applied to the
paragraph.
- OD 2008-01-17 #newlistlevelattrs#
The list level indents can be applied to the paragraph under the one
of following conditions:
- the list style is directly applied to the paragraph and the paragraph
@@ -4074,8 +4072,6 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const
/** Retrieves the list tab stop position, if the paragraph's list level defines
one and this list tab stop has to merged into the tap stops of the paragraph
- OD 2008-01-17 #newlistlevelattrs#
-
@author OD
@param nListTabStopPosition
@@ -4120,8 +4116,6 @@ bool SwTxtNode::GetListTabStopPosition( long& nListTabStopPosition ) const
/** Retrieves the character following the list label, if the paragraph's
list level defines one.
- OD 2008-01-17 #newlistlevelattrs#
-
@author OD
@return XubString - the list tab stop position
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index f296171..f26aa35 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -41,9 +41,7 @@
#include <editeng/emphitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/charrotateitem.hxx>
-// --> OD 2008-01-16 #newlistlevelattrs#
#include <editeng/lrspitem.hxx>
-// <--
#include <txtinet.hxx>
#include <txtflcnt.hxx>
#include <fmtfld.hxx>
@@ -1812,7 +1810,6 @@ public:
SwPoolItemEndPair() : mpItem( 0 ), mnEndPos( 0 ) {};
};
-// --> OD 2008-01-16 #newlistlevelattrs#
void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode,
SfxItemSet& rSet )
{
@@ -1834,7 +1831,6 @@ void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTxtNode& rTxtNode,
}
// erfrage die Attribute vom TextNode ueber den Bereich
-// --> OD 2008-01-16 #newlistlevelattrs#
BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
BOOL bOnlyTxtAttr, BOOL bGetFromChrFmt,
const bool bMergeIndentValuesOfNumRule ) const
@@ -1862,12 +1858,10 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
if( !bOnlyTxtAttr )
{
SwCntntNode::GetAttr( aFmtSet );
- // --> OD 2008-01-16 #newlistlevelattrs#
if ( bMergeIndentValuesOfNumRule )
{
lcl_MergeListLevelIndentAsLRSpaceItem( *this, aFmtSet );
}
- // <--
}
const USHORT nSize = m_pSwpHints->Count();
@@ -2051,12 +2045,10 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
{
// dann besorge mal die Auto-(Fmt)Attribute
SwCntntNode::GetAttr( rSet );
- // --> OD 2008-01-16 #newlistlevelattrs#
if ( bMergeIndentValuesOfNumRule )
{
lcl_MergeListLevelIndentAsLRSpaceItem( *this, rSet );
}
- // <--
}
return rSet.Count() ? TRUE : FALSE;
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 959fbbf..ae02d2e 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -631,8 +631,6 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
}
// -----------------------------------------------------
-
-// --> OD 2008-02-12 #newlistlevelattrs#
SwUndoFmtResetAttr::SwUndoFmtResetAttr( SwFmt& rChangedFormat,
const USHORT nWhichId )
: SwUndo( UNDO_RESETATTR )
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index e0e874e..1d8bc2a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -72,10 +72,8 @@
#include <editeng/unofdesc.hxx>
#include <fmtornt.hxx>
#include <SwStyleNameMapper.hxx>
-// --> OD 2008-01-15 #newlistlevelattrs#
#include <com/sun/star/text/PositionAndSpaceMode.hpp>
#include <com/sun/star/text/LabelFollow.hpp>
-// <--
#include <numrule.hxx>
using ::rtl::OUString;
@@ -1217,12 +1215,10 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
#if OSL_DEBUG_LEVEL > 1
sal_uInt16 nIndex =
#endif
- // --> OD 2008-02-11 #newlistlevelattrs#
rDoc.MakeNumRule( sCreatedNumRuleName, 0, FALSE,
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- // <--
#if OSL_DEBUG_LEVEL > 1
(void)nIndex;
#endif
@@ -1414,7 +1410,6 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
pData = new PropValData((void*)&nINT16, "StartWith", ::getCppuType((const sal_Int16*)0));
aPropertyValues.Insert(pData, aPropertyValues.Count());
- // --> OD 2008-01-23 #newlistlevelattrs#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
//leftmargin
@@ -1432,9 +1427,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
pData = new PropValData((void*)&nINT32, SW_PROP_NAME_STR(UNO_NAME_FIRST_LINE_OFFSET), ::getCppuType((const sal_Int32*)0));
aPropertyValues.Insert(pData, aPropertyValues.Count());
}
- // <--
- // --> OD 2008-01-15 #newlistlevelattrs#
// PositionAndSpaceMode
nINT16 = PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION;
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
@@ -1484,7 +1477,6 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
::getCppuType((const sal_Int32*)0));
aPropertyValues.Insert(pData, aPropertyValues.Count());
}
- // <--
//numberingtype
nINT16 = rFmt.GetNumberingType();
@@ -1653,13 +1645,11 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN), //6
SW_PROP_NAME_STR(UNO_NAME_SYMBOL_TEXT_DISTANCE), //7
SW_PROP_NAME_STR(UNO_NAME_FIRST_LINE_OFFSET), //8
- // --> OD 2008-01-15 #newlistlevelattrs#
SW_PROP_NAME_STR(UNO_NAME_POSITION_AND_SPACE_MODE), //9
SW_PROP_NAME_STR(UNO_NAME_LABEL_FOLLOWED_BY), //10
SW_PROP_NAME_STR(UNO_NAME_LISTTAB_STOP_POSITION), //11
SW_PROP_NAME_STR(UNO_NAME_FIRST_LINE_INDENT), //12
SW_PROP_NAME_STR(UNO_NAME_INDENT_AT), //13
- // <--
"NumberingType", //14
"BulletId", //15
SW_PROP_NAME_STR(UNO_NAME_BULLET_FONT), //16
@@ -1671,10 +1661,8 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
SW_PROP_NAME_STR(UNO_NAME_VERT_ORIENT), //22
SW_PROP_NAME_STR(UNO_NAME_HEADING_STYLE_NAME) //23
};
- // --> OD 2008-01-15 #newlistlevelattrs#
const sal_uInt16 nPropNameCount = 24;
const sal_uInt16 nNotInChapter = 15;
- // <--
const beans::PropertyValue* pPropArray = rProperties.getConstArray();
PropValDataArr aPropertyValues;
@@ -1842,7 +1830,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
aFmt.SetFirstLineOffset((short)nValue);
}
break;
- // --> OD 2008-01-15 #newlistlevelattrs#
case 9: // UNO_NAME_POSITION_AND_SPACE_MODE
{
sal_Int16 nValue = 0;
@@ -1914,7 +1901,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
aFmt.SetIndentAt( nValue );
}
break;
- // <--
case 14: //"NumberingType"
{
sal_Int16 nSet = 0;
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 164e6b0..10ed0bb 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -544,10 +544,8 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
else
{
aNumRuleName = pDoc->GetUniqueNumRuleName();
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aNumRule( aNumRuleName,
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
- // <--
SwNumFmt aNumFmt( aNumRule.Get( 0 ) );
// --> OD 2008-06-03 #i63395#
// Only apply user defined default bullet font
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 076a26a..56b68dc 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -63,11 +63,9 @@ USHORT MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, BYTE nLevel,
USHORT nNumId = USHRT_MAX;
String sPrefix( CREATE_CONST_ASC( "WW8TempExport" ) );
sPrefix += String::CreateFromInt32( nUniqueList++ );
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule* pMyNumRule =
new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
- // <--
pUsedNumTbl->Insert( pMyNumRule, pUsedNumTbl->Count() );
for ( USHORT i = 0; i < MAXLEVEL; i++ )
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 65172b1..0db0be3 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -864,11 +864,9 @@ void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen )
pAktColl->SetFmtAttr( SwNumRuleItem() );
String aName(CREATE_CONST_ASC( "Outline" ));
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
OUTLINE_RULE );
- // <--
aNR = *rDoc.GetOutlineNumRule();
SetAnld(&aNR, (WW8_ANLD*)pData, nSwNumLevel, true);
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 60d0359..8832cc7 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -625,10 +625,8 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
::SwToSfxPageDescAttr( rSet );
// erstmal nur eine Null
rSet.Put(SwBackgroundDestinationItem(SID_PARA_BACKGRND_DESTINATION, 0));
- // --> OD 2008-02-13 #newlistlevelattrs#
// merge list level indent attributes into the item set if needed
xTmp->MergeIndentAttrsOfListStyle( rSet );
- // <--
}
else if( SFX_STYLE_FAMILY_CHAR == nFamily )
{
@@ -682,11 +680,9 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam
{
SfxItemSet aSet( *pDlg->GetOutputItemSet() );
::SfxToSwPageDescAttr( *GetWrtShell(), aSet );
- // --> OD 2008-02-12 #newlistlevelattrs#
// reset indent attributes at paragraph style, if a list style
// will be applied and no indent attributes will be applied.
xTmp->SetItemSet( aSet, true );
- // <--
}
else
{
@@ -877,14 +873,12 @@ USHORT SwDocShell::ApplyStyles(const String &rName, USHORT nFamily,
}
case SFX_STYLE_FAMILY_PSEUDO:
{
- // --> OD 2008-02-08 #newlistlevelattrs#
// 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();
pSh->SetCurNumRule( *pNumRule, false, sListIdForStyle, true );
- // <--
break;
}
default:
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index e0b4963..76d141d 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -63,7 +63,6 @@ class SwNumPositionTabPage : public SfxTabPage
FixedLine aLevelFL;
MultiListBox aLevelLB;
- // --> OD 2008-02-01 #newlistlevelattrs#
// former set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
FixedText aDistBorderFT;
@@ -75,9 +74,7 @@ class SwNumPositionTabPage : public SfxTabPage
MetricField aDistNumMF;
FixedText aAlignFT;
ListBox aAlignLB;
- // <--
- // --> OD 2008-02-01 #newlistlevelattrs#
// new set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
FixedText aLabelFollowedByFT;
@@ -90,7 +87,6 @@ class SwNumPositionTabPage : public SfxTabPage
MetricField aAlignedAtMF;
FixedText aIndentAtFT;
MetricField aIndentAtMF;
- // <--
PushButton aStandardPB;
@@ -106,9 +102,7 @@ class SwNumPositionTabPage : public SfxTabPage
BOOL bModified : 1;
BOOL bPreset : 1;
BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
- // --> OD 2008-02-01 #newlistlevelattrs#
bool bLabelAlignmentPosAndSpaceModeActive;
- // <--
void InitControls();
@@ -118,7 +112,6 @@ class SwNumPositionTabPage : public SfxTabPage
DECL_LINK( RelativeHdl, CheckBox * );
DECL_LINK( StandardHdl, PushButton * );
- // --> OD 2008-02-01 #newlistlevelattrs#
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
@@ -126,7 +119,6 @@ class SwNumPositionTabPage : public SfxTabPage
DECL_LINK( ListtabPosHdl_Impl, MetricField* );
DECL_LINK( AlignAtHdl_Impl, MetricField* );
DECL_LINK( IndentAtHdl_Impl, MetricField* );
- // <--
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 5aec13e..a5c5b66 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -970,7 +970,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
// #101524# OJ
aStdFont.SetColor( SwViewOption::GetFontColor() );
- //
USHORT nFontHeight = nYStep * 6 / 10;
if(bPosition)
nFontHeight = nYStep * 15 / 10;
@@ -996,7 +995,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
const SwNumFmt &rFmt = pActNum->Get(nLevel);
aNumVector.push_back(rFmt.GetStart());
- // --> OD 2008-02-01 #newlistlevelattrs#
USHORT nXStart( 0 );
short nTextOffset( 0 );
USHORT nNumberXPos( 0 );
@@ -1026,7 +1024,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
nNumberXPos = static_cast<USHORT>(nTmpNumberXPos);
}
}
- // <--
USHORT nBulletWidth = 0;
if( SVX_NUM_BITMAP == rFmt.GetNumberingType() )
@@ -1051,7 +1048,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
nBulletWidth = (USHORT)pVDev->GetTextWidth(aText);
nPreNum++;
}
- // --> OD 2008-02-01 #newlistlevelattrs#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT &&
rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
@@ -1060,9 +1056,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
nBulletWidth = nBulletWidth + (USHORT)pVDev->GetTextWidth(aText);
}
- // <--
- // --> OD 2008-02-01 #newlistlevelattrs#
USHORT nTextXPos( 0 );
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -1096,7 +1090,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
nXStart = static_cast<USHORT>( rFmt.GetIndentAt() / nWidthRelation );
}
- // <--
Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
@@ -1117,7 +1110,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
{
const SwNumFmt &rFmt = pActNum->Get(nLevel);
aNumVector.push_back(rFmt.GetStart());
- // --> OD 2008-02-01 #newlistlevelattrs#
USHORT nXStart( 0 );
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -1139,7 +1131,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
}
nXStart /= 2;
nXStart += 2;
- // <--
USHORT nTextOffset = 2 * nXStep;
if( SVX_NUM_BITMAP == rFmt.GetNumberingType() )
{
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1d6ac61..1b37ac7 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -889,10 +889,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
FN_DROP_TEXT, FN_DROP_CHAR_STYLE_NAME,
0);
- // --> OD 2008-01-16 #newlistlevelattrs#
// get also the list level indent values merged as LR-SPACE item, if needed.
rWrtSh.GetCurAttr( aCoreSet, true );
- // <--
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE,
::GetHtmlMode(GetView().GetDocShell())));
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 1bb4dc9..50a682e 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -405,10 +405,8 @@ SET_LINESPACE:
aRule.SetLevel(i, aFmt, aRule.Get(i) != 0);
}
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aSetRule( pCurRule->GetName(),
pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
- // <--
aSetRule.SetSvxRule( aRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
// --> OD 2008-03-17 #refactorlists#
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index b7f1da7..bfe73d9 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -138,12 +138,10 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
}
else
{
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aRule( GetShell().GetUniqueNumRuleName(),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- // <--
SvxNumRule aSvxRule = aRule.MakeSvxNumRule();
const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 );
@@ -192,14 +190,12 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
rReq.Done();
SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule();
pSetRule->UnLinkGraphics();
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aSetRule( pCurRule
? pCurRule->GetName()
: GetShell().GetUniqueNumRuleName(),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- // <--
aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
// --> OD 2008-03-17 #refactorlists#
@@ -217,12 +213,10 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
rReq.AppendItem( *pItem );
rReq.Done();
SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule();
- // --> OD 2008-02-11 #newlistlevelattrs#
SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(),
// --> OD 2008-06-06 #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- // <--
aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc());
aSetRule.SetAutoRule( TRUE );
// --> OD 2008-03-17 #refactorlists#
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 8f52d92..319f605 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -932,10 +932,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SfxItemSet aCoreSet( GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
RES_LR_SPACE, RES_UL_SPACE, 0 );
- // --> OD 2008-01-17 #newlistlevelattrs#
// get also the list level indent values merged as LR-SPACE item, if needed.
rSh.GetCurAttr( aCoreSet, true );
- // <--
SelectionType nSelType = rSh.GetSelectionType();
SfxWhichIter aIter( rSet );
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 65fad33..839b329 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1346,12 +1346,10 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
}
}
// <--
- // --> OD 2008-02-08 #newlistlevelattrs#
// reset indent attribute on applying list style
// --> OD 2008-03-17 #refactorlists#
// start new list
SetCurNumRule( aNumRule, true, String(), true );
- // <--
}
EndUndo(UNDO_NUMORNONUM);
--
1.7.3.5
--------------000301050909050105060206
Content-Type: text/plain;
name="0002-Forgot-this-at-newlistlevelattrs-removal.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="0002-Forgot-this-at-newlistlevelattrs-removal.patch"
More information about the LibreOffice
mailing list