From 9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Dec 2017 14:20:26 +0200 Subject: loplugin:salcall fix non-virtual methods first, since those are safer to change than virtual methods Change-Id: Ie3b624019d75ee2b793cee33b3c5f64e994e8bfe Reviewed-on: https://gerrit.libreoffice.org/45798 Tested-by: Jenkins Reviewed-by: Noel Grandin --- extensions/source/propctrlr/browserlistbox.cxx | 10 +++++----- extensions/source/propctrlr/browserlistbox.hxx | 6 +++--- extensions/source/propctrlr/commoncontrol.cxx | 4 ++-- extensions/source/propctrlr/commoncontrol.hxx | 10 +++++----- extensions/source/propctrlr/composeduiupdate.cxx | 6 +++--- extensions/source/propctrlr/composeduiupdate.hxx | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'extensions/source') diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 38f5a92c6be8..a68e2aa956ce 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -147,7 +147,7 @@ namespace pcr XPropertyControlContext methods will throw a DisposedException. */ - void SAL_CALL dispose(); + void dispose(); /** sets the notification mode, so that notifications received from the controls are forwarded to our OBrowserListBox either synchronously or asynchronously @@ -207,7 +207,7 @@ namespace pcr } - void SAL_CALL PropertyControlContext_Impl::dispose() + void PropertyControlContext_Impl::dispose() { SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) @@ -918,7 +918,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) + void OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -934,7 +934,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) + void OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -956,7 +956,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) + void OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) { DBG_TESTSOLARMUTEX(); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 9ec019fe9c64..d5a2aa64e85e 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -144,11 +144,11 @@ namespace pcr void CommitModified( ); /// @throws css::uno::RuntimeException - void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); + void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); + void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ); + void activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ); private: // IButtonClickListener diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index c84593501edc..be480faa8846 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -47,12 +47,12 @@ namespace pcr { } - void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) + void CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) { m_xContext = _controlcontext; } - void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( ) + void CommonBehaviourControlHelper::notifyModifiedValue( ) { if ( isModified() && m_xContext.is() ) { diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index ed2261b598ba..b6c0add791e1 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -75,15 +75,15 @@ namespace pcr // XPropertyControl /// @throws css::uno::RuntimeException - ::sal_Int16 SAL_CALL getControlType() { return m_nControlType; } + ::sal_Int16 getControlType() { return m_nControlType; } /// @throws css::uno::RuntimeException - const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() { return m_xContext; } + const css::uno::Reference< css::inspection::XPropertyControlContext >& getControlContext() { return m_xContext; } /// @throws css::uno::RuntimeException - void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ); + void setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ); /// @throws css::uno::RuntimeException - bool SAL_CALL isModified( ) { return m_bModified; } + bool isModified( ) { return m_bModified; } /// @throws css::uno::RuntimeException - void SAL_CALL notifyModifiedValue( ); + void notifyModifiedValue( ); /** (fail-safe) wrapper around calling our context's activateNextControl */ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index c6a1c32a7ea7..86e6bb8f670a 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -711,14 +711,14 @@ namespace pcr } - void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire() + void ComposedPropertyUIUpdate::suspendAutoFire() { impl_checkDisposed(); osl_atomic_increment( &m_nSuspendCounter ); } - void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire() + void ComposedPropertyUIUpdate::resumeAutoFire() { impl_checkDisposed(); if ( 0 == osl_atomic_decrement( &m_nSuspendCounter ) ) @@ -747,7 +747,7 @@ namespace pcr } - void SAL_CALL ComposedPropertyUIUpdate::dispose() + void ComposedPropertyUIUpdate::dispose() { if ( impl_isDisposed() ) return; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index c38c405a334c..805ed2cf5583 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -118,13 +118,13 @@ namespace pcr @seealso resumeAutoFire */ - void SAL_CALL suspendAutoFire(); + void suspendAutoFire(); /** Suspends automatic firing of UI changes @seealso suspendAutoFire */ - void SAL_CALL resumeAutoFire(); + void resumeAutoFire(); /** disposes the instance, so it becomes non-functional. @@ -132,7 +132,7 @@ namespace pcr the latter will also be disposed, so that if anybody still holds a reference to them and tries to operate them will get a DisposedException. */ - void SAL_CALL dispose(); + void dispose(); /** invokes m_pPropertyCheck to check whether a given property should be handled */ -- cgit