loplugin:constantparam in chart2..connectivity

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

50 files changed, 89 insertions, 175 deletions

diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx
index 2528a68f78c0..13e88f15b78f 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.cxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.cxx
@@ -38,7 +38,7 @@ namespace cairocanvas
                                 const rendering::ViewState&                 rUsedViewState,
                                 const rendering::RenderState&               rUsedRenderState,
                                 const uno::Reference< rendering::XCanvas >& rTarget ) :
-        CachedPrimitiveBase( rUsedViewState, rTarget, true ),
+        CachedPrimitiveBase( rUsedViewState, rTarget ),
         mpSurface( pSurface ),
         maRenderState( rUsedRenderState )
     {}
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index 2a4639aa1284..e185bf969a0e 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -32,12 +32,10 @@ using namespace ::com::sun::star;
 namespace canvas
 {
     CachedPrimitiveBase::CachedPrimitiveBase( const rendering::ViewState&                   rUsedViewState,
-                                              const uno::Reference< rendering::XCanvas >&   rTarget,
-                                              bool                                          bFailForChangedViewTransform ) :
+                                              const uno::Reference< rendering::XCanvas >&   rTarget ) :
         CachedPrimitiveBase_Base( m_aMutex ),
         maUsedViewState( rUsedViewState ),
-        mxTarget( rTarget ),
-        mbFailForChangedViewTransform( bFailForChangedViewTransform )
+        mxTarget( rTarget )
     {
     }
 
@@ -65,8 +63,7 @@ namespace canvas
 
         const bool bSameViewTransforms( aUsedTransformation == aNewTransformation );
 
-        if( mbFailForChangedViewTransform &&
-            !bSameViewTransforms )
+        if( !bSameViewTransforms )
         {
             // differing transformations, don't try to draft the
             // output, just plain fail here.
diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx
index 72ced6762629..eb94333c707d 100644
--- a/canvas/source/vcl/cachedbitmap.cxx
+++ b/canvas/source/vcl/cachedbitmap.cxx
@@ -40,7 +40,7 @@ namespace vclcanvas
                                 const rendering::ViewState&                 rUsedViewState,
                                 const rendering::RenderState&               rUsedRenderState,
                                 const uno::Reference< rendering::XCanvas >& rTarget ) :
-        CachedPrimitiveBase( rUsedViewState, rTarget, true ),
+        CachedPrimitiveBase( rUsedViewState, rTarget ),
         mpGraphicObject( rGraphicObject ),
         maRenderState(rUsedRenderState),
         maPoint( rPoint ),
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index a2fd92385738..767d6fba8bb4 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,7 +27,7 @@
 namespace chart
 {
 
-TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1, vcl::Window* pWindow2 ) :
+TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent ) :
     svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
 {
     InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
@@ -37,8 +37,6 @@ TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* p
     if( !SvtLanguageOptions().IsCTLFontEnabled() )
     {
         Hide();
-        if( pWindow1 ) pWindow1->Hide();
-        if( pWindow2 ) pWindow2->Hide();
     }
 }
 
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 3babe25309d0..066c9b272462 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -64,8 +64,7 @@ public:
         const css::uno::Reference<css::frame::XModel>& xChartModel,
         SfxItemPool& rItemPool,
         SdrModel& rDrawModel,
-        const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
-        const css::awt::Size* pRefSize = nullptr );
+        const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory );
 
     virtual ~AllDataLabelItemConverter() override;
 
@@ -79,8 +78,7 @@ public:
     AllTitleItemConverter(
         const css::uno::Reference<css::frame::XModel>& xChartModel,
         SfxItemPool& rItemPool, SdrModel& rDrawModel,
-        const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
-        const css::awt::Size* pRefSize = nullptr );
+        const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory );
 
     virtual ~AllTitleItemConverter() override;
 
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 3e3562ed9ffa..c3054072f1d3 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -30,8 +30,7 @@ namespace chart
 class TextDirectionListBox : public svx::FrameDirectionListBox
 {
 public:
-    explicit            TextDirectionListBox( vcl::Window* pParent,
-                            vcl::Window* pWindow1 = nullptr, vcl::Window* pWindow2 = nullptr );
+    explicit            TextDirectionListBox( vcl::Window* pParent );
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index bfcd17a10cf3..02481f3b977e 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -101,8 +101,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     SfxItemPool& rItemPool,
     SdrModel& rDrawModel,
-    const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
-    const awt::Size* pRefSize )
+    const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory )
         : MultipleItemConverter( rItemPool )
 {
     ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
@@ -122,7 +121,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
             new ::chart::wrapper::DataPointItemConverter(
                 xChartModel, xContext, xObjectProperties, *aIt, rItemPool, rDrawModel,
                 xNamedPropertyContainerFactory, GraphicPropertyItemConverter::FILLED_DATA_POINT,
-                pRefSize, true, false, 0, true, nNumberFormat, nPercentNumberFormat));
+                nullptr, true, false, 0, true, nNumberFormat, nPercentNumberFormat));
     }
 }
 
