diff options
author | Noel Grandin <noel@peralex.com> | 2012-05-26 13:53:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-04 16:57:55 +0200 |
commit | b3c76dee6d44d07eae404b8d7341e6c88e6c4429 (patch) | |
tree | c747dd5bddf94c3b4312c7b1861a5087e76e71d6 /writerfilter | |
parent | Improve error reporting (diff) | |
download | core-b3c76dee6d44d07eae404b8d7341e6c88e6c4429.tar.gz core-b3c76dee6d44d07eae404b8d7341e6c88e6c4429.zip |
fdo#46808, Adapt UNO services to new style, Part 7, updating ::create
Update calls to factories to use new ::create methods
Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index af0aa6a5e208..9b660d30abac 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok)) $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ configmgr/source/configmgr \ + svtools/util/svt \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ writerfilter/util/writerfilter \ diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index afab11eb6e7f..6d16a8dcef73 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -1281,12 +1282,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b uno::Reference< text::XTextContent > xGraphicObject; try { - uno::Reference< graphic::XGraphicProvider > xGraphicProvider( - m_xComponentContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString("com.sun.star.graphic.GraphicProvider"), - m_xComponentContext), - uno::UNO_QUERY_THROW ); - + uno::Reference< graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(m_xComponentContext) ); uno::Reference< graphic::XGraphic > xGraphic = xGraphicProvider->queryGraphic( aMediaProperties ); if(xGraphic.is()) |