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>

13 files changed, 38 insertions, 38 deletions

diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx
index 60a8e1e9f0e5..7a8e0c379596 100644
--- a/package/inc/ByteGrabber.hxx
+++ b/package/inc/ByteGrabber.hxx
@@ -51,18 +51,18 @@ public:
     /// @throws css::io::BufferSizeExceededException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead );
+    sal_Int32 readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead );
     // XSeekable
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL seek( sal_Int64 location );
+    void seek( sal_Int64 location );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL getPosition(  );
+    sal_Int64 getPosition(  );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL getLength(  );
+    sal_Int64 getLength(  );
 
     sal_uInt16 ReadUInt16();
     sal_uInt32 ReadUInt32();
diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx
index 778756475414..e19ed60d99c3 100644
--- a/package/inc/CRC32.hxx
+++ b/package/inc/CRC32.hxx
@@ -33,15 +33,15 @@ public:
     ~CRC32();
 
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL updateStream (css::uno::Reference < css::io::XInputStream > const & xStream);
+    sal_Int64 updateStream (css::uno::Reference < css::io::XInputStream > const & xStream);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len);
+    void updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL update(const css::uno::Sequence< sal_Int8 > &b);
+    void update(const css::uno::Sequence< sal_Int8 > &b);
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL getValue();
+    sal_Int32 getValue();
     /// @throws css::uno::RuntimeException
-    void SAL_CALL reset();
+    void reset();
 };
 
 #endif
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index c84ae2ce2410..07e8a5848617 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -26,8 +26,8 @@ class ZipEnumeration final
     EntryHash       &rEntryHash;
     EntryHash::const_iterator aIterator;
 public:
-    bool SAL_CALL hasMoreElements();
-    const ZipEntry * SAL_CALL nextElement();
+    bool hasMoreElements();
+    const ZipEntry * nextElement();
     ZipEnumeration( EntryHash &rNewEntryHash );
     ~ZipEnumeration();
 };
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index d8f6903e35ac..4620b5da64f2 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -75,7 +75,7 @@ private:
     css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream();
     /// get raw data using unbuffered stream
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData();
+    css::uno::Reference< css::io::XInputStream > getRawData();
 
 public:
     bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 56bc3d48e3bd..cbcceece39ea 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1817,7 +1817,7 @@ OStorage::~OStorage()
     }
 }
 
-void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl )
+void OStorage::InternalDispose( bool bNotifyImpl )
 {
     if ( !m_pImpl )
     {
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 532088359184..262b317e4def 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -318,7 +318,7 @@ public:
 
     virtual ~OStorage() override;
 
-    void SAL_CALL InternalDispose( bool bNotifyImpl );
+    void InternalDispose( bool bNotifyImpl );
 
     void ChildIsDisposed( const css::uno::Reference< css::uno::XInterface >& xChild );
 
diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx
index 89e22c368851..9552c53f7111 100644
--- a/package/source/zipapi/ByteGrabber.cxx
+++ b/package/source/zipapi/ByteGrabber.cxx
@@ -53,7 +53,7 @@ void ByteGrabber::setInputStream (const uno::Reference < io::XInputStream >& xNe
 }
 
 // XInputStream chained
-sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
+sal_Int32 ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
                                         sal_Int32 nBytesToRead )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -61,7 +61,7 @@ sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
 }
 
 // XSeekable chained...
-void SAL_CALL ByteGrabber::seek( sal_Int64 location )
+void ByteGrabber::seek( sal_Int64 location )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!xSeek.is() )
@@ -75,7 +75,7 @@ void SAL_CALL ByteGrabber::seek( sal_Int64 location )
     xSeek->seek( location );
 }
 
-sal_Int64 SAL_CALL ByteGrabber::getPosition(  )
+sal_Int64 ByteGrabber::getPosition(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!xSeek.is() )
@@ -84,7 +84,7 @@ sal_Int64 SAL_CALL ByteGrabber::getPosition(  )
     return xSeek->getPosition();
 }
 
-sal_Int64 SAL_CALL ByteGrabber::getLength(  )
+sal_Int64 ByteGrabber::getLength(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!xSeek.is() )
diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index 0476f663e916..a38d7562cf17 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/CRC32.cxx
@@ -35,28 +35,28 @@ CRC32::CRC32()
 CRC32::~CRC32()
 {
 }
-void SAL_CALL CRC32::reset()
+void CRC32::reset()
 {
     nCRC=0;
 }
