tdf#91054: cleanup weirdo function prototypes

cleanup the folders chart2/ and ucb/

Change-Id: Ia5f230703e55da5710eaa52bbd9e22a6395a49ad
Reviewed-on: https://gerrit.libreoffice.org/15832
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 29 insertions, 48 deletions

diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 0b7aaa2d7861..8d8a22c73163 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1632,8 +1632,8 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
     return sal_False;
 }
 
-        uno::Any SAL_CALL ChartController
-::getSelection() throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ChartController::getSelection()
+    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aReturn;
     if ( m_aSelection.hasSelection() )
@@ -1652,10 +1652,8 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
     return aReturn;
 }
 
-        void SAL_CALL ChartController
-::addSelectionChangeListener( const uno::Reference<
-        view::XSelectionChangeListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
+    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
@@ -1665,10 +1663,8 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
     m_aLifeTimeManager.m_aListenerContainer.addInterface( cppu::UnoType<view::XSelectionChangeListener>::get(), xListener );
 }
 
-        void SAL_CALL ChartController
-::removeSelectionChangeListener( const uno::Reference<
-        view::XSelectionChangeListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChartController::removeSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
+    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode?
@@ -1678,8 +1674,7 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
     m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<view::XSelectionChangeListener>::get(), xListener );
 }
 
-        void ChartController
-::impl_notifySelectionChangeListeners()
+void ChartController::impl_notifySelectionChangeListeners()
 {
     ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
         .getContainer( cppu::UnoType<view::XSelectionChangeListener>::get() );
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index daca8983d0b7..ec948277df0b 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -44,8 +44,7 @@ ChartFrameLoader::~ChartFrameLoader()
 {
 }
 
-    bool ChartFrameLoader
-::impl_checkCancel()
+bool ChartFrameLoader::impl_checkCancel()
 {
     if(m_bCancelRequired)
     {
@@ -89,10 +88,8 @@ uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static()
 
 // frame::XFrameLoader
 
-    sal_Bool SAL_CALL ChartFrameLoader
-::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor
-        , const uno::Reference<frame::XFrame >& xFrame )
-        throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor, const uno::Reference<frame::XFrame >& xFrame )
+    throw (uno::RuntimeException, std::exception)
 {
     //@todo ? need to add as terminate listener to desktop?
 
@@ -197,8 +194,8 @@ uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static()
     return sal_True;
 }
 
-    void SAL_CALL ChartFrameLoader
-::cancel() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartFrameLoader::cancel()
+    throw (uno::RuntimeException, std::exception)
 {
     m_oCancelFinished.reset();
     m_bCancelRequired = true;
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 36bf210f7274..7d6d7249d440 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -64,8 +64,8 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     }
     return false;
 }
-            bool LifeTimeManager
-::impl_canStartApiCall()
+
+bool LifeTimeManager::impl_canStartApiCall()
 {
     if( impl_isDisposed() )
         return false; //behave passive if already disposed
@@ -74,8 +74,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     return true;
 }
 
-    void LifeTimeManager
-::impl_registerApiCall(bool bLongLastingCall)
+void LifeTimeManager::impl_registerApiCall(bool bLongLastingCall)
 {
     //only allowed if not disposed
     //do not acquire the mutex here because it will be acquired already
@@ -89,8 +88,8 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     if(m_nLongLastingCallCount==1)
         m_aNoLongLastingCallCountCondition.reset();
 }
-    void LifeTimeManager
-::impl_unregisterApiCall(bool bLongLastingCall)
+
+void LifeTimeManager::impl_unregisterApiCall(bool bLongLastingCall)
 {
     //Mutex needs to be acquired exactly ones
     //mutex may be released inbetween in special case of impl_apiCallCountReachedNull()
@@ -111,8 +110,8 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     }
 }
 
-        bool LifeTimeManager
-::dispose() throw(uno::RuntimeException)
+bool LifeTimeManager::dispose()
+    throw(uno::RuntimeException)
 {
     //hold no mutex
     {
@@ -192,8 +191,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     return false;
 }
 
-        bool CloseableLifeTimeManager
-::g_close_startTryClose(bool bDeliverOwnership)
+bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership)
     throw ( uno::Exception )
 {
     //no mutex is allowed to be acquired
@@ -252,8 +250,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     return true;
 }
 
-    void CloseableLifeTimeManager
-::g_close_endTryClose(bool bDeliverOwnership, bool /* bMyVeto */ )
+void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool /* bMyVeto */ )
 {
     //this method is called, if the try to close was not successful
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
@@ -267,8 +264,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     impl_unregisterApiCall(false);
 }
 
-    bool CloseableLifeTimeManager
-::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex )
+bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex )
     throw ( util::CloseVetoException )
 {
     //this method is called when no closelistener has had a veto during queryclosing
@@ -296,8 +292,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     throw ex;
 }
 
-    void CloseableLifeTimeManager
-::g_close_endTryClose_doClose()
+void CloseableLifeTimeManager::g_close_endTryClose_doClose()
 {
     //this method is called, if the try to close was successful
     osl::ResettableGuard< osl::Mutex > aGuard( m_aAccessMutex );
@@ -316,8 +311,7 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
     m_bOwnership            = bDeliverOwnership && bMyVeto;
 }
 
-    void CloseableLifeTimeManager
-::impl_apiCallCountReachedNull()
+void CloseableLifeTimeManager::impl_apiCallCountReachedNull()
 {
     //Mutex needs to be acquired exactly ones
     //mutex will be released inbetween in impl_doClose()
@@ -325,8 +319,7 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
         impl_doClose();
 }
 
-    void CloseableLifeTimeManager
-::impl_doClose()
+void CloseableLifeTimeManager::impl_doClose()
 {
     //Mutex needs to be acquired exactly ones before calling impl_doClose()
 
@@ -380,8 +373,7 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
     //mutex will be reacquired in destructor of aNegativeGuard
 }
 
-    bool CloseableLifeTimeManager
-::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener )
+bool CloseableLifeTimeManager::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener )
     throw(uno::RuntimeException)
 {
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
@@ -395,8 +387,7 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
     return true;
 }
 
-    bool CloseableLifeTimeManager
-::impl_canStartApiCall()
+bool CloseableLifeTimeManager::impl_canStartApiCall()
 {
     //Mutex needs to be acquired exactly ones before calling this method
     //the mutex will be released inbetween and reacquired
@@ -423,8 +414,7 @@ void CloseableLifeTimeManager::impl_setOwnership( bool bDeliverOwnership, bool b
     return true;
 }
 
-    bool LifeTimeGuard
-::startApiCall(bool bLongLastingCall)
+bool LifeTimeGuard::startApiCall(bool bLongLastingCall)
 {
     //Mutex needs to be acquired exactly ones; will be released inbetween
     //mutex is requiered due to constructor of LifeTimeGuard
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index c9c1ba2930da..7b6128b35cce 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -180,8 +180,7 @@ DrawModelWrapper::~DrawModelWrapper()
     m_pRefDevice.disposeAndClear();
 }
 
-uno::Reference< uno::XInterface > DrawModelWrapper
-::createUnoModel()
+uno::Reference< uno::XInterface > DrawModelWrapper::createUnoModel()
 {
     uno::Reference< lang::XComponent > xComponent = new SvxUnoDrawingModel( this ); //tell Andreas Schluens if SvxUnoDrawingModel is not needed anymore -> remove export from svx to avoid link problems in writer
     return uno::Reference< uno::XInterface >::query( xComponent );