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

Tomaž Vajngerl tomaz.vajngerl at collabora.com
Fri Oct 30 04:21:00 PDT 2015


 vcl/source/control/edit.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d36d2d68f3cb5f270081243269ca83109a2a3732
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Oct 28 20:27:48 2015 +0100

    tdf#94138 also apply settings when printing (Draw call)
    
    (cherry picked from commit 93a007b1b02c13025b08bcefe19dd54e24e2b80f)
    
    Change-Id: I72056f3e167923f00c37648a24190b533eb9b471
    Reviewed-on: https://gerrit.libreoffice.org/19655
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 3250845..7e04604 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1804,6 +1804,8 @@ void Edit::Resize()
 
 void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
+    ApplySettings(*pDev);
+
     Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = pDev->LogicToPixel( rSize );
     vcl::Font aFont = GetDrawPixelFont( pDev );


More information about the Libreoffice-commits mailing list