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>

5 files changed, 34 insertions, 34 deletions

diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 938ee61c8b2c..d1f1199ff7e7 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -89,7 +89,7 @@ SfxFilterListener::~SfxFilterListener()
 {
 }
 
-void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource )
+void SfxFilterListener::refreshed( const lang::EventObject& aSource )
 {
     SolarMutexGuard aGuard;
     uno::Reference< util::XRefreshable > xContainer( aSource.Source, uno::UNO_QUERY );
@@ -102,7 +102,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource )
     }
 }
 
-void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource )
+void SfxFilterListener::disposing( const lang::EventObject& aSource )
 {
     SolarMutexGuard aGuard;
     uno::Reference< util::XRefreshable > xNotifier( aSource.Source, uno::UNO_QUERY );
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index bf4d348a0e44..29f0c3bb88fe 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -42,10 +42,10 @@ class SfxFilterListener final
     public:
         // XRefreshListener
         /// @throws css::uno::RuntimeException
-        void SAL_CALL refreshed( const css::lang::EventObject& aSource );
+        void refreshed( const css::lang::EventObject& aSource );
         // XEventListener
         /// @throws css::uno::RuntimeException
-        void SAL_CALL disposing( const css::lang::EventObject& aSource );
+        void disposing( const css::lang::EventObject& aSource );
 
 };
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 115cc0eebd16..af1df14d68a8 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -609,7 +609,7 @@ void collectUIInformation(const util::URL& rURL)
 
 }
 
-void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
+void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
         const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
 {
@@ -831,7 +831,7 @@ SfxDispatcher* SfxDispatchController_Impl::GetDispatcher()
     return pDispatcher;
 }
 
-void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL)
+void SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL)
 {
     SolarMutexGuard aGuard;
     if ( !pDispatch )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 3393046a66bd..486cfcbbe8e7 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2572,12 +2572,12 @@ const uno::Reference < XFilePicker3 >& FileDialogHelper::GetFilePicker() const
 }
 
 // XFilePickerListener Methods
-void SAL_CALL FileDialogHelper::FileSelectionChanged()
+void FileDialogHelper::FileSelectionChanged()
 {
     mpImpl->handleFileSelectionChanged();
 }
 
-void SAL_CALL FileDialogHelper::DirectoryChanged()
+void FileDialogHelper::DirectoryChanged()
 {
     mpImpl->handleDirectoryChanged();
 }
@@ -2592,12 +2592,12 @@ void SAL_CALL FileDialogHelper::ControlStateChanged( const FilePickerEvent& aEve
     mpImpl->handleControlStateChanged( aEvent );
 }
 
-void SAL_CALL FileDialogHelper::DialogSizeChanged()
+void FileDialogHelper::DialogSizeChanged()
 {
     mpImpl->handleDialogSizeChanged();
 }
 
