[Libreoffice-commits] core.git: sw/inc sw/sdi sw/source
Philipp Riemer
ruderphilipp at gmail.com
Wed Oct 2 08:17:29 PDT 2013
sw/inc/editsh.hxx | 2 -
sw/inc/ndarr.hxx | 2 -
sw/inc/ndtxt.hxx | 5 +---
sw/sdi/_textsh.sdi | 4 +--
sw/sdi/swriter.sdi | 3 --
sw/source/core/doc/dbgoutsw.cxx | 2 -
sw/source/core/doc/doc.cxx | 4 +--
sw/source/core/doc/docdde.cxx | 6 +---
sw/source/core/doc/docfmt.cxx | 14 +++++------
sw/source/core/doc/docglbl.cxx | 4 +--
sw/source/core/doc/docnum.cxx | 30 +++++++++++-------------
sw/source/core/doc/doctxm.cxx | 4 +--
sw/source/core/doc/ftnidx.cxx | 8 ++----
sw/source/core/doc/poolfmt.cxx | 4 +--
sw/source/core/edit/acorrect.cxx | 2 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 3 --
sw/source/core/txtnode/ndtxt.cxx | 3 --
sw/source/core/unocore/unoobj2.cxx | 3 --
sw/source/core/unocore/unoprnms.cxx | 3 --
sw/source/core/unocore/unosett.cxx | 3 --
sw/source/filter/ww8/ww8atr.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 2 -
sw/source/filter/ww8/ww8par2.cxx | 2 -
sw/source/filter/ww8/ww8par5.cxx | 3 --
sw/source/filter/xml/swxml.cxx | 4 +--
sw/source/ui/app/docsh2.cxx | 7 ++---
sw/source/ui/app/docst.cxx | 5 ----
sw/source/ui/fmtui/tmpdlg.cxx | 1
sw/source/ui/index/cnttab.cxx | 4 +--
sw/source/ui/misc/outline.cxx | 12 +++------
sw/source/ui/uiview/view.src | 3 --
sw/source/ui/uiview/view2.cxx | 5 +---
sw/source/ui/wrtsh/wrtsh1.cxx | 4 +--
33 files changed, 68 insertions(+), 95 deletions(-)
New commits:
commit 1cd2575ac974e385202e197e40aa8158924e104e
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Fri Sep 27 14:40:18 2013 +0200
remove zhaojianwei code markers
Conflicts:
sw/source/core/doc/docfmt.cxx
Change-Id: Iddda0d57ae547680634d45aaf8c6deb40855b860
Reviewed-on: https://gerrit.libreoffice.org/6078
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8174f67..0e6e9ed 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -517,7 +517,7 @@ public:
/// Get Outline level of current paragraph.
- int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei
+ int GetCurrentParaOutlineLevel( ) const;
// i29560
sal_Bool HasNumber() const;
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 2cdea1b..56b1cce 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -247,8 +247,6 @@ public:
/// Array of all OutlineNodes.
const SwOutlineNodes& GetOutLineNds() const;
- //void UpdateOutlineNode( const SwNode&, sal_uInt8 nOldLevel, sal_uInt8 nNewLevel );//#outline level,removed by zhaojianwei
-
/// Update all Nodes - Rule/Format-Change.
void UpdateOutlineNode(SwNode & rNd);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 3eed398..6be3944 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -105,7 +105,6 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
mutable bool m_bLastOutlineState : 1;
bool m_bNotifiable;
- /// sal_uInt8 nOutlineLevel; //#outline level, removed by zhaojianwei.
bool mbEmptyListStyleSetDueToSetOutlineLevelAttr;
/** boolean, indicating that a <SetAttr(..)> or <ResetAttr(..)> or
@@ -588,7 +587,7 @@ public:
@return outline level or NO_NUMBERING if there is no outline level
*/
- int GetAttrOutlineLevel() const;//#OutlineLevel,added by zhaojianwei
+ int GetAttrOutlineLevel() const;
/**
Sets the out line level *at* a text node.
@@ -603,7 +602,7 @@ public:
NOTE: This is subject to change, see GetOutlineLevel.
*/
- void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
+ void SetAttrOutlineLevel(int nLevel);
bool IsEmptyListStyleDueToSetOutlineLevelAttr();
void SetEmptyListStyleDueToSetOutlineLevelAttr();
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 594e46b..44f2b15 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -93,12 +93,12 @@ interface BaseText
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- //#outline level,add by zhaojianwei
+
SID_ATTR_PARA_OUTLINE_LEVEL
[
ExecMethod = Execute ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]//<-end,zhaojianwei
+ ]
SID_ATTR_PARA_PAGENUM
[
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 1949ecc..04fb941 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8925,7 +8925,6 @@ SwNumRuleItem NumRule SID_ATTR_PARA_NUMRULE
GroupId = GID_FORMAT;
]
-//#outline level,add by zhaojianwei
//---------------------------------------------------------------------------
SfxUInt16Item OutlineLevel SID_ATTR_PARA_OUTLINE_LEVEL
@@ -8952,7 +8951,7 @@ SfxUInt16Item OutlineLevel SID_ATTR_PARA_OUTLINE_LEVEL
ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
-//<-end,zhaojianwei
+
//--------------------------------------------------------------------------
SfxUInt16Item NumNewStartAt FN_NUMBER_NEWSTART_AT
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index cf5ab8b..f0f54c1 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -633,7 +633,7 @@ static String lcl_dbg_out(const SwNode & rNode)
aTmpStr += String("(", RTL_TEXTENCODING_ASCII_US);
aTmpStr += OUString::number
- (static_cast<SwTxtFmtColl *>(pColl)->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
+ (static_cast<SwTxtFmtColl *>(pColl)->GetAssignedOutlineStyleLevel());
const SwNumRuleItem & rItem =
static_cast<const SwNumRuleItem &>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index e4bdbca..904c006 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2085,7 +2085,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
::SetProgressState( i, GetDocShell() );
const sal_uLong nIndex = rOutNds[ i ]->GetIndex();
- const int nLvl = ((SwTxtNode*)GetNodes()[ nIndex ])->GetAttrOutlineLevel()-1;//<-end,zhaojianwei
+ const int nLvl = ((SwTxtNode*)GetNodes()[ nIndex ])->GetAttrOutlineLevel()-1;
if( nLvl > nLevel )
continue;
sal_uInt16 nEndOfs = 1;
@@ -2125,7 +2125,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
SwTxtFmtColl* pMyColl = pNd->GetTxtColl();
const sal_uInt16 nHeadLine = static_cast<sal_uInt16>(
- !pMyColl->IsAssignedToListLevelOfOutlineStyle() //<-end,zhaojianwei
+ !pMyColl->IsAssignedToListLevelOfOutlineStyle()
? RES_POOLCOLL_HEADLINE2
: RES_POOLCOLL_HEADLINE1 );
pMyColl = pExtDoc->GetTxtCollFromPool( nHeadLine );
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 3591035..e03a52a 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -342,8 +342,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
if( GotoOutline( aPos, sName ))
{
SwNode* pNd = &aPos.nNode.GetNode();
- //sal_uInt8 nLvl = pNd->GetTxtNode()->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
- const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1;//<-end,zhaojianwei
+ const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1;
const SwOutlineNodes& rOutlNds = GetNodes().GetOutLineNds();
sal_uInt16 nTmpPos;
@@ -354,8 +353,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
for( ++nTmpPos;
nTmpPos < rOutlNds.size() &&
nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
- //GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
- GetAttrOutlineLevel()-1;//<-end,zhaojianwei
+ GetAttrOutlineLevel()-1;
++nTmpPos )
; // there is no block
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 1685b58..d026411 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -183,7 +183,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
SfxItemSet aSet( pDoc->GetAttrPool(),
RES_PAGEDESC, RES_BREAK,
RES_PARATR_NUMRULE, RES_PARATR_NUMRULE,
- RES_PARATR_OUTLINELEVEL,RES_PARATR_OUTLINELEVEL,//#outline level,removed by zhaojianwei
+ RES_PARATR_OUTLINELEVEL,RES_PARATR_OUTLINELEVEL,
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1,
0 );
const SfxItemSet* pSet = pNode->GetpSwAttrSet();
@@ -208,10 +208,10 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
const SfxPoolItem* pItem;
- sal_uInt16 const aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK, //->add by zhaojianwei
+ sal_uInt16 const aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK,
RES_PARATR_NUMRULE,
RES_PARATR_OUTLINELEVEL };
- for( sal_uInt16 n = 0; n < 4; ++n ) //<-end,zhaojianwei
+ for( sal_uInt16 n = 0; n < 4; ++n )
{
if( SFX_ITEM_SET == pSet->GetItemState( aSavIds[ n ], sal_False, &pItem ))
{
@@ -229,11 +229,11 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
bSave = !((SwNumRuleItem*)pItem)->GetValue().isEmpty();
}
break;
- case RES_PARATR_OUTLINELEVEL: //#outline level,add by zhaojianwei
+ case RES_PARATR_OUTLINELEVEL:
{
bSave = pPara && pPara->bKeepOutlineLevelAttr;
}
- break; //<-end,zhaojianwei
+ break;
}
if( bSave )
{
@@ -1865,7 +1865,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
pNewColl->CopyAttrs( rColl, sal_True );
if(rColl.IsAssignedToListLevelOfOutlineStyle())
- pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
+ pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());
pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
@@ -2589,7 +2589,7 @@ namespace docfunc
SwTxtFmtColl* pTxtFmtColl = (*pTxtFmtColls)[i];
if ( pTxtFmtColl->IsDefault() ||
- ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() ) //<-end,zhaojianwei
+ ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
{
continue;
}
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 272617d..6920b48 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -163,7 +163,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
if( pSplitColl )
{
// If it isn't a OutlineNumbering, then use an own array and collect the Nodes.
- if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814
+ if( pSplitColl->GetAttrOutlineLevel() == 0 )
{
pOutlNds = new SwOutlineNodes;
SwIterator<SwTxtNode,SwFmtColl> aIter( *pSplitColl );
@@ -183,7 +183,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
// Look for the 1st level OutlineTemplate
const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
for( sal_uInt16 n = rFmtColls.size(); n; )
- if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
+ if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )
{
pSplitColl = rFmtColls[ n ];
break;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4d89ea3..eb1c2f6 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -149,7 +149,7 @@ void SwDoc::PropagateOutlineRule()
{
SwTxtFmtColl *pColl = (*mpTxtFmtCollTbl)[n];
- if(pColl->IsAssignedToListLevelOfOutlineStyle())//<-end,zhaojianwei
+ if(pColl->IsAssignedToListLevelOfOutlineStyle())
{
// Check only the list style, which is set at the paragraph style
const SwNumRuleItem & rCollRuleItem = pColl->GetNumRule( sal_False );
@@ -206,7 +206,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
{
const int nLevel = (*mpTxtFmtCollTbl)[ n ]->GetAssignedOutlineStyleLevel();
aCollArr[ nLevel ] = (*mpTxtFmtCollTbl)[ n ];
- }//<-end,zhaojianwei
+ }
}
/* Find the last occupied level (backward). */
@@ -230,7 +230,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
- aTmpColl->GetAssignedOutlineStyleLevel() == n )//<-end,zhaojianwei
+ aTmpColl->GetAssignedOutlineStyleLevel() == n )
{
aCollArr[n] = aTmpColl;
break;
@@ -258,9 +258,8 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
SwTxtFmtColl *aTmpColl =
GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
- //if (aTmpColl->GetOutlineLevel() == n)//#outline level,zhaojianwei
if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
- aTmpColl->GetAssignedOutlineStyleLevel() == n )//<-end,zhaojianwei
+ aTmpColl->GetAssignedOutlineStyleLevel() == n )
{
aCollArr[n] = aTmpColl;
break;
@@ -341,7 +340,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
const int nLevel = pColl->GetAssignedOutlineStyleLevel();
if (aMoveArr[nLevel] == -1)
bMoveApplicable = false;
- }//<-end,zhaojianwei
+ }
// Check on outline level attribute of text node, if text node is
// not an outline via a to outline style assigned paragraph style.
@@ -375,7 +374,7 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
if( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
- const int nLevel = pColl->GetAssignedOutlineStyleLevel();//#outline level,add by zhaojianwei
+ const int nLevel = pColl->GetAssignedOutlineStyleLevel();
OSL_ENSURE(aMoveArr[nLevel] >= 0,
"move table: current TxtColl not found when building table!");
@@ -390,13 +389,13 @@ bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}
}
- else if( pTxtNd->GetAttrOutlineLevel() > 0) //#outline level,add by zhaojianwei
+ else if( pTxtNd->GetAttrOutlineLevel() > 0)
{
int nLevel = pTxtNd->GetAttrOutlineLevel() + nOffset;
if( 0 <= nLevel && nLevel <= MAXLEVEL)
pTxtNd->SetAttrOutlineLevel( nLevel );
- }//<-end,zhaojianwei
+ }
n++;
// Undo ???
@@ -429,11 +428,11 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
sal_uInt16 nAktPos = 0;
SwNodeIndex aSttRg( rStt.nNode ), aEndRg( rEnd.nNode );
- int nOutLineLevel = MAXLEVEL; //<-end,zhaojianwei
+ int nOutLineLevel = MAXLEVEL;
SwNode* pSrch = &aSttRg.GetNode();
if( pSrch->IsTxtNode())
- nOutLineLevel = static_cast<sal_uInt8>(((SwTxtNode*)pSrch)->GetAttrOutlineLevel()-1);//<-end,zhaojianwei
+ nOutLineLevel = static_cast<sal_uInt8>(((SwTxtNode*)pSrch)->GetAttrOutlineLevel()-1);
SwNode* pEndSrch = &aEndRg.GetNode();
if( !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nAktPos ) )
{
@@ -455,7 +454,7 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) )
{
if( !pEndSrch->IsTxtNode() || pEndSrch == pSrch ||
- nOutLineLevel < ((SwTxtNode*)pEndSrch)->GetAttrOutlineLevel()-1 )//<-end,zhaojianwei
+ nOutLineLevel < ((SwTxtNode*)pEndSrch)->GetAttrOutlineLevel()-1 )
++nTmpPos; // For sub outlines only!
}
@@ -643,7 +642,7 @@ static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
for( ; nPos < (sal_Int32) rOutlNds.size(); ++nPos )
{
pNd = rOutlNds[ nPos ]->GetTxtNode();
- const int nLvl = pNd->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
+ const int nLvl = pNd->GetAttrOutlineLevel()-1;
if( nLvl == nLevel - 1)
{
// #i51089#, #i68289#
@@ -1358,7 +1357,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
pTNd->ChkCondColl();
}
else if( !pOutlNd &&
- static_cast<SwTxtFmtColl*>(pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )//<-end,zhaojianwei
+ static_cast<SwTxtFmtColl*>(pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )
{
pOutlNd = pTNd;
}
@@ -2422,8 +2421,7 @@ sal_Int32 SwDoc::getOutlineNodesCount() const
int SwDoc::getOutlineLevel( const sal_Int32 nIdx ) const
{
return GetNodes().GetOutLineNds()[ static_cast<sal_uInt16>(nIdx) ]->
- // GetTxtNode()->GetOutlineLevel(); //#outline level,zhaojianwei
- GetTxtNode()->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
+ GetTxtNode()->GetAttrOutlineLevel()-1;
}
String SwDoc::getOutlineText( const sal_Int32 nIdx,
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 1d7425e..ae4b75a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1453,7 +1453,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
if( pOutlNd )
{
if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
- nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel() ;//<-end,zhaojianwei
+ nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
}
}
@@ -1508,7 +1508,7 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
{
const int nTmp = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
- pNew->SetLevel( static_cast<sal_uInt16>(nTmp) );//<-end ,zhaojianwei
+ pNew->SetLevel( static_cast<sal_uInt16>(nTmp) );
}
}
}
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 721021c..d50619b 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -64,13 +64,11 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
for( n = 0; n < rOutlNds.size(); ++n )
if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
break; // found it!
- //else if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() ) //#outline level,zhaojianwei
- else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 ) //<-end,zhaojianwei
+ else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
pCapStt = rOutlNds[ n ]; // Beginning of a new Chapter
// now find the end of the range
for( ; n < rOutlNds.size(); ++n )
- //if( !rOutlNds[ n ]->GetTxtNode()->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
- if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
+ if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
{
nCapEnd = rOutlNds[ n ]->GetIndex(); // End of the found Chapter
break;
@@ -179,7 +177,7 @@ void SwFtnIdxs::UpdateAllFtn()
nFtnIdx = 0; // Index into theFtnIdx array
for( sal_uInt16 n = 0; n < rOutlNds.size(); ++n )
{
- if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
+ if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
{
sal_uLong nCapStt = rOutlNds[ n ]->GetIndex(); // Start of a new chapter
for( ; nFtnIdx < size(); ++nFtnIdx )
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9ff849f..c6e52af 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -206,7 +206,7 @@ static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
{
if( !( nOutLvlBits & ( 1 << nLevel )) )
{
- pColl->AssignToListLevelOfOutlineStyle(nLevel);//<-end,zhaojianwei
+ pColl->AssignToListLevelOfOutlineStyle(nLevel);
if( !bHTMLMode )
{
SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
@@ -310,7 +310,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
if( pNewColl->IsAssignedToListLevelOfOutlineStyle())
- nOutLvlBits |= ( 1 << pNewColl->GetAssignedOutlineStyleLevel() );//<-end,zhaojianwei
+ nOutLvlBits |= ( 1 << pNewColl->GetAssignedOutlineStyleLevel() );
}
// Didn't find it until here -> create anew
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 8d9fb7c..1d909a9 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -285,7 +285,7 @@ OUString SwAutoCorrDoc::GetPrevPara( sal_Bool bAtNormalPos )
(*pIdx)--;
pTNd = pIdx->GetNode().GetTxtNode();
}
- if( pTNd && 0 == pTNd->GetAttrOutlineLevel() )//#outline level,zhaojianwei
+ if( pTNd && 0 == pTNd->GetAttrOutlineLevel() )
aStr = pTNd->GetTxt();
if( bUndoIdInitialized )
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 1228d5b..46e26f7 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1150,8 +1150,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
//
if ( pTxtNd->IsOutline() )
{
- //int nRealLevel = pTxtNd->GetOutlineLevel(); //#outline level,zhaojianwei
- int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1; //<-end,zhaojianwei
+ int nRealLevel = pTxtNd->GetAttrOutlineLevel()-1;
nRealLevel = nRealLevel > 5 ? 5 : nRealLevel;
nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::H1 + nRealLevel);
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 074b146..a994f5a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3761,11 +3761,11 @@ void SwTxtNode::UpdateOutlineState()
m_bLastOutlineState = IsOutline();
}
-//#outline level, zhaojianwei
int SwTxtNode::GetAttrOutlineLevel() const
{
return ((const SfxUInt16Item &)GetAttr(RES_PARATR_OUTLINELEVEL)).GetValue();
}
+
void SwTxtNode::SetAttrOutlineLevel(int nLevel)
{
assert(0 <= nLevel && nLevel <= MAXLEVEL); // Level Out Of Range
@@ -3775,7 +3775,6 @@ void SwTxtNode::SetAttrOutlineLevel(int nLevel)
static_cast<sal_uInt16>(nLevel) ) );
}
}
-//<-end
// #i70748#
bool SwTxtNode::IsEmptyListStyleDueToSetOutlineLevelAttr()
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index a4c3b05..7fccf6a 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -340,7 +340,7 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
{
pDoc->InsertItemSet( rPam, rSet, nFlags );
}
- //#outline level,add by zhaojianwei
+
if( rSet.GetItemState( RES_PARATR_OUTLINELEVEL, false ) >= SFX_ITEM_AVAILABLE )
{
SwTxtNode * pTmpNode = rPam.GetNode()->GetTxtNode();
@@ -349,7 +349,6 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
rPam.GetDoc()->GetNodes().UpdateOutlineNode( *pTmpNode );
}
}
- //<-end,zhaojianwei
}
// #i63870#
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index ff4d840..7318255 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -704,7 +704,6 @@ const SwPropNameTab aPropNameTab = {
/* 0673 UNO_NAME_TRANSFORMATION_IN_HORI_L2R */ {MAP_CHAR_LEN("TransformationInHoriL2R")},
/* 0674 UNO_NAME_POSITION_LAYOUT_DIR*/ {MAP_CHAR_LEN("PositionLayoutDir")},
/* 0675 UNO_NAME_NUMBERING_IS_OUTLINE*/ {MAP_CHAR_LEN("NumberingIsOutline")},
-///* 0676 UNO_NAME_DEFAULT_OUTLINE_LEVEL */ {MAP_CHAR_LEN("DefaultOutlineLevel")}, //#outline level,removed by zhaojianwei
/* 0677 UNO_NAME_STARTPOSITION_IN_HORI_L2R */ {MAP_CHAR_LEN("StartPositionInHoriL2R")},
/* 0678 UNO_NAME_ENDPOSITION_IN_HORI_L2R */ {MAP_CHAR_LEN("EndPositionInHoriL2R")},
/* 0679 UNO_NAME_SUBJECT */ {MAP_CHAR_LEN("Subject")},
@@ -764,7 +763,7 @@ const SwPropNameTab aPropNameTab = {
/* 0732 CHAR_OVERLINE */ {MAP_CHAR_LEN("CharOverline")},
/* 0733 CHAR_OVERLINE_COLOR */ {MAP_CHAR_LEN("CharOverlineColor")},
/* 0734 CHAR_OVERLINE_HAS_COLOR */ {MAP_CHAR_LEN("CharOverlineHasColor")},
-/* 0735 UNO_NAME_OUTLINE_LEVEL */ {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
+/* 0735 UNO_NAME_OUTLINE_LEVEL */ {MAP_CHAR_LEN("OutlineLevel")},
/* 0736 UNO_NAME_DESCRIPTION */ {MAP_CHAR_LEN("Description")},
/* 0737 UNO_NAME_META */ {MAP_CHAR_LEN("InContentMetadata")},
/* 0738 UNO_NAME_IS_TEMPLATE */ {MAP_CHAR_LEN("IsTemplate")},
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 4a474e4..7f26de8 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1556,10 +1556,9 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
if(rTxtColl.IsDefault())
continue;
- //sal_Int8 nOutLevel = rTxtColl.GetOutlineLevel(); //#outline level,zhaojianwei
const sal_Int16 nOutLevel = rTxtColl.IsAssignedToListLevelOfOutlineStyle()
? static_cast<sal_Int16>(rTxtColl.GetAssignedOutlineStyleLevel())
- : MAXLEVEL; //<-end,zhaojianwei
+ : MAXLEVEL;
if ( nOutLevel == nIndex )
{
sValue = rTxtColl.GetName();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 1fd8304..12c3897 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3348,7 +3348,7 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
{
const SwTxtFmtColl* pC = (SwTxtFmtColl*)GetExport().pOutFmtNode;
if ( pC && pC->IsAssignedToListLevelOfOutlineStyle() )
- nLvl = static_cast< sal_uInt8 >( pC->GetAssignedOutlineStyleLevel() ); //<-end,zhaojianwei
+ nLvl = static_cast< sal_uInt8 >( pC->GetAssignedOutlineStyleLevel() );
}
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 16751ca..ce951a8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5323,7 +5323,7 @@ public:
outlineeq(sal_uInt8 nNum) : mnNum(nNum) {}
bool operator()(const SwTxtFmtColl *pTest) const
{
- return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei
+ return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum;
}
};
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0dd16eb..c243c12 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -751,7 +751,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
{
nSwNumLevel = *pData - 1;
if (!bNoAttrImport)
- ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei
+ ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel );
// For WW-NoNumbering also NO_NUMBERING could be used.
// ( For normal numberierung NO_NUM has to be used:
// NO_NUM : pauses numbering,
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 9a0163b..f71e705 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2077,7 +2077,6 @@ bool ConvertMacroSymbol( const String& rName, OUString& rReference )
}
return bConverted;
}
-//end
// "MACROSCHALTFL"ACHE"
eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
@@ -2635,7 +2634,7 @@ bool SwWW8ImplReader::AddExtraOutlinesAsExtraStyles(SwTOXBase& rBase)
sal_uInt16 nStyleLevel = rSI.nOutlineLevel;
sal_uInt16 nMaxLevel = rBase.GetLevel();
if (
- nStyleLevel != (pFmt->GetAttrOutlineLevel()-1) && //<-end,zhaojianwei
+ nStyleLevel != (pFmt->GetAttrOutlineLevel()-1) &&
nStyleLevel < nMaxLevel
)
{
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 0633f18..010ed84 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -418,7 +418,7 @@ static void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
SwTxtFmtColl* pColl = rColls[ n ];
if ( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
- aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei
+ aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;
}
for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
@@ -445,7 +445,7 @@ static void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
! aCreatedDefaultOutlineStyles[ i ]->IsAssignedToListLevelOfOutlineStyle() )
{
// apply outline level at created default outline style
- aCreatedDefaultOutlineStyles[ i ]->AssignToListLevelOfOutlineStyle(i);//#outline level added by zhaojianwei
+ aCreatedDefaultOutlineStyles[ i ]->AssignToListLevelOfOutlineStyle(i);
// apply outline numbering rule, if none is set.
const SfxPoolItem& rItem =
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 9331b06..f946a07 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -112,7 +112,7 @@
#include "dialog.hrc"
#include "swabstdlg.hxx"
-#include <ndtxt.hxx> //#outline level,add by zhaojianwei
+#include <ndtxt.hxx>
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::lang;
@@ -849,8 +849,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
bDone = sal_False;
bool bCreateHtml = FN_NEW_HTML_DOC == nWhich;
- bool bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei
- sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei
+ bool bCreateByOutlineLevel = false;
+ sal_Int32 nTemplateOutlineLevel = 0;
String aFileName, aTemplateName;
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_False, &pItem ) )
@@ -1435,7 +1435,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
}
}
if ( bImport )
- // <--
{
SwRead pRead = ReadXML;
SwReader* pReader = 0;
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 51d4969..c6e1590 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -75,7 +75,7 @@
#include <list.hxx>
-#include <paratr.hxx> //#outline level,add by zhaojianwei
+#include <paratr.hxx>
extern bool bNoInterrupt; // in mainwn.cxx
@@ -637,7 +637,6 @@ sal_uInt16 SwDocShell::Edit(
pDStyle->GetCollection()->SetDerivedFrom( pColl );
pDStyle->PresetParent( rParent );
- //#outline level,add by zhaojianwei
/*When a new paragraph style is created based on a "to outline style
assigned" paragraph style, the outline level attribute and the list
style attribute of the new paragraph style have to be set to 0
@@ -648,8 +647,6 @@ sal_uInt16 SwDocShell::Edit(
pDStyle->GetCollection()->SetFmtAttr( aItem );
pDStyle->GetCollection()->SetAttrOutlineLevel( 0 );
}
- //<-end,zhaojianwei
-
}
else
{
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 7e977dc..855c3f6 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -406,7 +406,6 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if (nId == m_nOutlineId)
{
- //-->#outlinelevel added by zhaojianwei
// handle if the current paragraph style is assigned to a list level of outline style,
SwTxtFmtColl* pTmpColl = pWrtShell->FindTxtFmtCollByName( GetStyleSheet().GetName() );
if( pTmpColl && pTmpColl->IsAssignedToListLevelOfOutlineStyle() )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 139bc56..4b8ea5e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -549,12 +549,12 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
{
SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
- if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
+ if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle())
return sal_True;
sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(nId != USHRT_MAX &&
- ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
+ ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle())
return sal_True;
return sal_False;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f879821..6723f08 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -188,13 +188,11 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, const SfxItemSet* pSwIte
SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
if(!rTxtColl.IsDefault())
{
- //->added by zhaojianwei
if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
{
int nOutLevel = rTxtColl.GetAssignedOutlineStyleLevel();
aCollNames[ nOutLevel ] = rTxtColl.GetName();
}
- //<-end
}
}
}
@@ -322,8 +320,7 @@ sal_uInt16 SwOutlineTabDialog::GetLevel(const String &rFmtName) const
if(aCollNames[i] == rFmtName)
return i;
}
- return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei
-
+ return MAXLEVEL;
}
short SwOutlineTabDialog::Ok()
@@ -345,11 +342,10 @@ short SwOutlineTabDialog::Ok()
SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
if( !rTxtColl.IsDefault() )
{
-
const SfxPoolItem & rItem =
rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, sal_False);
- if ((sal_uInt8)GetLevel(rTxtColl.GetName()) == MAXLEVEL) //add by zhaojianwei
+ if ((sal_uInt8)GetLevel(rTxtColl.GetName()) == MAXLEVEL)
{
if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
{
@@ -371,7 +367,7 @@ short SwOutlineTabDialog::Ok()
SwNumRuleItem aItem(pOutlineRule->GetName());
rTxtColl.SetFmtAttr(aItem);
}
- } //<-end,zhaojianwei
+ }
}
}
@@ -799,7 +795,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
{
nTmp = static_cast<sal_uInt16>(pSh->getIDocumentOutlineNodesAccess()->getOutlineLevel(nOutlinePos));
}
- m_pLevelLB->SelectEntryPos(nTmp-1);//nTmp);//#outline level,zhaojianwei
+ m_pLevelLB->SelectEntryPos(nTmp-1);
// collect char styles
m_pCharFmtLB->Clear();
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 23f2f13..665f75d 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -79,11 +79,10 @@ String STR_NUM_LEVEL
{
Text [ en-US ] = "Level " ;
};
-//#outline level,zhaojianwei
String STR_NUM_OUTLINE
{
Text [ en-US ] = "Outline ";
-};//<-end,zhaojianwei
+};
String STR_ERROR_NOLANG
{
Text [ en-US ] = "No language is selected in the proofed section." ;
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index cb5faee..e0cd59d 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -139,7 +139,7 @@
#include <vcl/GraphicNativeMetadata.hxx>
const char sStatusDelim[] = " : ";
-const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei
+const char sStatusComma[] = " , ";
using namespace sfx2;
using namespace ::com::sun::star;
@@ -1458,7 +1458,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
}
}
- //-->#outline level,added by zhaojianwei
+
const SwNumRule* pNumRule = rShell.GetCurNumRule();
const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0;
@@ -1508,7 +1508,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
sStr += SW_RESSTR(STR_NUM_OUTLINE);
sStr += OUString::number( nOutlineLevel);
}
- //<-end ,zhaojianwei
if( rShell.HasReadonlySel() )
{
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index d00f845..e52f7af 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1051,7 +1051,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
// activate outline numbering, because from the precondition
// it's known, that <SwEdit::HasNumber()> == sal_False
bActivateOutlineRule = true;
- nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
+ nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();
}
}
else if ( !pNumRule )
@@ -1059,7 +1059,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
// #i101234#
// Check, if corresponding list level of the outline numbering
// has already a numbering format set.
- nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei,need further consideration
+ nActivateOutlineLvl = pColl->GetAssignedOutlineStyleLevel();
if ( pCollRule->Get( static_cast<sal_uInt16>(nActivateOutlineLvl) ).GetNumberingType()
== SVX_NUM_NUMBER_NONE )
{
More information about the Libreoffice-commits
mailing list