diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-01 15:15:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-06 10:53:34 +0200 |
| commit | 0fcd1a73f0e1ec564f3c6da1ccd890183d3c18db (patch) | |
| tree | 3895ecd6f804b8f3ef3a8f03f1739e17918feeef /vbahelper | |
| parent | 8a95074eaefd01621dc55db8567b19c8e6157f95 (diff) | |
fdo#46808, Adapt UNO services to new style, Part 7, updating ::create
Update code to use factory method URLTransformer::create
Change-Id: I3fd2e838497bcfd8fc949615c0e7d60a6ea47118
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/vbahelper/vbadocumentbase.cxx | 7 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 977f5ead5f4c..526b07a1c009 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XProtectable.hpp> #include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -141,11 +142,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, uno::Reference< frame::XDispatchProvider > xDispatchProvider( xController->getFrame(), uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); - uno::Reference< util::XURLTransformer > xURLTransformer( - xServiceManager->createInstanceWithContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ), - mxContext ), - uno::UNO_QUERY_THROW ); + uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create(mxContext) ); util::URL aURL; aURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc" ) ); diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index a917ef7a6786..b65f36a754f5 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ #include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -171,11 +172,7 @@ dispatchRequests (const uno::Reference< frame::XModel>& xModel, const rtl::OUStr if ( !xServiceManager.is() ) return; - uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext( - rtl::OUString( "com.sun.star.util.URLTransformer" ), xContext), - uno::UNO_QUERY_THROW ); - if (!xParser.is()) - return; + uno::Reference<util::XURLTransformer> xParser( util::URLTransformer::create(xContext) ); xParser->parseStrict (url); } catch (const uno::Exception&) |