loplugin:checkunusedparams more part1

seems I got one of the checks wrong, and was missing a bunch of stuff

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

34 files changed, 87 insertions, 120 deletions

diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx
index 790236873d99..4dc7ac0bba7d 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/checkunusedparams.cxx
@@ -10,6 +10,7 @@
 #include <cassert>
 #include <string>
 #include <set>
+#include <iostream>
 
 #include "plugin.hxx"
 
@@ -80,7 +81,11 @@ bool CheckUnusedParams::VisitDeclRefExpr(DeclRefExpr const * declRef) {
 
 
 static int noFieldsInRecord(RecordType const * recordType) {
-    return std::distance(recordType->getDecl()->field_begin(), recordType->getDecl()->field_end());
+    auto recordDecl = recordType->getDecl();
+    // if it's complicated, lets just assume it has fields
+    if (isa<ClassTemplateSpecializationDecl>(recordDecl))
+        return 1;
+    return std::distance(recordDecl->field_begin(), recordDecl->field_end());
 }
 static bool startswith(const std::string& rStr, const char* pSubStr) {
     return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
@@ -291,6 +296,27 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
     // bool marker parameter
     if (fqn == "SvxIconReplacementDialog::SvxIconReplacementDialog")
         return true;
+    // callback
+    if (fqn == "basctl::SIDEModel_createInstance")
+        return true;
+    // callback
+    if (startswith(fqn, "SbRtl_"))
+        return true;
+    // takes pointer to fn
+    if (fqn == "migration::BasicMigration_create" || fqn == "migration::WordbookMigration_create"
+        || fqn == "FontIdentificator_createInstance" || fqn == "vcl::DragSource_createInstance"
+        || fqn == "vcl::DropTarget_createInstance" || fqn == "vcl::FontIdentificator_createInstance"
+        || fqn == "drawinglayer::unorenderer::XPrimitive2DRenderer_createInstance")
+         return true;
+    // TODO
+    if (fqn == "FontSubsetInfo::CreateFontSubsetFromType1")
+         return true;
+    // used in template magic
+    if (fqn == "MtfRenderer::MtfRenderer")
+         return true;
+    // FIXME
+    if (fqn == "GtkSalDisplay::filterGdkEvent")
+         return true;
 
     // ignore the LINK macros from include/tools/link.hxx
     if (decl->getLocation().isMacroID())
@@ -298,6 +324,8 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
 
     for( auto it = decl->param_begin(); it != decl->param_end(); ++it) {
         auto param = *it;
+        if (fqn.find("fillShapeProperties") != std::string::npos)
+            param->dump();
         if (param->hasAttr<UnusedAttr>())
             continue;
         if (!param->getName().empty())
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index b891cc22b580..d84e8a1eaedd 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -103,9 +103,9 @@ OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProduct
 {
     return m_ProfileAccess->getProfilePath(product,profileName);
 }
-sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName )
+sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType /*product*/, const OUString& /*profileName*/ )
 {
-    return m_ProfileAccess->isProfileLocked(product,profileName);
+    return true;
 }
 sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 97e61013786c..f3e80833b6f5 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -194,10 +194,6 @@ namespace connectivity
             const ProfileStruct& rProfile = (*rProduct.mProfileList.begin()).second;
             return rProfile.getProfileName();
         }
-        bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType, const OUString& )
-        {
-            return true;
-        }
 
         bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName )
         {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 8424fb6fdcd1..9918180a473f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -78,8 +78,6 @@ namespace connectivity
             /// @throws css::uno::RuntimeException
             OUString getDefaultProfile( css::mozilla::MozillaProductType product );
             /// @throws css::uno::RuntimeException
-            bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName );
-            /// @throws css::uno::RuntimeException
             bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
         private:
             ProductStruct m_ProductProfileList[4];
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index 63ee1dcf8a7f..80ded934203f 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -20,26 +20,16 @@
 #ifndef INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
 #define INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppcanvas/color.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering
