diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
| commit | 3b27e34b953c114fec7f6c23ce0e6c583d463c46 (patch) | |
| tree | 20005593536b5b878df2aad76e6acf64891cbf3f /drawinglayer | |
| parent | f854bf9f55fefd83ee24d9f4d3c800ac2de01998 (diff) | |
| parent | b4533051a5b364470be0a2f0ee461f45419a836d (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2 |
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()) |