loplugin:checkunusedparams in configmgr and vcl

Change-Id: I7226d01f38e6edaf3868d7267d9b02dbdbc9e5ba
Reviewed-on: https://gerrit.libreoffice.org/36975
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

35 files changed, 144 insertions, 205 deletions

diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index d26bddc481fa..10860628e491 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -275,8 +275,7 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const {
 }
 
 bool ValueParser::startElement(
-    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
-    std::set< OUString > const *)
+    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
     if (!node_.is()) {
         return false;
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 50cab466d2d4..a1d585e89587 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -51,8 +51,7 @@ public:
     xmlreader::XmlReader::Text getTextMode() const;
 
     bool startElement(
-        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
-        std::set< OUString > const *);
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
 
     bool endElement();
 
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 6c1b2fea9a4a..50415391e55e 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -125,9 +125,9 @@ xmlreader::XmlReader::Text XcsParser::getTextMode() {
 
 bool XcsParser::startElement(
     xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
-    std::set< OUString > const * existingDependencies)
+    std::set< OUString > const * /*existingDependencies*/)
 {
-    if (valueParser_.startElement(reader, nsId, name, existingDependencies)) {
+    if (valueParser_.startElement(reader, nsId, name)) {
         return true;
     }
     if (state_ == STATE_START) {
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 34e0eb5973c8..bac4119262ca 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -72,9 +72,9 @@ xmlreader::XmlReader::Text XcuParser::getTextMode() {
 
 bool XcuParser::startElement(
     xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
-    std::set< OUString > const * existingDependencies)
+    std::set< OUString > const * /*existingDependencies*/)
 {
-    if (valueParser_.startElement(reader, nsId, name, existingDependencies)) {
+    if (valueParser_.startElement(reader, nsId, name)) {
         return true;
     }
     if (state_.empty()) {
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 522c095026ab..5d2982315f25 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -61,8 +61,7 @@ void LdapConnection::disconnect()
 
 
 static void checkLdapReturnCode(const sal_Char *aOperation,
-                                LdapErrCode aRetCode,
-                                LDAP * /*aConnection*/)
+                                LdapErrCode aRetCode)
 {
     if (aRetCode == LDAP_SUCCESS) { return ; }
 
@@ -140,7 +139,7 @@ void  LdapConnection::connectSimple()
                                                OUStringToOString( mLdapDefinition.mAnonCredentials, RTL_TEXTENCODING_UTF8 ).getStr()) ;
 #endif
 
-        checkLdapReturnCode("SimpleBind", retCode, mConnection) ;
+        checkLdapReturnCode("SimpleBind", retCode) ;
     }
 }
 
@@ -194,7 +193,7 @@ void LdapConnection::initConnection()
                                       0, // Attributes + values
                                       &result.msg) ;
 #endif
-    checkLdapReturnCode("getUserProfile", retCode,mConnection) ;
+    checkLdapReturnCode("getUserProfile", retCode) ;
 
     BerElement * ptr;
 #ifdef _WIN32
@@ -256,7 +255,7 @@ void LdapConnection::initConnection()
                                       LDAP_SCOPE_SUBTREE,
                                       OUStringToOString( filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ;
 #endif
-    checkLdapReturnCode("FindUserDn", retCode,mConnection) ;
+    checkLdapReturnCode("FindUserDn", retCode) ;
     OUString userDn ;
     LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ;
 
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 5ecf4359d88a..8c2bc8b9cf33 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -58,7 +58,7 @@ class SvMetaType : public SvMetaReference
     void                WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
                                       SvStream & rOutStm );
 protected:
-    bool                ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    bool                ReadHeaderSvIdl( SvTokenStream & rInStm );
 public:
             SvMetaType();
             SvMetaType( const OString& rTypeName );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index ed58c172f39c..f90145f7cd56 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -156,8 +156,7 @@ SvMetaType * SvMetaType::GetReturnType() const
     return static_cast<SvMetaType *>(GetRef());
 }
 
-bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & ,
-                                  SvTokenStream & rInStm )
+bool SvMetaType::ReadHeaderSvIdl( SvTokenStream & rInStm )
 {
     bool bOk = false;
     sal_uInt32  nTokPos = rInStm.Tell();
@@ -181,7 +180,7 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & ,
 bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
                             SvTokenStream & rInStm )
 {
-    if( ReadHeaderSvIdl( rBase, rInStm ) )
+    if( ReadHeaderSvIdl( rInStm ) )
     {
         rBase.Write(OString('.'));
         return SvMetaReference::ReadSvIdl( rBase, rInStm );
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index d160b97c7e50..a8227865b261 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -205,7 +205,7 @@ namespace sax_fastparser {
 class FastSaxParserImpl
 {
 public:
-    explicit FastSaxParserImpl(FastSaxParser* pFront);
+    explicit FastSaxParserImpl();
     ~FastSaxParserImpl();
 
     // XFastParser
@@ -234,8 +234,8 @@ public:
 
     // called by the C callbacks of the expat parser
     void callbackStartElement( const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI,
-        int numNamespaces, const xmlChar** namespaces, int numAttributes, int defaultedAttributes, const xmlChar **attributes );
-    void callbackEndElement( const xmlChar* localName, const xmlChar* prefix, const xmlChar* URI );
+        int numNamespaces, const xmlChar** namespaces, int numAttributes, const xmlChar **attributes );
+    void callbackEndElement();
     void callbackCharacters( const xmlChar* s, int nLen );
 #if 0
     bool callbackExternalEntityRef( XML_Parser parser, const xmlChar *openEntityNames, const xmlChar *base, const xmlChar *systemId, const xmlChar *publicId);
@@ -309,16 +309,16 @@ private:
 extern "C" {
 
 static void call_callbackStartElement(void *userData, const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI,
-    int numNamespaces, const xmlChar** namespaces, int numAttributes, int defaultedAttributes, const xmlChar **attributes)
+    int numNamespaces, const xmlChar** namespaces, int numAttributes, int /*defaultedAttributes*/, const xmlChar **attributes)
 {
     FastSaxParserImpl* pFastParser = static_cast<FastSaxParserImpl*>( userData );
-    pFastParser->callbackStartElement( localName, prefix, URI, numNamespaces, namespaces, numAttributes, defaultedAttributes, attributes );
+    pFastParser->callbackStartElement( localName, prefix, URI, numNamespaces, namespaces, numAttributes, attributes );
 }
 
-static void call_callbackEndElement(void *userData, const xmlChar* localName, const xmlChar* prefix, const xmlChar* URI)
+static void call_callbackEndElement(void *userData, const xmlChar* /*localName*/, const xmlChar* /*prefix*/, const xmlChar* /*URI*/)
 {
     FastSaxParserImpl* pFastParser = static_cast<FastSaxParserImpl*>( userData );
-    pFastParser->callbackEndElement( localName, prefix, URI );
+    pFastParser->callbackEndElement();
 }
 
 static void call_callbackCharacters( void *userData , const xmlChar *s , int nLen )
@@ -631,7 +631,7 @@ void Entity::saveException( const Any & e )
 
 namespace sax_fastparser {
 
-FastSaxParserImpl::FastSaxParserImpl( FastSaxParser* ) :
+FastSaxParserImpl::FastSaxParserImpl() :
 #if 0
     mpFront(pFront),
 #endif
@@ -1063,7 +1063,7 @@ void FastSaxParserImpl::parse()
 
 // The C-Callbacks
 void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI,
-    int numNamespaces, const xmlChar** namespaces, int numAttributes, int /*defaultedAttributes*/, const xmlChar **attributes)
+    int numNamespaces, const xmlChar** namespaces, int numAttributes, const xmlChar **attributes)
 {
     if (!pendingCharacters.isEmpty())
         sendPendingCharacters();
@@ -1218,7 +1218,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm
     }
 }
 
-void FastSaxParserImpl::callbackEndElement( const xmlChar*, const xmlChar*, const xmlChar* )
+void FastSaxParserImpl::callbackEndElement()
 {
     if (!pendingCharacters.isEmpty())
         sendPendingCharacters();
@@ -1360,7 +1360,7 @@ bool FastSaxParserImpl::callbackExternalEntityRef(
 }
 #endif
 
-FastSaxParser::FastSaxParser() : mpImpl(new FastSaxParserImpl(this)) {}
+FastSaxParser::FastSaxParser() : mpImpl(new FastSaxParserImpl) {}
 
 FastSaxParser::~FastSaxParser()
 {
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index eff3d95e471d..dda025eee33c 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -289,7 +289,7 @@ void generateXLocalizableBodies(std::ostream& o) {
         "        return m_locale;\n    }\n\n";
 }
 
-void generateXAddInBodies(std::ostream& o, ProgramOptions const &)
+void generateXAddInBodies(std::ostream& o)
 {
     // com.sun.star.sheet.XAddIn:
     // getProgrammaticFuntionName
@@ -515,7 +515,7 @@ void generateMethodBodies(std::ostream& o,
                     generated.add(u2b(type));
                     continue;
                 } else if (type == "com.sun.star.sheet.XAddIn") {
-                    generateXAddInBodies(o, options);
+                    generateXAddInBodies(o);
                     generated.add(u2b(type));
 
                     // special handling of XLocalizable -> parent of XAddIn
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 00f92f896d15..e44a69ff69fa 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -38,8 +38,7 @@ SvpSalFrame* SvpSalFrame::s_pFocusFrame = nullptr;
 
 SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
                           SalFrame* pParent,
-                          SalFrameStyleFlags nSalFrameStyle,
-                          SystemParentData* ) :
+                          SalFrameStyleFlags nSalFrameStyle ) :
     m_pInstance( pInstance ),
     m_pParent( static_cast<SvpSalFrame*>(pParent) ),
     m_nStyle( nSalFrameStyle ),
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index f46722da4da5..e84316045ab5 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -249,9 +249,9 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
     return bRet;
 }
 
-SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle )
+SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle )
 {
-    return new SvpSalFrame( this, nullptr, nStyle, pParent );
+    return new SvpSalFrame( this, nullptr, nStyle );
 }
 
 SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c5245899c748..a045683991b9 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -58,8 +58,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
 public:
     SvpSalFrame( SvpSalInstance* pInstance,
                  SalFrame* pParent,
-                 SalFrameStyleFlags nSalFrameStyle,
-                 SystemParentData* pSystemParent = nullptr );
+                 SalFrameStyleFlags nSalFrameStyle );
     virtual ~SvpSalFrame() override;
 
     void GetFocus();
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 1f546b0dd240..2eb39b084018 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -131,7 +131,7 @@ public:
     void DrawLineSegment(float x1, float y1, float x2, float y2);
     void DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool blockAA = false );
     void DrawRegionBand( const RegionBand& rRegion );
