summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-11-04 09:38:06 +0000
committerOliver Bolte <obo@openoffice.org>2009-11-04 09:38:06 +0000
commit1ffca0e2bc60f2a11d84a718f2968932eac32629 (patch)
tree7d39f7e37b228de9351b07ee1005312a7848b954
parentba9850edf9c8b169418d01c9567c97d34b44849d (diff)
CWS-TOOLING: integrate CWS tl75
2009-10-20 15:29:06 +0200 tl r277057 : #i98908# unsorted char attribute array fixed 2009-10-19 13:31:12 +0200 ufi r277022 : i86464 2009-10-19 13:21:57 +0200 tl r277020 : #i92190# dictionary update 2009-10-19 12:10:05 +0200 tl r277019 : #92190# dictionray update
-rw-r--r--svx/source/editeng/editdoc.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx
index 7160a4197a..d5f9ee16ee 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/svx/source/editeng/editdoc.cxx
@@ -1427,9 +1427,11 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT
else
pNextFeature = 0; // Feature interessiert unten nicht
-
DBG_ASSERT( nEnd >= nIndex, "Ende vorm Index?" );
- aStr += XubString( *pNode, nIndex, nEnd-nIndex );
+ //!! beware of sub string length of -1 which is also defined as STRING_LEN and
+ //!! thus would result in adding the whole sub string up to the end of the node !!
+ if (nEnd > nIndex)
+ aStr += XubString( *pNode, nIndex, nEnd - nIndex );
if ( pNextFeature )
{
@@ -1790,7 +1792,12 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
}
if ( bChanged )
+ {
+ // char attributes need to be sorted by start again
+ pNode->GetCharAttribs().ResortAttribs();
+
SetModified( TRUE );
+ }
return bChanged;
}