[Libreoffice-commits] .: Branch 'libreoffice-3-3' - vcl/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Dec 12 06:23:00 PST 2010


 vcl/source/gdi/metaact.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f2659d8f013078de247c68cca6ee0eb448c12d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 12 14:08:56 2010 +0000

    Resolves: fdo#32236# #i115825# Regression in wmf text rendering
    
    Regression in rendering chunks out of multipart text lines
    (cherry picked from commit c512e7f3bc299f57dc2500c21e0f81f5a2072e80)

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 0968bde..fd95f70 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1442,7 +1442,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm	>> mnLen;
     rIStm	>> nAryLen;
 
-    if ( mnIndex > mnLen )
+    if ( mnIndex + mnLen > maStr.Len() )
     {
         mnIndex = 0;
         mpDXAry = 0;


More information about the Libreoffice-commits mailing list