-    void DrawTextureRect( OpenGLTexture& rTexture, const SalTwoRect& rPosAry, bool bInverted = false );
+    void DrawTextureRect( const SalTwoRect& rPosAry );
     void DrawTexture( OpenGLTexture& rTexture, const SalTwoRect& rPosAry, bool bInverted = false );
     void DrawTransformedTexture( OpenGLTexture& rTexture, OpenGLTexture& rMask, const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rY );
     void DrawAlphaTexture( OpenGLTexture& rTexture, const SalTwoRect& rPosAry, bool bInverted, bool pPremultiplied );
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 6f6e64c83f6a..2890d5dcffb1 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -74,7 +74,7 @@ public:
     /// wraps cupsGetPPD, so unlink after use !
     const PPDParser* createCUPSParser( const OUString& rPrinter );
 
-    const char* authenticateUser( const char* );
+    const char* authenticateUser();
 
     virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ) override;
     virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) override;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index d244daf67c59..eb350ef0abd1 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -73,9 +73,9 @@ public:
 private:
     friend class FreetypeFont;
     // used by FreetypeFont class only
-    void                    AddedGlyph( FreetypeFont&, GlyphData& );
+    void                    AddedGlyph( GlyphData& );
     void                    RemovingGlyph();
-    void                    UsingGlyph( FreetypeFont&, GlyphData& );
+    void                    UsingGlyph( GlyphData& );
 
 private:
     void                    GarbageCollect();
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 69ff7f479478..8e8719a8a174 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -166,8 +166,7 @@ public:
     virtual ScreenData *initScreen( SalX11Screen nXScreen ) const override;
 #endif
 
-    GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
-                                    GdkEvent* event );
+    GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event );
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
 
     void screenSizeChanged( GdkScreen* );
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 28ec8ccfec93..17e973f2d429 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -65,8 +65,8 @@ public:
     void UnsetICFocus( SalFrame* pFrame );
     void HandleDestroyIM();
 
-    void EndExtTextInput( EndExtTextInputFlags nFlags );        // unused
-    void  CommitKeyEvent( sal_Unicode* pText, std::size_t nLength );
+    void EndExtTextInput();
+    void CommitKeyEvent( sal_Unicode* pText, std::size_t nLength );
     int  UpdateSpotLocation();
 
     void Map( SalFrame *pFrame );
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 59c2f338d2bd..41a5f843cc39 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -269,7 +269,7 @@ public:
 
     // clip region
     void            ResetClipRegion ();
