diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-23 08:33:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-23 09:58:25 +0200 |
| commit | fcd990f208be4430157dca2d6093337f21cb079b (patch) | |
| tree | 8b132e4081b8f4d9cc4f8aa71f6d937d4f65ef03 /comphelper/source/misc/storagehelper.cxx | |
| parent | 3e7990faa4dda6022c63aebb2ac8f12b2bbc0731 (diff) | |
Some clean up after previous commit
Change-Id: Ie419c769c5d661d51c1b43b9808791dcf9e1725c
Diffstat (limited to 'comphelper/source/misc/storagehelper.cxx')
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index ebe8c4146459..785d4b26dea2 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -19,8 +19,9 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEncryptionProtectedSource2.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -35,7 +36,6 @@ #include <ucbhelper/content.hxx> -#include <comphelper/componentcontext.hxx> #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <comphelper/documentconstants.hxx> @@ -224,20 +224,10 @@ void OStorageHelper::CopyInputToOutput( // ---------------------------------------------------------------------- uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( const ::rtl::OUString& aURL, - const uno::Reference< lang::XMultiServiceFactory >& xSF ) + const uno::Reference< uno::XComponentContext >& context ) throw ( uno::Exception ) { - uno::Reference< lang::XMultiServiceFactory > xFactory = xSF.is() ? xSF : ::comphelper::getProcessServiceFactory(); - if ( !xFactory.is() ) - throw uno::RuntimeException(); - - uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess( - ucb::SimpleFileAccess::create(comphelper::ComponentContext(xFactory).getUNOContext()) ); - - if ( !xTempAccess.is() ) - throw uno::RuntimeException(); - - uno::Reference< io::XInputStream > xInputStream = xTempAccess->openFileRead( aURL ); + uno::Reference< io::XInputStream > xInputStream = ucb::SimpleFileAccess::create(context)->openFileRead( aURL ); if ( !xInputStream.is() ) throw uno::RuntimeException(); |