-{
-    class  XGraphicDevice;
-} } } }
-
-
 namespace cppcanvas
 {
     namespace tools
     {
-        css::uno::Sequence< double >
-            intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&,
-                                      Color::IntSRGBA );
+        css::uno::Sequence< double > intSRGBAToDoubleSequence( Color::IntSRGBA );
 
-        Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice,
-                                                  const css::uno::Sequence< double >&                          rColor  );
+        Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor  );
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 2777abb7e24c..db8c597afcba 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -84,8 +84,7 @@ namespace cppcanvas
                                         const CanvasSharedPtr&     rCanvas,
                                         const OutDevState&         rState ) :
                 CachedPrimitiveBase( rCanvas, true ),
-                mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
-                                                                rBmpEx ) ),
+                mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ),
                 mpCanvas( rCanvas ),
                 maState()
             {
@@ -112,8 +111,7 @@ namespace cppcanvas
                                         const CanvasSharedPtr&      rCanvas,
                                         const OutDevState&          rState      ) :
                 CachedPrimitiveBase( rCanvas, true ),
-                mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
-                                                                rBmpEx ) ),
+                mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ),
                 mpCanvas( rCanvas ),
                 maState()
             {
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 2a2f75c9f7d0..79887c892857 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1713,10 +1713,7 @@ namespace cppcanvas
                                         aMatrix );
 
                                     aTexture.Alpha = 1.0 - aFill.getTransparency();
-                                    aTexture.Bitmap =
-                                        vcl::unotools::xBitmapFromBitmapEx(
-                                            rCanvas->getUNOCanvas()->getDevice(),
-                                            aBmpEx );
+                                    aTexture.Bitmap = vcl::unotools::xBitmapFromBitmapEx( aBmpEx );
                                     if( aFill.isTiling() )
                                     {
                                         aTexture.RepeatModeX = rendering::TexturingMode::REPEAT;
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index db4dd13c2f59..6bf9c55433c4 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.cxx
@@ -27,8 +27,7 @@ namespace cppcanvas
 {
     namespace tools
     {
-        uno::Sequence< double > intSRGBAToDoubleSequence( const uno::Reference< rendering::XGraphicDevice >&,
-                                                          Color::IntSRGBA                                   aColor  )
+        uno::Sequence< double > intSRGBAToDoubleSequence( Color::IntSRGBA aColor  )
         {
             uno::Sequence< double > aRes( 4 );
 
@@ -40,8 +39,7 @@ namespace cppcanvas
             return aRes;
         }
 
-        Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Reference< rendering::XGraphicDevice >&,
-                                                  const uno::Sequence< double >&                    rColor  )
+        Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Sequence< double >& rColor  )
         {
             return makeColor( static_cast<sal_uInt8>( 255*rColor[0] + .5 ),
                               static_cast<sal_uInt8>( 255*rColor[1] + .5 ),
diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx
index 1c69bb4251f3..a22fffe39c47 100644
--- a/cppcanvas/source/wrapper/implcolor.cxx
+++ b/cppcanvas/source/wrapper/implcolor.cxx
@@ -44,7 +44,7 @@ namespace cppcanvas
             OSL_ENSURE( mxDevice.is(), "ImplColor::getDeviceColor(): Invalid graphic device" );
 
             // TODO(F1): Color space handling
-            return tools::intSRGBAToDoubleSequence( mxDevice, aSRGBA );
+            return tools::intSRGBAToDoubleSequence( aSRGBA );
         }
 
     }
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index ddd3be37fddc..ab1504c78e5c 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -64,22 +64,19 @@ namespace cppcanvas
 
         void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor )
         {
-            maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(),
-                                                           aColor );
+            maFillColor = tools::intSRGBAToDoubleSequence( aColor );
             mbFillColorSet = true;
         }
 
         void ImplPolyPolygon::setRGBALineColor( Color::IntSRGBA aColor )
         {
-            maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(),
-                                                             aColor );
+            maStrokeColor = tools::intSRGBAToDoubleSequence( aColor );
             mbStrokeColorSet = true;
         }
 
         Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const
         {
-            return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),
-                                                    maStrokeColor );
+            return tools::doubleSequenceToIntSRGBA( maStrokeColor );
         }
 
         void ImplPolyPolygon::setStrokeWidth( const double& rStrokeWidth )
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 4715e790d83e..de3b1f6176c9 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -81,9 +81,7 @@ namespace cppcanvas
             return BitmapSharedPtr();
 
         return BitmapSharedPtr( new internal::ImplBitmap( rCanvas,
-                                                          vcl::unotools::xBitmapFromBitmapEx(
-                                                              xCanvas->getDevice(),
-                                                              rBmpEx) ) );
+                                                          vcl::unotools::xBitmapFromBitmapEx(rBmpEx) ) );
     }
 
     RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr&        rCanvas,
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 109d0b07b970..8a515b117e4d 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -169,11 +169,9 @@ namespace drawinglayer
 
                     if(!aBitmapEx.IsEmpty())
                     {
-                        const uno::Reference< rendering::XGraphicDevice > xGraphicDevice;
-
                         aBitmapEx.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
                         aBitmapEx.SetPrefSize(Size(basegfx::fround(fWidth), basegfx::fround(fHeight)));
-                        XBitmap = vcl::unotools::xBitmapFromBitmapEx(xGraphicDevice, aBitmapEx);
+                        XBitmap = vcl::unotools::xBitmapFromBitmapEx(aBitmapEx);
                     }
                 }
             }
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index a446405d544c..a098ff15d31f 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -362,7 +362,7 @@ private:
     static std::vector<vcl::EnumContext::Context> handleStyle(xmlreader::XmlReader &reader, int &nPriority);
     static OString getStyleClass(xmlreader::XmlReader &reader);
     void        applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader);
