de-macroize ucb filprp

Change-Id: Id8c72bbc527a9dbe706761ed635d5ce621047e8e

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 )

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 )