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 /sfx2/source/dialog/mailmodel.cxx | |
| 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 'sfx2/source/dialog/mailmodel.cxx')
| -rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index a6362bdb6cd8..8e2c6d8f9f67 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/uno/Reference.h> +#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/system/XSimpleMailClientSupplier.hpp> #include <com/sun/star/system/SimpleMailClientFlags.hpp> @@ -72,6 +73,7 @@ #include <tools/urlobj.hxx> #include <unotools/useroptions.hxx> #include <comphelper/extract.hxx> +#include <comphelper/componentcontext.hxx> #include <comphelper/mediadescriptor.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -570,20 +572,15 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( css::util::URL aPrepareURL; css::uno::Reference< css::frame::XDispatch > xPrepareDispatch; css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xFrame, css::uno::UNO_QUERY ); - css::uno::Reference< css::util::XURLTransformer > xURLTransformer( - xSMGR->createInstance( rtl::OUString( "com.sun.star.util.URLTransformer" )), - css::uno::UNO_QUERY ); + css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create( ::comphelper::ComponentContext(xSMGR).getUNOContext() ) ); if( !bSendAsPDF ) { try { // check if the document needs to be prepared for sending as mail (embedding of links, removal of invisible content) - if ( xURLTransformer.is() ) - { - aPrepareURL.Complete = rtl::OUString( ".uno:PrepareMailExport" ); - xURLTransformer->parseStrict( aPrepareURL ); - } + aPrepareURL.Complete = rtl::OUString( ".uno:PrepareMailExport" ); + xURLTransformer->parseStrict( aPrepareURL ); if ( xDispatchProvider.is() ) { @@ -651,11 +648,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { css::util::URL aURL; // #i30432# notify that export is finished - the Writer may want to restore removed content - if ( xURLTransformer.is() ) - { - aURL.Complete = rtl::OUString( ".uno:MailExportFinished" ); - xURLTransformer->parseStrict( aURL ); - } + aURL.Complete = rtl::OUString( ".uno:MailExportFinished" ); + xURLTransformer->parseStrict( aURL ); if ( xDispatchProvider.is() ) { |