summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive2d
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-12-14 15:42:18 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-12-14 15:42:18 +0100
commit9c5a2fb27f432c2fe4528f2239f560b515d2021c (patch)
treec492c9e8696f8f77d78e2b3cdb3b1fc999f04bbc /drawinglayer/source/primitive2d
parent5e5f32868925e3fc20bad2b7cc1c23b77b524d5e (diff)
parent4a46e845c33b70c4987a633a0729c3f1aee4192a (diff)
merge OOO330
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 73683884e2bd..893c572a3086 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2017,7 +2017,7 @@ namespace
if(nTextLength + nTextIndex > nStringLength)
{
- nTextLength = nStringLength - nTextIndex;
+ nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
}
if(nTextLength && rPropertyHolders.Current().getTextColorActive())