@@ -140,8 +139,7 @@ AllTitleItemConverter::AllTitleItemConverter(
     const uno::Reference< frame::XModel > & xChartModel,
     SfxItemPool& rItemPool,
     SdrModel& rDrawModel,
-    const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
-    const awt::Size* pRefSize )
+    const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory )
         : MultipleItemConverter( rItemPool )
 {
     for(sal_Int32 nTitle = TitleHelper::TITLE_BEGIN; nTitle < TitleHelper::NORMAL_TITLE_END; nTitle++ )
@@ -152,7 +150,7 @@ AllTitleItemConverter::AllTitleItemConverter(
         uno::Reference< beans::XPropertySet > xObjectProperties( xTitle, uno::UNO_QUERY);
         m_aConverters.push_back(
             new ::chart::wrapper::TitleItemConverter(
-                xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pRefSize));
+                xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, nullptr));
     }
 }
 
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index 8a18fabb6a82..906df93f12f9 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -33,6 +33,8 @@ using namespace com::sun::star;
 namespace comphelper {
 namespace service_decl {
 
+const char cDelim = ';';
+
 class ServiceDecl::Factory :
         public cppu::WeakImplHelper<lang::XSingleComponentFactory,
                                      lang::XServiceInfo>
@@ -126,7 +128,7 @@ uno::Sequence<OUString> ServiceDecl::getSupportedServiceNames() const
     OString const str(m_pServiceNames);
     sal_Int32 nIndex = 0;
     do {
-        OString const token( str.getToken( 0, m_cDelim, nIndex ) );
+        OString const token( str.getToken( 0, cDelim, nIndex ) );
         vec.push_back( OUString( token.getStr(), token.getLength(),
                                       RTL_TEXTENCODING_ASCII_US ) );
     }
@@ -140,7 +142,7 @@ bool ServiceDecl::supportsService( OUString const& name ) const
     OString const str(m_pServiceNames);
     sal_Int32 nIndex = 0;
     do {
-        OString const token( str.getToken( 0, m_cDelim, nIndex ) );
+        OString const token( str.getToken( 0, cDelim, nIndex ) );
         if (name.equalsAsciiL( token.getStr(), token.getLength() ))
             return true;
     }
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 77af56f931af..486a826e50e4 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1276,7 +1276,7 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance()
     OUString tmplName(
         static_cast< SetNode * >(getNode().get())->getDefaultTemplateName());
     rtl::Reference< Node > tmpl(
-        components_.getTemplate(Data::NO_LAYER, tmplName));
+        components_.getTemplate(tmplName));
     if (!tmpl.is()) {
         throw css::uno::Exception(
             "unknown template " + tmplName,
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 2450d0b4af40..4797a6732136 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -224,10 +224,9 @@ rtl::Reference< Node > Components::resolvePathRepresentation(
         pathRepresentation, canonicRepresentation, path, finalizedLayer);
 }
 
-rtl::Reference< Node > Components::getTemplate(
-    int layer, OUString const & fullName) const
+rtl::Reference< Node > Components::getTemplate(OUString const & fullName) const
 {
-    return data_.getTemplate(layer, fullName);
+    return data_.getTemplate(Data::NO_LAYER, fullName);
 }
 
 void Components::addRootAccess(rtl::Reference< RootAccess > const & access) {
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 1ca24d638087..fc10060e0845 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -61,8 +61,7 @@ public:
         OUString * canonicRepresenation, std::vector<OUString> * path, int * finalizedLayer)
         const;
 
-    rtl::Reference< Node > getTemplate(
-        int layer, OUString const & fullName) const;
+    rtl::Reference< Node > getTemplate( OUString const & fullName) const;
 
     void addRootAccess(rtl::Reference< RootAccess > const & access);
 
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index c5b9249fb544..4aa37e197144 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -94,7 +94,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
                                                       nSize,
                                                       nDec,
                                                       nDataType,
-                                                      false,false,false,true,
+                                                      true,
                                                       aCatalog, aSchema, aTable);
                 xRet = pRet;
                 break;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index b2ad1966a435..6a71ff72088f 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -109,9 +109,6 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
                                                   nSize,
                                                   nDec,
                                                   nDataType,
-                                                  false,
-                                                  false,
-                                                  false,
                                                   isCaseSensitive(),
                                                   aCatalog,
                                                   aSchema,
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 0e8caed1782d..5498b982c7dc 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -175,7 +175,7 @@ bool ODbaseIndex::openIndexFile()
 OIndexIterator* ODbaseIndex::createIterator()
 {
     openIndexFile();
-    return new OIndexIterator(this, nullptr, nullptr);
+    return new OIndexIterator(this);
 }
 
 bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 7aa3df1e625d..951c0982f41b 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -56,9 +56,6 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
-                                                    ,false
-                                                    ,false
-                                                    ,false
                                                     ,pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()
                                                     ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME)))
                                                     ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)))
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 3451cb9f8e18..44d90cdc61ac 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -33,8 +33,8 @@ using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::sdbc;
 
