loplugin:checkunusedparams in various

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

15 files changed, 166 insertions, 325 deletions

diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx
index 1618cee5be41..9772b2f90889 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/checkunusedparams.cxx
@@ -403,7 +403,8 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
          return true;
     // used in template magic
     if (fqn == "MtfRenderer::MtfRenderer" || fqn == "shell::sessioninstall::SyncDbusSessionHelper::SyncDbusSessionHelper"
-        || fqn == "dp_gui::LicenseDialog::LicenseDialog")
+        || fqn == "dp_gui::LicenseDialog::LicenseDialog"
+        || fqn == "(anonymous namespace)::OGLTransitionFactoryImpl::OGLTransitionFactoryImpl")
          return true;
     // FIXME
     if (fqn == "GtkSalDisplay::filterGdkEvent" || fqn == "SvXMLEmbeddedObjectHelper::ImplReadObject"
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 7925036608fa..e4f629fe6a0a 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -115,10 +115,8 @@ void RptMLMasterStylesContext_Impl::EndElement()
 ErrCode ReadThroughComponent(
     const uno::Reference<XInputStream>& xInputStream,
     const uno::Reference<XComponent>& xModelComponent,
-    const sal_Char* /*pStreamName*/,
     const uno::Reference<XComponentContext> & rContext,
-    const uno::Reference< XDocumentHandler >& _xFilter,
-    bool /*bEncrypted*/ )
+    const uno::Reference< XDocumentHandler >& _xFilter )
 {
     OSL_ENSURE(xInputStream.is(), "input stream missing");
     OSL_ENSURE(xModelComponent.is(), "document missing");
@@ -255,10 +253,8 @@ ErrCode ReadThroughComponent(
         // read from the stream
         return ReadThroughComponent( xInputStream
                                     ,xModelComponent
-                                    ,pStreamName
                                     ,rxContext
-                                    ,xDocHandler
-                                    ,bEncrypted );
+                                    ,xDocHandler );
     }
 
     // TODO/LATER: better error handling
@@ -642,7 +638,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
             break;
         case XML_TOK_DOC_META:
             GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-            pContext = CreateMetaContext( rLocalName,xAttrList );
+            pContext = CreateMetaContext( rLocalName );
             break;
         default:
             break;
@@ -983,7 +979,7 @@ void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunctio
     m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction));
 }
 
-SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&)
+SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName)
 {
     SvXMLImportContext* pContext = nullptr;
 
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 14d7db53d766..6969c56859ac 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -96,8 +96,7 @@ private:
 
     SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
                                             const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
-    SvXMLImportContext* CreateMetaContext(const OUString& rLocalName,
-                                          const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
+    SvXMLImportContext* CreateMetaContext(const OUString& rLocalName);
     SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
             const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
 protected:
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 4c07402a1039..40e00edfff25 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -989,7 +989,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
                 case css::presentation::EffectNodeType::TIMING_ROOT : nPPTNodeType = DFF_ANIM_NODE_TYPE_TIMING_ROOT; break;
                 case css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE: nPPTNodeType = DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ; break;
             }
-            exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType );
         }
     }
     sal_uInt32 nPresetId = 0;
@@ -1036,11 +1036,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
         }
     }
     if ( bPresetId )
-        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_ID, nPresetId, TRANSLATE_NONE );
+        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_ID, nPresetId );
     if ( bPresetSubType )
-        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_SUB_TYPE, nPresetSubType, TRANSLATE_NONE );
+        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_SUB_TYPE, nPresetSubType );
     if ( bPresetClass )
-        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_CLASS, nPresetClass, TRANSLATE_NONE );
+        exportAnimPropertyuInt32( rStrm, DFF_ANIM_PRESET_CLASS, nPresetClass );
 
     if ( pAny[ DFF_ANIM_ID ] )
     {
@@ -1058,7 +1058,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
     {
         sal_Int32 nRunTimeContext = 0;
         if ( *pAny[ DFF_ANIM_RUNTIMECONTEXT ] >>= nRunTimeContext )
-            exportAnimPropertyuInt32( rStrm, DFF_ANIM_RUNTIMECONTEXT, nRunTimeContext, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, DFF_ANIM_RUNTIMECONTEXT, nRunTimeContext );
     }
     if ( pAny[ DFF_ANIM_PATH_EDIT_MODE ] )
     {
@@ -1072,7 +1072,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
         {
 
             bool bDirection = !xColor->getDirection();
-            exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0 );
         }
     }
 
