diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-08 22:29:19 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-08 22:56:01 -0600 |
commit | 9bb4d1d9009aee027634229fad8e476c6c6e2fa9 (patch) | |
tree | c75db34f5f8bfc4d63a97260ba7bce60d67db040 /ucb | |
parent | de-macroize ucb filinsreq (diff) | |
download | core-9bb4d1d9009aee027634229fad8e476c6c6e2fa9.tar.gz core-9bb4d1d9009aee027634229fad8e476c6c6e2fa9.zip |
de-macroize ucb filprp
Change-Id: Id8c72bbc527a9dbe706761ed635d5ce621047e8e
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/file/filprp.cxx | 36 | ||||
-rw-r--r-- | ucb/source/ucp/file/filprp.hxx | 31 |
2 files changed, 3 insertions, 64 deletions
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 6987c80e0bd3..72c1e12dab80 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 63540854b796..5d2b24eca436 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 ) |