summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-04 14:20:26 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-05 07:32:46 +0100
commit9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 (patch)
tree544f3e51a3978bd234a1c9fcdbf12d9b84352da4 /forms
parenteaf89e477af94bd3977aca17d72dd442c7604e63 (diff)
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 <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/Columns.cxx4
-rw-r--r--forms/source/component/Columns.hxx4
-rw-r--r--forms/source/component/EditBase.hxx4
-rw-r--r--forms/source/component/errorbroadcaster.cxx6
-rw-r--r--forms/source/component/errorbroadcaster.hxx6
-rw-r--r--forms/source/helper/controlfeatureinterception.cxx4
-rw-r--r--forms/source/helper/formnavigation.cxx2
-rw-r--r--forms/source/inc/controlfeatureinterception.hxx6
-rw-r--r--forms/source/inc/formnavigation.hxx2
-rw-r--r--forms/source/inc/propertybaghelper.hxx2
10 files changed, 20 insertions, 20 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 32d5c4db1e94..ed6bfae0daa6 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -466,7 +466,7 @@ Reference< XCloneable > SAL_CALL OGridColumn::createClone( )
// XPersistObject
-void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream)
+void OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream)
{
// 1. Write the UnoControl
Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY);
@@ -514,7 +514,7 @@ void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStr
}
-void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream)
+void OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream)
{
// 1. Read the UnoControl
sal_Int32 nLen = _rxInStream->readLong();
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 26b6aec61cbd..66a61056ac7e 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -85,8 +85,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
// XPersistObject
- void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
- void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
+ void write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
+ void read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
// XPropertySet
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0;
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 3790e4f5d6b7..a98b91b51a57 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -84,8 +84,8 @@ public:
protected:
// new properties common to all edit models should be handled with the following two methods
- void SAL_CALL readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
- void SAL_CALL writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
+ void readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream);
+ void writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
void defaultCommonEditProperties();
virtual sal_uInt16 getPersistenceFlags() const;
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index b73b96c3a0e0..fe1121c660c5 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -51,14 +51,14 @@ namespace frm
}
- void SAL_CALL OErrorBroadcaster::disposing()
+ void OErrorBroadcaster::disposing()
{
EventObject aDisposeEvent( static_cast< XSQLErrorBroadcaster* >( this ) );
m_aErrorListeners.disposeAndClear( aDisposeEvent );
}
- void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
+ void OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
{
Any aError;
if ( !_rContextDescription.isEmpty() )
@@ -70,7 +70,7 @@ namespace frm
}
- void SAL_CALL OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError )
+ void OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError )
{
if ( m_aErrorListeners.getLength() )
{
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index 0f445900a85f..b60bfcecce0f 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -44,10 +44,10 @@ namespace frm
explicit OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper );
virtual ~OErrorBroadcaster( );
- void SAL_CALL disposing();
+ void disposing();
- void SAL_CALL onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription );
- void SAL_CALL onError( const css::sdb::SQLErrorEvent& _rException );
+ void onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription );
+ void onError( const css::sdb::SQLErrorEvent& _rException );
protected:
// XSQLErrorBroadcaster
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index f3299dea6499..5e79a5c65995 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -37,7 +37,7 @@ namespace frm
}
- void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
+ void ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
if ( !_rxInterceptor.is() )
{
@@ -60,7 +60,7 @@ namespace frm
}
- void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
+ void ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
{
if ( !_rxInterceptor.is() )
{
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 529ba5f1f81a..89f2e7a6ad66 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -52,7 +52,7 @@ namespace frm
}
- void SAL_CALL OFormNavigationHelper::dispose( )
+ void OFormNavigationHelper::dispose( )
{
m_pFeatureInterception->dispose();
disconnectDispatchers();
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index 80d3a2cab8f0..f89af1d1827a 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -61,12 +61,12 @@ namespace frm
// XDispatchProviderInterception
/// @throws css::uno::RuntimeException
- void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
+ void registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
/// @throws css::uno::RuntimeException
- void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
+ void releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
// XComponent
- void SAL_CALL dispose();
+ void dispose();
/** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags
*/
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index b0f8663075fe..e1068f7bb526 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -79,7 +79,7 @@ namespace frm
// XComponent
/// @throws css::uno::RuntimeException
- void SAL_CALL dispose( );
+ void dispose( );
// XDispatchProviderInterception
virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index e3d86b3673a7..0e93500ad1a2 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -76,7 +76,7 @@ namespace frm
void removeProperty( const OUString& _rName );
// XPropertyAccess equivalent
- css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues();
+ css::uno::Sequence< css::beans::PropertyValue > getPropertyValues();
void setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& _rProps );
// forwards to m_aDynamicProperties