summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive2d
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
commit2f17014a588ca53646ff838a4d2325b3bdeb9f21 (patch)
tree084a8d6262786afce508d7996c50845658c69f1c /drawinglayer/source/primitive2d
parente27bf5c9c68153aac908161f6c4c4ebf6f6816b0 (diff)
parent4a46e845c33b70c4987a633a0729c3f1aee4192a (diff)
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
Diffstat (limited to 'drawinglayer/source/primitive2d')
-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 e135a3509ba6..d205981205aa 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())