diff options
| author | jp <jp@openoffice.org> | 2001-01-16 18:18:34 +0000 |
|---|---|---|
| committer | jp <jp@openoffice.org> | 2001-01-16 18:18:34 +0000 |
| commit | 5c6afc77acbf29ed3dd5e638c42c781232e28bea (patch) | |
| tree | 3e80eb84b418319e390a3aec2e1946e37ff290fb | |
| parent | dec9f2a338250ff162997158e5b53a66f2cb40df (diff) | |
Bug #80628#: Modify - if reset numrule then call first the modify of the base class
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index be785fd1e75b..8bca5e5c8f59 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: node.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2000-11-20 16:36:58 $ + * last change: $Author: jp $ $Date: 2001-01-16 19:18:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -962,7 +962,7 @@ void SwCntntNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue ) { USHORT nWhich = pOldValue ? pOldValue->Which() : pNewValue ? pNewValue->Which() : 0 ; - BOOL bNumRuleSet = FALSE; + BOOL bNumRuleSet = FALSE, bCallModify = TRUE; String sNumRule, sOldNumRule; const SfxPoolItem* pItem; @@ -1077,6 +1077,8 @@ void SwCntntNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue ) } else if( ((SwTxtNode*)this)->GetNum() ) { + bCallModify = FALSE; + SwModify::Modify( pOldValue, pNewValue ); ((SwTxtNode*)this)->UpdateNum( SwNodeNum(NO_NUMBERING) ); #ifndef NUM_RELSPACE SetNumLSpace( TRUE ); @@ -1090,7 +1092,8 @@ void SwCntntNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue ) pRule->SetInvalidRule( TRUE ); } - SwModify::Modify( pOldValue, pNewValue ); + if( bCallModify ) + SwModify::Modify( pOldValue, pNewValue ); } BOOL SwCntntNode::InvalidateNumRule() |