-    void            BeginSetClipRegion (sal_uInt32);
+    void            BeginSetClipRegion();
     void            UnionClipRegion (sal_Int32 nX, sal_Int32 nY,
                                      sal_Int32 nDX, sal_Int32 nDY);
     void            EndSetClipRegion ();
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 6b0e722dd7d6..1a4c9d015568 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -163,7 +163,6 @@ private:
                         Drawable aSrcDrawable,
                         long nSrcDrawableDepth,
                         Drawable aDstDrawable,
-                        long nDstDrawableDepth,
                         long nSrcX,
                         long nSrcY,
                         long nDestWidth,
@@ -208,7 +207,6 @@ public:
 
     void            ImplDraw(
                         Drawable aDrawable,
-                        long nDrawableDepth,
                         const SalTwoRect& rTwoRect,
                         const GC& rGC
                     ) const;
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 5b92cb08c64b..80ba872b4fc5 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -944,7 +944,7 @@ void OpenGLSalGraphicsImpl::DrawRegionBand( const RegionBand& rRegion )
     CHECK_GL_ERROR();
 }
 
-void OpenGLSalGraphicsImpl::DrawTextureRect( OpenGLTexture& /*rTexture*/, const SalTwoRect& rPosAry, bool /*bInverted*/ )
+void OpenGLSalGraphicsImpl::DrawTextureRect( const SalTwoRect& rPosAry )
 {
     OpenGLZone aZone;
 
@@ -982,7 +982,7 @@ void OpenGLSalGraphicsImpl::DrawTexture( OpenGLTexture& rTexture, const SalTwoRe
     mpProgram->SetMaskCoord(aTexCoord);
     mpProgram->SetAlphaCoord(aTexCoord);
 
-    DrawTextureRect( rTexture, rPosAry, bInverted );
+    DrawTextureRect( rPosAry );
     mpProgram->Clean();
 }
 
@@ -1212,7 +1212,7 @@ void OpenGLSalGraphicsImpl::DrawAlphaTexture( OpenGLTexture& rTexture, const Sal
     mpProgram->SetMaskCoord(aTexCoord);
     mpProgram->SetAlphaCoord(aTexCoord);
 
-    DrawTextureRect( rTexture, rPosAry, bInverted );
+    DrawTextureRect( rPosAry );
     mpProgram->Clean();
 }
 
@@ -1237,7 +1237,7 @@ void OpenGLSalGraphicsImpl::DrawTextureDiff( OpenGLTexture& rTexture, OpenGLText
     rMask.GetCoord(aMaskCoord, rPosAry, bInverted);
     mpProgram->SetMaskCoord(aMaskCoord);
 
-    DrawTextureRect( rTexture, rPosAry, bInverted );
+    DrawTextureRect( rPosAry );
     mpProgram->Clean();
 }
 
@@ -1262,7 +1262,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( OpenGLTexture& rTexture, OpenGL
     rMask.GetCoord(aMaskCoord, rPosAry);
     mpProgram->SetMaskCoord(aMaskCoord);
 
-    DrawTextureRect(rTexture, rPosAry);
+    DrawTextureRect(rPosAry);
     mpProgram->Clean();
 }
 
@@ -1290,7 +1290,7 @@ void OpenGLSalGraphicsImpl::DrawBlendedTexture( OpenGLTexture& rTexture, OpenGLT
     mpProgram->SetMaskCoord(aMaskCoord);
 
     mpProgram->SetBlendMode( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-    DrawTextureRect( rTexture, rPosAry );
+    DrawTextureRect( rPosAry );
     mpProgram->Clean();
 }
 
@@ -1312,7 +1312,7 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture& rMask, SalColor nMaskColor,
     mpProgram->SetAlphaCoord(aTexCoord);
 
     mpProgram->SetBlendMode( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-    DrawTextureRect(rMask, rPosAry);
+    DrawTextureRect(rPosAry);
     mpProgram->Clean();
 }
 
@@ -1831,7 +1831,7 @@ bool OpenGLSalGraphicsImpl::blendBitmap(
     mpProgram->SetAlphaCoord(aTexCoord);
 
     mpProgram->SetBlendMode(GL_ZERO, GL_SRC_COLOR);
-    DrawTextureRect(rTexture, rPosAry);
+    DrawTextureRect(rPosAry);
     mpProgram->Clean();
 
     PostDraw();
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 1837364118e4..2532e9f8b094 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -609,7 +609,7 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
 // multi byte input method only
 
 void
-SalI18N_InputContext::EndExtTextInput( EndExtTextInputFlags /*nFlags*/ )
+SalI18N_InputContext::EndExtTextInput()
 {
     if ( mbUseable && (maContext != nullptr) && maClientData.pFrame )
     {
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index 3f923d4b0e95..82d3290a4469 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
@@ -29,10 +29,8 @@ using namespace x11;
 
 DropTargetDropContext::DropTargetDropContext(
     ::Window aDropWindow,
-    Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
-        m_nTimestamp( aTimestamp ),
         m_rManager( rManager ),
         m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
 {
@@ -44,17 +42,17 @@ DropTargetDropContext::~DropTargetDropContext()
 
 void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation )
 {
-    m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
+    m_rManager.accept( dragOperation, m_aDropWindow );
 }
 
 void DropTargetDropContext::rejectDrop()
 {
-    m_rManager.reject( m_aDropWindow, m_nTimestamp );
+    m_rManager.reject( m_aDropWindow );
 }
 
 void DropTargetDropContext::dropComplete( sal_Bool success )
 {
-    m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp );
+    m_rManager.dropComplete( success, m_aDropWindow );
 }
 
 /*
@@ -63,10 +61,8 @@ void DropTargetDropContext::dropComplete( sal_Bool success )
 
 DropTargetDragContext::DropTargetDragContext(
     ::Window aDropWindow,
-    Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
-        m_nTimestamp( aTimestamp ),
         m_rManager( rManager ),
         m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
 {
@@ -78,12 +74,12 @@ DropTargetDragContext::~DropTargetDragContext()
 
 void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation )
 {
-    m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
+    m_rManager.accept( dragOperation, m_aDropWindow );
 }
 
 void DropTargetDragContext::rejectDrag()
 {
-    m_rManager.reject( m_aDropWindow, m_nTimestamp );
+    m_rManager.reject( m_aDropWindow );
 }
 
 /*
@@ -92,10 +88,8 @@ void DropTargetDragContext::rejectDrag()
 
 DragSourceContext::DragSourceContext(
     ::Window aDropWindow,
-    Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
-        m_nTimestamp( aTimestamp ),
         m_rManager( rManager ),
         m_xManagerRef( static_cast< OWeakObject* >(&rManager) )
 {
@@ -112,7 +106,7 @@ sal_Int32 DragSourceContext::getCurrentCursor()
 
 void DragSourceContext::setCursor( sal_Int32 cursorId )
 {
-    m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp );
+    m_rManager.setCursor( cursorId, m_aDropWindow );
 }
 
 void DragSourceContext::setImage( sal_Int32 )
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index 93b493daaf4c..e770c58686d1 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -36,11 +36,10 @@ namespace x11 {
         public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDropContext>
     {
         ::Window                    m_aDropWindow;
-        Time                        m_nTimestamp;
         SelectionManager&           m_rManager;
         css::uno::Reference< XInterface >     m_xManagerRef;
     public:
-        DropTargetDropContext( ::Window, Time, SelectionManager& );
+        DropTargetDropContext( ::Window, SelectionManager& );
         virtual ~DropTargetDropContext() override;
 
         // XDropTargetDropContext
@@ -53,11 +52,10 @@ namespace x11 {
         public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDragContext>
     {
         ::Window                    m_aDropWindow;
-        Time                        m_nTimestamp;
         SelectionManager&           m_rManager;
         css::uno::Reference< XInterface >     m_xManagerRef;
     public:
-        DropTargetDragContext( ::Window, Time, SelectionManager& );
+        DropTargetDragContext( ::Window, SelectionManager& );
         virtual ~DropTargetDragContext() override;
 
         // XDropTargetDragContext
@@ -69,11 +67,10 @@ namespace x11 {
         public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDragSourceContext>
     {
         ::Window                    m_aDropWindow;
-        Time                        m_nTimestamp;
         SelectionManager&           m_rManager;
         css::uno::Reference< XInterface >     m_xManagerRef;
     public:
-        DragSourceContext( ::Window, Time, SelectionManager& );
+        DragSourceContext( ::Window, SelectionManager& );
         virtual ~DragSourceContext() override;
 
         // XDragSourceContext
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index afbd0b6bc428..dff6aa2127c0 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1749,7 +1749,7 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest
     {
         DragSourceDropEvent dsde;
         dsde.Source                 = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, rRequest.time, *this );
+        dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, *this );
         dsde.DragSource             = static_cast< XDragSource* >(this);
         if( aNotify.xselection.property != None )
         {
@@ -2117,7 +2117,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
         // some listener forgot to call dropComplete in the last operation
         // let us end it now and accept the new enter event
         aGuard.clear();
-        dropComplete( false, m_aCurrentDropWindow, m_nDropTime );
+        dropComplete( false, m_aCurrentDropWindow );
         aGuard.reset();
     }
 
@@ -2161,7 +2161,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
 #endif
             DropTargetDragEnterEvent aEvent;
             aEvent.Source       = static_cast< XDropTarget* >(it->second.m_pTarget);
-            aEvent.Context      = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+            aEvent.Context      = new DropTargetDragContext( m_aCurrentDropWindow, *this );
             aEvent.LocationX    = m_nLastX;
             aEvent.LocationY    = m_nLastY;
             aEvent.SourceActions = m_nSourceActions;
@@ -2226,7 +2226,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             {
                 DropTargetDropEvent aEvent;
                 aEvent.Source       = static_cast< XDropTarget* >(it->second.m_pTarget);
-                aEvent.Context      = new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                aEvent.Context      = new DropTargetDropContext( m_aCurrentDropWindow, *this );
                 aEvent.LocationX    = m_nLastX;
                 aEvent.LocationY    = m_nLastY;
                 aEvent.DropAction   = m_nLastDropAction;
@@ -2249,7 +2249,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
                 aGuard.clear();
                 it->second->dragExit( aEvent );
                 // reset the drop status, notify source
-                dropComplete( false, m_aCurrentDropWindow, m_nDropTime );
+                dropComplete( false, m_aCurrentDropWindow );
             }
         }
     }
@@ -2260,7 +2260,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
  *  methods for XDropTargetDropContext
  */
 
-void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow, Time )
+void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow )
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
 
@@ -2270,7 +2270,7 @@ void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow, Time )
         {
             DragSourceDropEvent dsde;
             dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource         = static_cast< XDragSource* >(this);
             dsde.DropAction         = getUserDragAction();
             dsde.DropSuccess        = bSuccess;
@@ -2345,13 +2345,13 @@ void SelectionManager::sendDragStatus( Atom nDropAction )
 
         if( nNewDragAction != m_nTargetAcceptAction )
         {
-            setCursor( getDefaultCursor( nNewDragAction ), m_aDropWindow, m_nDragTimestamp );
+            setCursor( getDefaultCursor( nNewDragAction ), m_aDropWindow );
             m_nTargetAcceptAction = nNewDragAction;
         }
 
         DragSourceDragEvent dsde;
         dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
         dsde.DragSource         = static_cast< XDragSource* >(this);
         dsde.DropAction         = m_nSourceActions;
         dsde.UserAction         = getUserDragAction();
@@ -2439,7 +2439,7 @@ bool SelectionManager::updateDragAction( int modifierState )
 
         DragSourceDragEvent dsde;
         dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
         dsde.DragSource         = static_cast< XDragSource* >(this);
         dsde.DropAction         = m_nUserDragAction;
         dsde.UserAction         = m_nUserDragAction;
@@ -2467,7 +2467,7 @@ void SelectionManager::sendDropPosition( bool bForce, Time eventTime )
             XTranslateCoordinates( m_pDisplay, it->second.m_aRootWindow, m_aDropWindow, m_nLastDragX, m_nLastDragY, &x, &y, &aChild );
             DropTargetDragEvent dtde;
             dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
-            dtde.Context        = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+            dtde.Context        = new DropTargetDragContext( m_aCurrentDropWindow, *this );
             dtde.LocationX      = x;
             dtde.LocationY      = y;
             dtde.DropAction     = getUserDragAction();
@@ -2559,7 +2559,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             bHandled = true;
             DragSourceDragEvent dsde;
             dsde.Source                 = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext      = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource             = static_cast< XDragSource* >( this );
             dsde.UserAction = getUserDragAction();
             dsde.DropAction = DNDConstants::ACTION_NONE;
@@ -2595,7 +2595,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             else
                 m_nNoPosX = m_nNoPosY = m_nNoPosWidth = m_nNoPosHeight = 0;
 
-            setCursor( getDefaultCursor( dsde.DropAction ), m_aDropWindow, m_nDragTimestamp );
+            setCursor( getDefaultCursor( dsde.DropAction ), m_aDropWindow );
             aGuard.clear();
             m_xDragSourceListener->dragOver( dsde );
         }
@@ -2605,7 +2605,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             // notify the listener
             DragSourceDropEvent dsde;
             dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource         = static_cast< XDragSource* >(this);
             dsde.DropAction         = m_nTargetAcceptAction;
             dsde.DropSuccess        = m_bDropSuccess;
@@ -2671,7 +2671,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             // notify the listener
             DragSourceDropEvent dsde;
             dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource         = static_cast< XDragSource* >(this);
             dsde.DropAction         = DNDConstants::ACTION_NONE;
             dsde.DropSuccess        = false;
@@ -2723,7 +2723,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                     XTranslateCoordinates( m_pDisplay, rMessage.xbutton.root, m_aDropWindow, rMessage.xbutton.x_root, rMessage.xbutton.y_root, &x, &y, &aChild );
                     DropTargetDropEvent dtde;
                     dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
-                    dtde.Context        = new DropTargetDropContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                    dtde.Context        = new DropTargetDropContext( m_aCurrentDropWindow, *this );
                     dtde.LocationX      = x;
                     dtde.LocationY      = y;
                     dtde.DropAction     = m_nUserDragAction;
@@ -2812,7 +2812,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             // cancel drag
             DragSourceDropEvent dsde;
             dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource         = static_cast< XDragSource* >(this);
             dsde.DropAction         = DNDConstants::ACTION_NONE;
             dsde.DropSuccess        = false;
@@ -2826,7 +2826,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
     return bHandled;
 }
 
-void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, Time )
+void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow )
 {
     if( aDropWindow == m_aCurrentDropWindow )
     {
@@ -2846,7 +2846,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, Tim
     }
 }
 
