diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-04 14:20:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-05 07:32:46 +0100 |
commit | 9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 (patch) | |
tree | 544f3e51a3978bd234a1c9fcdbf12d9b84352da4 /framework | |
parent | eaf89e477af94bd3977aca17d72dd442c7604e63 (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 'framework')
-rw-r--r-- | framework/inc/helper/statusindicatorfactory.hxx | 8 | ||||
-rw-r--r-- | framework/inc/recording/dispatchrecorder.hxx | 4 | ||||
-rw-r--r-- | framework/inc/services/desktop.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/constitemcontainer.hxx | 2 | ||||
-rw-r--r-- | framework/source/accelerators/moduleacceleratorconfiguration.cxx | 2 | ||||
-rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 2 | ||||
-rw-r--r-- | framework/source/recording/dispatchrecorder.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/dispatchhelper.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 16 | ||||
-rw-r--r-- | framework/source/uielement/uicommanddescription.cxx | 4 |
11 files changed, 24 insertions, 24 deletions
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index a01b63e261e9..caa384796e7e 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -216,14 +216,14 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper< const OUString& sText , sal_Int32 nRange); - void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ); - void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); // specials diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 369a11d9afe6..79166fb8c87f 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -85,10 +85,10 @@ class DispatchRecorder // private functions private: - void SAL_CALL implts_recordMacro( const OUString& aURL, + void implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, bool bAsComment, OUStringBuffer& ); - void SAL_CALL AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ); + void AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ); }; // class DispatcRecorder diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 58a8be553c8a..a01e102df934 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -282,7 +282,7 @@ class Desktop : private cppu::BaseMutex, // we need this wrapped terminate()-call to terminate even the QuickStarter // non-virtual and non-UNO for now /// @throws css::uno::RuntimeException - bool SAL_CALL terminateQuickstarterToo(); + bool terminateQuickstarterToo(); // protected methods diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index db960358c8ab..5efc22b30fdb 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -87,7 +87,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper< virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override; private: - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::cppu::IPropertyArrayHelper& getInfoHelper(); const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector ); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 051373c3d92a..fe02406cd39f 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -84,7 +84,7 @@ public: } /// This has to be called after when the instance is acquire()'d. - void SAL_CALL fillCache(); + void fillCache(); private: /** helper to listen for configuration changes without ownership cycle problems */ diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index efe3167c81a9..d1e45af96492 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -263,7 +263,7 @@ Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) throw UnknownPropertyException(); } -::cppu::IPropertyArrayHelper& SAL_CALL ConstItemContainer::getInfoHelper() +::cppu::IPropertyArrayHelper& ConstItemContainer::getInfoHelper() { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 2446e02b8368..5832f55d3f0c 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -157,7 +157,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() return sScript; } -void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ) +void DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ) { // if value == bool if (aValue.getValueTypeClass() == css::uno::TypeClass_STRUCT ) @@ -284,7 +284,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUS } } -void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, +void DispatchRecorder::implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, bool bAsComment, OUStringBuffer& aScriptBuffer ) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 119dd5d69697..5fc7a7fc4ce7 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -386,7 +386,7 @@ namespace }; } -bool SAL_CALL Desktop::terminateQuickstarterToo() +bool Desktop::terminateQuickstarterToo() { QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher); m_bSession = true; diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 1c5df528a6bb..3d58fe9bd32c 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -108,7 +108,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( } -css::uno::Any SAL_CALL DispatchHelper::executeDispatch( +css::uno::Any DispatchHelper::executeDispatch( const css::uno::Reference< css::frame::XDispatch >& xDispatch , const css::util::URL& aURL , bool SyncronFlag , diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 5998d7902ccb..17efc5d0386a 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -306,10 +306,10 @@ public: private: - void SAL_CALL impl_setPropertyValue(sal_Int32 nHandle, + void impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue); - css::uno::Any SAL_CALL impl_getPropertyValue(sal_Int32 nHandle); + css::uno::Any impl_getPropertyValue(sal_Int32 nHandle); /** set a new owner for this helper. * @@ -331,11 +331,11 @@ private: * The owner of this class has to be sure, that every new property does * not clash with any existing one. */ - void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty); + void impl_addPropertyInfo(const css::beans::Property& aProperty); /** mark the object as "dead". */ - void SAL_CALL impl_disablePropertySet(); + void impl_disablePropertySet(); bool impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent); @@ -2701,7 +2701,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() return nCurrentLocks; } -void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle, +void Frame::impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) { @@ -2758,7 +2758,7 @@ void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle, } } -css::uno::Any SAL_CALL Frame::impl_getPropertyValue(sal_Int32 nHandle) +css::uno::Any Frame::impl_getPropertyValue(sal_Int32 nHandle) { /* There is no need to lock any mutex here. Because we share the solar mutex with our base class. And we said to our base class: "don't release it on calling us" .-) @@ -2809,7 +2809,7 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un m_xBroadcaster = xBroadcaster; } -void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) +void Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) { SolarMutexGuard g; @@ -2820,7 +2820,7 @@ void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) m_lProps[aProperty.Name] = aProperty; } -void SAL_CALL Frame::impl_disablePropertySet() +void Frame::impl_disablePropertySet() { SolarMutexGuard g; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index bd199b6891b1..ab76bdca2e76 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -92,7 +92,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual void SAL_CALL disposing( const EventObject& aEvent ) override; protected: - css::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); + css::uno::Any getByNameImpl( const OUString& aName ); struct CmdToInfoMap { @@ -208,7 +208,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() } // XNameAccess -Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) +Any ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) { static sal_Int32 nRequests = 0; |