-    void        collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec);
+    void        collectProperty(xmlreader::XmlReader &reader, stringmap &rVec);
     static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
     static void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap);
     static void collectAccelerator(xmlreader::XmlReader &reader, accelmap &rMap);
@@ -379,14 +379,14 @@ private:
     void        handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &reader);
 
     void        handleListStore(xmlreader::XmlReader &reader, const OString &rID);
-    void        handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex);
+    void        handleRow(xmlreader::XmlReader &reader, const OString &rID);
     void        handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader);
     void        handleMenu(xmlreader::XmlReader &reader, const OString &rID);
-    std::vector<OUString> handleItems(xmlreader::XmlReader &reader, const OString &rID);
+    std::vector<OUString> handleItems(xmlreader::XmlReader &reader);
 
-    void        handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID);
+    void        handleSizeGroup(xmlreader::XmlReader &reader);
 
-    void        handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow);
+    void        handleAtkObject(xmlreader::XmlReader &reader, vcl::Window *pWindow);
 
     void        handleActionWidget(xmlreader::XmlReader &reader);
 
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index e2abfb32bbe1..915e4e218cd3 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -74,8 +74,7 @@ namespace vcl
         /** Create an XBitmap from VCL BitmapEx
          */
         css::uno::Reference< css::rendering::XBitmap >
-            VCL_DLLPUBLIC xBitmapFromBitmapEx( const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice,
-                                               const ::BitmapEx&                                            inputBitmap );
+            VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::BitmapEx& inputBitmap );
 
         /** Create a BitmapEx from an XBitmap
          */
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index d1f65b29b7aa..d300abefcd97 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -107,7 +107,6 @@ XUnbufferedStream::XUnbufferedStream(
 
 // allows to read package raw stream
 XUnbufferedStream::XUnbufferedStream(
-                    const uno::Reference< uno::XComponentContext >& /*xContext*/,
                     const rtl::Reference< comphelper::RefCountedMutex >& aMutexHolder,
                     const Reference < XInputStream >& xRawStream,
                     const ::rtl::Reference< EncryptionData >& rData )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index a463983b90b0..c9d44ebde07e 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -76,7 +76,6 @@ public:
 
     // allows to read package raw stream
     XUnbufferedStream(
-                 const css::uno::Reference< css::uno::XComponentContext >& xContext,
                  const rtl::Reference<comphelper::RefCountedMutex>& aMutexHolder,
                  const css::uno::Reference < css::io::XInputStream >& xRawStream,
                  const ::rtl::Reference< EncryptionData >& rData );
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 817a0e2798bb..3108578fad3b 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -420,7 +420,7 @@ uno::Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const rtl::R
             throw packages::WrongPasswordException(THROW_WHERE );
     }
 
