de-macroize ucbhelper commandenvironment

Change-Id: I39c7ca30d483dab3eae0f39be15ef9586aef7851

1 files changed, 7 insertions, 63 deletions

diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index 80b0004b6035..d083f5a8595b 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;