diff options
Diffstat (limited to 'sd/source/ui/framework')
3 files changed, 9 insertions, 20 deletions
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 4f77bf2a7edd..7d770ffa04c5 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> #include <boost/bind.hpp> #include <algorithm> @@ -51,11 +52,8 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag mxURLTransformer() { // Create the URL transformer. - Reference<lang::XMultiServiceFactory> xServiceManager ( - ::comphelper::getProcessServiceFactory()); - mxURLTransformer = Reference<util::XURLTransformer>( - xServiceManager->createInstance("com.sun.star.util.URLTransformer"), - UNO_QUERY); + Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); + mxURLTransformer = util::URLTransformer::create(xContext); } diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index aece40c1d8a0..7816e770a31f 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -32,6 +32,7 @@ #include "tools/SdGlobalResourceContainer.hxx" #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> #include <rtl/ref.hxx> @@ -597,11 +598,8 @@ void ResourceId::ParseResourceURL (void) if ( ! xURLTransformer.is()) { // Create the URL transformer. - Reference<lang::XMultiServiceFactory> xServiceManager ( - ::comphelper::getProcessServiceFactory()); - xURLTransformer = Reference<util::XURLTransformer>( - xServiceManager->createInstance("com.sun.star.util.URLTransformer"), - UNO_QUERY); + Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); + xURLTransformer = Reference<util::XURLTransformer>(util::URLTransformer::create(xContext)); mxURLTransformerWeak = xURLTransformer; SdGlobalResourceContainer::Instance().AddResource( Reference<XInterface>(xURLTransformer,UNO_QUERY)); diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index 1f5577cfb203..423d503645e3 100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -66,16 +67,8 @@ ReadOnlyModeObserver::ReadOnlyModeObserver ( { // Create a URL object for the slot name. maSlotNameURL.Complete = ".uno:EditDoc"; - uno::Reference<lang::XMultiServiceFactory> xServiceManager ( - ::comphelper::getProcessServiceFactory()); - if (xServiceManager.is()) - { - Reference<util::XURLTransformer> xTransformer(xServiceManager->createInstance( - "com.sun.star.util.URLTransformer"), - UNO_QUERY); - if (xTransformer.is()) - xTransformer->parseStrict(maSlotNameURL); - } + Reference<util::XURLTransformer> xTransformer(util::URLTransformer::create(::comphelper::getProcessComponentContext())); + xTransformer->parseStrict(maSlotNameURL); if ( ! ConnectToDispatch()) { |