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

[Chris Sherlock]

 vcl/inc/fontattributes.hxx |    6 ++----
 vcl/inc/outfont.hxx        |   10 +---------
 2 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 7aeb2e8c42cd7d0850aaf33a8a8b4d88c173047f
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Jan 7 13:59:43 2016 +1100

    vcl: remove unnecessary includes in font headers
    
    Change-Id: Idb18436c578ae6d745bb2177688cb3f5435df7a2
    Reviewed-on: https://gerrit.libreoffice.org/21177
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 1ce7a4a..a958d04 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -20,15 +20,13 @@
 #ifndef INCLUDED_VCL_INC_FONTSELECT_HXX
 #define INCLUDED_VCL_INC_FONTSELECT_HXX
 
-#include <rtl/ustring.hxx>
-#include <sal/log.hxx>
-#include <sal/types.h>
 #include <i18nlangtag/lang.h>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <unotools/fontdefs.hxx>
 #include <vcl/vclenum.hxx>
 
+#include "outfont.hxx"
+
 #include <unordered_map>
 
 class PhysicalFontFace;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 7f03dce..cb5b983 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -20,19 +20,11 @@
 #ifndef INCLUDED_VCL_INC_OUTFONT_HXX
 #define INCLUDED_VCL_INC_OUTFONT_HXX
 
-#include <rtl/ustring.hxx>
-#include <sal/log.hxx>
-#include <sal/types.h>
-#include <i18nlangtag/lang.h>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <unotools/fontdefs.hxx>
-#include <vcl/vclenum.hxx>
+#include "fontattributes.hxx"
 
 #include <unordered_map>
 
-#include "fontattributes.hxx"
-
 class PhysicalFontFace;
 class ImplFontEntry;
 class ImplFontCache;