de-macroize ucb filrow

Change-Id: I2dc553b5618a61079e6fa1c56c77268fdbfd158b

2 files changed, 3 insertions, 62 deletions

diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index b91525cde3ca..9569a239586d 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 e7de455589df..f97d19b6f3b2 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 )