[Libreoffice-commits] core.git: vcl/source

Douglas Mencken dougmencken at gmail.com
Thu Jan 12 11:22:49 UTC 2017


 vcl/source/gdi/CommonSalLayout.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 77a0817cf46aace4b446d05af13c6905c7c6411a
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Jan 8 15:04:12 2017 -0500

    make the include of OpenGLHelper.hxx not global here
    
    surround it like in pieces of code which actually uses it
    
    Change-Id: Iac993553455248a2d2f999f857b781dbdb37acf5
    Reviewed-on: https://gerrit.libreoffice.org/32852
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 2dd9925..3451478 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -19,7 +19,6 @@
 
 #include "CommonSalLayout.hxx"
 
-#include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/unohelp.hxx>
 #include <scrptrun.h>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -39,6 +38,10 @@ T lround(T x)
 }
 #endif
 
+#ifdef _WIN32
+#  include <vcl/opengl/OpenGLHelper.hxx>
+#endif
+
 
 static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pUserData)
 {


More information about the Libreoffice-commits mailing list