-ONDXKey::ONDXKey(sal_uInt32 nRec)
-    :nRecord(nRec)
+ONDXKey::ONDXKey()
+    :nRecord(0)
 {
 }
 
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index fe87987fd73e..dc7f20087aa8 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -44,7 +44,7 @@ OHSQLUser::OHSQLUser(   const css::uno::Reference< css::sdbc::XConnection >& _xC
 
 OHSQLUser::OHSQLUser(   const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                 const OUString& Name
-            ) : connectivity::sdbcx::OUser(Name, true)
+            ) : connectivity::sdbcx::OUser(Name,true)
                 ,m_xConnection(_xConnection)
 {
     construct();
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 7498422a4b8b..f98dcd57367a 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -54,7 +54,7 @@ namespace connectivity { namespace hsqldb
 
     HView::HView( const Reference< XConnection >& _rxConnection, bool _bCaseSensitive,
         const OUString& _rSchemaName, const OUString& _rName )
-        :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() )
+        :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), OUString(), _rSchemaName, OUString() )
         ,m_xConnection( _rxConnection )
     {
     }
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index 18ae66d34ed4..93c7177a181b 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -51,7 +51,7 @@ const char *MorkMagicHeader = "// <!-- <mdb:mork:z v=\"1.4\"/> -->";
 const char *MorkDictColumnMeta = "<(a=c)>";
 
 
-MorkParser::MorkParser( int DefaultScope ) :
+MorkParser::MorkParser() :
     columns_(),
     values_(),
     mork_(),
@@ -60,7 +60,7 @@ MorkParser::MorkParser( int DefaultScope ) :
     morkData_(),
     morkPos_(0),
     nextAddValueId_(0x7fffffff),
-    defaultScope_(DefaultScope),
+    defaultScope_(0x80),
     defaultListScope_(0x81),
     defaultTableId_(1),
     nowParsing_(NPValues)
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index b43557400f9f..0d3993351f5e 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -69,7 +69,7 @@ class LO_DLLPUBLIC_MORK MorkParser
 {
 public:
 
-    explicit MorkParser( int defaultScope = 0x80 );
+    explicit MorkParser();
 
     /// Open and parse mork file
 
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 7a81dd2bbafe..0cd8d5ad341a 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -44,7 +44,7 @@ OMySQLUser::OMySQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xC
 
 OMySQLUser::OMySQLUser(   const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                 const OUString& Name
-            ) : connectivity::sdbcx::OUser(Name, true)
+            ) : connectivity::sdbcx::OUser(Name,true)
                 ,m_xConnection(_xConnection)
 {
     construct();
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 1519ea4adca5..0e45831c7ad2 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -60,7 +60,6 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName)
     return new ::connectivity::sdbcx::OView(isCaseSensitive(),
                             sTable,
                             m_xMetaData,
-                            0,
                             OUString(),
                             sSchema,
                             sCatalog
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index 74563555a51e..948d6f8f3731 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -76,25 +76,12 @@ namespace connectivity
                 sal_Int32       _aColumnDisplaySize=0,
                 sal_Int32       _aPrecision=0,
                 sal_Int32       _aScale=0,
-                sal_Int32       _aColumnType=0,
-
-                bool        _aAutoIncrement=false,
-                bool        _aCaseSensitive=false,
-                bool        _aSearchable=true,
-                bool        _aCurrency=false,
-                bool        _aSigned=false,
-                bool        _aReadOnly=true,
-                bool        _aWritable=false,
-                bool        _aDefinitelyWritable=false,
-
-                const OUString &_aColumnLabel = OUString(),
-                const OUString &_aColumnTypeName = OUString(),
-                const OUString &_aColumnServiceName = OUString())
+                sal_Int32       _aColumnType=0)
         :   m_TableName(_aTableName),
             m_ColumnName(_aColumnName),
