summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-12-15 11:04:54 +0000
committerNoel Power <noel.power@novell.com>2010-12-15 11:04:54 +0000
commitd2d5e0d1e55ee692632aa547f17f6a48179af2b7 (patch)
tree33961c3c392a6de8f1ef384476d5214263807c79 /drawinglayer
parentfae626b938106e00d8f4dfb5c4ca8e9294b37c30 (diff)
parent760601cdbae7c063f13902e66ed76c022018d848 (diff)
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 10ddadc529..ffb90a5700 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2018,7 +2018,7 @@ namespace
if(nTextLength + nTextIndex > nStringLength)
{
- nTextLength = nStringLength - nTextIndex;
+ nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
}
if(nTextLength && rPropertyHolders.Current().getTextColorActive())