-void SelectionManager::reject( ::Window aDropWindow, Time )
+void SelectionManager::reject( ::Window aDropWindow )
 {
     if( aDropWindow == m_aCurrentDropWindow )
     {
@@ -2859,7 +2859,7 @@ void SelectionManager::reject( ::Window aDropWindow, Time )
         {
             DragSourceDropEvent dsde;
             dsde.Source             = static_cast< OWeakObject* >(this);
-            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+            dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
             dsde.DragSource         = static_cast< XDragSource* >(this);
             dsde.DropAction         = DNDConstants::ACTION_NONE;
             dsde.DropSuccess        = false;
@@ -3005,7 +3005,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, ::Window aRoot )
 
     DragSourceDragEvent dsde;
     dsde.Source             = static_cast< OWeakObject* >(this);
-    dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+    dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
     dsde.DragSource         = static_cast< XDragSource* >(this);
     dsde.DropAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
     dsde.UserAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
@@ -3073,7 +3073,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, ::Window aRoot )
                 XTranslateCoordinates( m_pDisplay, aRoot, m_aDropWindow, nX, nY, &nWinX, &nWinY, &aChild );
                 DropTargetDragEnterEvent dtde;
                 dtde.Source                 = static_cast< OWeakObject* >( it->second.m_pTarget );
-                dtde.Context                = new DropTargetDragContext( m_aCurrentDropWindow, m_nDropTimestamp, *this );
+                dtde.Context                = new DropTargetDragContext( m_aCurrentDropWindow, *this );
                 dtde.LocationX              = nWinX;
                 dtde.LocationY              = nWinY;
                 dtde.DropAction             = m_nUserDragAction;
@@ -3131,7 +3131,7 @@ void SelectionManager::startDrag(
     DragSourceDropEvent aDragFailedEvent;
     aDragFailedEvent.Source             = static_cast< OWeakObject* >(this);
     aDragFailedEvent.DragSource         = static_cast< XDragSource* >(this);
-    aDragFailedEvent.DragSourceContext  = new DragSourceContext( None, CurrentTime, *this );
+    aDragFailedEvent.DragSourceContext  = new DragSourceContext( None, *this );
     aDragFailedEvent.DropAction         = DNDConstants::ACTION_NONE;
     aDragFailedEvent.DropSuccess        = false;
 
@@ -3411,7 +3411,7 @@ void SelectionManager::dragDoDispatch()
 
         DragSourceDropEvent dsde;
         dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
         dsde.DragSource         = static_cast< XDragSource* >(this);
         dsde.DropAction         = DNDConstants::ACTION_NONE;
         dsde.DropSuccess        = false;
@@ -3458,7 +3458,7 @@ void SelectionManager::dragDoDispatch()
  */
 
 
-void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, Time )
+void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow )
 {
     osl::MutexGuard aGuard( m_aMutex );
     if( aDropWindow == m_aDropWindow && Cursor(cursor) != m_aCurrentCursor )
@@ -3937,7 +3937,7 @@ void SelectionManager::deregisterDropTarget( ::Window aWindow )
         // notify the listener
         DragSourceDropEvent dsde;
         dsde.Source             = static_cast< OWeakObject* >(this);
-        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this );
+        dsde.DragSourceContext  = new DragSourceContext( m_aDropWindow, *this );
         dsde.DragSource         = static_cast< XDragSource* >(this);
         dsde.DropAction         = DNDConstants::ACTION_NONE;
         dsde.DropSuccess        = false;
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 7d6de7ca12f5..516c9dc6c8f8 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -451,13 +451,13 @@ namespace x11 {
         void deregisterDropTarget( ::Window aXLIB_Window );
 
         // for XDropTarget{Drag|Drop}Context
-        void accept( sal_Int8 dragOperation, ::Window aDropXLIB_Window, Time aTimestamp );
-        void reject( ::Window aDropXLIB_Window, Time aTimestamp );
-        void dropComplete( bool success, ::Window aDropXLIB_Window, Time aTimestamp );
+        void accept( sal_Int8 dragOperation, ::Window aDropXLIB_Window );
+        void reject( ::Window aDropXLIB_Window );
+        void dropComplete( bool success, ::Window aDropXLIB_Window );
 
         // for XDragSourceContext
         sal_Int32 getCurrentCursor() { return m_aCurrentCursor;}
-        void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window, Time aTimestamp );
+        void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window );
         void transferablesFlavorsChanged();
 
         void shutdown() throw();
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 5517b47c894d..73fc5a424152 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -698,7 +698,7 @@ void X11SalBitmap::ImplDraw(
 {
     ImplGetDDB( aDrawable, nXScreen, nDrawableDepth, rTwoRect );
     if( mpDDB )
-        mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC );
+        mpDDB->ImplDraw( aDrawable, rTwoRect, rGC );
 }
 
 bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