-void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent )
+void FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent )
 {
     m_nError = ( RET_OK == _rEvent.DialogResult ) ? ERRCODE_NONE : ERRCODE_ABORT;
     m_aDialogClosedLink.Call( this );
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 06343859c834..63cae375728b 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -263,35 +263,35 @@ protected:
     OUString m_DefaultTarget;
 
     /// check if we are initialized properly
-    void SAL_CALL checkInit() const;
+    void checkInit() const;
     /// initialize state from given DOM tree
-    void SAL_CALL init(const css::uno::Reference<css::xml::dom::XDocument>& i_xDom);
+    void init(const css::uno::Reference<css::xml::dom::XDocument>& i_xDom);
     /// update element in DOM tree
-    void SAL_CALL updateElement(const char *i_name,
+    void updateElement(const char *i_name,
         std::vector<std::pair<const char *, OUString> >* i_pAttrs = nullptr);
     /// update user-defined meta data and attributes in DOM tree
-    void SAL_CALL updateUserDefinedAndAttributes();
+    void updateUserDefinedAndAttributes();
     /// create empty DOM tree (XDocument)
-    css::uno::Reference<css::xml::dom::XDocument> SAL_CALL createDOM() const;
+    css::uno::Reference<css::xml::dom::XDocument> createDOM() const;
     /// extract base URL (necessary for converting relative links)
-    css::uno::Reference<css::beans::XPropertySet> SAL_CALL getURLProperties(
+    css::uno::Reference<css::beans::XPropertySet> getURLProperties(
         const css::uno::Sequence<css::beans::PropertyValue> & i_rMedium) const;
     /// get text of standard meta data element
-    OUString SAL_CALL getMetaText(const char* i_name) const;
+    OUString getMetaText(const char* i_name) const;
     /// set text of standard meta data element iff not equal to existing text
-    bool SAL_CALL setMetaText(const char* i_name,
+    bool setMetaText(const char* i_name,
         const OUString & i_rValue);
     /// set text of standard meta data element iff not equal to existing text
-    void SAL_CALL setMetaTextAndNotify(const char* i_name,
+    void setMetaTextAndNotify(const char* i_name,
         const OUString & i_rValue);
     /// get text of standard meta data element's attribute
-    OUString SAL_CALL getMetaAttr(const char* i_name,
+    OUString getMetaAttr(const char* i_name,
         const char* i_attr) const;
     /// get text of a list of standard meta data elements (multiple occ.)
-    css::uno::Sequence< OUString > SAL_CALL getMetaList(
+    css::uno::Sequence< OUString > getMetaList(
         const char* i_name) const;
     /// set text of a list of standard meta data elements (multiple occ.)
-    bool SAL_CALL setMetaList(const char* i_name,
+    bool setMetaList(const char* i_name,
         const css::uno::Sequence< OUString > & i_rValue,
         AttrVector const*);
     void createUserDefined();
@@ -558,7 +558,7 @@ OUString SAL_CALL durationToText(sal_Int32 i_value) throw ()
 }
 
 // extract base URL (necessary for converting relative links)
-css::uno::Reference< css::beans::XPropertySet > SAL_CALL
+css::uno::Reference< css::beans::XPropertySet >
 SfxDocumentMetaData::getURLProperties(
     const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) const
 {
@@ -616,7 +616,7 @@ getNodeText(const css::uno::Reference<css::xml::dom::XNode>& i_xNode)
     return OUString();
 }
 
-OUString SAL_CALL
+OUString
 SfxDocumentMetaData::getMetaText(const char* i_name) const
 //        throw (css::uno::RuntimeException)
 {
@@ -628,7 +628,7 @@ SfxDocumentMetaData::getMetaText(const char* i_name) const
     return (xNode.is()) ? getNodeText(xNode) : OUString();
 }
 
-bool SAL_CALL
+bool
 SfxDocumentMetaData::setMetaText(const char* i_name,
         const OUString & i_rValue)
     // throw (css::uno::RuntimeException)
@@ -683,7 +683,7 @@ SfxDocumentMetaData::setMetaText(const char* i_name,
     }
 }
 
-void SAL_CALL
+void
 SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name,
         const OUString & i_rValue)
     // throw (css::uno::RuntimeException)
@@ -695,7 +695,7 @@ SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name,
     }
 }
 
-OUString SAL_CALL
+OUString
 SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const
 //        throw (css::uno::RuntimeException)
 {
@@ -712,7 +712,7 @@ SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const
     }
 }
 
-css::uno::Sequence< OUString> SAL_CALL
+css::uno::Sequence< OUString>
 SfxDocumentMetaData::getMetaList(const char* i_name) const
 //        throw (css::uno::RuntimeException)
 {
@@ -728,7 +728,7 @@ SfxDocumentMetaData::getMetaList(const char* i_name) const
     return ret;
 }
 
-bool SAL_CALL
+bool
 SfxDocumentMetaData::setMetaList(const char* i_name,
         const css::uno::Sequence<OUString> & i_rValue,
         AttrVector const* i_pAttrs)
@@ -918,7 +918,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
 }
 
 // remove the given element from the DOM, and iff i_pAttrs != 0 insert new one
-void SAL_CALL
+void
 SfxDocumentMetaData::updateElement(const char *i_name,
         std::vector<std::pair<const char *, OUString> >* i_pAttrs)
 {
@@ -956,7 +956,7 @@ SfxDocumentMetaData::updateElement(const char *i_name,
 }
 
 // update user-defined meta data in DOM tree
-void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
+void SfxDocumentMetaData::updateUserDefinedAndAttributes()
 {
     createUserDefined();
     const css::uno::Reference<css::beans::XPropertySet> xPSet(m_xUserDefined,
@@ -1011,7 +1011,7 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
 }
 
 // create empty DOM tree (XDocument)
-css::uno::Reference<css::xml::dom::XDocument> SAL_CALL
+css::uno::Reference<css::xml::dom::XDocument>
 SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException)
 {
     css::uno::Reference<css::xml::dom::XDocumentBuilder> xBuilder( css::xml::dom::DocumentBuilder::create(m_xContext) );
@@ -1023,7 +1023,7 @@ SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException)
     return xDoc;
 }
 
-void SAL_CALL
+void
 SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
 {
     if (!m_isInitialized) {
@@ -1035,7 +1035,7 @@ SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
 }
 
 // initialize state from DOM tree
-void SAL_CALL SfxDocumentMetaData::init(
+void SfxDocumentMetaData::init(
         const css::uno::Reference<css::xml::dom::XDocument>& i_xDoc)
 {
     if (!i_xDoc.is())