summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/inc/generic/glyphcache.hxx54
1 files changed, 20 insertions, 34 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 7cd7bbae788e..c0eb98d387c4 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: