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

Michael Meeks michael.meeks at collabora.com
Fri Oct 2 01:38:14 PDT 2015


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

New commits:
commit 1d49c4a54995b6c96a32a092f78b38b36a5748d5
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Oct 1 16:30:06 2015 +0100

    tdf#94428 - don't use OpenGL font rendering when we're printing.
    
    Change-Id: I212bb442bdffa38d77e7e7357199c39420fa7951
    Reviewed-on: https://gerrit.libreoffice.org/19079
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index da72f11..0d733ee 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2501,7 +2501,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int nFallba
     const ImplWinFontData& rFontFace = *mpWinFontData[ nFallbackLevel ];
     ImplWinFontEntry& rFontInstance = *mpWinFontEntry[ nFallbackLevel ];
 
-    bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled();
+    bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter;
 
     if (!bUspInited)
         InitUSP();


More information about the Libreoffice-commits mailing list