#i103496#: move some enums, defines and inlines from vcl to tools to get xmloff free of vcl stuff

7 files changed, 6 insertions, 20 deletions

diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index d3c601cb37c2..9854f99d39e1 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -36,20 +36,6 @@
 #include <comphelper/extract.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-
-/*
-#include <vcl/vclenum.hxx>
-#include <tools/solar.h>
-
-#ifndef _INC_LIMITS
-#include <limits.h>
-#endif
-
-
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
-*/
 #include <com/sun/star/uno/Any.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index e823b13c474c..a5c662ef33a7 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <svl/cntnrsrt.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 010544766e77..acfc846883e7 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <xmloff/xmlelement.hxx>
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index 6c5365b72f73..9f22f6d914ac 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -36,7 +36,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #ifndef _XMLOFF_XMLEMENT_HXX
 #include <xmloff/xmlelement.hxx>
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 61c6b2a8e183..fa63df061ced 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -33,7 +33,7 @@
 #include <weighhdl.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <tools/solar.h>
 
 #ifndef _INC_LIMITS
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 2fd2565ef91a..7233c0f7da8f 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -58,7 +58,7 @@
 #include "XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 1fcbe0024193..66f10e7274c6 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -33,7 +33,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>