@@ -1080,14 +1080,14 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
     {
         sal_Int32 nOverride = 0;
         if ( *pAny[ DFF_ANIM_OVERRIDE ] >>= nOverride )
-            exportAnimPropertyuInt32( rStrm, DFF_ANIM_OVERRIDE, nOverride, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, DFF_ANIM_OVERRIDE, nOverride );
     }
 
     if ( pAny[ DFF_ANIM_MASTERREL ] )
     {
         sal_Int32 nMasterRel = 0;
         if ( *pAny[ DFF_ANIM_MASTERREL ] >>= nMasterRel )
-            exportAnimPropertyuInt32( rStrm, DFF_ANIM_MASTERREL, nMasterRel, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, DFF_ANIM_MASTERREL, nMasterRel );
     }
 
 /* todo
@@ -1130,7 +1130,7 @@ bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nP
                 sal_Int32 nVal = 0;
                 if ( rAny >>= nVal )
                 {
-                    exportAnimPropertyuInt32( rStrm, nPropertyId, nVal, eTranslateMode );
+                    exportAnimPropertyuInt32( rStrm, nPropertyId, nVal );
                     bRet = true;
                 }
             }
@@ -1198,7 +1198,7 @@ void AnimationExporter::exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt
          .WriteFloat( fFloat );
 }
 
-void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode )
+void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal )
 {
     EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
     rStrm.WriteUChar( DFF_ANIM_PROP_TYPE_INT32 )
@@ -1690,11 +1690,11 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
         if( nAfterEffectType != AFTEREFFECT_NONE )
         {
             EscherExContainer aAnimPropertySet( rStrm, DFF_msofbtAnimPropertySet );
-            exportAnimPropertyuInt32( rStrm, 6, 1, TRANSLATE_NONE );
+            exportAnimPropertyuInt32( rStrm, 6, 1 );
             if( nAfterEffectType == AFTEREFFECT_COLOR )
             {
-                exportAnimPropertyuInt32( rStrm, 4, 0, TRANSLATE_NONE );
-                exportAnimPropertyuInt32( rStrm, 5, 0, TRANSLATE_NONE );
+                exportAnimPropertyuInt32( rStrm, 4, 0 );
+                exportAnimPropertyuInt32( rStrm, 5, 0 );
             }
         }
         exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), false );
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 4628a104ac96..05583164b2d5 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -72,7 +72,7 @@ class AnimationExporter
     static bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const css::uno::Any& rAny, const TranslateMode eTranslateMode );
     static void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode );
     static void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal );
-    static void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode );
+    static void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal );
     static void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal );
 
     /** if available exportAnimPropertySet
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 6ca871a0d823..6386fc562013 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -132,7 +132,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
                     // resource managed by this ResourceManager accordingly.
                     HandleMainViewSwitch(
                         rEvent.ResourceId->getResourceURL(),
-                        rEvent.Configuration,
                         true);
                 }
             }
@@ -150,7 +149,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
             {
                 HandleMainViewSwitch(
                     OUString(),
-                    rEvent.Configuration,
                     false);
             }
             else if (rEvent.ResourceId->compareTo(mxResourceId) == 0)
@@ -166,7 +164,6 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
 
 void ResourceManager::HandleMainViewSwitch (
     const OUString& rsViewURL,
-    const Reference<XConfiguration>& /*rxConfiguration*/,
     const bool bIsActivated)
 {
     if (bIsActivated)
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 080ac90d18e3..ba0d45ffcf16 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -86,7 +86,6 @@ private:
 
     void HandleMainViewSwitch (
         const OUString& rsViewURL,
-        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration,
         const bool bIsActivated);
     void HandleResourceRequest(
         bool bActivation,
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 7e1048114eea..1e05d78ec5e4 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -49,8 +49,7 @@ static Reference<lang::XEventListener> mxControllerDisposeListener;
 
 //----- PanelFactory --------------------------------------------------------
 
-PanelFactory::PanelFactory(
-        const css::uno::Reference<css::uno::XComponentContext>& /*rxContext*/)
+PanelFactory::PanelFactory()
     : PanelFactoryInterfaceBase(m_aMutex)
 {
 }
@@ -144,10 +143,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* context,
+org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(css::uno::XComponentContext* /*context*/,
                                                                    css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new sd::sidebar::PanelFactory(context));
+    return cppu::acquire(new sd::sidebar::PanelFactory);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 444438255ea0..921c07e2fac6 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -46,7 +46,7 @@ class PanelFactory
       public PanelFactoryInterfaceBase
 {
 public:
-    explicit PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
+    explicit PanelFactory ();
     virtual ~PanelFactory() override;
     PanelFactory(const PanelFactory&) = delete;
     PanelFactory& operator=(const PanelFactory&) = delete;
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 7dbd8e9e38a0..02af8b856a4b 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -223,7 +223,6 @@ class PresenterTheme::Theme
 {
 public:
     Theme (
-        const OUString& rsName,
         const Reference<container::XHierarchicalNameAccess>& rThemeRoot,
         const OUString& rsNodeName);
 
@@ -572,7 +571,6 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize (
 //===== Theme =================================================================
 
 PresenterTheme::Theme::Theme (
-    const OUString& /*rsName*/,
     const Reference<container::XHierarchicalNameAccess>& rxThemeRoot,
     const OUString& rsNodeName)
     : msConfigurationNodeName(rsNodeName),
@@ -785,7 +783,7 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
                     >>= sThemeName;
                 if (sThemeName == sCurrentThemeName)
                 {
-                    pTheme.reset(new PresenterTheme::Theme(sThemeName,xTheme,rsKey));
+                    pTheme.reset(new PresenterTheme::Theme(xTheme,rsKey));
                     break;
                 }
             }
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index f2126c74e3f0..930ff81b506f 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -905,8 +905,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
 
     SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,
-        const OUString& rLocalName,
-        const uno::Reference< xml::sax::XAttributeList > &xAttrList);
+        const OUString& rLocalName);
 
     void EndElement() override;
 };
@@ -2189,7 +2188,7 @@ const SvXMLTokenMap& SmXMLImport::GetMspaceAttrTokenMap()
 SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
-    const uno::Reference<xml::sax::XAttributeList>& xAttrList)
+    const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
 {
     SvXMLImportContext* pContext = nullptr;
 
@@ -2199,86 +2198,69 @@ SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
     {
         //Consider semantics a dummy except for any starmath annotations
         case XML_TOK_SEMANTICS:
-            pContext = GetSmImport().CreateRowContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateRowContext(nPrefix,rLocalName);
             break;
         /*General Layout Schemata*/
         case XML_TOK_MROW:
-            pContext = GetSmImport().CreateRowContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateRowContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MENCLOSE:
-            pContext = GetSmImport().CreateEncloseContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateEncloseContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MFRAC:
-            pContext = GetSmImport().CreateFracContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateFracContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MSQRT:
-            pContext = GetSmImport().CreateSqrtContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateSqrtContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MROOT:
-            pContext = GetSmImport().CreateRootContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateRootContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MSTYLE:
-            pContext = GetSmImport().CreateStyleContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateStyleContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MERROR:
-            pContext = GetSmImport().CreateErrorContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateErrorContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MPADDED:
-            pContext = GetSmImport().CreatePaddedContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreatePaddedContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MPHANTOM:
-            pContext = GetSmImport().CreatePhantomContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreatePhantomContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MFENCED:
-            pContext = GetSmImport().CreateFencedContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateFencedContext(nPrefix,rLocalName);
             break;
         /*Script and Limit Schemata*/
         case XML_TOK_MSUB:
-            pContext = GetSmImport().CreateSubContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateSubContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MSUP:
-            pContext = GetSmImport().CreateSupContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateSupContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MSUBSUP:
-            pContext = GetSmImport().CreateSubSupContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateSubSupContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MUNDER:
-            pContext = GetSmImport().CreateUnderContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateUnderContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MOVER:
-            pContext = GetSmImport().CreateOverContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateOverContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MUNDEROVER:
-            pContext = GetSmImport().CreateUnderOverContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateUnderOverContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MMULTISCRIPTS:
             pContext = GetSmImport().CreateMultiScriptsContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
         case XML_TOK_MTABLE:
             pContext = GetSmImport().CreateTableContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
         case XML_TOK_MACTION:
             pContext = GetSmImport().CreateActionContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
         default:
             /*Basically theres an implicit mrow around certain bare
@@ -2288,7 +2270,7 @@ SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
                 GetXMLToken(XML_MROW)));
 
             pContext = aTempContext->StrictCreateChildContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
     }
     return pContext;
@@ -2486,8 +2468,7 @@ void SmXMLRowContext_Impl::EndElement()
 
 SvXMLImportContext *SmXMLRowContext_Impl::StrictCreateChildContext(
     sal_uInt16 nPrefix,
-    const OUString& rLocalName,
-    const uno::Reference<xml::sax::XAttributeList>& xAttrList)
+    const OUString& rLocalName)
 {
     SvXMLImportContext* pContext = nullptr;
 
@@ -2496,40 +2477,32 @@ SvXMLImportContext *SmXMLRowContext_Impl::StrictCreateChildContext(
     {
         /*Note that these should accept malignmark subelements, but do not*/
         case XML_TOK_MN:
-            pContext = GetSmImport().CreateNumberContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateNumberContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MI:
-            pContext = GetSmImport().CreateIdentifierContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateIdentifierContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MO:
-            pContext = GetSmImport().CreateOperatorContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateOperatorContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MTEXT:
-            pContext = GetSmImport().CreateTextContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateTextContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MSPACE:
-            pContext = GetSmImport().CreateSpaceContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateSpaceContext(nPrefix,rLocalName);
             break;
         case XML_TOK_MS:
-            pContext = GetSmImport().CreateStringContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateStringContext(nPrefix,rLocalName);
             break;
 
         /*Note: The maligngroup should only be seen when the row
          * (or descendants) are in a table*/
         case XML_TOK_MALIGNGROUP:
-            pContext = GetSmImport().CreateAlignGroupContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateAlignGroupContext(nPrefix,rLocalName);
             break;
 
         case XML_TOK_ANNOTATION:
-            pContext = GetSmImport().CreateAnnotationContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateAnnotationContext(nPrefix,rLocalName);
             break;
 
         default:
@@ -2545,7 +2518,7 @@ SvXMLImportContext *SmXMLRowContext_Impl::CreateChildContext(
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
     SvXMLImportContext* pContext = StrictCreateChildContext(nPrefix,
-    rLocalName, xAttrList);
+            rLocalName);
 
     if (!pContext)
     {
@@ -2573,11 +2546,10 @@ SvXMLImportContext *SmXMLMultiScriptsContext_Impl::CreateChildContext(
             bHasPrescripts = true;
             ProcessSubSupPairs(false);
             pContext = GetSmImport().CreatePrescriptsContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
         case XML_TOK_NONE:
-            pContext = GetSmImport().CreateNoneContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateNoneContext(nPrefix,rLocalName);
             break;
         default:
             pContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
@@ -2725,7 +2697,7 @@ SvXMLImportContext *SmXMLTableRowContext_Impl::CreateChildContext(
     {
         case XML_TOK_MTD:
             pContext = GetSmImport().CreateTableCellContext(nPrefix,
-                rLocalName, xAttrList);
+                rLocalName);
             break;
         default:
             pContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
@@ -2747,8 +2719,7 @@ SvXMLImportContext *SmXMLTableContext_Impl::CreateChildContext(
     switch(rTokenMap.Get(nPrefix, rLocalName))
     {
         case XML_TOK_MTR:
-            pContext = GetSmImport().CreateTableRowContext(nPrefix,rLocalName,
-                xAttrList);
+            pContext = GetSmImport().CreateTableRowContext(nPrefix,rLocalName);
             break;
         default:
             pContext = SmXMLTableRowContext_Impl::CreateChildContext(nPrefix,
@@ -2847,217 +2818,186 @@ SvXMLImportContext *SmXMLImport::CreateContext(sal_uInt16 nPrefix,
 }
 
 SvXMLImportContext *SmXMLImport::CreateRowContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
         return new SmXMLRowContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateTextContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLTextContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateAnnotationContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLAnnotationContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateStringContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLStringContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateNumberContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLNumberContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateIdentifierContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLIdentifierContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateOperatorContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLOperatorContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateSpaceContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLSpaceContext_Impl(*this,nPrefix,rLocalName);
 }
 
 
 SvXMLImportContext *SmXMLImport::CreateEncloseContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLEncloseContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateFracContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLFracContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateSqrtContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLSqrtContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateRootContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLRootContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateStyleContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLStyleContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreatePaddedContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLPaddedContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreatePhantomContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLPhantomContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateFencedContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLFencedContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateErrorContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLErrorContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateSubContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLSubContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateSubSupContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLSubSupContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateSupContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLSupContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateUnderContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
         return new SmXMLUnderContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateOverContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLOverContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateUnderOverContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLUnderOverContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateMultiScriptsContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLMultiScriptsContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateTableContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLTableContext_Impl(*this,nPrefix,rLocalName);
 }
 SvXMLImportContext *SmXMLImport::CreateTableRowContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLTableRowContext_Impl(*this,nPrefix,rLocalName);
 }
 SvXMLImportContext *SmXMLImport::CreateTableCellContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLTableCellContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateNoneContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLNoneContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreatePrescriptsContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLPrescriptsContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateAlignGroupContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLAlignGroupContext_Impl(*this,nPrefix,rLocalName);
 }
 
 SvXMLImportContext *SmXMLImport::CreateActionContext(sal_uInt16 nPrefix,
-    const OUString &rLocalName,
-    const uno::Reference <xml::sax::XAttributeList> & /*xAttrList*/)
+    const OUString &rLocalName)
 {
     return new SmXMLActionContext_Impl(*this,nPrefix,rLocalName);
 }
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 31556b77073d..c0e43d8cd83a 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -99,129 +99,67 @@ public:
         const css::uno::Reference <
         css::xml::sax::XAttributeList> &xAttrList) override;
     SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateEncloseContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
     SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix,
-        const OUString &rLocalName,
-        const css::uno::Reference <
-        css::xml::sax::XAttributeList> &xAttrList);
+        const OUString &rLocalName);
 
     const SvXMLTokenMap &GetPresLayoutElemTokenMap();
     const SvXMLTokenMap &GetPresLayoutAttrTokenMap();
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 8c552393e578..4b0a670763da 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -226,8 +226,7 @@ private:
                         cairo_t *cr,
                         const tools::Rectangle& rControlRectangle,
                         ControlType nType,