-    return new XUnbufferedStream( rxContext, aMutexHolder, xStream, rData );
+    return new XUnbufferedStream( aMutexHolder, xStream, rData );
 }
 
 #if 0
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8a6516b0714c..ef249c60ac3d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1057,8 +1057,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
         {
             BitmapEx waitSymbolBitmap(BMP_WAIT_ICON);
             const Reference<rendering::XBitmap> xBitmap(
-                vcl::unotools::xBitmapFromBitmapEx(
-                    xSpriteCanvas->getDevice(), waitSymbolBitmap ) );
+                vcl::unotools::xBitmapFromBitmapEx( waitSymbolBitmap ) );
             if (xBitmap.is())
             {
                 mxShow->setProperty(
@@ -1070,8 +1069,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
 
             BitmapEx pointerSymbolBitmap(BMP_POINTER_ICON);
             const Reference<rendering::XBitmap> xPointerBitmap(
-                vcl::unotools::xBitmapFromBitmapEx(
-                    xSpriteCanvas->getDevice(), pointerSymbolBitmap ) );
+                vcl::unotools::xBitmapFromBitmapEx( pointerSymbolBitmap ) );
             if (xPointerBitmap.is())
             {
                 mxShow->setProperty(
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 38843be80939..8f6c27e83831 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -23,7 +23,7 @@ class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel
 {
 public:
     SendMailResult      SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame );
-    SendMailResult      Send( const css::uno::Reference< css::frame::XFrame >& xFrame );
+    SendMailResult      Send();
 };
 
 #endif
diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx
index af81e39636c4..9150b411e522 100644
--- a/sfx2/source/dialog/bluthsnd.cxx
+++ b/sfx2/source/dialog/bluthsnd.cxx
@@ -26,7 +26,7 @@ SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const css::uno
     if( eSaveResult == SAVE_SUCCESSFULL )
     {
         maAttachedDocuments.push_back( aFileName );
-        return Send( xFrame );
+        return Send();
     }
     else if( eSaveResult == SAVE_CANCELLED )
         eResult = SEND_MAIL_CANCELLED;
@@ -34,7 +34,7 @@ SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const css::uno
     return eResult;
 }
 
-SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send( const css::uno::Reference< css::frame::XFrame >& /*xFrame*/ )
+SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send()
 {
 #ifndef LINUX
     (void) this; // avoid loplugin:staticmethods
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 833f5b3e5edd..d08933acc0e1 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -186,8 +186,7 @@ namespace slideshow
                 Graphic aGraphic(xGraphic);
                 const BitmapEx aBmp = aGraphic.GetBitmapEx();
 
-                uno::Reference< rendering::XBitmap > xBitmap(vcl::unotools::xBitmapFromBitmapEx(
-                    pCanvas->getUNOCanvas()->getDevice(), aBmp));
+                uno::Reference< rendering::XBitmap > xBitmap(vcl::unotools::xBitmapFromBitmapEx(aBmp));
 
                 rendering::ViewState aViewState;
                 aViewState.AffineTransform = pCanvas->getViewState().AffineTransform;
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index 056a6c8b7604..d33bb2c371ed 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -56,8 +56,7 @@ FontIdentificator_createInstance(
 OUString SAL_CALL Clipboard_getImplementationName();
 
 css::uno::Reference<css::lang::XSingleServiceFactory> SAL_CALL
-Clipboard_createFactory(
-    css::uno::Reference<css::lang::XMultiServiceFactory > const &);
+Clipboard_createFactory();
 
 css::uno::Sequence<OUString> SAL_CALL DragSource_getSupportedServiceNames();
 
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index 12f0ede73992..aef484124db8 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -34,7 +34,6 @@ class X11OpenGLSalVirtualDevice : public SalVirtualDevice
 public:
     X11OpenGLSalVirtualDevice( SalGraphics *pGraphics,
                                long &nDX, long &nDY,
-                               DeviceFormat eFormat,
                                const SystemGraphicsData *pData,
                                X11SalGraphics* pNewGraphics);
     virtual ~X11OpenGLSalVirtualDevice() override;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 6a057078f04f..8c552393e578 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -341,7 +341,6 @@ protected:
                           ControlState nState, const ImplControlValue& aValue );
     bool NWPaintGTKScrollbar( ControlPart nPart,
                               const tools::Rectangle& rControlRectangle,
-                              const std::list< tools::Rectangle >& rClipList,
                               ControlState nState, const ImplControlValue& aValue );
     bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const tools::Rectangle& rControlRectangle,
@@ -350,7 +349,6 @@ protected:
                             const OUString& rCaption );
     bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                            const tools::Rectangle& rControlRectangle,
-                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
@@ -361,7 +359,6 @@ protected:
                              const OUString& rCaption );
     bool NWPaintGTKTabItem( ControlType nType,
                             const tools::Rectangle& rControlRectangle,
-                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue );
     bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlPart nPart,
                             const tools::Rectangle& rControlRectangle,
