[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

Tamas Bunth tamas.bunth at collabora.co.uk
Tue Jun 19 13:21:08 UTC 2018


 vcl/source/outdev/text.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 221234c0203d5b3caf6907bff110fc1a9b71a5ad
Author: Tamas Bunth <tamas.bunth at collabora.co.uk>
Date:   Sun Jan 28 00:14:55 2018 +0100

    tdf#114736 no need to call AdjustLayout here
    
    Change-Id: Iae8c953155d46e53cffdf3483e3b4b95157719f6
    Reviewed-on: https://gerrit.libreoffice.org/48761
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/49033
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 5694a8165b58..6d43a5b9f9a3 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -888,13 +888,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
         if( mbInitFont )
             InitFont();
 
-
-        OUString aStrModifiable = rStr;
-        ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs( aStrModifiable, nIndex, nLen,
-                0, nullptr);
-
-        // position, justify, etc. the layout
-        pLayoutCache->AdjustLayout( aLayoutArgs );
         pLayoutCache->DrawBase() = ImplLogicToDevicePixel( rStartPt );
 
         ImplDrawText( *pLayoutCache );


More information about the Libreoffice-commits mailing list