diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-05 14:04:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-05 15:00:54 +0000 |
| commit | 4f5cd607e30633ca51263c2f45c4753e8990302f (patch) | |
| tree | 5aba23b6bbaf5b0fa16fb5faa702c56c5f144aa0 | |
| parent | 57990e4b8ea2eaeb478b161b568e31036c7a5fe4 (diff) | |
move CommandImageResolver out of vcl and beside its only user
Change-Id: I2bd70d87bb12d5750d8427b8a8fe786cfce8961b
| -rw-r--r-- | framework/Library_fwk.mk | 1 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/CommandImageResolver.cxx (renamed from vcl/source/bitmap/CommandImageResolver.cxx) | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/CommandImageResolver.hxx (renamed from include/vcl/CommandImageResolver.hxx) | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 2246286b0348..1eaf49756fb0 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -113,6 +113,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/services/substitutepathvars \ framework/source/services/taskcreatorsrv \ framework/source/services/urltransformer \ + framework/source/uiconfiguration/CommandImageResolver \ framework/source/uiconfiguration/globalsettings \ framework/source/uiconfiguration/graphicnameaccess \ framework/source/uiconfiguration/imagemanager \ diff --git a/vcl/source/bitmap/CommandImageResolver.cxx b/framework/source/uiconfiguration/CommandImageResolver.cxx index d34140d3b9d3..98aec12e3b4c 100644 --- a/vcl/source/bitmap/CommandImageResolver.cxx +++ b/framework/source/uiconfiguration/CommandImageResolver.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <vcl/CommandImageResolver.hxx> +#include "CommandImageResolver.hxx" #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/include/vcl/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx index 482e4525b2c9..79368fc5ceca 100644 --- a/include/vcl/CommandImageResolver.hxx +++ b/framework/source/uiconfiguration/CommandImageResolver.hxx @@ -22,7 +22,7 @@ namespace vcl { -class VCL_DLLPUBLIC CommandImageResolver final +class CommandImageResolver final { private: typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 1d5022b868ff..ec2cf9bb950e 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -48,7 +48,7 @@ #include <unordered_map> #include <vector> -#include <vcl/CommandImageResolver.hxx> +#include "CommandImageResolver.hxx" namespace framework { diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 050ee31be90a..07566d0eb194 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -311,7 +311,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/bitmap/BitmapProcessor \ vcl/source/bitmap/BitmapTools \ vcl/source/bitmap/checksum \ - vcl/source/bitmap/CommandImageResolver \ vcl/source/image/Image \ vcl/source/image/ImageArrayData \ vcl/source/image/ImageList \ |