-            m_ColumnLabel(_aColumnLabel),
-            m_ColumnTypeName(_aColumnTypeName),
-            m_ColumnServiceName(_aColumnServiceName),
+            m_ColumnLabel(),
+            m_ColumnTypeName(),
+            m_ColumnServiceName(),
 
             m_Nullable(_aNullable),
             m_ColumnDisplaySize(_aColumnDisplaySize),
@@ -102,14 +89,14 @@ namespace connectivity
             m_Scale(_aScale),
             m_ColumnType(_aColumnType),
 
-            m_AutoIncrement(_aAutoIncrement),
-            m_CaseSensitive(_aCaseSensitive),
-            m_Searchable(_aSearchable),
-            m_Currency(_aCurrency),
-            m_Signed(_aSigned),
-            m_ReadOnly(_aReadOnly),
-            m_Writable(_aWritable),
-            m_DefinitelyWritable(_aDefinitelyWritable)
+            m_AutoIncrement(false),
+            m_CaseSensitive(false),
+            m_Searchable(true),
+            m_Currency(false),
+            m_Signed(false),
+            m_ReadOnly(true),
+            m_Writable(false),
+            m_DefinitelyWritable(false)
         {
             if(m_ColumnLabel.isEmpty())
                 m_ColumnLabel = _aColumnName;
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 141b4bed83ba..55305bf3c74a 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -52,11 +52,9 @@ namespace connectivity
             ONDXKey* GetNextKey();
 
         public:
-            OIndexIterator(ODbaseIndex* pInd,
-                            file::OBoolOperator* pOp,
-                            const file::OOperand* pOper)
-                :m_pOperator(pOp)
-                ,m_pOperand(pOper)
+            OIndexIterator(ODbaseIndex* pInd)
+                :m_pOperator(nullptr)
+                ,m_pOperand(nullptr)
                 ,m_xIndex(pInd)
                 ,m_nCurNode(NODE_NOTFOUND)
             {
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 9d5977e3a384..53d079c4c83a 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -48,7 +48,7 @@ namespace connectivity
             ORowSetValue    xValue;                 /* Key values     */
 
         public:
-            ONDXKey(sal_uInt32 nRec=0);
+            ONDXKey();
             ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
             ONDXKey(const OUString& aStr, sal_uInt32 nRec = 0);
             ONDXKey(double aVal, sal_uInt32 nRec = 0);
@@ -90,7 +90,7 @@ namespace connectivity
             sal_uInt32  nPagePos;       // Position in the index file
 
         public:
-            ONDXPagePtr(sal_uInt32 nPos = 0) : mpPage(nullptr), nPagePos(nPos) {}
+            ONDXPagePtr() : mpPage(nullptr), nPagePos(0) {}
             ONDXPagePtr(const ONDXPagePtr& rRef);
             ONDXPagePtr(ONDXPage* pRefPage);
             inline ~ONDXPagePtr();
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 3981e2670382..a0dacf137503 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw
     return cppu::supportsService(this, _rServiceName);
 }
 
-OIndex::OIndex(bool _bCase) :   ODescriptor_BASE(m_aMutex)
+OIndex::OIndex(bool _bCase) : ODescriptor_BASE(m_aMutex)
                 ,   ODescriptor(ODescriptor_BASE::rBHelper,_bCase,true)
                 ,m_IsUnique(false)
                 ,m_IsPrimaryKeyIndex(false)
@@ -76,7 +76,7 @@ OIndex::OIndex( const OUString& Name,
                 bool _isPrimaryKeyIndex,
                 bool _isClustered,
                 bool _bCase) :  ODescriptor_BASE(m_aMutex)
-                        ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
+                        ,ODescriptor(ODescriptor_BASE::rBHelper, _bCase)
                         ,m_Catalog(Catalog)
                         ,m_IsUnique(_isUnique)
                         ,m_IsPrimaryKeyIndex(_isPrimaryKeyIndex)
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 2cf762a9d49e..115382acf1a0 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -63,9 +63,6 @@ OIndexColumn::OIndexColumn( bool             IsAscending,
                             sal_Int32        Precision,
                             sal_Int32        Scale,
                             sal_Int32        Type,
-                            bool             IsAutoIncrement,
-                            bool             IsRowVersion,
-                            bool             IsCurrency,
                             bool             _bCase,
                             const OUString&  CatalogName,
                             const OUString&  SchemaName,
@@ -78,9 +75,9 @@ OIndexColumn::OIndexColumn( bool             IsAscending,
                             Precision,
                             Scale,
                             Type,
-                            IsAutoIncrement,
-                            IsRowVersion,
-                            IsCurrency,
+                            false/*IsAutoIncrement*/,
+                            false/*IsRowVersion*/,
+                            false/*IsCurrency*/,
                             _bCase,
                             CatalogName,
                             SchemaName,
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index ce448f78cd94..8eaf5e784792 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -68,7 +68,7 @@ OKey::OKey(bool _bCase) :   ODescriptor_BASE(m_aMutex)
 
 OKey::OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps, bool _bCase)
 : ODescriptor_BASE(m_aMutex)
- ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
+ ,ODescriptor(ODescriptor_BASE::rBHelper, _bCase)
  ,m_aProps(_rProps)
  ,m_pColumns(nullptr)
 {
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 7ebc912e3815..7693717178db 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -63,9 +63,6 @@ OKeyColumn::OKeyColumn( const OUString&  ReferencedColumn,
                         sal_Int32        Precision,
                         sal_Int32        Scale,
                         sal_Int32        Type,
-                        bool             IsAutoIncrement,
-                        bool             IsRowVersion,
-                        bool             IsCurrency,
                         bool             _bCase,
                         const OUString&  CatalogName,
                         const OUString&  SchemaName,
@@ -78,9 +75,9 @@ OKeyColumn::OKeyColumn( const OUString&  ReferencedColumn,
                             Precision,
                             Scale,
                             Type,
-                            IsAutoIncrement,
-                            IsRowVersion,
-                            IsCurrency,
+                            false/*IsAutoIncrement*/,
+                            false/*IsRowVersion*/,
+                            false/*IsCurrency*/,
                             _bCase,
                             CatalogName,
                             SchemaName,
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 8bdbca929ff2..673b11d11f08 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -37,14 +37,13 @@ IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View
 OView::OView(bool _bCase,
             const OUString& Name,
             const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData,
-            sal_Int32 CheckOption,
             const OUString& Command,
             const OUString& SchemaName,
             const OUString& CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase)
             ,m_CatalogName(CatalogName)
             ,m_SchemaName(SchemaName)
             ,m_Command(Command)
-            ,m_CheckOption(CheckOption)
+            ,m_CheckOption(0)
             ,m_xMetaData(_xMetaData)
 
 {
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 725e0cba2248..8a1d65859002 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -100,8 +100,7 @@ namespace svx
 
     public:
         void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-            Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation,
-            vcl::ControlLayoutData* _pLayoutData = nullptr );
+            Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation );
     };
 
     PseudoRubyText::PseudoRubyText()
@@ -118,13 +117,8 @@ namespace svx
 
 
     void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-                               Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation,
-                               vcl::ControlLayoutData* _pLayoutData )
+                               Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation )
     {
-        bool bLayoutOnly  = (nullptr != _pLayoutData);
-        MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : nullptr;
-        OUString* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText       : nullptr;
-
         Size aPlaygroundSize(_rRect.GetSize());
 
         // the font for the secondary text:
@@ -194,10 +188,10 @@ namespace svx
         nDrawTextStyle &= ~DrawTextFlags( DrawTextFlags::Right | DrawTextFlags::Left | DrawTextFlags::Bottom | DrawTextFlags::Top );
         nDrawTextStyle |= DrawTextFlags::Center | DrawTextFlags::VCenter;
 
-        rRenderContext.DrawText( aPrimaryRect, m_sPrimaryText, nDrawTextStyle, pTextMetrics, pDisplayText );
+        rRenderContext.DrawText( aPrimaryRect, m_sPrimaryText, nDrawTextStyle );
         {
             FontSwitch aFontRestore(rRenderContext, aSmallerFont);
-            rRenderContext.DrawText( aSecondaryRect, m_sSecondaryText, nDrawTextStyle, pTextMetrics, pDisplayText );
+            rRenderContext.DrawText( aSecondaryRect, m_sSecondaryText, nDrawTextStyle );
         }
 
         // outta here
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index fbaaf4753159..3e38e4da4bf1 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -155,12 +155,11 @@ VCL_BUILDER_FACTORY_ARGS(SvtIconChoiceCtrl,
                          WB_NODRAGSELECTION | WB_TABSTOP);
 
 IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
-                                     const OUString& rUIXMLDescription,
-                                     const SfxItemSet *pItemSet )
+                                     const OUString& rUIXMLDescription )
 :   ModalDialog         ( pParent, rID, rUIXMLDescription ),
     mnCurrentPageId ( USHRT_MAX ),
 