@@ -974,7 +974,7 @@ ImplSalDDB::ImplSalDDB(
         }
 
         aGC = XCreateGC( pXDisp, maPixmap, nValues, &aValues );
-        ImplDraw( aDrawable, nDrawableDepth, maPixmap, mnDepth,
+        ImplDraw( aDrawable, nDrawableDepth, maPixmap,
                   nX, nY, nWidth, nHeight, 0, 0, aGC );
         XFreeGC( pXDisp, aGC );
     }
@@ -1027,12 +1027,11 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe
 
 void ImplSalDDB::ImplDraw(
     Drawable aDrawable,
-    long nDrawableDepth,
     const SalTwoRect& rTwoRect,
     const GC& rGC
 ) const
 {
-    ImplDraw( maPixmap, mnDepth, aDrawable, nDrawableDepth,
+    ImplDraw( maPixmap, mnDepth, aDrawable,
               rTwoRect.mnSrcX - maTwoRect.mnSrcX, rTwoRect.mnSrcY - maTwoRect.mnSrcY,
               rTwoRect.mnDestWidth, rTwoRect.mnDestHeight,
               rTwoRect.mnDestX, rTwoRect.mnDestY, rGC );
@@ -1042,7 +1041,6 @@ void ImplSalDDB::ImplDraw(
     Drawable aSrcDrawable,
     long nSrcDrawableDepth,
     Drawable aDstDrawable,
-    long,
     long nSrcX,
     long nSrcY,
     long nDestWidth,
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index 7709ece77b69..37cb6f0f3c43 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -277,16 +277,16 @@ void GlyphCache::GarbageCollect()
     }
 }
 
-inline void GlyphCache::UsingGlyph( FreetypeFont&, GlyphData& rGlyphData )
+inline void GlyphCache::UsingGlyph( GlyphData& rGlyphData )
 {
     rGlyphData.SetLruValue( mnLruIndex++ );
 }
 
-inline void GlyphCache::AddedGlyph( FreetypeFont& rFreetypeFont, GlyphData& rGlyphData )
+inline void GlyphCache::AddedGlyph( GlyphData& rGlyphData )
 {
     ++mnGlyphCount;
     mnBytesUsed += sizeof( rGlyphData );
-    UsingGlyph( rFreetypeFont, rGlyphData );
+    UsingGlyph( rGlyphData );
     if( mnBytesUsed > mnMaxSize )
         GarbageCollect();
 }
@@ -320,7 +320,7 @@ const tools::Rectangle& FreetypeFont::GetGlyphBoundRect(const GlyphItem& rGlyph)
     GlyphList::iterator it = maGlyphList.find(rGlyph.maGlyphId);
     if( it != maGlyphList.end() ) {
         GlyphData& rGlyphData = it->second;
-        GlyphCache::GetInstance().UsingGlyph( *this, rGlyphData );
+        GlyphCache::GetInstance().UsingGlyph( rGlyphData );
         return rGlyphData.GetBoundRect();
     }
 
@@ -328,7 +328,7 @@ const tools::Rectangle& FreetypeFont::GetGlyphBoundRect(const GlyphItem& rGlyph)
     GlyphData& rGlyphData = maGlyphList[rGlyph.maGlyphId];
     mnBytesUsed += sizeof( GlyphData );
     InitGlyphData(rGlyph, rGlyphData);
-    GlyphCache::GetInstance().AddedGlyph( *this, rGlyphData );
+    GlyphCache::GetInstance().AddedGlyph( rGlyphData );
     return rGlyphData.GetBoundRect();
 }
 
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 1a394a25769d..c9be5dde750c 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -151,7 +151,7 @@ PrinterGfx::ResetClipRegion()
 }
 
 void
