diff options
author | Noel Grandin <noel@peralex.com> | 2012-11-02 17:46:30 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 08:28:44 +0100 |
commit | 5837402fb1daa437d9a1a37edc9ede57319944f1 (patch) | |
tree | 61e39515cd546fe7ad76364ebb444850b93541ce /basic | |
parent | fdo#46808, use service constructor for i18n::TextConversion (diff) | |
download | core-5837402fb1daa437d9a1a37edc9ede57319944f1.tar.gz core-5837402fb1daa437d9a1a37edc9ede57319944f1.zip |
fdo#46808, use service constructor for ucb::SimpleFileAccess
I upgraded the service to return XSimpleFileAccess3, since it
already implemented that interface, and it's backwards
compatible.
Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 19 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 6 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 65 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 9 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 4 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 24 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 12 |
8 files changed, 65 insertions, 78 deletions
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index a6ae94761c29..3a50d5aaac5e 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -125,7 +125,7 @@ public: ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, SfxDialogLibraryContainer* pParent ); @@ -134,7 +134,7 @@ public: ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& aStorageURL, sal_Bool ReadOnly, SfxDialogLibraryContainer* pParent ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 5213510493fe..893990e95568 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/script/XLibraryContainer3.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess3.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/util/XMacroExpander.hpp> @@ -219,7 +219,7 @@ class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEven OUString msProjectName; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > mxSFI; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > mxSFI; ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander; ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubstitution; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > mxOwnerDocument; @@ -260,7 +260,7 @@ protected: const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, @@ -270,7 +270,7 @@ protected: void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI ); bool implLoadLibraryIndexFile( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib, @@ -310,7 +310,7 @@ protected: virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, sal_Bool bVerifyPasswordOnly=false ) @@ -560,7 +560,7 @@ class SfxLibrary friend class SfxScriptLibraryContainer; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > mxSFI; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > mxSFI; ModifiableHelper& mrModifiable; NameContainer maNameContainer; @@ -621,16 +621,15 @@ public: ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Type& aType, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI ); SfxLibrary( ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Type& aType, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, - const OUString& - aStorageURL, + const OUString& aStorageURL, sal_Bool ReadOnly ); diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index a7bdb200444e..5b063d3d66cb 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -70,7 +70,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& Name, sal_Bool bVerifyPasswordOnly=false ) @@ -160,14 +160,14 @@ public: ( ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI ); SfxScriptLibrary ( ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& aStorageURL, sal_Bool ReadOnly ); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index c6cf5fad1cb5..124608eaafc1 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -55,7 +54,6 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XSeekable.hpp> -using namespace comphelper; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; @@ -224,7 +222,7 @@ bool needSecurityRestrictions( void ) return true; } - Reference< XComponentContext > xContext = getProcessComponentContext(); + Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference< XBridgeFactory2 > xBridgeFac( BridgeFactory::create(xContext) ); Sequence< Reference< XBridge > > aBridgeSeq = xBridgeFac->getExistingBridges(); @@ -279,7 +277,7 @@ bool hasUno( void ) if( bNeedInit ) { bNeedInit = false; - Reference< XComponentContext > xContext = getProcessComponentContext(); + Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); if( !xContext.is() ) { // No service manager at all @@ -571,42 +569,37 @@ SbError SbiStream::Open if( hasUno() ) { - Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory(); - if( xSMgr.is() ) + Reference< XSimpleFileAccess3 > xSFI( SimpleFileAccess::create( comphelper::getProcessComponentContext() ) ); + try { - Reference< XSimpleFileAccess2 > - xSFI( SimpleFileAccess::create( comphelper::getComponentContext(xSMgr) ) ); - try - { - // #??? For write access delete file if it already exists (not for appending) - if( (nStrmMode & STREAM_WRITE) != 0 && !IsAppend() && !IsBinary() && - xSFI->exists( aNameStr ) && !xSFI->isFolder( aNameStr ) ) - { - xSFI->kill( aNameStr ); - } + // #??? For write access delete file if it already exists (not for appending) + if( (nStrmMode & STREAM_WRITE) != 0 && !IsAppend() && !IsBinary() && + xSFI->exists( aNameStr ) && !xSFI->isFolder( aNameStr ) ) + { + xSFI->kill( aNameStr ); + } - if( (nStrmMode & (STREAM_READ | STREAM_WRITE)) == (STREAM_READ | STREAM_WRITE) ) - { - Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr ); - pStrm = new UCBStream( xIS ); - } - else if( nStrmMode & STREAM_WRITE ) - { - Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr ); - pStrm = new UCBStream( xIS ); - } - else //if( nStrmMode & STREAM_READ ) - { - Reference< XInputStream > xIS = xSFI->openFileRead( aNameStr ); - pStrm = new UCBStream( xIS ); - } + if( (nStrmMode & (STREAM_READ | STREAM_WRITE)) == (STREAM_READ | STREAM_WRITE) ) + { + Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr ); + pStrm = new UCBStream( xIS ); + } + else if( nStrmMode & STREAM_WRITE ) + { + Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr ); + pStrm = new UCBStream( xIS ); + } + else //if( nStrmMode & STREAM_READ ) + { + Reference< XInputStream > xIS = xSFI->openFileRead( aNameStr ); + pStrm = new UCBStream( xIS ); + } - } - catch(const Exception & ) - { - nError = ERRCODE_IO_GENERAL; - } + } + catch(const Exception & ) + { + nError = ERRCODE_IO_GENERAL; } } diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 881ee8678c0e..08d6699f9785 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess3.hpp> +#include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/script/XErrorQuery.hpp> #include <ooo/vba/XHelperInterface.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> @@ -175,12 +175,7 @@ static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess( void ) static uno::Reference< ucb::XSimpleFileAccess3 > xSFI; if( !xSFI.is() ) { - uno::Reference< lang::XMultiServiceFactory > xSMgr = getProcessServiceFactory(); - if( xSMgr.is() ) - { - xSFI = uno::Reference< ucb::XSimpleFileAccess3 >( xSMgr->createInstance - ( OUString("com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY ); - } + xSFI = ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ); } return xSFI; } diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 1d77d41ed59e..7820e721bff5 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -539,7 +539,7 @@ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Refere SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess2 >& xSFI, + const Reference< XSimpleFileAccess3 >& xSFI, SfxDialogLibraryContainer* pParent ) : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xMSF, xSFI ) , m_pParent( pParent ) @@ -550,7 +550,7 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess2 >& xSFI, + const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly, diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 7d49a15ef850..c9a67b64e627 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -574,7 +574,7 @@ static void checkAndCopyFileImpl( const INetURLObject& rSourceFolderInetObj, const INetURLObject& rTargetFolderInetObj, const OUString& rCheckFileName, const OUString& rCheckExtension, - Reference< XSimpleFileAccess2 > xSFI ) + Reference< XSimpleFileAccess3 > xSFI ) { INetURLObject aTargetFolderInetObj( rTargetFolderInetObj ); aTargetFolderInetObj.insertName( rCheckFileName, sal_True, INetURLObject::LAST_SEGMENT, @@ -1357,7 +1357,7 @@ sal_Bool SfxLibraryContainer::implStorePasswordLibrary( const OUString& /*aName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& /*xStorage*/, const OUString& /*aTargetURL*/, - const Reference< XSimpleFileAccess2 > /*xToUseSFI*/, + const Reference< XSimpleFileAccess3 > /*xToUseSFI*/, const uno::Reference< task::XInteractionHandler >& ) { return sal_False; @@ -1407,7 +1407,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, const uno::Reference< embed::XStorage >& xStorage ) { OUString aDummyLocation; - Reference< XSimpleFileAccess2 > xDummySFA; + Reference< XSimpleFileAccess3 > xDummySFA; Reference< XInteractionHandler > xDummyHandler; implStoreLibrary( pLib, aName, xStorage, aDummyLocation, xDummySFA, xDummyHandler ); } @@ -1417,7 +1417,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, const OUString& aName, const uno::Reference< embed::XStorage >& xStorage, const OUString& aTargetURL, - Reference< XSimpleFileAccess2 > xToUseSFI, + Reference< XSimpleFileAccess3 > xToUseSFI, const Reference< XInteractionHandler >& xHandler ) { sal_Bool bLink = pLib->mbLink; @@ -1483,7 +1483,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, bool bExport = !aTargetURL.isEmpty(); try { - Reference< XSimpleFileAccess2 > xSFI = mxSFI; + Reference< XSimpleFileAccess3 > xSFI = mxSFI; if( xToUseSFI.is() ) { xSFI = xToUseSFI; @@ -1565,7 +1565,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, const uno::Reference< embed::XStorage >& xStorage ) { OUString aDummyLocation; - Reference< XSimpleFileAccess2 > xDummySFA; + Reference< XSimpleFileAccess3 > xDummySFA; implStoreLibraryIndexFile( pLib, rLib, xStorage, aDummyLocation, xDummySFA ); } @@ -1573,8 +1573,8 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, const uno::Reference< embed::XStorage >& xStorage, - const OUString& aTargetURL, - Reference< XSimpleFileAccess2 > xToUseSFI ) + const ::rtl::OUString& aTargetURL, + Reference< XSimpleFileAccess3 > xToUseSFI ) { // Create sax writer Reference< XWriter > xWriter = xml::sax::Writer::create(comphelper::getComponentContext(mxMSF)); @@ -1618,7 +1618,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, { // Export? bool bExport = !aTargetURL.isEmpty(); - Reference< XSimpleFileAccess2 > xSFI = mxSFI; + Reference< XSimpleFileAccess3 > xSFI = mxSFI; if( xToUseSFI.is() ) { xSFI = xToUseSFI; @@ -2812,7 +2812,7 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); - Reference< XSimpleFileAccess2 > xToUseSFI; + Reference< XSimpleFileAccess3 > xToUseSFI; if( Handler.is() ) { xToUseSFI = ucb::SimpleFileAccess::create( comphelper::getComponentContext(mxMSF) ); @@ -3021,7 +3021,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic // Ctor SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, - const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess2 >& xSFI ) + const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess3 >& xSFI ) : OComponentHelper( m_aMutex ) , mxMSF( xMSF ) , mxSFI( xSFI ) @@ -3043,7 +3043,7 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, } SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, - const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess2 >& xSFI, + const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ) : OComponentHelper( m_aMutex ) , mxMSF( xMSF ) diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 00ffe7893b94..40bbef1afba1 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess3.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEncryptionProtectedSource.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -581,14 +581,14 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { OUString aDummyLocation; - Reference< XSimpleFileAccess2 > xDummySFA; + Reference< XSimpleFileAccess3 > xDummySFA; return implStorePasswordLibrary( pLib, aName, xStorage, aDummyLocation, xDummySFA, xHandler ); } sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& aTargetURL, - const Reference< XSimpleFileAccess2 > xToUseSFI, + const Reference< XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { bool bExport = !aTargetURL.isEmpty(); @@ -730,7 +730,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, { try { - Reference< XSimpleFileAccess2 > xSFI = mxSFI; + Reference< XSimpleFileAccess3 > xSFI = mxSFI; if( xToUseSFI.is() ) { xSFI = xToUseSFI; @@ -1234,7 +1234,7 @@ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::Create( const Refere // Ctor SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess2 >& xSFI ) + const Reference< XSimpleFileAccess3 >& xSFI ) : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xMSF, xSFI ) , mbLoadedSource( false ) , mbLoadedBinary( false ) @@ -1243,7 +1243,7 @@ SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess2 >& xSFI, + const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ) |