@@ -388,11 +385,9 @@ protected:
                             const ImplControlValue& aValue );
     bool NWPaintGTKSlider( ControlPart nPart,
                            const tools::Rectangle& rControlRectangle,
-                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue );
     bool NWPaintGTKListNode(
                             const tools::Rectangle& rControlRectangle,
-                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue );
 };
 
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index f06e9c3a43a5..c0bb8464b89e 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -34,7 +34,6 @@ void X11SalGraphics::Init( X11OpenGLSalVirtualDevice *pDevice )
 
 X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
                                                       long &nDX, long &nDY,
-                                                      DeviceFormat /*eFormat*/,
                                                       const SystemGraphicsData *pData,
                                                       X11SalGraphics* pNewGraphics) :
     mpGraphics(pNewGraphics),
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 0946b0e34fa5..4419e269c982 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -231,7 +231,7 @@ OUString SAL_CALL Clipboard_getImplementationName()
      );
 }
 
-Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > &  )
+Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory()
 {
     return Reference< XSingleServiceFactory >( new ClipboardFactory() );
 }
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 4d7fa497ef35..27f701f721f9 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -59,7 +59,7 @@ extern "C" {
             }
             else if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) )
             {
-                xFactory = vcl::Clipboard_createFactory( xMgr );
+                xFactory = vcl::Clipboard_createFactory();
             }
             else if( vcl::DragSource_getImplementationName().equalsAscii( pImplementationName ) )
             {
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 8bcf4d69bc90..7b75c586a8ae 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -65,8 +65,7 @@ namespace vcl
 {
     namespace unotools
     {
-        uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >&    /*xGraphicDevice*/,
-                                                                  const ::BitmapEx&                                     inputBitmap )
+        uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx(const ::BitmapEx& inputBitmap )
         {
             SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" );
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bc4b3047cfa0..5a7faafb87a9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1867,7 +1867,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read
                 --nLevel;
             }
             else if (name.equals("property"))
-                collectProperty(reader, sID, aProperties);
+                collectProperty(reader, aProperties);
         }
 
         if (res == xmlreader::XmlReader::Result::End)
@@ -2172,7 +2172,7 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM
         rMap[sProperty] = OUString::fromUtf8(sValue);
 }
 
-void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 /*nRowIndex*/)
+void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID)
 {
     int nLevel = 1;
 
@@ -2268,7 +2268,10 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI
         if (res == xmlreader::XmlReader::Result::Begin)
         {
             if (name.equals("row"))
-                handleRow(reader, rID, nRowIndex++);
+            {
+                handleRow(reader, rID);
+                nRowIndex++;
+            }
             else
                 ++nLevel;
         }
@@ -2283,7 +2286,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI
     }
 }
 
-void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow)
+void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, vcl::Window *pWindow)
 {
     assert(pWindow);
 
@@ -2306,7 +2309,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
         {
             ++nLevel;
             if (name.equals("property"))
-                collectProperty(reader, rID, aProperties);
+                collectProperty(reader, aProperties);
         }
 
         if (res == xmlreader::XmlReader::Result::End)
@@ -2330,7 +2333,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
     }
 }
 
-std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const OString & /*rID*/)
+std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader)
 {
     int nLevel = 1;
 
@@ -2432,7 +2435,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID)
             {
                 ++nLevel;
                 if (name.equals("property"))
-                    collectProperty(reader, rID, aProperties);
+                    collectProperty(reader, aProperties);
             }
         }
 