-                        ControlPart nPart,
-                        const ImplControlValue& aValue);
+                        ControlPart nPart);
     static void PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,
                                   const tools::Rectangle& rControlRectangle,
                                   bool bIsCheck, bool bInMenu);
@@ -303,7 +302,6 @@ protected:
                            const std::list< tools::Rectangle >& aClip,
                            ControlState nState,
                            const ImplControlValue& aValue,
-                           const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
 
     bool NWPaintGTKArrow( GdkDrawable* gdkDrawable,
@@ -342,21 +340,18 @@ protected:
     bool NWPaintGTKScrollbar( ControlPart nPart,
                               const tools::Rectangle& rControlRectangle,
                               ControlState nState, const ImplControlValue& aValue );
-    bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType,
                             const tools::Rectangle& rControlRectangle,
                             const std::list< tools::Rectangle >& rClipList,
-                            ControlState nState, const ImplControlValue& aValue,
-                            const OUString& rCaption );
+                            ControlState nState );
     bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                            const tools::Rectangle& rControlRectangle,
                            ControlState nState, const ImplControlValue& aValue,
-                           const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
     bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                              const tools::Rectangle& rControlRectangle,
                              const std::list< tools::Rectangle >& rClipList,
-                             ControlState nState, const ImplControlValue& aValue,
-                             const OUString& rCaption );
+                             ControlState nState );
     bool NWPaintGTKTabItem( ControlType nType,
                             const tools::Rectangle& rControlRectangle,
                             ControlState nState, const ImplControlValue& aValue );
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 3c8e75628a3e..95fecb7d57c7 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -229,16 +229,13 @@ static tools::Rectangle NWGetTabItemRect( SalX11Screen nScreen, tools::Rectangle
 static tools::Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, tools::Rectangle aAreaRect );
 
 static void NWPaintOneEditBox( SalX11Screen nScreen, GdkDrawable * gdkDrawable, GdkRectangle const *gdkRect,
-                               ControlType nType, ControlPart nPart, tools::Rectangle aEditBoxRect,
-                               ControlState nState, const ImplControlValue& aValue,
-                               const OUString& rCaption );
+                               ControlType nType, tools::Rectangle aEditBoxRect,
+                               ControlState nState );
 