-PrinterGfx::BeginSetClipRegion( sal_uInt32 )
+PrinterGfx::BeginSetClipRegion()
 {
     maClipRegion.clear();
 }
@@ -1130,7 +1130,7 @@ PrinterGfx::DrawEPS( const tools::Rectangle& rBoundingBox, void* pPtr, sal_uInt3
                  "  } if\n"
                  "}if\n" );
         // set up clip path and scale
-        BeginSetClipRegion( 1 );
+        BeginSetClipRegion();
         UnionClipRegion( rBoundingBox.Left(), rBoundingBox.Top(), rBoundingBox.GetWidth(), rBoundingBox.GetHeight() );
         EndSetClipRegion();
         PSTranslate( aTranslatePoint );
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index f844fc8789f6..85f81cc4454b 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -296,7 +296,7 @@ bool GenPspGraphics::setClipRegion( const vcl::Region& i_rClip )
     // TODO: support polygonal clipregions here
     RectangleVector aRectangles;
     i_rClip.GetRegionRectangles(aRectangles);
-    m_pPrinterGfx->BeginSetClipRegion(aRectangles.size());
+    m_pPrinterGfx->BeginSetClipRegion();
 
     for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter)
     {
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 00ed8860c3e2..41a6cfc54a83 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -145,13 +145,13 @@ OString CUPSManager::threadedCupsGetPPD( const char* pPrinter )
     return aResult;
 }
 
-static const char* setPasswordCallback( const char* pIn )
+static const char* setPasswordCallback( const char* /*pIn*/ )
 {
     const char* pRet = nullptr;
 
     PrinterInfoManager& rMgr = PrinterInfoManager::get();
     if( rMgr.getType() == PrinterInfoManager::Type::CUPS ) // sanity check
-        pRet = static_cast<CUPSManager&>(rMgr).authenticateUser( pIn );
+        pRet = static_cast<CUPSManager&>(rMgr).authenticateUser();
     return pRet;
 }
 
@@ -892,7 +892,7 @@ namespace
     }
 }
 
-const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
+const char* CUPSManager::authenticateUser()
 {
     const char* pRet = nullptr;
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index c99e80024f45..39142e456ffd 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2370,10 +2370,10 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
     return;
 }
 
-void X11SalFrame::EndExtTextInput( EndExtTextInputFlags nFlags )
+void X11SalFrame::EndExtTextInput( EndExtTextInputFlags )
 {
     if (mpInputContext != nullptr)
-          mpInputContext->EndExtTextInput( nFlags );
+          mpInputContext->EndExtTextInput();
 }
 
 OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 70e790443b29..cf466457e744 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -55,11 +55,11 @@ using namespace vcl_sal;
  ***************************************************************/
 extern "C" {
 GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
-                                     GdkEvent* event,
+                                     GdkEvent* /*event*/,
                                      gpointer data )
 {
     GtkSalDisplay *pDisplay = static_cast<GtkSalDisplay *>(data);
-    return pDisplay->filterGdkEvent( sys_event, event );
+    return pDisplay->filterGdkEvent( sys_event );
 }
 }
 