-    pSet            ( pItemSet ),
+    pSet            ( nullptr ),
     pOutSet         ( nullptr ),
     pExampleSet     ( nullptr ),
     pRanges         ( nullptr ),
@@ -273,12 +272,9 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
     CreatePage      pCreateFunc /* != 0 */
 )
 {
-    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
-                                                         nullptr );
+    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc );
     maPageList.push_back( pData );
 
-    pData->fnGetRanges = nullptr;
-
     sal_uInt16 *pId = new sal_uInt16 ( nId );
     SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->InsertEntry( rIconText, rChoiceIcon );
     pEntry->SetUserData ( static_cast<void*>(pId) );
@@ -531,20 +527,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
     std::vector<sal_uInt16> aUS;
 
     size_t nCount = maPageList.size();
-    for ( size_t i = 0; i < nCount; ++i )
-    {
-        IconChoicePageData* pData = maPageList[ i ];
-        if ( pData->fnGetRanges )
-        {
-            const sal_uInt16* pTmpRanges = (pData->fnGetRanges)();
-            const sal_uInt16* pIter = pTmpRanges;
-
-            sal_uInt16 nLen;
-            for( nLen = 0; *pIter; ++nLen, ++pIter )
-                ;
-            aUS.insert( aUS.end(), pTmpRanges, pTmpRanges + nLen );
-        }
-    }
 
     // remove double Id's
     {
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index a83e11ac991f..6c02303647f2 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -21,8 +21,8 @@
 #include "dialmgr.hxx"
 #include "newtabledlg.hxx"
 
-SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent )
-    : m_pDialog( VclPtr<ModalDialog>::Create( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
+SvxNewTableDialog::SvxNewTableDialog()
+    : m_pDialog( VclPtr<ModalDialog>::Create( nullptr, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
 {
     m_pDialog->get(mpNumRows, "rows");
     m_pDialog->get(mpNumColumns, "columns");
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 95e4fbc3ebc6..3cceae8a9a74 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -71,7 +71,7 @@ using namespace css::document;
 
 void ShowErrorDialog( const Any& aException )
 {
-    std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( nullptr, aException ));
+    std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( aException ));
     pDlg->Execute();
 }
 
@@ -1434,8 +1434,7 @@ OUString GetErrorMessage( const css::uno::Any& aException )
 
 }
 
-SvxScriptErrorDialog::SvxScriptErrorDialog(
-    vcl::Window* , css::uno::Any aException )
+SvxScriptErrorDialog::SvxScriptErrorDialog( css::uno::Any aException )
     : m_sMessage()
 {
     SolarMutexGuard aGuard;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 94ca9e671fad..f748ab491e69 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -956,7 +956,7 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre
 VclAbstractDialog*
 AbstractDialogFactory_Impl::CreateScriptErrorDialog(const css::uno::Any& rException)
 {
-    return new SvxScriptErrorDialog(nullptr, rException);
+    return new SvxScriptErrorDialog(rException);
 }
 
 AbstractScriptSelectorDialog*
@@ -1506,7 +1506,7 @@ SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDi
 
 SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog()
 {
-    return new SvxNewTableDialog( nullptr );
+    return new SvxNewTableDialog;
 }
 
 VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 45cd694f6be6..5005acf32a2c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -73,8 +73,8 @@ class OfaACorrCheckListBox : public SvSimpleTable
         virtual void    KeyInput( const KeyEvent& rKEvt ) override;
 
     public:
-        OfaACorrCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
-            : SvSimpleTable(rParent, nBits)
+        OfaACorrCheckListBox(SvSimpleTableContainer& rParent)
+            : SvSimpleTable(rParent, WB_BORDER)
         {
         }
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 3cc6f7c5b568..6f9eda810afd 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -39,22 +39,19 @@ class IconChoicePage;
 
 // Create-Function
 typedef VclPtr<IconChoicePage> (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet);
-typedef const sal_uInt16*      (*GetPageRanges)(); // gives international Which-value
 
 /// Data-structure for pages in dialog
 struct IconChoicePageData
 {
     sal_uInt16 nId;
     CreatePage fnCreatePage;    ///< pointer to the factory
-    GetPageRanges fnGetRanges;  ///< pointer to the ranges-function
     VclPtr<IconChoicePage> pPage;      ///< the TabPage itself
     bool bRefresh;          ///< Flag: page has to be newly initialized
 
     // constructor
-    IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges )
+    IconChoicePageData( sal_uInt16 Id, CreatePage fnPage )
         : nId           ( Id ),
           fnCreatePage  ( fnPage ),
-          fnGetRanges   ( fnRanges ),
           pPage         ( nullptr ),
           bRefresh      ( false )
     {}
@@ -154,8 +151,7 @@ protected:
 public:
 
     // the IconChoiceCtrl's could also be set in the Ctor
-    IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
-                       const SfxItemSet * pItemSet = nullptr );
+    IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~IconChoiceDialog () override;
     virtual void dispose() override;
 
diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index ccf25f63d110..6dd1de126ae4 100644
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@ -34,7 +34,7 @@ private:
     VclPtr<NumericField> mpNumRows;
 
 public:
-    SvxNewTableDialog( vcl::Window* pWindow );
+    SvxNewTableDialog();
     virtual ~SvxNewTableDialog() override;
 
     virtual short Execute() override;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 0429601d5d0a..fac8bccfe8dd 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -53,7 +53,7 @@ protected:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
-    SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER);
+    SvxNumberPreview(vcl::Window* pParent);
 
     void            NotifyChange( const OUString& rPrevStr, const Color* pColor = nullptr );
 };
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index b158ffe8fdfd..94732fcf6d9f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -190,7 +190,7 @@ private:
 
 public:
 
