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

[Tor Lillqvist]

 vcl/inc/generic/glyphcache.hxx |   54 +++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

New commits:
commit 6e38357d5d8aee5204f8671ec7f363d769b4329c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 15:25:29 2014 +0300

    Cosmetics
    
    Change-Id: I4ad71bd3538b1d5b033802469b16dd35df5b9724

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 7cd7bba..c0eb98d 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -20,48 +20,36 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 #define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
-#include <vcl/dllapi.h>
+#include <config_graphite.h>
 
-class GlyphCache;
-class GlyphMetric;
-class GlyphData;
-class ServerFont;
-class GlyphCachePeer;
-class ServerFontLayoutEngine;
-class ServerFontLayout;
-class ImplFontOptions;
-class PhysicalFontCollection;
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include <tools/gen.hxx>
-#include <basebmp/bitmapdevice.hxx>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
 #include <boost/shared_ptr.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-
-namespace basegfx { class B2DPolyPolygon; }
+#include <boost/unordered_map.hpp>
 
-class RawBitmap;
+#include <basebmp/bitmapdevice.hxx>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <tools/gen.hxx>
+#include <vcl/dllapi.h>
 
 #include <outfont.hxx>
 #include <impfont.hxx>
-
-class ServerFontLayout;
 #include <sallayout.hxx>
 
-#include <config_graphite.h>
-#if ENABLE_GRAPHITE
+class FtFontInfo;
+class GlyphCachePeer;
+class GlyphData;
 class GraphiteFaceWrapper;
-#endif
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-
-namespace vcl
-{
-    struct FontCapabilities;
-}
+class ImplFontOptions;
+class PhysicalFontCollection;
+class RawBitmap;
+class ServerFont;
+class ServerFontLayout;
+class ServerFontLayoutEngine;
+namespace basegfx { class B2DPolyPolygon; }
+namespace vcl { struct FontCapabilities; }
 
 class VCL_DLLPUBLIC GlyphCache
 {
@@ -173,8 +161,6 @@ private:
     mutable long            mnLruValue;
 };
 
-class FtFontInfo;
-
 class VCL_DLLPUBLIC ServerFont
 {
 public: