diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-08 08:13:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-08 08:13:57 +0000 |
| commit | 0e4d010993dce872792387b2757e4dc9045bfcef (patch) | |
| tree | 038946d43e2193255c4e63aec0737470814ba673 /svx/source/editeng/editdoc.cxx | |
| parent | INTEGRATION: CWS textconversion (1.8.168); FILE MERGED (diff) | |
| download | core-0e4d010993dce872792387b2757e4dc9045bfcef.tar.gz core-0e4d010993dce872792387b2757e4dc9045bfcef.zip | |
INTEGRATION: CWS textconversion (1.38.168); FILE MERGED
2005/10/26 21:27:01 tl 1.38.168.2: RESYNC: (1.38-1.39); FILE MERGED
2005/09/09 12:56:32 tl 1.38.168.1: #124006# keep attributes as much as possible in Chinese text conversion
Diffstat (limited to 'svx/source/editeng/editdoc.cxx')
| -rw-r--r-- | svx/source/editeng/editdoc.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx index a43f69479a82..1c74a7deb9f7 100644 --- a/svx/source/editeng/editdoc.cxx +++ b/svx/source/editeng/editdoc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: editdoc.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:26:33 $ + * last change: $Author: rt $ $Date: 2005-11-08 09:13:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1683,7 +1683,8 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi { pAttr->GetStart() = nEnd; // dann faengt es dahinter an rpStarting = pAttr; - break; // es kann kein weiteres Attrib hier liegen + if ( nWhich ) + break; // es kann kein weiteres Attrib hier liegen } else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) ) { @@ -1715,13 +1716,15 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi { pAttr->GetStart() = nEnd; rpStarting = pAttr; - break; // es kann weitere Attribute geben! + if ( nWhich ) + break; // es kann weitere Attribute geben! } else if ( pAttr->GetEnd() == nEnd ) { pAttr->GetEnd() = nStart; rpEnding = pAttr; - break; // es kann weitere Attribute geben! + if ( nWhich ) + break; // es kann weitere Attribute geben! } else // Attribut muss gesplittet werden... { @@ -1729,7 +1732,8 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi pAttr->GetEnd() = nStart; rpEnding = pAttr; InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd ); - break; // es kann weitere Attribute geben! + if ( nWhich ) + break; // es kann weitere Attribute geben! } } } |