@@ -116,8 +116,7 @@ void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
 
 }
 
-GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
-                                               GdkEvent* )
+GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event )
 {
     GdkFilterReturn aFilterReturn = GDK_FILTER_CONTINUE;
     XEvent *pEvent = static_cast<XEvent *>(sys_event);
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 491444287256..13cac1ac4514 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -222,13 +222,11 @@ static void NWCalcArrowRect( const tools::Rectangle& rButton, tools::Rectangle&
  *
  */
 
-static tools::Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                                const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetButtonArea( SalX11Screen nScreen, tools::Rectangle aAreaRect, ControlState nState);
 
 static tools::Rectangle NWGetTabItemRect( SalX11Screen nScreen, tools::Rectangle aAreaRect );
 
-static tools::Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                            const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, tools::Rectangle aAreaRect );
 
 static void NWPaintOneEditBox( SalX11Screen nScreen, GdkDrawable * gdkDrawable, GdkRectangle *gdkRect,
                                ControlType nType, ControlPart nPart, tools::Rectangle aEditBoxRect,
@@ -242,22 +240,15 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, Cont
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 
-static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                            const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlPart nPart, tools::Rectangle aAreaRect );
 
-static tools::Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                            const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlPart nPart, tools::Rectangle aAreaRect);
 
-static tools::Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                            const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, tools::Rectangle aAreaRect);
 
 static tools::Rectangle NWGetToolbarRect( SalX11Screen nScreen,
-                                   ControlType nType,
                                    ControlPart nPart,
-                                   tools::Rectangle aAreaRect,
-                                   ControlState nState,
-                                   const ImplControlValue& aValue,
-                                   const OUString& rCaption );
+                                   tools::Rectangle aAreaRect );
 
 static int getFrameWidth(GtkWidget* widget);
 
@@ -1091,10 +1082,8 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         && (rControlRegion.GetWidth() > 16)
     && (rControlRegion.GetHeight() > 16) )
     {
-        rNativeBoundingRegion = NWGetButtonArea( m_nXScreen, nType, nPart, rControlRegion,
-        nState, aValue, rCaption );
+        rNativeBoundingRegion = NWGetButtonArea( m_nXScreen, rControlRegion, nState );
         rNativeContentRegion = rControlRegion;
-
         returnVal = true;
     }
     if (nType == ControlType::TabItem && nPart == ControlPart::Entire)
@@ -1105,8 +1094,7 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     }
     if ( (nType==ControlType::Combobox) && ((nPart==ControlPart::ButtonDown) || (nPart==ControlPart::SubEdit)) )
     {
-        rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nXScreen, nType, nPart, rControlRegion, nState,
-        aValue, rCaption );
+        rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nXScreen, nPart, rControlRegion);
         rNativeContentRegion = rNativeBoundingRegion;
 
         returnVal = true;
@@ -1122,8 +1110,7 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     }
     if ( (nType==ControlType::Listbox) && ((nPart==ControlPart::ButtonDown) || (nPart==ControlPart::SubEdit)) )
     {
-        rNativeBoundingRegion = NWGetListBoxButtonRect( m_nXScreen, nType, nPart, rControlRegion, nState,
-        aValue, rCaption );
+        rNativeBoundingRegion = NWGetListBoxButtonRect( m_nXScreen, nPart, rControlRegion);
         rNativeContentRegion = rNativeBoundingRegion;
 
         returnVal = true;
@@ -1136,7 +1123,7 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         (nPart==ControlPart::Button)
         ))
     {
-        rNativeBoundingRegion = NWGetToolbarRect( m_nXScreen, nType, nPart, rControlRegion, nState, aValue, rCaption );
+        rNativeBoundingRegion = NWGetToolbarRect( m_nXScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
         returnVal = true;
     }
@@ -1713,8 +1700,7 @@ bool GtkSalGraphics::NWPaintGTKButton(
 }
 
 static tools::Rectangle NWGetButtonArea( SalX11Screen nScreen,
-                                  ControlType, ControlPart, tools::Rectangle aAreaRect, ControlState nState,
-                                  const ImplControlValue&, const OUString& )
+                                  tools::Rectangle aAreaRect, ControlState nState )
 {
     gboolean        interiorFocus;
     gint            focusWidth;
@@ -2312,8 +2298,7 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
 
     // Find the overall bounding rect of the buttons's drawing area,
     // plus its actual draw rect excluding adornment
-    pixmapRect = NWGetEditBoxPixmapRect( m_nXScreen, nType, nPart, rControlRectangle,
-                                         nState, aValue, rCaption );
+    pixmapRect = NWGetEditBoxPixmapRect( m_nXScreen, rControlRectangle );
     for( std::list< tools::Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
         clipRect.x = it->Left();
@@ -2332,12 +2317,7 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
  * any focus requirements.
  */
 static tools::Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen,
-                                        ControlType,
-                                        ControlPart,
-                                        tools::Rectangle aAreaRect,
-                                        ControlState,
-                                        const ImplControlValue&,
-                                        const OUString& )
+                                        tools::Rectangle aAreaRect)
 {
     tools::Rectangle        pixmapRect = aAreaRect;
     gboolean        interiorFocus;
@@ -2636,7 +2616,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
     NWSetWidgetState( gWidgetData[m_nXScreen].gComboWidget, nState, stateType );
     NWSetWidgetState( gWidgetData[m_nXScreen].gArrowWidget, nState, stateType );
 
-    buttonRect = NWGetComboBoxButtonRect( m_nXScreen, nType, ControlPart::ButtonDown, pixmapRect, nState, aValue, rCaption );
+    buttonRect = NWGetComboBoxButtonRect( m_nXScreen, ControlPart::ButtonDown, pixmapRect );
     if( nPart == ControlPart::ButtonDown )
         buttonRect.Left() += 1;
 
@@ -2684,12 +2664,8 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
 }
 
 static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
-                                          ControlType,
                                           ControlPart nPart,
-                                          tools::Rectangle                aAreaRect,
-                                          ControlState,
-                                          const ImplControlValue&,
-                                          const OUString& )
+                                          tools::Rectangle                aAreaRect )
 {
     tools::Rectangle    aButtonRect;
     gint        nArrowWidth;
@@ -2892,12 +2868,12 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
 }
 
 bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
-                                        ControlType nType, ControlPart nPart,
+                                        ControlType , ControlPart nPart,
                                         const tools::Rectangle& rControlRectangle,
                                         const std::list< tools::Rectangle >& rClipList,
                                         ControlState nState,
