diff options
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/imagemanager.cxx | 27 |
2 files changed, 11 insertions, 18 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 924cfa3fa6db..7ecd19e2276c 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -55,7 +55,6 @@ #include <services/sessionlistener.hxx> #include <services/taskcreatorsrv.hxx> -#include <uiconfiguration/imagemanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> #include <services/substitutepathvars.hxx> #include <services/pathsettings.hxx> @@ -86,7 +85,6 @@ COMPONENTGETFACTORY ( fwk, IFFACTORY( ::framework::StatusbarControllerFactory ) else IFFACTORY( ::framework::SessionListener ) else IFFACTORY( ::framework::TaskCreatorService ) else - IFFACTORY( ::framework::ImageManager ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else IFFACTORY( ::framework::SubstitutePathVariables ) else IFFACTORY( ::framework::PathSettings ) else diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index f3f78547564b..4d08b66a59cc 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -22,7 +22,6 @@ #include <threadhelp/resetableguard.hxx> #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> -#include <services.h> #include "imagemanagerimpl.hxx" #include "properties.h" @@ -34,6 +33,7 @@ #include <com/sun/star/io/XStream.hpp> #include <vcl/svapp.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> #include <comphelper/sequence.hxx> @@ -41,10 +41,6 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> -//_________________________________________________________________________________________________________________ -// namespaces -//_________________________________________________________________________________________________________________ - using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Exception; @@ -63,17 +59,6 @@ using namespace ::com::sun::star::beans; namespace framework { -//***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ImageManager , - ::cppu::OWeakObject , - "com.sun.star.ui.ImageManager" , - OUString("com.sun.star.comp.framework.ImageManager") - ) - -DEFINE_INIT_SERVICE ( ImageManager, {} ) - ImageManager::ImageManager( const uno::Reference< uno::XComponentContext >& rxContext ) : ThreadHelpBase( &Application::GetSolarMutex() ) , m_pImpl( new ImageManagerImpl(rxContext, this, false) ) @@ -222,4 +207,14 @@ sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::Runti } // namespace framework +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_framework_ImageManager_get_implementation( + css::uno::XComponentContext *context, + css::uno::Sequence<css::uno::Any> const &) +{ + rtl::Reference<framework::ImageManager> x(new framework::ImageManager(context)); + x->acquire(); + return static_cast<cppu::OWeakObject *>(x.get()); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |