CWS-TOOLING: integrate CWS outlinelevel
2008-12-19 10:32:51 +0100 od r265718 : #i70748# method <SwWW8Writer::StartTOX(..)>
- correction for custom to outline style
assigned paragraph styles
2008-12-19 09:24:41 +0100 od r265715 : #i70748# method <HandleModifyAtTxtNode(..)>
- retrieve former applied list style before potential
reset of empty list style due to set outline level
2008-12-17 15:33:57 +0100 hde r265608 : #i97013#
2008-12-17 14:43:42 +0100 od r265603 : #i70748# adjust fix i44177 - adjustment of to outline style assigned
paragraph styles only for OOo-Templates.
2008-12-17 12:59:42 +0100 od r265598 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
- special handling of OOo 2.x document regarding
outline numbering of headings.
2008-12-17 12:45:53 +0100 od r265597 : #i70748# method <HandleModifyAtTxtNode(..)>
- correct determination of new and former applied list style
2008-12-17 10:18:41 +0100 od r265581 : #i97312# method <XMLTextNumRuleInfo::Set(..)>
- check, if numbering rules instance contains any numbering rule.
2008-12-16 14:34:22 +0100 hde r265542 : #i97013
2008-12-16 14:20:24 +0100 od r265541 : #i70748# adjust documentation of "Which"-ID numbers
2008-12-16 14:19:49 +0100 od r265539 : #i70748# Adjust Attribute-Function-Mapping table due to new attribute
2008-12-16 14:06:24 +0100 od r265538 : #i70748# - Correct handling of to outline style assigned paragraph styles
on reset of all paragraph style attributes
- WW8 import: Consider refactoring of paragraph style's outline
level attribute - NO_NUMBERING define no longer exsits.
2008-12-16 10:37:19 +0100 od r265530 : #i70478# Correction on moving outline paragraph up respectively down
in its outline level:
- Check also outline paragraph, which are not an outline via
a to outline style assigned paragraph style, if action is applicable.
2008-12-16 09:10:13 +0100 hde r265523 : #i97277
2008-12-16 09:09:30 +0100 hde r265522 : #i97277
2008-12-16 09:07:40 +0100 hde r265521 : Added control and purged obsolete id's
2008-12-10 13:09:36 +0100 od r265174 : #i70748# correction of previous fix due to warning-free code
2008-12-10 13:03:30 +0100 od r265172 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
- Due to performance issues avoid retrieving outline level value from paragraph's paragraph
style for each paragraph. Instead retrieve current outline level value from paragraph,
which is the inherited value from its paragraph style, and only when it is needed.
2008-12-09 16:50:36 +0100 ufi r265117 : help
2008-12-09 16:49:50 +0100 ufi r265116 : help
2008-12-09 15:45:05 +0100 od r265107 : #i70748# method <XMLTextImportHelper::SetStyleAndAttrs(..)>
- some minor rework and check access to paragraph styles
2008-12-09 15:42:04 +0100 od r265106 : #i70748# adjust name of local variable to avoid hiding of class variable
2008-12-09 15:40:51 +0100 od r265105 : #i70748# correct initialization order
2008-12-09 15:35:07 +0100 od r265101 : #i70748# remove duplicate entry in certain property map
2008-12-09 15:33:39 +0100 od r265100 : #i70748# add end of file token
2008-12-07 15:11:54 +0100 zhaojianwei r264952 : conflicts left not to be resolved when cws rebase
2008-12-04 14:52:21 +0100 zhaojianwei r264846 : CWS-TOOLING: rebase CWS outlinelevel to trunk@264325 (milestone: DEV300:m36)
2008-11-28 03:42:09 +0100 zhaojianwei r264525 : #i70748#: migrate CWS outlinelevel to SVN
2008-11-28 03:41:39 +0100 zhaojianwei r264524 : #i70748#: migrate CWS outlinelevel to SVN
2008-11-28 03:41:11 +0100 zhaojianwei r264523 : #i70748#: migrate CWS outlinelevel to SVN
This commit is contained in:
Jens-Heiner Rechtien
@@ -188,7 +188,8 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
|
||||
pTxtNode->RemoveFromList();
|
||||
// <--
|
||||
|
||||
if ( pTxtNode->GetTxtColl()->GetOutlineLevel() != NO_NUMBERING )
|
||||
//if ( pTxtNode->GetTxtColl()->GetOutlineLevel() != NO_NUMBERING )//#outline level,zhaojianwei
|
||||
if ( pTxtNode->GetAttrOutlineLevel() != 0 )//<-end,zhaojianwei
|
||||
{
|
||||
const SwNodePtr pSrch = (SwNodePtr)&rNd;
|
||||
pOutlineNds->Remove( pSrch );
|
||||
@@ -207,7 +208,8 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
|
||||
// <--
|
||||
|
||||
if( bInsOutlineIdx &&
|
||||
NO_NUMBERING != rTxtNd.GetTxtColl()->GetOutlineLevel() )
|
||||
//NO_NUMBERING != rTxtNd.GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
|
||||
0 != rTxtNd.GetAttrOutlineLevel() )//<-end,zhaojianwei
|
||||
{
|
||||
const SwNodePtr pSrch = (SwNodePtr)&rNd;
|
||||
pOutlineNds->Insert( pSrch );
|
||||
@@ -248,7 +250,8 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
|
||||
SwTxtNode* pTxtNd = (SwTxtNode*)pNd;
|
||||
|
||||
// loesche die Gliederungs-Indizies aus dem alten Nodes-Array
|
||||
if( NO_NUMBERING != pTxtNd->GetTxtColl()->GetOutlineLevel() )
|
||||
//if( NO_NUMBERING != pTxtNd->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
|
||||
if( 0 != pTxtNd->GetAttrOutlineLevel() )//<-end,zhaojianwei
|
||||
pOutlineNds->Remove( pNd );
|
||||
|
||||
// muss die Rule kopiere werden?
|
||||
@@ -287,9 +290,13 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
|
||||
{
|
||||
const SwpHints* pHts = pTxtNd->GetpSwpHints();
|
||||
// setze die OultineNodes im neuen Nodes-Array
|
||||
if( bInsOutlineIdx && NO_NUMBERING !=
|
||||
pTxtNd->GetTxtColl()->GetOutlineLevel() )
|
||||
//if( bInsOutlineIdx && NO_NUMBERING != //#outline level,removed by zhaojianwei
|
||||
// pTxtNd->GetTxtColl()->GetOutlineLevel() )
|
||||
if( bInsOutlineIdx &&
|
||||
0 != pTxtNd->GetAttrOutlineLevel() ) //#outline level,added by zhaojianwei
|
||||
{
|
||||
rNds.pOutlineNds->Insert( pTxtNd );
|
||||
}
|
||||
|
||||
// --> OD 2008-03-13 #refactorlists#
|
||||
// pTxtNd->SyncNumberAndNumRule();
|
||||
@@ -554,8 +561,10 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
|
||||
// setze bei Start/EndNodes die richtigen Indizies
|
||||
// loesche die Gliederungs-Indizies aus
|
||||
// dem alten Nodes-Array
|
||||
if( pCNd->IsTxtNode() && NO_NUMBERING !=
|
||||
((SwTxtNode*)pCNd)->GetTxtColl()->GetOutlineLevel() )
|
||||
//if( pCNd->IsTxtNode() && NO_NUMBERING != //#outline level,zhaojianwei
|
||||
// ((SwTxtNode*)pCNd)->GetTxtColl()->GetOutlineLevel() )
|
||||
if( pCNd->IsTxtNode() && 0 !=
|
||||
((SwTxtNode*)pCNd)->GetAttrOutlineLevel() )//<-end,by zhaojianwei
|
||||
pOutlineNds->Remove( pCNd );
|
||||
else
|
||||
pCNd = 0;
|
||||
@@ -593,8 +602,10 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
|
||||
((SwSectionNode*)pNd)->DelFrms();
|
||||
}
|
||||
*/
|
||||
BOOL bOutlNd = pNd->IsTxtNode() && NO_NUMBERING !=
|
||||
((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();
|
||||
//BOOL bOutlNd = pNd->IsTxtNode() && NO_NUMBERING !=//#outline level,zhaojianwei
|
||||
// ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();
|
||||
const bool bOutlNd = pNd->IsTxtNode() &&
|
||||
0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//<-end,zhaojianwei
|
||||
// loesche die Gliederungs-Indizies aus
|
||||
// dem alten Nodes-Array
|
||||
if( bOutlNd )
|
||||
@@ -1280,9 +1291,10 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
|
||||
|
||||
if( pNd->IsTxtNode() )
|
||||
{
|
||||
if( NO_NUMBERING !=
|
||||
((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() &&
|
||||
pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
|
||||
//if( NO_NUMBERING != //#outline level,zhaojianwei
|
||||
// ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() &&
|
||||
if( 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() &&//<-end,zhaojianwei
|
||||
pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
|
||||
{
|
||||
// loesche die Gliederungs-Indizies.
|
||||
pOutlineNds->Remove( nIdxPos );
|
||||
@@ -1669,7 +1681,8 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, ULONG nCnt )
|
||||
SwNode* pNd = (*this)[ n ];
|
||||
|
||||
if( pNd->IsTxtNode() &&
|
||||
NO_NUMBERING != ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() )
|
||||
//NO_NUMBERING != ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
|
||||
0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() ) //<-end,zhaojianwei
|
||||
{ // loesche die Gliederungs-Indizies.
|
||||
USHORT nIdxPos;
|
||||
if( pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
|
||||
|
||||
Reference in New Issue
Block a user