diff options
| author | Noel Grandin <noel@peralex.com> | 2012-05-29 17:17:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-06 10:01:22 +0200 |
| commit | d08578912f2c9ef42d4349079422e25b951e544e (patch) | |
| tree | d029b5a9110bcdc255e72ef9c98887f3f8521ea6 /sfx2 | |
| parent | 7d2a5b5114987f1ab415e32ebb5bb9a46b98dc17 (diff) | |
fdo#46808, Adapt UNO services to new style, Part 7, updating ::create
Update calls to factories to use new SimpleFileAccess::create method
Change-Id: Ie5b0696fe2228a9033b19969245a53c21a61aa14
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfac.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index de87ca6db8fc..570a1aa21f2e 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -29,7 +29,8 @@ #include <com/sun/star/registry/MergeConflictException.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> +#include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -38,6 +39,7 @@ #include <unotools/moduleoptions.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/localfilehelper.hxx> +#include <comphelper/componentcontext.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/configurationhelper.hxx> @@ -213,7 +215,6 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri static const int nMaxPathSize = 16000; static ::rtl::OUString SERVICE_FILTER_FACTORY("com.sun.star.document.FilterFactory"); static ::rtl::OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); - static ::rtl::OUString SERVICE_SIMPLE_ACCESS("com.sun.star.ucb.SimpleFileAccess"); static ::rtl::OUString CONF_ROOT("/org.openoffice.Setup"); static ::rtl::OUString CONF_PATH = ::rtl::OUString("Office/Factories/" ) + ::rtl::OUString( rServiceName ); @@ -263,8 +264,8 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri aUserTemplateURL += DEF_TPL_STR; aUserTemplateURL += aExt; - uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess( - xFactory->createInstance( SERVICE_SIMPLE_ACCESS ), uno::UNO_QUERY_THROW ); + uno::Reference<ucb::XSimpleFileAccess2> xSimpleFileAccess( + ucb::SimpleFileAccess::create( ::comphelper::ComponentContext(xFactory).getUNOContext() ) ); ::rtl::OUString aBackupURL; ::osl::Security().getConfigDir(aBackupURL); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3bcc77e5ced3..3b44ed30cfdc 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -57,7 +57,8 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> +#include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> @@ -2140,8 +2141,8 @@ void SfxObjectShell::StoreLog() aFileURL += ::rtl::OUString( "/user/temp/document_io_logring.txt" ); try { - uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW ); - uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess( xFactory->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + uno::Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(xContext)); uno::Reference< io::XStream > xStream( xSimpleFileAccess->openFileReadWrite( aFileURL ), uno::UNO_SET_THROW ); uno::Reference< io::XOutputStream > xOutStream( xStream->getOutputStream(), uno::UNO_SET_THROW ); uno::Reference< io::XTruncate > xTruncate( xOutStream, uno::UNO_QUERY_THROW ); |