diff options
| author | jp <jp@openoffice.org> | 2000-11-06 17:16:53 +0000 |
|---|---|---|
| committer | jp <jp@openoffice.org> | 2000-11-06 17:16:53 +0000 |
| commit | 6589dffc4a5b4fb6b3832e70b22d860295b48a90 (patch) | |
| tree | de06d0ac6ced37eba14861169585371ddea5a293 /sw/source/core | |
| parent | dd3054f9d9c80bbdcc5e5cfc0acdaedbb94a8420 (diff) | |
SwpHints:Insert: use DontMergeAttr flag correct
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index c68f8acadd5d..e6a82ca093d5 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2,9 +2,9 @@ * * $RCSfile: thints.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jp $ $Date: 2000-11-06 10:43:55 $ + * last change: $Author: jp $ $Date: 2000-11-06 18:16:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1725,7 +1725,7 @@ void SwpHints::Insert( SwTxtAttr *pHint, SwTxtNode &rNode, USHORT nMode ) BOOL bINet = nWhich == RES_TXTATR_INETFMT; BOOL bForgetAttr = bParaAttr; // Muessen wir uns aufspalten? - if ( !bINet || !pHint->IsDontMergeAttr() ) + if ( !bINet && !pHint->IsDontMergeAttr() ) { // Ab der zweiten Runde muessen wir zunaechst einen neuen // Hint erzeugen. |