-static tools::Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect, ControlState nState,
-                            const ImplControlValue& aValue, const OUString& rCaption );
+static tools::Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlPart nPart, tools::Rectangle aAreaRect );
 
-static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect,
-                            ControlState nState, const ImplControlValue& aValue,
-                            const OUString& rCaption );
+static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, ControlPart nPart, tools::Rectangle aAreaRect,
+                            ControlState nState );
 
 static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlPart nPart, tools::Rectangle aAreaRect );
 
@@ -830,7 +827,7 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType        nType,
 
 bool GtkSalGraphics::drawNativeControl(ControlType nType, ControlPart nPart,
         const tools::Rectangle& rControlRegion, ControlState nState,
-        const ImplControlValue& aValue, const OUString& rCaption)
+        const ImplControlValue& aValue, const OUString& /*rCaption*/)
 {
     // get a GC with current clipping region set
     GetFontGC();
@@ -926,7 +923,7 @@ bool GtkSalGraphics::drawNativeControl(ControlType nType, ControlPart nPart,
             return false;
 
         returnVal = DoDrawNativeControl(gdkDrawable[i], nType, nPart, aCtrlRect, aClip,
-                                        nState, aValue, rCaption, aControlCacheKey);
+                                        nState, aValue, aControlCacheKey);
         if( !returnVal )
             break;
     }