-    SvxScriptErrorDialog( vcl::Window* parent, css::uno::Any aException );
+    SvxScriptErrorDialog( css::uno::Any aException );
 
     virtual ~SvxScriptErrorDialog() override;
 
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 6a2292ac216c..1cbc2ca6a522 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -93,7 +93,7 @@ namespace offapp
                 ++aLoopDrivers
             )
         {
-            aSettings.push_back(DriverPooling(*aLoopDrivers, 120));
+            aSettings.push_back(DriverPooling(*aLoopDrivers));
         }
 
         // then look for which of them settings are stored in the configuration
@@ -121,7 +121,7 @@ namespace offapp
 
             if (aLookup == aSettings.end())
             {   // do not know the driver - add it
-                aSettings.push_back(DriverPooling(sThisDriverName, 120));
+                aSettings.push_back(DriverPooling(sThisDriverName));
 
                 // and the position of the new entry
                 aLookup = aSettings.end();
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 7eb2d8e82929..6bc676cfbe39 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -23,10 +23,10 @@
 namespace offapp
 {
 
-    DriverPooling::DriverPooling( const OUString& _rName, const sal_Int32 _nTimeout )
+    DriverPooling::DriverPooling( const OUString& _rName )
         :sName(_rName)
         ,bEnabled(false)
-        ,nTimeoutSeconds(_nTimeout)
+        ,nTimeoutSeconds(120)
     {
     }
 
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 6cb1b0de3a33..07b607730953 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -37,7 +37,7 @@ namespace offapp
         bool                bEnabled;
         sal_Int32           nTimeoutSeconds;
 
-        DriverPooling( const OUString& _rName, const sal_Int32 _nTimeout );
+        DriverPooling( const OUString& _rName );
 
         bool operator == (const DriverPooling& _rR) const;
         bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); }
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index e5768dcfdf39..e0f460a47a0c 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -77,8 +77,8 @@ const sal_uInt16 SvxNumberFormatTabPage::pRanges[] =
 #*
 #************************************************************************/
 
-SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle)
-    : Window(pParent, nStyle)
+SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent)
+    : Window(pParent, WB_BORDER)
     , mnPos(-1)
     , mnChar(0x0)
 {
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index d15c1c21da3f..b30f1c865f19 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -50,7 +50,7 @@ namespace dbaccess
     // View
     View::View( const Reference< XConnection >& _rxConnection, bool _bCaseSensitive,
         const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName )
-        :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName )
+        :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), OUString(), _rSchemaName, _rCatalogName )
     {
         m_nCommandHandle = getProperty(PROPERTY_COMMAND).Handle;
         try
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 23d98a3845b0..6b25a1564c2d 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -52,17 +52,9 @@ namespace canvas
 
             @param rTarget
             The target canvas the repaint should happen on.
-
-            @param bFailForChangedViewTransform
-            When true, derived classes will never receive doRedraw()
-            calls with dissimilar view transformations and
-            bSameViewTransform set to false. This is useful for cached
-            objects where re-transforming the generated output is not
-            desirable, e.g. for hinted font output.
          */
         CachedPrimitiveBase( const css::rendering::ViewState&  rUsedViewState,
-                             const css::uno::Reference< css::rendering::XCanvas >& rTarget,
-                             bool                              bFailForChangedViewTransform );
+                             const css::uno::Reference< css::rendering::XCanvas >& rTarget );
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing() override;
@@ -106,7 +98,6 @@ namespace canvas
 
         css::rendering::ViewState                         maUsedViewState;
         css::uno::Reference< css::rendering::XCanvas >    mxTarget;
