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, 9 insertions, 9 deletions

diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index cffeb7c5bbd6..e62bbe0af49e 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -71,7 +71,7 @@ namespace unotools
         virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override;
         virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override;
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette(  );
+        css::uno::Reference< css::rendering::XBitmapPalette > getPalette(  );
         virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) override;
 
         // XBitmapPalette
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 7570f9c22672..475db74c94a3 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -309,7 +309,7 @@ private:
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette(  )
+    uno::Reference< rendering::XBitmapPalette > getPalette(  )
     {
         uno::Reference< XBitmapPalette > aRet;
         if( mnBitsPerPixel == 8 )
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 1ca2aa7e569b..e7151f317894 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -610,7 +610,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::Integer
     return aRet;
 }
 
-uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette()
+uno::Reference< rendering::XBitmapPalette > VclCanvasBitmap::getPalette()
 {
     SolarMutexGuard aGuard;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index a45f79c35bcb..daa066ad6577 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -238,7 +238,7 @@ SalGtkPicker::~SalGtkPicker()
     }
 }
 
-void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory )
+void SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory )
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
@@ -256,7 +256,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory
         aTxt.getStr() );
 }
 
-OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory()
+OUString SalGtkPicker::implgetDisplayDirectory()
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
@@ -268,7 +268,7 @@ OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory()
     return aCurrentFolderName;
 }
 
-void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle )
+void SalGtkPicker::implsetTitle( const OUString& aTitle )
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 6af2459562eb..b31d21aa656c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -50,14 +50,14 @@ class SalGtkPicker
         GtkWidget  *m_pDialog;
     protected:
         /// @throws css::uno::RuntimeException
-        void SAL_CALL implsetTitle( const OUString& aTitle );
+        void implsetTitle( const OUString& aTitle );
 
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory );
+        void implsetDisplayDirectory( const OUString& rDirectory );
 
         /// @throws css::uno::RuntimeException
-        OUString SAL_CALL implgetDisplayDirectory(  );
+        OUString implgetDisplayDirectory(  );
         OUString uritounicode(const gchar *pIn);
         OString unicodetouri(const OUString &rURL);