@@ -948,7 +945,6 @@ bool GtkSalGraphics::DoDrawNativeControl(
                             const std::list< tools::Rectangle >& aClip,
                             ControlState nState,
                             const ImplControlValue& aValue,
-                            const OUString& rCaption,
                             ControlCacheKey& rControlCacheKey)
 {
     if ( (nType==ControlType::Pushbutton) && (nPart==ControlPart::Entire) )
@@ -972,23 +968,23 @@ bool GtkSalGraphics::DoDrawNativeControl(
     || ((nType==ControlType::Combobox) && (nPart==ControlPart::HasBackgroundTexture))
     || ((nType==ControlType::Listbox) && (nPart==ControlPart::HasBackgroundTexture)) )
     {
-        return NWPaintGTKEditBox( pDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
+        return NWPaintGTKEditBox( pDrawable, nType, aCtrlRect, aClip, nState );
     }
     else if ( (nType==ControlType::MultilineEditbox) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::HasBackgroundTexture)) )
     {
-        return NWPaintGTKEditBox( pDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
+        return NWPaintGTKEditBox( pDrawable, nType, aCtrlRect, aClip, nState );
     }
     else if ( ((nType==ControlType::Spinbox) || (nType==ControlType::SpinButtons))
         && ((nPart==ControlPart::Entire) || (nPart==ControlPart::AllButtons)) )
     {
-        return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, nState, aValue, rCaption, rControlCacheKey);
+        return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, nState, aValue, rControlCacheKey);
     }
     else if ( (nType == ControlType::Combobox) &&
         ( (nPart==ControlPart::Entire)
         ||(nPart==ControlPart::ButtonDown)
         ) )
     {
-        return NWPaintGTKComboBox( pDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
+        return NWPaintGTKComboBox( pDrawable, nType, nPart, aCtrlRect, aClip, nState );
     }
     else if ( (nType==ControlType::TabItem) || (nType==ControlType::TabPane) || (nType==ControlType::TabBody) )
     {
@@ -1070,7 +1066,7 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                 const tools::Rectangle& rControlRegion,
                                 ControlState nState,
                                 const ImplControlValue& aValue,
-                                const OUString& rCaption,
+                                const OUString& /*rCaption*/,
                                 tools::Rectangle &rNativeBoundingRegion,
                                 tools::Rectangle &rNativeContentRegion )
 {
@@ -1100,8 +1096,7 @@ bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     if ( (nType==ControlType::Spinbox) && ((nPart==ControlPart::ButtonUp) || (nPart==ControlPart::ButtonDown) || (nPart==ControlPart::SubEdit)) )
     {
 
-        rNativeBoundingRegion = NWGetSpinButtonRect( m_nXScreen, nType, nPart, rControlRegion, nState,
-        aValue, rCaption );
+        rNativeBoundingRegion = NWGetSpinButtonRect( m_nXScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
 
         returnVal = true;
@@ -2260,12 +2255,10 @@ static tools::Rectangle NWGetScrollButtonRect(    SalX11Screen nScreen, ControlP
 }
 
 bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
-                                        ControlType nType, ControlPart nPart,
+                                        ControlType nType,
                                         const tools::Rectangle& rControlRectangle,
                                         const std::list< tools::Rectangle >& rClipList,
-                                        ControlState nState,
-                                        const ImplControlValue& aValue,
-                                        const OUString& rCaption )
+                                        ControlState nState )
 {
     tools::Rectangle        pixmapRect;
     GdkRectangle    clipRect;
@@ -2280,7 +2273,7 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
         clipRect.width = it->GetWidth();
         clipRect.height = it->GetHeight();
 
-        NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption );
+        NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, pixmapRect, nState );
     }
 
     return true;
