diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-08 22:41:20 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-08 22:56:03 -0600 |
commit | 76f279a52fdce1d82ecd5e96e7968821e9ec3007 (patch) | |
tree | af2e1b65111b121abf9b75c44f6307363adb886e /ucb | |
parent | de-macroize ucb filrset (diff) | |
download | core-76f279a52fdce1d82ecd5e96e7968821e9ec3007.tar.gz core-76f279a52fdce1d82ecd5e96e7968821e9ec3007.zip |
de-macroize ucb filstr
Change-Id: I08f7d8360a3abdac1b12bd3cfb157e408b0aabbe
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 52 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.hxx | 44 |
2 files changed, 8 insertions, 88 deletions
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 054f2fbe1ea7..dd439e7d4af7 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -40,58 +40,6 @@ using namespace com::sun::star::ucb; /* */ /******************************************************************************/ - -uno::Any SAL_CALL -XStream_impl::queryInterface( - const uno::Type& rType ) - throw( uno::RuntimeException, std::exception) -{ - uno::Any aRet = cppu::queryInterface( rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< io::XStream* >(this)), - (static_cast< io::XInputStream* >(this)), - (static_cast< io::XOutputStream* >(this)), - (static_cast< io::XSeekable* >(this)), - (static_cast< io::XTruncate* >(this)), - (static_cast< io::XAsyncOutputMonitor* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - -void SAL_CALL -XStream_impl::acquire( - void ) - throw() -{ - OWeakObject::acquire(); -} - - -void SAL_CALL -XStream_impl::release( - void ) - throw() -{ - OWeakObject::release(); -} - - - -// XTypeProvider - - - -XTYPEPROVIDER_IMPL_7( XStream_impl, - lang::XTypeProvider, - io::XStream, - io::XSeekable, - io::XInputStream, - io::XOutputStream, - io::XTruncate, - io::XAsyncOutputMonitor ) - - - XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 66f7f9376be5..f5a870a05d21 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -21,10 +21,7 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -32,6 +29,7 @@ #include <com/sun/star/io/XStream.hpp> #include "com/sun/star/io/XAsyncOutputMonitor.hpp" #include <com/sun/star/ucb/XContentProvider.hpp> +#include <cppuhelper/implbase6.hxx> #include "filrec.hxx" @@ -40,15 +38,13 @@ namespace fileaccess { // forward: class shell; - class XStream_impl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::io::XStream, - public com::sun::star::io::XSeekable, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XOutputStream, - public com::sun::star::io::XTruncate, - public com::sun::star::io::XAsyncOutputMonitor +class XStream_impl : public cppu::WeakImplHelper6< + css::io::XStream, + css::io::XSeekable, + css::io::XInputStream, + css::io::XOutputStream, + css::io::XTruncate, + css::io::XAsyncOutputMonitor > { public: @@ -64,30 +60,6 @@ namespace fileaccess { virtual ~XStream_impl(); - - // OWeakObject - - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception); - - virtual void SAL_CALL - acquire( - void ) - throw(); - - virtual void SAL_CALL - release( - void ) - throw(); - - - // XTypeProvider - - XTYPEPROVIDER_DECL() - - // XStream virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL |