ucb/source/ucp/file/filinsreq.cxx | 119 -------------------------------------- ucb/source/ucp/file/filinsreq.hxx | 84 ++------------------------ ucb/source/ucp/file/filprp.cxx | 36 ----------- ucb/source/ucp/file/filprp.hxx | 31 --------- ucb/source/ucp/file/filrow.cxx | 34 ---------- ucb/source/ucp/file/filrow.hxx | 31 --------- ucb/source/ucp/file/filrset.cxx | 53 ---------------- ucb/source/ucp/file/filrset.hxx | 48 +++------------ ucb/source/ucp/file/filstr.cxx | 52 ---------------- ucb/source/ucp/file/filstr.hxx | 44 ++------------ 10 files changed, 31 insertions(+), 501 deletions(-)
New commits: commit 76f279a52fdce1d82ecd5e96e7968821e9ec3007 Author: Norbert Thiebaud <[email protected]> Date: Sat Mar 8 22:41:20 2014 -0600 de-macroize ucb filstr Change-Id: I08f7d8360a3abdac1b12bd3cfb157e408b0aabbe diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 054f2fb..dd439e7 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 66f7f93..f5a870a 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 commit 403c674b44617597ef14377ff52a004df0e56e02 Author: Norbert Thiebaud <[email protected]> Date: Sat Mar 8 22:37:57 2014 -0600 de-macroize ucb filrset Change-Id: I48a7aa2eaa5c2694eae0e9139ba7d2f165a195d1 diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 952b0ab..e49f5d9 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -107,46 +107,6 @@ sal_Int32 SAL_CALL XResultSet_impl::getMinorError() void SAL_CALL -XResultSet_impl::acquire( - void ) - throw() -{ - OWeakObject::acquire(); -} - - -void SAL_CALL -XResultSet_impl::release( - void ) - throw() -{ - OWeakObject::release(); -} - - - -uno::Any SAL_CALL -XResultSet_impl::queryInterface( - const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) -{ - uno::Any aRet = cppu::queryInterface( - rType, - (static_cast< lang::XComponent* >(this)), - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< lang::XEventListener* >(this)), - (static_cast< sdbc::XRow* >(this)), - (static_cast< sdbc::XResultSet* >(this)), - (static_cast< sdbc::XCloseable* >(this)), - (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)), - (static_cast< beans::XPropertySet* >(this)), - (static_cast< ucb::XContentAccess* >(this)), - (static_cast< ucb::XDynamicResultSet* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - -void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) { @@ -154,19 +114,6 @@ XResultSet_impl::disposing( const lang::EventObject& ) } -XTYPEPROVIDER_IMPL_10( XResultSet_impl, - lang::XTypeProvider, - lang::XTypeProvider, - lang::XEventListener, - sdbc::XRow, - sdbc::XResultSet, - XDynamicResultSet, - sdbc::XCloseable, - sdbc::XResultSetMetaDataSupplier, - beans::XPropertySet, - ucb::XContentAccess ) - - void SAL_CALL XResultSet_impl::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 9543e31..23e1fc7 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -20,13 +20,9 @@ #define _FILRSET_HXX_ #include <vector> -#include <ucbhelper/macros.hxx> #include <osl/file.hxx> -#include "osl/mutex.hxx" -#include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -39,6 +35,7 @@ #include <com/sun/star/beans/Property.hpp> #include "filrow.hxx" #include "filnot.hxx" +#include <cppuhelper/implbase8.hxx> @@ -46,18 +43,15 @@ namespace fileaccess { class Notifier; - class XResultSet_impl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XEventListener, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XResultSet, - public com::sun::star::ucb::XDynamicResultSet, - public com::sun::star::sdbc::XCloseable, - public com::sun::star::sdbc::XResultSetMetaDataSupplier, - public com::sun::star::beans::XPropertySet, - public com::sun::star::ucb::XContentAccess, - public Notifier +class XResultSet_impl : public Notifier, + public cppu::WeakImplHelper8< css::lang::XEventListener, + css::sdbc::XRow, + css::sdbc::XResultSet, + css::ucb::XDynamicResultSet, + css::sdbc::XCloseable, + css::sdbc::XResultSetMetaDataSupplier, + css::beans::XPropertySet, + css::ucb::XContentAccess > { public: @@ -102,28 +96,6 @@ namespace fileaccess { sal_Int32 SAL_CALL CtorSuccess(); sal_Int32 SAL_CALL getMinorError(); - // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& aType ) - 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() - - // XEventListener virtual void SAL_CALL disposing( commit f72078e88759a520e61edb23572fe6c5b918b3a7 Author: Norbert Thiebaud <[email protected]> Date: Sat Mar 8 22:32:00 2014 -0600 de-macroize ucb filrow Change-Id: I2dc553b5618a61079e6fa1c56c77268fdbfd158b diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index b91525c..9569a23 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -88,40 +88,6 @@ XRow_impl::~XRow_impl() } -void SAL_CALL -XRow_impl::acquire( - void ) - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL -XRow_impl::release( - void ) - throw() -{ - OWeakObject::release(); -} - - -uno::Any SAL_CALL -XRow_impl::queryInterface( - const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) -{ - uno::Any aRet = cppu::queryInterface( rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< sdbc::XRow* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - -XTYPEPROVIDER_IMPL_2( XRow_impl, - lang::XTypeProvider, - sdbc::XRow ) - - sal_Bool SAL_CALL XRow_impl::wasNull( void ) diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index e7de455..f97d19b 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -19,47 +19,22 @@ #ifndef _FILROW_HXX_ #define _FILROW_HXX_ -#include <ucbhelper/macros.hxx> - -#include "osl/mutex.hxx" -#include <cppuhelper/weak.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/script/XTypeConverter.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> +#include <cppuhelper/implbase1.hxx> namespace fileaccess { class shell; - class XRow_impl: - public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::sdbc::XRow + class XRow_impl: public cppu::WeakImplHelper1< + css::sdbc::XRow > { public: XRow_impl( shell* pShell,const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& __m_aValueMap ); ~XRow_impl(); - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& aType ) - 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() - virtual sal_Bool SAL_CALL wasNull( void ) commit 9bb4d1d9009aee027634229fad8e476c6c6e2fa9 Author: Norbert Thiebaud <[email protected]> Date: Sat Mar 8 22:29:19 2014 -0600 de-macroize ucb filprp Change-Id: Id8c72bbc527a9dbe706761ed635d5ce621047e8e diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 6987c80..72c1e12 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -75,42 +75,6 @@ XPropertySetInfo_impl::~XPropertySetInfo_impl() } -void SAL_CALL -XPropertySetInfo_impl::acquire( - void ) - throw() -{ - OWeakObject::acquire(); -} - - -void SAL_CALL -XPropertySetInfo_impl::release( - void ) - throw() -{ - OWeakObject::release(); -} - - - -XTYPEPROVIDER_IMPL_2( XPropertySetInfo_impl, - lang::XTypeProvider, - beans::XPropertySetInfo ) - - -Any SAL_CALL -XPropertySetInfo_impl::queryInterface( - const Type& rType ) - throw( RuntimeException, std::exception ) -{ - Any aRet = cppu::queryInterface( rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< beans::XPropertySetInfo* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 6354085..5d2b24e 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -19,21 +19,17 @@ #ifndef _FILPRP_HXX_ #define _FILPRP_HXX_ -#include <ucbhelper/macros.hxx> -#include <cppuhelper/weak.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> +#include <cppuhelper/implbase1.hxx> namespace fileaccess { class shell; - class XPropertySetInfo_impl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::beans::XPropertySetInfo +class XPropertySetInfo_impl : public cppu::WeakImplHelper1< + css::beans::XPropertySetInfo > { public: XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); @@ -41,27 +37,6 @@ namespace fileaccess { virtual ~XPropertySetInfo_impl(); - // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( - const com::sun::star::uno::Type& aType ) - 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() - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties( void ) commit 9cb66e66e7aeb416b8d1560f2cf2ac6a26d722d4 Author: Norbert Thiebaud <[email protected]> Date: Sat Mar 8 22:26:57 2014 -0600 de-macroize ucb filinsreq Change-Id: I880eff465f48882b17779e9e707b82d44ac27531 diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 4ae0826..a2eb970 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -37,85 +37,6 @@ using namespace com::sun::star::beans; using namespace fileaccess; - -void SAL_CALL -XInteractionSupplyNameImpl::acquire( void ) - throw() -{ - OWeakObject::acquire(); -} - - - -void SAL_CALL -XInteractionSupplyNameImpl::release( void ) - throw() -{ - OWeakObject::release(); -} - - - -Any SAL_CALL -XInteractionSupplyNameImpl::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) -{ - Any aRet = cppu::queryInterface( rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< XInteractionSupplyName* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - - -// XTypeProvider - - -XTYPEPROVIDER_IMPL_2( XInteractionSupplyNameImpl, - XTypeProvider, - XInteractionSupplyName ) - - - -void SAL_CALL -XInteractionAbortImpl::acquire( void ) - throw() -{ - OWeakObject::acquire(); -} - - - -void SAL_CALL -XInteractionAbortImpl::release( void ) - throw() -{ - OWeakObject::release(); -} - - - -Any SAL_CALL -XInteractionAbortImpl::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) -{ - Any aRet = cppu::queryInterface( rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< XInteractionAbort* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - - -// XTypeProvider - - -XTYPEPROVIDER_IMPL_2( XInteractionAbortImpl, - XTypeProvider, - XInteractionAbort ) - - - XInteractionRequestImpl::XInteractionRequestImpl( const OUString& aClashingName, const Reference<XInterface>& xOrigin, @@ -135,46 +56,6 @@ XInteractionRequestImpl::XInteractionRequestImpl( } -void SAL_CALL -XInteractionRequestImpl::acquire( void ) - throw() -{ - OWeakObject::acquire(); -} - - - -void SAL_CALL -XInteractionRequestImpl::release( void ) - throw() -{ - OWeakObject::release(); -} - - - -Any SAL_CALL -XInteractionRequestImpl::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) -{ - Any aRet = - cppu::queryInterface( - rType, - (static_cast< lang::XTypeProvider* >(this)), - (static_cast< XInteractionRequest* >(this)) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - - - -// XTypeProvider - - -XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl, - XTypeProvider, - XInteractionRequest ) - - Any SAL_CALL XInteractionRequestImpl::getRequest() throw(RuntimeException, std::exception) diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index a3cc8d9..b448bf9 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -21,14 +21,12 @@ #ifndef _FILINSREQ_HXX_ #define _FILINSREQ_HXX_ -#include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ucb/XInteractionSupplyName.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> +#include <cppuhelper/implbase1.hxx> namespace fileaccess { @@ -37,10 +35,8 @@ namespace fileaccess { class shell; - class XInteractionSupplyNameImpl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XInteractionSupplyName +class XInteractionSupplyNameImpl : public cppu::WeakImplHelper1< + css::ucb::XInteractionSupplyName > { public: @@ -49,27 +45,6 @@ namespace fileaccess { { } - 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() - - virtual void SAL_CALL select() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -100,10 +75,8 @@ namespace fileaccess { - class XInteractionAbortImpl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionAbort + class XInteractionAbortImpl : public cppu::WeakImplHelper1< + css::task::XInteractionAbort > { public: @@ -112,27 +85,6 @@ namespace fileaccess { { } - 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() - - virtual void SAL_CALL select() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -152,10 +104,8 @@ namespace fileaccess { - class XInteractionRequestImpl - : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionRequest + class XInteractionRequestImpl : public cppu::WeakImplHelper1< + css::task::XInteractionRequest > { public: @@ -166,26 +116,6 @@ namespace fileaccess { shell* pShell, sal_Int32 CommandId); - 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() - ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw (::com::sun::star::uno::RuntimeException, std::exception); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