@@ -2318,15 +2311,12 @@ static tools::Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen,
  * All coordinates should be local to the Pixmap, NOT
  * screen/window coordinates.
  */
-static void NWPaintOneEditBox(    SalX11Screen nScreen,
+static void NWPaintOneEditBox(  SalX11Screen nScreen,
                                 GdkDrawable * gdkDrawable,
                                 GdkRectangle const *   gdkRect,
                                 ControlType            nType,
-                                ControlPart,
-                                tools::Rectangle                aEditBoxRect,
-                                ControlState            nState,
-                                const ImplControlValue&,
-                                const OUString& )
+                                tools::Rectangle       aEditBoxRect,
+                                ControlState           nState )
 {
     GtkStateType    stateType;
     GtkShadowType    shadowType;
@@ -2390,7 +2380,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                                        const tools::Rectangle& rControlRectangle,
                                        ControlState nState,
                                        const ImplControlValue& aValue,
-                                       const OUString& rCaption,
                                        ControlCacheKey& rControlCacheKey)
 {
     tools::Rectangle            pixmapRect;
@@ -2430,8 +2419,8 @@ bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                 pixmapRect.Right(),
                 pixmapRect.Bottom() );
 
-        upBtnRect = NWGetSpinButtonRect( m_nXScreen, nType, upBtnPart, pixmapRect, upBtnState, aValue, rCaption );
-        downBtnRect = NWGetSpinButtonRect( m_nXScreen, nType, downBtnPart, pixmapRect, downBtnState, aValue, rCaption );
+        upBtnRect = NWGetSpinButtonRect( m_nXScreen, upBtnPart, pixmapRect );
+        downBtnRect = NWGetSpinButtonRect( m_nXScreen, downBtnPart, pixmapRect );
 
         if ( (nType==ControlType::Spinbox) && (nPart!=ControlPart::AllButtons) )
         {
@@ -2444,7 +2433,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                 aEditBoxRect.setX( 0 );
             aEditBoxRect.setY( 0 );
 
-            NWPaintOneEditBox( m_nXScreen, gdkPixmap, nullptr, nType, nPart, aEditBoxRect, nState, aValue, rCaption );
+            NWPaintOneEditBox( m_nXScreen, gdkPixmap, nullptr, nType, aEditBoxRect, nState );
         }
 
         NWSetWidgetState( gWidgetData[m_nXScreen].gSpinButtonWidget, nState, stateType );