-        const bool                                        mbFailForChangedViewTransform;
     };
 }
 
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 5fece98d9e25..c5dd87ff9d57 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -109,11 +109,10 @@ public:
     template <typename ImplClassT>
     ServiceDecl( ImplClassT const& implClass,
                  char const* pImplName,
-                 char const* pSupportedServiceNames, char cDelim = ';' )
+                 char const* pSupportedServiceNames )
         : m_createFunc(implClass.m_createFunc),
           m_pImplName(pImplName),
-          m_pServiceNames(pSupportedServiceNames),
-          m_cDelim(cDelim) {}
+          m_pServiceNames(pSupportedServiceNames) {}
 
     /// @internal gets called by component_getFactoryHelper()
     void * getFactory( sal_Char const* pImplName ) const;
@@ -134,7 +133,6 @@ private:
     detail::CreateFuncF const m_createFunc;
     char const* const m_pImplName;
     char const* const m_pServiceNames;
-    char const m_cDelim;
 };
 
 /** To specify whether the implementation class expects arguments
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index 601bcc39f2ae..0611e7ccc54d 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -47,9 +47,6 @@ namespace connectivity
                             sal_Int32       Precision,
                             sal_Int32       Scale,
                             sal_Int32       Type,
-                            bool            IsAutoIncrement,
-                            bool            IsRowVersion,
-                            bool            IsCurrency,
                             bool            _bCase,
                             const OUString& CatalogName,
                             const OUString& SchemaName,
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index b01076093ead..20d326e40666 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -47,9 +47,6 @@ namespace connectivity
                             sal_Int32       Precision,
                             sal_Int32       Scale,
                             sal_Int32       Type,
-                            bool            IsAutoIncrement,
-                            bool            IsRowVersion,
-                            bool            IsCurrency,
                             bool            _bCase,
                             const OUString& CatalogName,
                             const OUString& SchemaName,
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 2cb6e25f8ca2..1f08aee8e66c 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -67,7 +67,6 @@ namespace connectivity
             OView(  bool _bCase,
                     const OUString& _rName,
                     const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData,
-                    sal_Int32 _nCheckOption = 0,
                     const OUString& _rCommand = OUString(),
                     const OUString& _rSchemaName = OUString(),
                     const OUString& _rCatalogName = OUString());