de-macroize ucb filinsreq

Change-Id: I880eff465f48882b17779e9e707b82d44ac27531

2 files changed, 7 insertions, 196 deletions

diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 4ae082618aa4..a2eb9709e1fc 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 a3cc8d93e132..b448bf9ae581 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);