@@ -2461,21 +2450,17 @@ bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                 shadowRect.GetWidth(), shadowRect.GetHeight() );
         }
 
-        NWPaintOneSpinButton( m_nXScreen, gdkPixmap, nType, upBtnPart, pixmapRect, upBtnState, aValue, rCaption );
-        NWPaintOneSpinButton( m_nXScreen, gdkPixmap, nType, downBtnPart, pixmapRect, downBtnState, aValue, rCaption );
+        NWPaintOneSpinButton( m_nXScreen, gdkPixmap, upBtnPart, pixmapRect, upBtnState );
+        NWPaintOneSpinButton( m_nXScreen, gdkPixmap, downBtnPart, pixmapRect, downBtnState );
     }
     END_PIXMAP_RENDER_WITH_CONTROL_KEY(pixmapRect, rControlCacheKey);
 
     return true;
 }
 
-static tools::Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
-                                      ControlType,
-                                      ControlPart            nPart,
-                                      tools::Rectangle             aAreaRect,
-                                      ControlState,
-                                      const ImplControlValue&,
-                                      const OUString& )
+static tools::Rectangle NWGetSpinButtonRect( SalX11Screen     nScreen,
+                                             ControlPart      nPart,
+                                             tools::Rectangle aAreaRect )
 {
     gint            buttonSize;
     tools::Rectangle        buttonRect;
@@ -2517,14 +2502,11 @@ static tools::Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
     return buttonRect;
 }
 
