diff options
author | Michael Stahl <mst@openoffice.org> | 2010-03-16 17:15:38 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2010-03-16 17:15:38 +0100 |
commit | b9ba6b35bf4a2a3ef5f85e4cca6ac6e8818161f1 (patch) | |
tree | 5585ae1962fab93d7cc74698e69f26558f6ab79a /sw | |
parent | a4f0aa4ea560aefd0eba9dd59ad63d7d91087864 (diff) |
sw33bf03: #i110140#: SwFldFmt::Modify: apply patch by cmc
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 9ac53456e7ef..13695778c6a8 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -160,14 +160,16 @@ void SwFmtFld::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) if( !pTxtAttr ) return; + // don't do anything, especially not expand! + if( pNew && pNew->Which() == RES_OBJECTDYING ) + return; + SwTxtNode* pTxtNd = (SwTxtNode*)&pTxtAttr->GetTxtNode(); ASSERT( pTxtNd, "wo ist denn mein Node?" ); if( pNew ) { switch( pNew->Which() ) { - case RES_OBJECTDYING: - return; // don't do anything, especially not expand! case RES_TXTATR_FLDCHG: // "Farbe hat sich geaendert !" // this, this fuer "nur Painten" @@ -192,6 +194,8 @@ void SwFmtFld::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) case RES_FMT_CHG: pTxtNd->Modify( pOld, pNew ); return; + default: + break; } } |