@@ -2539,7 +2542,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
             {
                 ++nLevel;
                 if (name.equals("property"))
-                    collectProperty(reader, sID, aProperties);
+                    collectProperty(reader, aProperties);
                 else if (name.equals("accelerator"))
                     collectAccelerator(reader, aAccelerators);
             }
@@ -2557,7 +2560,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
     insertMenuObject(pParent, pSubMenu, sClass, sID, aProperties, aAccelerators);
 }
 
-void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID)
+void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader)
 {
     m_pParserState->m_aSizeGroups.push_back(SizeGroup());
     SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back();
@@ -2596,7 +2599,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI
             else
             {
                 if (name.equals("property"))
-                    collectProperty(reader, rID, rSizeGroup.m_aProperties);
+                    collectProperty(reader, rSizeGroup.m_aProperties);
             }
         }
 
@@ -2785,12 +2788,12 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm
     }
     else if (sClass == "GtkSizeGroup")
     {
-        handleSizeGroup(reader, sID);
+        handleSizeGroup(reader);
         return nullptr;
     }
     else if (sClass == "AtkObject")
     {
-        handleAtkObject(reader, sID, pParent);
+        handleAtkObject(reader, pParent);
         return nullptr;
     }
 
@@ -2824,7 +2827,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm
                 handleChild(pCurrentChild, reader);
             }
             else if (name.equals("items"))
-                aItems = handleItems(reader, sID);
+                aItems = handleItems(reader);
             else if (name.equals("style"))
             {
                 int nPriority = 0;
@@ -2848,7 +2851,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm
             {
                 ++nLevel;
                 if (name.equals("property"))
-                    collectProperty(reader, sID, aProperties);
+                    collectProperty(reader, aProperties);
                 else if (name.equals("attribute"))
                     collectPangoAttribute(reader, aPangoAttributes);
                 else if (name.equals("relation"))
@@ -3103,7 +3106,7 @@ OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader)
     return aRet;
 }
 
-void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString & /*rID*/, stringmap &rMap)
+void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap)
 {
     xmlreader::Span name;
     int nsId;
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 16d8d87ee715..b65563db588a 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -41,7 +41,7 @@ SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics,
 {
     assert(pNewGraphics);
     if (OpenGLHelper::isVCLOpenGLEnabled())
-        return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, eFormat, pData, pNewGraphics );
+        return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, pData, pNewGraphics );
     else
         return new X11SalVirtualDevice(pGraphics, nDX, nDY, eFormat, pData, pNewGraphics);
 }
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index fab7902d588c..c30a41905302 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -169,14 +169,12 @@ public:
     /// @throws lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
     void detachRecursive(
-        const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext
     );
 
     /// @throws lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
     void detachRecursive(
-        const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext,
         const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
     );
@@ -349,13 +347,12 @@ void DocumentFocusListener::detachRecursive(
         xAccessible->getAccessibleContext();
 
     if( xContext.is() )
-        detachRecursive(xAccessible, xContext);
+        detachRecursive(xContext);
 }
 
 /*****************************************************************************/
 
 void DocumentFocusListener::detachRecursive(
-    const uno::Reference< accessibility::XAccessible >& xAccessible,
     const uno::Reference< accessibility::XAccessibleContext >& xContext
 )
 {
@@ -363,13 +360,12 @@ void DocumentFocusListener::detachRecursive(
         xContext->getAccessibleStateSet();
 
     if( xStateSet.is() )
-        detachRecursive(xAccessible, xContext, xStateSet);
+        detachRecursive(xContext, xStateSet);
 }
 
 /*****************************************************************************/
 
 void DocumentFocusListener::detachRecursive(
-    const uno::Reference< accessibility::XAccessible >&,
     const uno::Reference< accessibility::XAccessibleContext >& xContext,
     const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
 )
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 6b87eef78f54..3c8e75628a3e 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -965,7 +965,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
     }
     else if ( (nType==ControlType::Scrollbar) && ((nPart==ControlPart::DrawBackgroundHorz) || (nPart==ControlPart::DrawBackgroundVert)) )
     {
-        return NWPaintGTKScrollbar( nPart, aCtrlRect, aClip, nState, aValue );
+        return NWPaintGTKScrollbar( nPart, aCtrlRect, nState, aValue );
     }
     else if ( ((nType==ControlType::Editbox) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::HasBackgroundTexture)) )
         || ((nType==ControlType::Spinbox) && (nPart==ControlPart::HasBackgroundTexture))
