summaryrefslogtreecommitdiff
path: root/vcl/win/source/gdi/salgdi3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/win/source/gdi/salgdi3.cxx')
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx42
1 files changed, 23 insertions, 19 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f87cfaec386f..d17eb504bc8a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -32,22 +32,7 @@
#include <string.h>
#include <malloc.h>
-#include <vcl/sysdata.hxx>
#include <svsys.h>
-
-#include "wincomp.hxx"
-#include "saldata.hxx"
-#include "salgdi.h"
-
-#include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/font.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/sallayout.hxx"
-
-#include "vcl/outdev.h" // for ImplGlyphFallbackFontSubstitution
-#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
-
#include "rtl/logfile.hxx"
#include "rtl/tencinfo.h"
#include "rtl/textcvt.h"
@@ -60,15 +45,34 @@
#include "osl/thread.hxx"
#include "osl/process.h"
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
+
+#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
+
+#include "vcl/font.hxx"
+#include "vcl/svapp.hxx"
+
#include "tools/poly.hxx"
#include "tools/debug.hxx"
#include "tools/stream.hxx"
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+
+#include <vcl/sysdata.hxx>
+
+#include "win/wincomp.hxx"
+#include "win/saldata.hxx"
+#include "win/salgdi.h"
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "sallayout.hxx"
+#include "outdev.h" // for ImplGlyphFallbackFontSubstitution
#include "sft.hxx"
#ifdef GCP_KERN_HACK