[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 26 10:20:47 UTC 2021


 vcl/source/font/font.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b8bb394e44815351fffa40ca862449675bcf3b07
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Wed Feb 24 10:06:32 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Aug 26 12:20:08 2021 +0200

    disable-pch fix
    
    Change-Id: I14760d858c1500800c9360530b0408986122e00b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111444
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121077
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index bb98445c9d2f..007c1e051cdd 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -24,6 +24,7 @@
 #include <unotools/fontdefs.hxx>
 
 #include <vcl/font.hxx>
+#include <vcl/virdev.hxx>
 
 #include <impfont.hxx>
 #include <fontattributes.hxx>
@@ -37,8 +38,6 @@
 
 #ifdef _WIN32
 #include <vcl/metric.hxx>
-#else
-#include <vcl/virdev.hxx>
 #endif
 
 using namespace vcl;


More information about the Libreoffice-commits mailing list