[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Matúš Kukan]

 vcl/source/gdi/outdev3.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d5b3e74e50a2616c85d1955f59e55bb4edba32dd
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Apr 1 13:01:14 2014 +0200

    fdo#74302: Adapt to OUString changes and set length exactly.
    
    This was fixed in master by 4c539fac018dfd44cd8db52161a8cb930c627da7
    
    Change-Id: I69219e643f5eff3126191220ce2b1d0e1089a93e
    Reviewed-on: https://gerrit.libreoffice.org/8808
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index d97b71b..537f8aa 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5399,6 +5399,9 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
          OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() );
 #endif
 
+    if( nLen == STRING_LEN )
+        nLen = rStr.getLength() - nIndex;
+
     if ( mpMetaFile )
         mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) );
     if( pVector )