de-macroize ucb ftpcontent

Change-Id: I33bc2982ba9c4490b4a649dd95225328d2877490

ucb/source/ucp/ftp/ftpintreq.cxx

@@ -36,47 +36,9 @@ XInteractionApproveImpl::XInteractionApproveImpl()
 {
 }
 
-
-void SAL_CALL
-XInteractionApproveImpl::acquire( void )
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-XInteractionApproveImpl::release( void )
-    throw()
-{
-    OWeakObject::release();
-}
-
-
-
-Any SAL_CALL
-XInteractionApproveImpl::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
-{
-    Any aRet = cppu::queryInterface(
-        rType,
-        (static_cast< lang::XTypeProvider* >(this)),
-        (static_cast< XInteractionApprove* >(this)) );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-
-//  XTypeProvider
-
-
-XTYPEPROVIDER_IMPL_2( XInteractionApproveImpl,
-                      XTypeProvider,
-                      XInteractionApprove )
-
-
 void SAL_CALL XInteractionApproveImpl::select()
-    throw (RuntimeException, std::exception)
+    throw (RuntimeException,
+           std::exception)
 {
     m_bSelected = true;
 }
@@ -95,107 +57,28 @@ XInteractionDisapproveImpl::XInteractionDisapproveImpl()
 {
 }
 
-
-void SAL_CALL
-XInteractionDisapproveImpl::acquire( void )
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-XInteractionDisapproveImpl::release( void )
-    throw()
-{
-    OWeakObject::release();
-}
-
-
-
-Any SAL_CALL
-XInteractionDisapproveImpl::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
-{
-    Any aRet = cppu::queryInterface(
-        rType,
-        (static_cast< lang::XTypeProvider* >(this)),
-        (static_cast< XInteractionDisapprove* >(this)) );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-
-//  XTypeProvider
-
-
-XTYPEPROVIDER_IMPL_2( XInteractionDisapproveImpl,
-                      XTypeProvider,
-                      XInteractionDisapprove )
-
-
 void SAL_CALL XInteractionDisapproveImpl::select()
-    throw (RuntimeException, std::exception)
-
+    throw (RuntimeException,
+           std::exception)
 {
     m_bSelected = true;
 }
 
-
 // XInteractionRequestImpl
 
 XInteractionRequestImpl::XInteractionRequestImpl(const OUString& aName)
-    : p1( new XInteractionApproveImpl ),
-      p2( new XInteractionDisapproveImpl ),
-      m_aName(aName),
-      m_aSeq( 2 )
+    : p1( new XInteractionApproveImpl )
+    , p2( new XInteractionDisapproveImpl )
+    , m_aName(aName)
+    , m_aSeq( 2 )
 {
     m_aSeq[0] = Reference<XInteractionContinuation>(p1);
     m_aSeq[1] = Reference<XInteractionContinuation>(p2);
 }
 
-
-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)
+    throw (RuntimeException,
+           std::exception)
 {
     Any aAny;
     UnsupportedNameClashException excep;
@@ -204,15 +87,13 @@ Any SAL_CALL XInteractionRequestImpl::getRequest(  )
     return aAny;
 }
 
-
-Sequence<Reference<XInteractionContinuation > > SAL_CALL
-XInteractionRequestImpl::getContinuations(  )
-    throw (RuntimeException, std::exception)
+Sequence<Reference<XInteractionContinuation > > SAL_CALL XInteractionRequestImpl::getContinuations()
+    throw (RuntimeException,
+           std::exception)
 {
     return m_aSeq;
 }
 
-
 bool XInteractionRequestImpl::approved() const
 {
     return p1->isSelected();

ucb/source/ucp/ftp/ftpintreq.hxx

@@ -28,42 +28,21 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
+#include <cppuhelper/implbase1.hxx>
 
 
 namespace ftp {
 
-
-    class XInteractionApproveImpl
-        : public cppu::OWeakObject,
-          public com::sun::star::lang::XTypeProvider,
-          public com::sun::star::task::XInteractionApprove
+    class XInteractionApproveImpl : public cppu::WeakImplHelper1 <
+        css::task::XInteractionApprove >
     {
     public:
 
         XInteractionApproveImpl();
 
-        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);
+            throw (css::uno::RuntimeException,
+                   std::exception);
 
         bool isSelected() const;
 
@@ -75,35 +54,13 @@ namespace ftp {
 
 
 
-    class XInteractionDisapproveImpl
-        : public cppu::OWeakObject,
-          public com::sun::star::lang::XTypeProvider,
-          public com::sun::star::task::XInteractionDisapprove
+    class XInteractionDisapproveImpl : public cppu::WeakImplHelper1 <
+        css::task::XInteractionDisapprove >
     {
     public:
 
         XInteractionDisapproveImpl();
 
-        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);
 
@@ -114,44 +71,21 @@ namespace ftp {
 
 
 
-    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:
 
         XInteractionRequestImpl(const OUString& aName);
 
-        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();
-
+        com::sun::star::uno::Any SAL_CALL getRequest(  )
+            throw (css::uno::RuntimeException,
+                   std::exception);
 
-        // XTypeProvider
-
-        XTYPEPROVIDER_DECL()
-
-        com::sun::star::uno::Any SAL_CALL
-        getRequest(  )
-            throw (com::sun::star::uno::RuntimeException, std::exception);
-
-        com::sun::star::uno::Sequence<
-            com::sun::star::uno::Reference<
-            com::sun::star::task::XInteractionContinuation > > SAL_CALL
+        css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL
         getContinuations(  )
-            throw (com::sun::star::uno::RuntimeException, std::exception);
+            throw (css::uno::RuntimeException,
+                   std::exception);
 
         bool approved() const;
 
@@ -162,9 +96,7 @@ namespace ftp {
 
         OUString m_aName;
 
-        com::sun::star::uno::Sequence<
-            com::sun::star::uno::Reference<
-            com::sun::star::task::XInteractionContinuation > > m_aSeq;
+        css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_aSeq;
     };
 
 }