-sal_Int32 SAL_CALL CRC32::getValue()
+sal_Int32 CRC32::getValue()
 {
     return nCRC & 0xFFFFFFFFL;
 }
 /** Update CRC32 with specified sequence of bytes
  */
-void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len)
+void CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len)
 {
     nCRC = rtl_crc32(nCRC, b.getConstArray(), len );
 }
 /** Update CRC32 with specified sequence of bytes
  */
-void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b)
+void CRC32::update(const Sequence< sal_Int8 > &b)
 {
     nCRC = rtl_crc32(nCRC, b.getConstArray(),b.getLength());
 }
 
-sal_Int64 SAL_CALL CRC32::updateStream( Reference < XInputStream > const & xStream )
+sal_Int64 CRC32::updateStream( Reference < XInputStream > const & xStream )
 {
     sal_Int32 nLength;
     sal_Int64 nTotal = 0;
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index e1694d293ca9..e2f0e7ebd374 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -93,35 +93,35 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
     }
 }
 
-void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer )
+void Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer )
 {
     sInBuffer = rBuffer;
     nOffset = 0;
     nLength = rBuffer.getLength();
 }
 
-bool SAL_CALL Deflater::needsInput(  )
+bool Deflater::needsInput(  )
 {
     return nLength <=0;
 }
-void SAL_CALL Deflater::finish(  )
+void Deflater::finish(  )
 {
     bFinish = true;
 }
-sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+sal_Int32 Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
 {
     OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()));
     return doDeflateBytes(rBuffer, nNewOffset, nNewLength);
 }
-sal_Int64 SAL_CALL Deflater::getTotalIn(  )
+sal_Int64 Deflater::getTotalIn(  )
 {
     return pStream->total_in; // FIXME64: zlib doesn't look 64bit clean here
 }
-sal_Int64 SAL_CALL Deflater::getTotalOut(  )
+sal_Int64 Deflater::getTotalOut(  )
 {
     return pStream->total_out; // FIXME64: zlib doesn't look 64bit clean here
 }
-void SAL_CALL Deflater::reset(  )
+void Deflater::reset(  )
 {
 #if !defined Z_PREFIX
     deflateReset(pStream);
@@ -132,7 +132,7 @@ void SAL_CALL Deflater::reset(  )
     bFinished = false;
     nOffset = nLength = 0;
 }
-void SAL_CALL Deflater::end(  )
+void Deflater::end(  )
 {
     if (pStream != nullptr)
     {
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index eb6cc734e769..a059eb1418de 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -59,7 +59,7 @@ Inflater::~Inflater()
     end();
 }
 
-void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer )
+void Inflater::setInput( const Sequence< sal_Int8 >& rBuffer )
 {
     sInBuffer = rBuffer;
     nOffset = 0;
@@ -67,7 +67,7 @@ void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer )
 }
 
 
-sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
+sal_Int32 Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
 {
     if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())
     {
@@ -76,7 +76,7 @@ sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sa
     return doInflateBytes(rBuffer, nNewOffset, nNewLength);
 }
 
-void SAL_CALL Inflater::end(  )
+void Inflater::end(  )
 {
     if (pStream != nullptr)
     {
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx
index 5417406db379..7f3c42485876 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -44,7 +44,7 @@ public:
     /// @throws css::io::BufferSizeExceededException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+    void skipBytes( sal_Int32 nBytesToSkip )
     {
         mnCurrent += nBytesToSkip;
     }
diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx
index f5093f6f69d2..794ac1a7b9fc 100644
--- a/package/source/zipapi/ZipEnumeration.cxx
+++ b/package/source/zipapi/ZipEnumeration.cxx
@@ -29,12 +29,12 @@ ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash)
 ZipEnumeration::~ZipEnumeration()
 {
 }
-bool SAL_CALL ZipEnumeration::hasMoreElements()
+bool ZipEnumeration::hasMoreElements()
 {
     return (aIterator != rEntryHash.end());
 }
 
-const ZipEntry* SAL_CALL ZipEnumeration::nextElement()
+const ZipEntry* ZipEnumeration::nextElement()
 {
     if (aIterator != rEntryHash.end())
         return &((*aIterator++).second);
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 160dfa8d310f..c555b1f0bfbc 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -937,7 +937,7 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
     m_nStreamMode = PACKAGE_STREAM_DETECT;
 }
 
-uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
+uno::Reference< io::XInputStream > ZipPackageStream::getRawData()
 {
     try
     {