-static void NWPaintOneSpinButton( SalX11Screen nScreen,
+static void NWPaintOneSpinButton( SalX11Screen          nScreen,
                                   GdkPixmap*            pixmap,
-                                  ControlType            nType,
-                                  ControlPart            nPart,
-                                  tools::Rectangle                aAreaRect,
-                                  ControlState            nState,
-                                  const ImplControlValue&    aValue,
-                                  const OUString&                rCaption )
+                                  ControlPart           nPart,
+                                  tools::Rectangle      aAreaRect,
+                                  ControlState          nState )
 {
     tools::Rectangle            buttonRect;
     GtkStateType        stateType;
@@ -2535,7 +2517,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen,
     NWEnsureGTKSpinButton( nScreen );
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
-    buttonRect = NWGetSpinButtonRect( nScreen, nType, nPart, aAreaRect, nState, aValue, rCaption );
+    buttonRect = NWGetSpinButtonRect( nScreen, nPart, aAreaRect );
 
     NWSetWidgetState( gWidgetData[nScreen].gSpinButtonWidget, nState, stateType );
     gtk_paint_box( gWidgetData[nScreen].gSpinButtonWidget->style, pixmap, stateType, shadowType, nullptr, gWidgetData[nScreen].gSpinButtonWidget,
@@ -2562,9 +2544,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                                          ControlType nType, ControlPart nPart,
                                          const tools::Rectangle& rControlRectangle,
                                          const std::list< tools::Rectangle >& rClipList,
-                                         ControlState nState,
-                                         const ImplControlValue& aValue,
-                                         const OUString& rCaption )
+                                         ControlState nState )
 {
     tools::Rectangle        pixmapRect;
     tools::Rectangle        buttonRect;
@@ -2612,8 +2592,8 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
         clipRect.height = it->GetHeight();
 
         if( nPart == ControlPart::Entire )
-            NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, nPart, aEditBoxRect,
-                               nState, aValue, rCaption );
+            NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, aEditBoxRect,
+                               nState );
 
         // Buttons must paint opaque since some themes have alpha-channel enabled buttons
         gtk_paint_flat_box( m_pWindow->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 459fab2732a0..f0d57e34069b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1197,8 +1197,7 @@ tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect(
 void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr,
                                     const tools::Rectangle& rControlRectangle,
                                     ControlType nType,
-                                    ControlPart nPart,
-                                    const ImplControlValue& /*rValue*/ )
+                                    ControlPart nPart )
 {
     tools::Rectangle        areaRect;
     tools::Rectangle        buttonRect;
@@ -2487,7 +2486,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
         PaintSpinButton(flags, cr, rControlRegion, nPart, rValue);
         break;
     case RenderType::Combobox:
-        PaintCombobox(flags, cr, rControlRegion, nType, nPart, rValue);
+        PaintCombobox(flags, cr, rControlRegion, nType, nPart);
         break;
     case RenderType::Icon:
         gtk_render_icon(context, cr, pixbuf, nX, nY);