include/ucbhelper/activedatastreamer.hxx | 33 +----
include/ucbhelper/commandenvironment.hxx | 46 +------
ucb/source/ucp/ftp/ftpintreq.cxx | 145 ++-----------------------
ucb/source/ucp/ftp/ftpintreq.hxx | 100 ++---------------
ucbhelper/source/client/activedatastreamer.cxx | 52 --------
ucbhelper/source/client/commandenvironment.cxx | 70 +-----------
6 files changed, 61 insertions(+), 385 deletions(-)
New commits:
commit d364e6eb08dfdc867515d5bf596208cc67b004ad
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Mar 8 15:27:04 2014 -0600
de-macroize ucb ftpcontent
Change-Id: I33bc2982ba9c4490b4a649dd95225328d2877490
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index e968e9c..f2e6beb 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/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();
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 1fedb44..0173d60 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/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;
};
}
commit b4ab8df0a470e67db245da951b4928965838c2d1
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Mar 8 14:22:13 2014 -0600
de-macroize ucbhelper commandenvironment
Change-Id: I39c7ca30d483dab3eae0f39be15ef9586aef7851
diff --git a/include/ucbhelper/commandenvironment.hxx
b/include/ucbhelper/commandenvironment.hxx
index 9a6ad0b..172eb77 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -20,27 +20,21 @@
#ifndef INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
#define INCLUDED_UCBHELPER_COMMANDENVIRONMENT_HXX
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <cppuhelper/weak.hxx>
-#include <ucbhelper/macros.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
+#include <cppuhelper/implbase1.hxx>
namespace ucbhelper
{
-
struct CommandEnvironment_Impl;
-
-
/**
* This class implements the interface
* com::sun::star::ucb::XCommandEnvironement. Instances of this class can
* be used to supply environments to commands executed by UCB contents.
*/
-class UCBHELPER_DLLPUBLIC CommandEnvironment : public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XCommandEnvironment
+class UCBHELPER_DLLPUBLIC CommandEnvironment :
+ public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment >
{
CommandEnvironment_Impl* m_pImpl;
@@ -57,39 +51,21 @@ public:
* @param rxProgressHandler is the implementation of a Progress
* Handler or an empty reference.
*/
- CommandEnvironment(
- const com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler >&
- rxInteractionHandler,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XProgressHandler >&
- rxProgressHandler );
+ CommandEnvironment( const css::uno::Reference<
css::task::XInteractionHandler >& rxInteractionHandler,
+ const css::uno::Reference< css::ucb::XProgressHandler
>& rxProgressHandler );
/**
* Destructor.
*/
virtual ~CommandEnvironment();
- // XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
- throw( css::uno::RuntimeException, std::exception );
- virtual void SAL_CALL acquire()
- throw();
- virtual void SAL_CALL release()
- throw();
-
- // XTypeProvider
- XTYPEPROVIDER_DECL()
-
// XCommandEnvironemnt
- virtual com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler > SAL_CALL
- getInteractionHandler()
- throw ( com::sun::star::uno::RuntimeException, std::exception );
+ virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL
getInteractionHandler()
+ throw ( css::uno::RuntimeException,
+ std::exception );
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XProgressHandler > SAL_CALL
- getProgressHandler()
- throw ( com::sun::star::uno::RuntimeException, std::exception );
+ virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL
getProgressHandler()
+ throw ( css::uno::RuntimeException,
+ std::exception );
};
} /* namespace ucbhelper */
diff --git a/ucbhelper/source/client/commandenvironment.cxx
b/ucbhelper/source/client/commandenvironment.cxx
index 80b0004..d083f5a 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -37,35 +37,21 @@ using namespace com::sun::star::uno;
namespace ucbhelper
{
-
-
-
-
// struct CommandEnvironment_Impl.
-
-
-
struct CommandEnvironment_Impl
{
Reference< XInteractionHandler > m_xInteractionHandler;
- Reference< XProgressHandler > m_xProgressHandler;
+ Reference< XProgressHandler > m_xProgressHandler;
- CommandEnvironment_Impl(
- const Reference< XInteractionHandler >& rxInteractionHandler,
- const Reference< XProgressHandler >& rxProgressHandler )
- : m_xInteractionHandler( rxInteractionHandler ),
- m_xProgressHandler( rxProgressHandler ) {}
+ CommandEnvironment_Impl( const Reference< XInteractionHandler >&
rxInteractionHandler,
+ const Reference< XProgressHandler >&
rxProgressHandler )
+ : m_xInteractionHandler( rxInteractionHandler )
+ , m_xProgressHandler( rxProgressHandler ) {}
};
-
-
-
// CommandEnvironment Implementation.
-
-
-
CommandEnvironment::CommandEnvironment(
const Reference< XInteractionHandler >& rxInteractionHandler,
const Reference< XProgressHandler >& rxProgressHandler )
@@ -74,65 +60,23 @@ CommandEnvironment::CommandEnvironment(
rxProgressHandler );
}
-
// virtual
CommandEnvironment::~CommandEnvironment()
{
delete m_pImpl;
}
-
-
-// XInterface methods
-
-void SAL_CALL CommandEnvironment::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL CommandEnvironment::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CommandEnvironment::queryInterface( const
css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- (static_cast< XTypeProvider*
>(this)),
- (static_cast<
XCommandEnvironment* >(this))
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods
-
-
-
-XTYPEPROVIDER_IMPL_2( CommandEnvironment,
- XTypeProvider,
- XCommandEnvironment );
-
-
-
// XCommandEnvironemnt methods.
-
-
// virtual
-Reference< XInteractionHandler > SAL_CALL
-CommandEnvironment::getInteractionHandler()
+Reference< XInteractionHandler > SAL_CALL
CommandEnvironment::getInteractionHandler()
throw ( RuntimeException, std::exception )
{
return m_pImpl->m_xInteractionHandler;
}
-
// virtual
-Reference< XProgressHandler > SAL_CALL
-CommandEnvironment::getProgressHandler()
+Reference< XProgressHandler > SAL_CALL CommandEnvironment::getProgressHandler()
throw ( RuntimeException, std::exception )
{
return m_pImpl->m_xProgressHandler;
commit a14e1cb35b93131ee8492cffdf936097f4fc8306
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Mar 8 14:12:42 2014 -0600
de-macroize ucbhelper activedatastreamer
Change-Id: I55bbce1f8e3c0dcd92d0e2af03d7be5c7ac910c0
diff --git a/include/ucbhelper/activedatastreamer.hxx
b/include/ucbhelper/activedatastreamer.hxx
index 0c1af6a..71b9675 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
#define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/io/XActiveDataStreamer.hpp>
-#include <cppuhelper/weak.hxx>
-#include <ucbhelper/macros.hxx>
+#include <cppuhelper/implbase1.hxx>
namespace ucbhelper
{
@@ -36,30 +34,19 @@ namespace ucbhelper
* "open" command.
*/
-class ActiveDataStreamer : public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::io::XActiveDataStreamer
+class ActiveDataStreamer :
+ public cppu::WeakImplHelper1< css::io::XActiveDataStreamer >
{
- com::sun::star::uno::Reference<
- com::sun::star::io::XStream > m_xStream;
+ css::uno::Reference< css::io::XStream > m_xStream;
public:
- // XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
- throw( css::uno::RuntimeException, std::exception );
- virtual void SAL_CALL acquire()
- throw();
- virtual void SAL_CALL release()
- throw();
-
- // XTypeProvider
- XTYPEPROVIDER_DECL()
-
// XActiveDataStreamer methods.
- virtual void SAL_CALL setStream( const com::sun::star::uno::Reference<
com::sun::star::io::XStream >& xStream )
- throw( com::sun::star::uno::RuntimeException, std::exception );
- virtual com::sun::star::uno::Reference< com::sun::star::io::XStream >
SAL_CALL getStream()
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL setStream( const css::uno::Reference<
css::io::XStream >& xStream )
+ throw( css::uno::RuntimeException,
+ std::exception );
+ virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream()
+ throw( css::uno::RuntimeException,
+ std::exception );
};
} /* namespace ucbhelper */
diff --git a/ucbhelper/source/client/activedatastreamer.cxx
b/ucbhelper/source/client/activedatastreamer.cxx
index 15baa8e..0190b6d 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -29,66 +29,22 @@ using namespace com::sun::star;
namespace ucbhelper
{
-
-
-
-
// ActiveDataStreamer Implementation.
-
-
-
-
-
-// XInterface methods
-
-void SAL_CALL ActiveDataStreamer::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL ActiveDataStreamer::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ActiveDataStreamer::queryInterface( const
css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- (static_cast<
lang::XTypeProvider* >(this)),
- (static_cast<
io::XActiveDataStreamer* >(this))
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods
-
-
-
-XTYPEPROVIDER_IMPL_2( ActiveDataStreamer,
- lang::XTypeProvider,
- io::XActiveDataStreamer );
-
-
-
// XActiveDataStreamer methods.
-
-
// virtual
void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream
>& xStream )
- throw( uno::RuntimeException, std::exception )
+ throw( uno::RuntimeException,
+ std::exception )
{
m_xStream = xStream;
}
-
// virtual
uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream()
- throw( uno::RuntimeException, std::exception )
+ throw( uno::RuntimeException,
+ std::exception )
{
return m_xStream;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
