move ImageList to framework

this can probably be replaced by a std::*map<Image>

Change-Id: Ic36c5f406f5ea51cb9ff135858e319e0877179c7

8 files changed, 71 insertions, 43 deletions

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 1eaf49756fb0..f5b8f23fe978 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -114,6 +114,9 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/services/taskcreatorsrv \
     framework/source/services/urltransformer \
     framework/source/uiconfiguration/CommandImageResolver \
+    framework/source/uiconfiguration/ImageArrayData \
+    framework/source/uiconfiguration/ImageList \
+    framework/source/uiconfiguration/ImplImageList \
     framework/source/uiconfiguration/globalsettings \
     framework/source/uiconfiguration/graphicnameaccess \
     framework/source/uiconfiguration/imagemanager \
diff --git a/vcl/source/image/ImageArrayData.cxx b/framework/source/uiconfiguration/ImageArrayData.cxx
index e1854d2aa55a..6ebfc0928fdf 100644
--- a/vcl/source/image/ImageArrayData.cxx
+++ b/framework/source/uiconfiguration/ImageArrayData.cxx
@@ -35,8 +35,6 @@
 #include <rtl/strbuf.hxx>
 #endif
 
-#include "BitmapProcessor.hxx"
-
 ImageAryData::ImageAryData( const ImageAryData& rData ) :
     maName( rData.maName ),
     mnId( rData.mnId ),
diff --git a/vcl/source/image/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx
index 6610c51c3216..6610c51c3216 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/framework/source/uiconfiguration/ImageList.cxx
diff --git a/vcl/source/image/ImplImageList.cxx b/framework/source/uiconfiguration/ImplImageList.cxx
index f1a0d94973c8..f1a0d94973c8 100644
--- a/vcl/source/image/ImplImageList.cxx
+++ b/framework/source/uiconfiguration/ImplImageList.cxx
diff --git a/framework/source/uiconfiguration/image.h b/framework/source/uiconfiguration/image.h
new file mode 100644
index 000000000000..9b0542f1462f
--- /dev/null
+++ b/framework/source/uiconfiguration/image.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef FRAMEWORK_SOURCE_UICONFIGURATION_IMAGE_H
+#define FRAMEWORK_SOURCE_UICONFIGURATION_IMAGE_H
+
+#include <vcl/bitmapex.hxx>
+
+#include <unordered_map>
+#include <vector>
+
+struct ImageAryData
+{
+    OUString maName;
+    // Images identified by either name, or by id
+    sal_uInt16              mnId;
+    BitmapEx                maBitmapEx;
+
+    ImageAryData( const OUString &aName,
+                  sal_uInt16 nId, const BitmapEx &aBitmap );
+    ImageAryData( const ImageAryData& rData );
+    ~ImageAryData();
+
+    bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); }
+    void Load(const OUString &rPrefix);
+
+    ImageAryData&   operator=( const ImageAryData& rData );
+};
+
+struct ImplImageList
+{
+    typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
+        ImageAryDataNameHash;
+
+    std::vector<ImageAryData *>        maImages;
+    ImageAryDataNameHash   maNameHash;
+    OUString               maPrefix;
+    Size                   maImageSize;
+
+    ImplImageList();
+    ImplImageList( const ImplImageList &aSrc );
+    ~ImplImageList();
+
+    void AddImage( const OUString &aName,
+                   sal_uInt16 nId, const BitmapEx &aBitmapEx );
+    void RemoveImage( sal_uInt16 nPos );
+};
+
+#endif // INCLUDED_VCL_INC_IMAGE_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx
index 80a6f3b5970c..43df2c9a43d8 100644
--- a/include/vcl/ImageTree.hxx
+++ b/include/vcl/ImageTree.hxx
@@ -54,7 +54,7 @@ public:
     VCL_DLLPUBLIC OUString getImageUrl(
         OUString const & name, OUString const & style, OUString const & lang);
 
-    bool loadImage(
+    VCL_DLLPUBLIC bool loadImage(
         OUString const & name, OUString const & style,
         BitmapEx & bitmap, bool localized,
         const ImageLoadFlags eFlags = ImageLoadFlags::NONE);
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 07566d0eb194..e8277dc78f95 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -312,12 +312,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/bitmap/BitmapTools \
     vcl/source/bitmap/checksum \
     vcl/source/image/Image \
-    vcl/source/image/ImageArrayData \
-    vcl/source/image/ImageList \
     vcl/source/image/ImageTree \
     vcl/source/image/ImageRepository \
     vcl/source/image/ImplImage \
-    vcl/source/image/ImplImageList \
     vcl/source/image/ImplImageTree \
     vcl/source/helper/canvasbitmap \
     vcl/source/helper/canvastools \
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 5446dc7d322a..72a7f3233775 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -25,43 +25,6 @@
 #include <unordered_map>
 #include <vector>
 
-struct ImageAryData
-{
-    OUString maName;
-    // Images identified by either name, or by id
-    sal_uInt16              mnId;
-    BitmapEx                maBitmapEx;
-
-    ImageAryData( const OUString &aName,
-                  sal_uInt16 nId, const BitmapEx &aBitmap );
-    ImageAryData( const ImageAryData& rData );
-    ~ImageAryData();
-
-    bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); }
-    void Load(const OUString &rPrefix);
-
-    ImageAryData&   operator=( const ImageAryData& rData );
-};
-
-struct ImplImageList
-{
-    typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
-        ImageAryDataNameHash;
-
-    std::vector<ImageAryData *>        maImages;
-    ImageAryDataNameHash   maNameHash;
-    OUString               maPrefix;
-    Size                   maImageSize;
-
-    ImplImageList();
-    ImplImageList( const ImplImageList &aSrc );
-    ~ImplImageList();
-
-    void AddImage( const OUString &aName,
-                   sal_uInt16 nId, const BitmapEx &aBitmapEx );
-    void RemoveImage( sal_uInt16 nPos );
-};
-
 struct ImplImage
 {
     BitmapChecksum maBitmapChecksum;