@@ -981,7 +981,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
     else if ( ((nType==ControlType::Spinbox) || (nType==ControlType::SpinButtons))
         && ((nPart==ControlPart::Entire) || (nPart==ControlPart::AllButtons)) )
     {
-        return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption, rControlCacheKey);
+        return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, nState, aValue, rCaption, rControlCacheKey);
     }
     else if ( (nType == ControlType::Combobox) &&
         ( (nPart==ControlPart::Entire)
@@ -995,7 +995,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
         if ( nType == ControlType::TabBody )
             return true;
         else
-            return NWPaintGTKTabItem( nType, aCtrlRect, aClip, nState, aValue);
+            return NWPaintGTKTabItem( nType, aCtrlRect, nState, aValue);
     }
     else if ( (nType==ControlType::Listbox) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::ListboxWindow)) )
     {
@@ -1031,7 +1031,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
     }
     else if( (nType == ControlType::ListNode) && (nPart == ControlPart::Entire) )
     {
-        return NWPaintGTKListNode( aCtrlRect, aClip, nState, aValue );
+        return NWPaintGTKListNode( aCtrlRect, nState, aValue );
     }
     else if( (nType == ControlType::ListNet) && (nPart == ControlPart::Entire) )
     {
@@ -1040,7 +1040,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
     }
     else if( nType == ControlType::Slider )
     {
-        return NWPaintGTKSlider( nPart, aCtrlRect, aClip, nState, aValue );
+        return NWPaintGTKSlider( nPart, aCtrlRect, nState, aValue );
     }
     else if( nType == ControlType::WindowBackground )
     {
@@ -1862,7 +1862,6 @@ static void NWCalcArrowRect( const tools::Rectangle& rButton, tools::Rectangle&
 
 bool GtkSalGraphics::NWPaintGTKScrollbar( ControlPart nPart,
                                           const tools::Rectangle& rControlRectangle,
-                                          const std::list< tools::Rectangle >&,
                                           ControlState nState,
                                           const ImplControlValue& aValue )
 {
@@ -2389,7 +2388,6 @@ static void NWPaintOneEditBox(    SalX11Screen nScreen,
 
 bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                                        const tools::Rectangle& rControlRectangle,
-                                       const std::list< tools::Rectangle >&,
                                        ControlState nState,
                                        const ImplControlValue& aValue,
                                        const OUString& rCaption,
@@ -2692,7 +2690,6 @@ static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
 
 bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType,
                                         const tools::Rectangle& rControlRectangle,
-                                        const std::list< tools::Rectangle >&,
                                         ControlState nState,
                                         const ImplControlValue& aValue )
 {
@@ -3380,7 +3377,6 @@ bool GtkSalGraphics::NWPaintGTKTooltip(
 
 bool GtkSalGraphics::NWPaintGTKListNode(
             const tools::Rectangle& rControlRectangle,
-            const std::list< tools::Rectangle >&,
             ControlState nState, const ImplControlValue& rValue )
 {
     NWEnsureGTKTreeView( m_nXScreen );
@@ -3489,7 +3485,6 @@ bool GtkSalGraphics::NWPaintGTKProgress(
 bool GtkSalGraphics::NWPaintGTKSlider(
             ControlPart nPart,
             const tools::Rectangle& rControlRectangle,
-            const std::list< tools::Rectangle >&,
             ControlState nState, const ImplControlValue& rValue )
 {
     OSL_ASSERT( rValue.getType() == ControlType::Slider );
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
index b232629b35b1..9cce03b2d593 100644
--- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
@@ -288,10 +288,6 @@ OUString SAXEventKeeperImpl_getImplementationName();
 /// @throws css::uno::RuntimeException
 css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  );
 
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
-
 #endif
 
 
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index b241912a3514..da70366c694c 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1175,12 +1175,6 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(
     return aRet;
 }
 
-cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
-    const cssu::Reference< cssl::XMultiServiceFactory > &)
-{
-    return static_cast<cppu::OWeakObject*>(new SAXEventKeeperImpl());
-}
-
 /* XServiceInfo */
 OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  )
 {