move ImageType enum out of CommandImageResolver.hxx

Change-Id: I0b4da9a4edff8d0f9016fbd79cb205bdf2b35268

3 files changed, 12 insertions, 10 deletions

diff --git a/include/vcl/CommandImageResolver.hxx b/include/vcl/CommandImageResolver.hxx
index 78af7b2e9336..482e4525b2c9 100644
--- a/include/vcl/CommandImageResolver.hxx
+++ b/include/vcl/CommandImageResolver.hxx
@@ -22,15 +22,6 @@
 namespace vcl
 {
 
-enum class ImageType
-{
-    Size16,
-    Size26,
-    Size32,
-    Small = Size16,
-    LAST = Size32,
-};
-
 class VCL_DLLPUBLIC CommandImageResolver final
 {
 private:
diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx
index fff271b39a9a..93f4f3fb13ec 100644
--- a/include/vcl/commandinfoprovider.hxx
+++ b/include/vcl/commandinfoprovider.hxx
@@ -22,7 +22,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/keycod.hxx>
 #include <vcl/image.hxx>
-#include <vcl/CommandImageResolver.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 9549133c68af..6fdfafff416f 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -36,6 +36,18 @@ struct ImplImage;
 struct ImplImageList;
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
 
+namespace vcl
+{
+    enum class ImageType
+    {
+        Size16,
+        Size26,
+        Size32,
+        Small = Size16,
+        LAST = Size32,
+    };
+}
+
 #define IMAGELIST_IMAGE_NOTFOUND    ((sal_uInt16)0xFFFF)
 
 class VCL_DLLPUBLIC Image