[Libreoffice-commits] .: vcl/source

Caolán McNamara caolan at kemper.freedesktop.org
Mon Nov 21 03:54:49 PST 2011


 vcl/source/gdi/outdev3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2de8d6208b3d1b95a44c8794615eb8da2b3e7286
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 21 11:53:54 2011 +0000

    fix text layout regression

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index bcd51a2..e68822f 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5991,13 +5991,13 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
         nLen = static_cast<xub_StrLen>(nNewLen);
     }
 
-    String aStr;
+    String aStr = rOrigStr;
 
     // filter out special markers
     if( bFilter )
     {
         xub_StrLen nCutStart, nCutStop, nOrgLen = nLen;
-        rtl::OUString aTmpStr(rOrigStr);
+        rtl::OUString aTmpStr(aStr);
         bool bFiltered = mpGraphics->filterText( rOrigStr, aTmpStr, nMinIndex, nLen, nCutStart, nCutStop );
         aStr = aTmpStr;
         if( !nLen )


More information about the Libreoffice-commits mailing list