-                                        const ImplControlValue& aValue,
-                                        const OUString& rCaption )
+                                        const ImplControlValue& ,
+                                        const OUString&  )
 {
     tools::Rectangle        aIndicatorRect;
     GtkStateType    stateType;
@@ -2947,8 +2923,7 @@ bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
             gtk_paint_box( gWidgetData[m_nXScreen].gOptionMenuWidget->style, gdkDrawable, stateType, shadowType, &clipRect,
                            gWidgetData[m_nXScreen].gOptionMenuWidget, "optionmenu",
                            x, y, w, h);
-            aIndicatorRect = NWGetListBoxIndicatorRect( m_nXScreen, nType, nPart, rControlRectangle, nState,
-                                                        aValue, rCaption );
+            aIndicatorRect = NWGetListBoxIndicatorRect( m_nXScreen, rControlRectangle);
             gtk_paint_tab( gWidgetData[m_nXScreen].gOptionMenuWidget->style, gdkDrawable, stateType, shadowType, &clipRect,
                            gWidgetData[m_nXScreen].gOptionMenuWidget, "optionmenutab",
                            aIndicatorRect.Left(), aIndicatorRect.Top(),
@@ -3642,12 +3617,8 @@ static int getFrameWidth(GtkWidget* widget)
 }
 
 static tools::Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
-                                         ControlType,
                                          ControlPart    nPart,
-                                         tools::Rectangle      aAreaRect,
-                                         ControlState,
-                                         const ImplControlValue&,
-                                         const OUString& )
+                                         tools::Rectangle      aAreaRect )
 {
     tools::Rectangle       aPartRect;
     GtkRequisition *pIndicatorSize = nullptr;
@@ -3705,12 +3676,7 @@ static tools::Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
 }
 
 static tools::Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
-                                            ControlType,
-                                            ControlPart,
-                                            tools::Rectangle                aAreaRect,
-                                            ControlState,
-                                            const ImplControlValue&,
-                                            const OUString& )
+                                            tools::Rectangle                aAreaRect )
 {
     tools::Rectangle       aIndicatorRect;
     GtkRequisition *pIndicatorSize = nullptr;
@@ -3755,12 +3721,8 @@ static tools::Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
 }
 
 static tools::Rectangle NWGetToolbarRect(  SalX11Screen nScreen,
-                                    ControlType,
                                     ControlPart                nPart,
-                                    tools::Rectangle                aAreaRect,
-                                    ControlState,
-                                    const ImplControlValue&,
-                                    const OUString& )
+                                    tools::Rectangle                aAreaRect )
 {
     tools::Rectangle aRet;
 
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 18327a484081..c5835e69f15a 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -61,11 +61,11 @@ using namespace vcl_sal;
  ***************************************************************/
 extern "C" {
 GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
-                                     GdkEvent* event,
+                                     GdkEvent* /*event*/,
                                      gpointer data )
 {
     GtkSalDisplay *pDisplay = static_cast<GtkSalDisplay *>(data);
-    return pDisplay->filterGdkEvent( sys_event, event );
+    return pDisplay->filterGdkEvent( sys_event );
 }
 }
 
@@ -116,8 +116,7 @@ void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
 
 }
 
-GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event,
-                                               GdkEvent* )
+GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event )
 {
     (void) this; // loplugin:staticmethods
     (void) sys_event;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8701127b3cb4..0f47ff54af5d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -301,9 +301,9 @@ public:
     virtual void SAL_CALL removeClipboardListener(
         const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
-    void ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info);
-    void ClipboardClear(GtkClipboard *clipboard);
-    void OwnerPossiblyChanged(GtkClipboard *clipboard, GdkEvent *event);
+    void ClipboardGet(GtkSelectionData *selection_data, guint info);
+    void ClipboardClear();
+    void OwnerPossiblyChanged(GtkClipboard *clipboard);
 };
 
 OUString VclGtkClipboard::getImplementationName()
@@ -334,8 +334,7 @@ Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents()
     return m_aContents;
 }
 
-void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, GtkSelectionData *selection_data,
-                                   guint info)
+void VclGtkClipboard::ClipboardGet(GtkSelectionData *selection_data, guint info)
 {
     if (!m_aContents.is())
         return;
@@ -362,28 +361,28 @@ namespace
 
 namespace
 {
-    void ClipboardGetFunc(GtkClipboard *clipboard, GtkSelectionData *selection_data,
+    void ClipboardGetFunc(GtkClipboard */*clipboard*/, GtkSelectionData *selection_data,
                           guint info,
                           gpointer user_data_or_owner)
     {
         VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
-        pThis->ClipboardGet(clipboard, selection_data, info);
+        pThis->ClipboardGet(selection_data, info);
     }
 
-    void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner)
+    void ClipboardClearFunc(GtkClipboard */*clipboard*/, gpointer user_data_or_owner)
     {
         VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner);
-        pThis->ClipboardClear(clipboard);
+        pThis->ClipboardClear();
     }
 
-    void handle_owner_change(GtkClipboard *clipboard, GdkEvent *event, gpointer user_data)
+    void handle_owner_change(GtkClipboard *clipboard, GdkEvent */*event*/, gpointer user_data)
     {
         VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data);
-        pThis->OwnerPossiblyChanged(clipboard, event);
+        pThis->OwnerPossiblyChanged(clipboard);
     }
 }
 
-void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard, GdkEvent* /*event*/)
+void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard)
 {
     if (!m_aContents.is())
         return;
@@ -429,7 +428,7 @@ void VclGtkClipboard::OwnerPossiblyChanged(GtkClipboard* clipboard, GdkEvent* /*
     }
 }
 
-void VclGtkClipboard::ClipboardClear(GtkClipboard * /*clipboard*/)
+void VclGtkClipboard::ClipboardClear()
 {
     for (auto &a : m_aGtkTargets)
         g_free(a.target);
@@ -541,7 +540,7 @@ VclGtkClipboard::~VclGtkClipboard()
     if (!m_aGtkTargets.empty())
     {
         gtk_clipboard_clear(clipboard);
-        ClipboardClear(clipboard);
+        ClipboardClear();
     }
     assert(m_aGtkTargets.empty());
 }
@@ -604,7 +603,7 @@ void VclGtkClipboard::setContents(
     if (!m_aGtkTargets.empty())
     {
         gtk_clipboard_clear(clipboard);
-        ClipboardClear(clipboard);
+        ClipboardClear();
     }
     assert(m_aGtkTargets.empty());
     if (m_aContents.is())