loplugin:constantparam

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

16 files changed, 577 insertions, 549 deletions

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 114d0cf97612..1a074b29f9d4 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -346,7 +346,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
             AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE);
             AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME);
             AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS);
-            AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create, nullptr);
+            AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create);
             if( aCJKOptions.IsAsianTypographyEnabled() )
                 AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN);
             break;
@@ -357,7 +357,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
             AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE);
             AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME);
             AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS);
-            AddTabPage("legendpos", SchResId(STR_PAGE_POSITION), SchLegendPosTabPage::Create, nullptr);
+            AddTabPage("legendpos", SchResId(STR_PAGE_POSITION), SchLegendPosTabPage::Create);
             if (aCJKOptions.IsAsianTypographyEnabled())
                 AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN);
             break;
@@ -365,12 +365,12 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
         case OBJECTTYPE_DATA_SERIES:
         case OBJECTTYPE_DATA_POINT:
             if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() )
-                AddTabPage("options", SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create, nullptr);
+                AddTabPage("options", SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create);
             if( m_pParameter->ProvidesStartingAngle())
-                AddTabPage("polaroptions", SchResId(STR_PAGE_OPTIONS), PolarOptionsTabPage::Create, nullptr);
+                AddTabPage("polaroptions", SchResId(STR_PAGE_OPTIONS), PolarOptionsTabPage::Create);
 
             if( m_pParameter->HasGeometryProperties() )
-                AddTabPage("layout", SchResId(STR_PAGE_LAYOUT), SchLayoutTabPage::Create, nullptr);
+                AddTabPage("layout", SchResId(STR_PAGE_LAYOUT), SchLayoutTabPage::Create);
 
             if(m_pParameter->HasAreaProperties())
             {
@@ -383,7 +383,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
         case OBJECTTYPE_DATA_LABEL:
         case OBJECTTYPE_DATA_LABELS:
             AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE);
-            AddTabPage("datalabels", SchResId(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, nullptr);
+            AddTabPage("datalabels", SchResId(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create);
             AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME);
             AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS);
             if( aCJKOptions.IsAsianTypographyEnabled() )
@@ -394,12 +394,12 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
         case OBJECTTYPE_AXIS:
         {
             if( m_pParameter->HasScaleProperties() )
-                AddTabPage("scale", SchResId(STR_PAGE_SCALE), ScaleTabPage::Create, nullptr);
+                AddTabPage("scale", SchResId(STR_PAGE_SCALE), ScaleTabPage::Create);
 
             if( m_pParameter->HasScaleProperties() )//no positioning page for z axes so far as the tickmarks are not shown so far
-                AddTabPage("axispos", SchResId(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create, nullptr);
+                AddTabPage("axispos", SchResId(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create);
             AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
-            AddTabPage("axislabel", SchResId(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create, nullptr);
+            AddTabPage("axislabel", SchResId(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create);
             if( m_pParameter->HasNumberProperties() )
                 AddTabPage("numberformat", SchResId(STR_PAGE_NUMBERS), RID_SVXPAGE_NUMBERFORMAT);
             AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME);
@@ -410,12 +410,12 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
         }
 
         case OBJECTTYPE_DATA_ERRORS_X:
-            AddTabPage("xerrorbar", SchResId(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create, nullptr);
+            AddTabPage("xerrorbar", SchResId(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create);
             AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
             break;
 
         case OBJECTTYPE_DATA_ERRORS_Y:
-            AddTabPage("yerrorbar", SchResId(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create, nullptr);
+            AddTabPage("yerrorbar", SchResId(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create);
             AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
             break;
 
@@ -430,7 +430,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
             break;
 
         case OBJECTTYPE_DATA_CURVE:
-            AddTabPage("trendline", SchResId(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create, nullptr);
+            AddTabPage("trendline", SchResId(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create);
             AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
             break;
 
@@ -462,7 +462,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
                 /*  When rotation is supported for equation text boxes, use
                     SchAlignmentTabPage::Create here. The special
                     SchAlignmentTabPage::CreateWithoutRotation can be deleted. */
-                AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation, nullptr);
+                AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation);
             }
             break;
         default:
diff --git a/compilerplugins/clang/constantparam.bitmask.results b/compilerplugins/clang/constantparam.bitmask.results
index e0edc377e13a..17bf470d3436 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -1,7 +1,7 @@
-codemaker/source/javamaker/classfile.hxx:152
+codemaker/source/javamaker/classfile.hxx:153
     void codemaker::javamaker::ClassFile::ClassFile(enum codemaker::javamaker::ClassFile::AccessFlags,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &)
     enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1
-codemaker/source/javamaker/classfile.hxx:167
+codemaker/source/javamaker/classfile.hxx:168
     void codemaker::javamaker::ClassFile::addField(enum codemaker::javamaker::ClassFile::AccessFlags,const class rtl::OString &,const class rtl::OString &,unsigned short,const class rtl::OString &)
     enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1
 cui/source/options/webconninfo.hxx:35
@@ -10,19 +10,19 @@ cui/source/options/webconninfo.hxx:35
 dbaccess/source/filter/xml/xmlExport.hxx:171
     void dbaxml::ODBExport::ODBExport(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,enum SvXMLExportFlags)
     enum SvXMLExportFlags nExportFlag setBits=0x400 clearBits=0x200
-include/basegfx/polygon/b2dpolygontools.hxx:143
+include/basegfx/polygon/b2dpolygontools.hxx:144
     enum CutFlagValue findCut(const class basegfx::B2DPoint &,const class basegfx::B2DVector &,const class basegfx::B2DPoint &,const class basegfx::B2DVector &,enum CutFlagValue,double *,double *)
     enum CutFlagValue aCutFlags setBits=0x1
 include/framework/framelistanalyzer.hxx:181
     void framework::FrameListAnalyzer::FrameListAnalyzer(const class com::sun::star::uno::Reference<class com::sun::star::frame::XFramesSupplier> &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,enum FrameAnalyzerFlags)
     enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/sfx2/objsh.hxx:464
+include/sfx2/objsh.hxx:468
     void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
     enum SfxLoadedFlags nWhich setBits=0x1
 include/svtools/brwbox.hxx:438
     void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString &,long,enum HeaderBarItemBits,unsigned short)
     enum HeaderBarItemBits nBits setBits=0x410 clearBits=0x3ac
-include/svtools/wizardmachine.hxx:172
+include/svtools/wizardmachine.hxx:178
     void svt::OWizardMachine::OWizardMachine(class vcl::Window *,enum WizardButtonFlags)
     enum WizardButtonFlags _nButtonFlags setBits=0xf
 include/vcl/gdimtf.hxx:195
@@ -43,13 +43,13 @@ sc/source/ui/view/cellsh1.cxx:115
 sc/source/ui/view/cellsh1.cxx:138
     class rtl::OUString FlagsToString(enum InsertDeleteFlags,enum InsertDeleteFlags)
     enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
-sw/source/core/view/viewsh.cxx:730
+sw/source/core/view/viewsh.cxx:734
     void lcl_InvalidateAllContent(class SwViewShell &,enum SwInvalidateFlags)
     enum SwInvalidateFlags nInv setBits=0x2
 sw/source/filter/html/swhtml.hxx:671
     void SwHTMLParser::SetFrameFormatAttrs(class SfxItemSet &,enum HtmlFrameFormatFlags,class SfxItemSet &)
     enum HtmlFrameFormatFlags nFlags setBits=0x1
-sw/source/filter/ww8/wrtw8esh.cxx:1534
+sw/source/filter/ww8/wrtw8esh.cxx:1529
     enum ShapeFlag AddMirrorFlags(enum ShapeFlag,const class SwMirrorGrf &)
     enum ShapeFlag nFlags setBits=0xa00 clearBits=0x5ef
 xmloff/inc/MetaExportComponent.hxx:32
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index e1a57614fe46..3b0b836aa652 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -98,7 +98,7 @@ chart2/qa/extras/PivotChartTest.cxx:224
     class com::sun::star::uno::Reference<class com::sun::star::sheet::XDataPilotTables> lclGetDataPilotTables(int,const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheetDocument> &)
     int nIndex
     0
-chart2/source/controller/dialogs/ChartTypeDialogController.hxx:55
+chart2/source/controller/dialogs/ChartTypeDialogController.hxx:52
     void chart::ChartTypeParameter::ChartTypeParameter(int,_Bool,_Bool,enum chart::GlobalStackMode,_Bool,_Bool,enum com::sun::star::chart2::CurveStyle)
     enum com::sun::star::chart2::CurveStyle eCurveStyle
     0
@@ -114,14 +114,6 @@ chart2/source/controller/inc/ChartController.hxx:367
     class chart::ChartController::TheModelRef & chart::ChartController::TheModelRef::operator=(class chart::ChartController::TheModel *)
      ###1
     0
-chart2/source/controller/inc/res_Titles.hxx:35
-    void chart::TitleResources::TitleResources(class VclBuilderContainer &,_Bool)
-    _Bool bShowSecondaryAxesTitle
-    0
-chart2/source/controller/inc/res_Titles.hxx:67
-    void chart::SchTitleResources::SchTitleResources(class weld::Builder &,_Bool)
-    _Bool bShowSecondaryAxesTitle
-    1
 chart2/source/controller/inc/ViewElementListProvider.hxx:51
     class Graphic chart::ViewElementListProvider::GetSymbolGraphic(int,const class SfxItemSet *) const
     int nStandardSymbol
@@ -174,7 +166,7 @@ chart2/source/view/main/VButton.hxx:51
     void chart::VButton::showArrow(_Bool)
     _Bool bShowArrow
     0
-codemaker/source/javamaker/classfile.hxx:119
+codemaker/source/javamaker/classfile.hxx:120
     void codemaker::javamaker::ClassFile::Code::storeLocalReference(unsigned short)
     unsigned short index
     1
@@ -206,7 +198,7 @@ connectivity/source/inc/odbc/OTools.hxx:219
     void connectivity::odbc::OTools::bindValue(const class connectivity::odbc::OConnection *,void *,int,short,short,const void *,void *,long *,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,unsigned short,_Bool)
     short _nMaxLen
     0
-cppcanvas/source/mtfrenderer/mtftools.cxx:260
+cppcanvas/source/mtfrenderer/mtftools.cxx:295
     void appendRect(class basegfx::B2DPolyPolygon &,const class basegfx::B2DPoint &,const double,const double,const double,const double)
     const double nX1
     0
@@ -242,7 +234,7 @@ cui/source/inc/scriptdlg.hxx:76
     class SvTreeListEntry * SFTreeListBox::insertEntry(const class rtl::OUString &,const class rtl::OUString &,class SvTreeListEntry *,_Bool,class std::unique_ptr<class SFEntry, struct std::default_delete<class SFEntry> > &&,const class rtl::OUString &)
     class SvTreeListEntry * pParent
     0
-cui/source/inc/SpellDialog.hxx:87
+cui/source/inc/SpellDialog.hxx:86
     void svx::SentenceEditWindow_Impl::SetAttrib(const class TextAttrib &,unsigned int,int,int)
     unsigned int nPara
     0
@@ -282,6 +274,10 @@ dbaccess/source/ui/control/tabletree.cxx:222
     class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > lcl_getMetaDataStrings_throw(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSet> &,int)
     int _nColumnIndex
     1
+dbaccess/source/ui/dlg/adminpages.hxx:225
+    void dbaui::OGenericAdministrationPage::fillBool(class SfxItemSet &,const class CheckBox *,unsigned short,_Bool &,_Bool)
+    _Bool _bRevertValue
+    0
 dbaccess/source/ui/inc/charsets.hxx:47
     class dbaui::OCharsetDisplay::ExtendedCharsetIterator dbaui::OCharsetDisplay::findEncoding(const unsigned short) const
     const unsigned short _eEncoding
@@ -302,9 +298,9 @@ desktop/source/deployment/gui/dp_gui_theextmgr.hxx:90
     void dp_gui::TheExtensionManager::ToTop(enum ToTopFlags)
     enum ToTopFlags nFlags
     1
-desktop/source/lib/init.cxx:4132
+desktop/source/lib/init.cxx:4291
     struct _LibreOfficeKit * libreofficekit_hook_2(const char *,const char *)
-    const char * user_profile_path
+    const char * user_profile_url
     0
 editeng/source/editeng/editstt2.hxx:29
     void InternalEditStatus::TurnOnFlags(enum EEControlBits)
@@ -326,19 +322,19 @@ extensions/source/propctrlr/newdatatype.hxx:40
     void pcr::NewDataTypeDialog::NewDataTypeDialog(class weld::Window *,const class rtl::OUString &,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
     class weld::Window * _pParent
     0
-extensions/source/propctrlr/propertyhandler.hxx:188
+extensions/source/propctrlr/propertyhandler.hxx:189
     void pcr::PropertyHandler::addDoublePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:196
+extensions/source/propctrlr/propertyhandler.hxx:197
     void pcr::PropertyHandler::addDatePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:204
+extensions/source/propctrlr/propertyhandler.hxx:205
     void pcr::PropertyHandler::addTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
-extensions/source/propctrlr/propertyhandler.hxx:212
+extensions/source/propctrlr/propertyhandler.hxx:213
     void pcr::PropertyHandler::addDateTimePropertyDescription(class std::__debug::vector<struct com::sun::star::beans::Property, class std::allocator<struct com::sun::star::beans::Property> > &,const class rtl::OUString &,short) const
     short _nAttribs
     1
@@ -410,7 +406,7 @@ filter/source/graphicfilter/eps/eps.cxx:212
     void PSWriter::ImplWriteFillColor(unsigned long)
     unsigned long nMode
     1
-filter/source/graphicfilter/icgm/cgm.hxx:93
+filter/source/graphicfilter/icgm/cgm.hxx:91
     unsigned char CGM::ImplGetByte(unsigned int,unsigned int)
     unsigned int nPrecision
     1
@@ -438,7 +434,7 @@ forms/source/inc/featuredispatcher.hxx:50
     void frm::IFeatureDispatcher::dispatchWithArgument(short,const char *,const class com::sun::star::uno::Any &) const
     short _nFeatureId
     1
-formula/source/ui/dlg/structpg.hxx:87
+formula/source/ui/dlg/structpg.hxx:86
     class SvTreeListEntry * formula::StructPage::InsertEntry(const class rtl::OUString &,class SvTreeListEntry *,unsigned short,unsigned long,const class formula::FormulaToken *)
     unsigned long nPos
     0
@@ -474,23 +470,23 @@ include/avmedia/mediaplayer.hxx:51
     void avmedia::MediaFloater::setURL(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool bPlayImmediately
     1
-include/basegfx/polygon/b2dpolygon.hxx:86
+include/basegfx/polygon/b2dpolygon.hxx:84
     void basegfx::B2DPolygon::insert(unsigned int,const class basegfx::B2DPoint &,unsigned int)
     unsigned int nCount
     1
-include/basegfx/polygon/b2dpolygontools.hxx:89
+include/basegfx/polygon/b2dpolygontools.hxx:90
     _Bool isInside(const class basegfx::B2DPolygon &,const class basegfx::B2DPolygon &,_Bool)
     _Bool bWithBorder
     1
-include/basegfx/polygon/b2dpolygontools.hxx:342
+include/basegfx/polygon/b2dpolygontools.hxx:343
     enum basegfx::B2VectorOrientation getOrientationForIndex(const class basegfx::B2DPolygon &,unsigned int)
     unsigned int nIndex
     0
-include/basegfx/polygon/b2dpolygontools.hxx:349
+include/basegfx/polygon/b2dpolygontools.hxx:350
     _Bool isPointOnPolygon(const class basegfx::B2DPolygon &,const class basegfx::B2DPoint &,_Bool)
     _Bool bWithPoints
     1
-include/basegfx/polygon/b2dpolygontools.hxx:352
+include/basegfx/polygon/b2dpolygontools.hxx:353
     _Bool isPointInTriangle(const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,const class basegfx::B2DPoint &,_Bool)
     _Bool bWithBorder
     1
@@ -518,19 +514,19 @@ include/basegfx/polygon/b2dpolypolygon.hxx:138
     shared_ptr<type-parameter-?-?> basegfx::B2DPolyPolygon::addOrReplaceSystemDependentData(class basegfx::SystemDependentDataManager &,type-parameter-?-? &&...) const
      ###3
     0
-include/basegfx/polygon/b3dpolygon.hxx:73
+include/basegfx/polygon/b3dpolygon.hxx:72
     void basegfx::B3DPolygon::append(const class basegfx::B3DPoint &,unsigned int)
     unsigned int nCount
     1
-include/basegfx/polygon/b3dpolygon.hxx:97
+include/basegfx/polygon/b3dpolygon.hxx:96
     void basegfx::B3DPolygon::append(const class basegfx::B3DPolygon &,unsigned int,unsigned int)
-    unsigned int nCount
+    unsigned int nIndex
     0
-include/basegfx/polygon/b3dpolygon.hxx:97
+include/basegfx/polygon/b3dpolygon.hxx:96
     void basegfx::B3DPolygon::append(const class basegfx::B3DPolygon &,unsigned int,unsigned int)
-    unsigned int nIndex
+    unsigned int nCount
     0
-include/basegfx/polygon/b3dpolygon.hxx:100
+include/basegfx/polygon/b3dpolygon.hxx:99
     void basegfx::B3DPolygon::remove(unsigned int,unsigned int)
     unsigned int nCount
     1
@@ -550,17 +546,17 @@ include/basegfx/polygon/b3dpolypolygon.hxx:89
     void basegfx::B3DPolyPolygon::remove(unsigned int,unsigned int)
     unsigned int nCount
     1
-include/basegfx/range/b2dpolyrange.hxx:74
+include/basegfx/range/b2dpolyrange.hxx:73
     void basegfx::B2DPolyRange::appendElement(const class basegfx::B2DRange &,enum basegfx::B2VectorOrientation,unsigned int)
     unsigned int nCount
     1
-include/basegfx/range/b2ibox.hxx:77
+include/basegfx/range/b2ibox.hxx:72
     void basegfx::B2IBox::B2IBox(int,int,int,int)
-    int y1
+    int x1
     0
-include/basegfx/range/b2ibox.hxx:77
+include/basegfx/range/b2ibox.hxx:72
     void basegfx::B2IBox::B2IBox(int,int,int,int)
-    int x1
+    int y1
     0
 include/basegfx/utils/tools.hxx:118
     class basegfx::B2DPolyPolygon number2PolyPolygon(double,int,int,_Bool)
@@ -798,7 +794,7 @@ include/formula/vectortoken.hxx:50
     void formula::VectorRefArray::VectorRefArray(enum formula::VectorRefArray::InitInvalid)
     enum formula::VectorRefArray::InitInvalid 
     0
-include/i18nutil/widthfolding.hxx:45
+include/i18nutil/widthfolding.hxx:47
     class rtl::OUString i18nutil::widthfolding::compose_ja_voiced_sound_marks(const class rtl::OUString &,int,int,class com::sun::star::uno::Sequence<int> &,_Bool,int)
     int startPos
     0
@@ -914,11 +910,11 @@ include/oox/vml/vmlformatting.hxx:123
     int decodeMeasureToHmm(const class oox::GraphicHelper &,const class rtl::OUString &,int,_Bool,_Bool)
     int nRefValue
     0
-include/opencl/openclwrapper.hxx:63
+include/opencl/openclwrapper.hxx:61
     _Bool buildProgramFromBinary(const char *,struct openclwrapper::GPUEnv *,const char *,int)
     int idx
     0
-include/opencl/openclwrapper.hxx:86
+include/opencl/openclwrapper.hxx:84
     void setOpenCLCmdQueuePosition(int)
     int nPos
     0
@@ -950,6 +946,10 @@ include/sfx2/filedlghelper.hxx:107
     void sfx2::FileDialogHelper::FileDialogHelper(short,enum FileDialogFlags,const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags,class weld::Window *)
     enum SfxFilterFlags nDont
     0
+include/sfx2/notebookbar/SfxNotebookBar.hxx:50
+    void sfx2::SfxNotebookBar::ShowMenubar(class SfxViewFrame *,_Bool)
+    _Bool bShow
+    1
 include/sfx2/opengrf.hxx:46
     void SvxOpenGraphicDialog::EnableLink(_Bool)
     _Bool 
@@ -974,7 +974,7 @@ include/sfx2/sfxdlg.hxx:139
     class VclPtr<class VclAbstractDialog> SfxAbstractDialogFactory::CreateEditObjectDialog(class weld::Window *,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::embed::XEmbeddedObject> &)
     class weld::Window * pParent
     0
-include/sfx2/sidebar/FocusManager.hxx:121
+include/sfx2/sidebar/FocusManager.hxx:117
     _Bool sfx2::sidebar::FocusManager::IsPanelTitleVisible(const int) const
     const int nPanelIndex
     0
@@ -982,35 +982,39 @@ include/sfx2/sidebar/SidebarToolBox.hxx:55
     void sfx2::sidebar::SidebarToolBox::SetController(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::frame::XToolbarController> &)
     const unsigned short nItemId
     1
+include/sfx2/tabdlg.hxx:266
+    void SfxTabDialogController::AddTabPage(const class rtl::OString &,const class rtl::OUString &,class VclPtr<class SfxTabPage> (*)(struct TabPageParent, const class SfxItemSet *),const unsigned short *(*)(void))
+    const unsigned short *(*)(void) pRangesFunc
+    0
 include/sfx2/thumbnailview.hxx:225
     void ThumbnailView::ShowTooltips(_Bool)
     _Bool bShowTooltips
     1
-include/sot/stg.hxx:168
+include/sot/stg.hxx:158
     void Storage::Storage(const class rtl::OUString &,enum StreamMode,_Bool)
     _Bool bDirect
     1
-include/sot/stg.hxx:261
+include/sot/stg.hxx:251
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bDirect
     0
-include/sot/stg.hxx:261
+include/sot/stg.hxx:251
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     _Bool bIsRoot
     1
-include/sot/stg.hxx:261
+include/sot/stg.hxx:251
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
     enum StreamMode nMode
     1
-include/sot/stg.hxx:267
+include/sot/stg.hxx:257
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bIsRoot
+    _Bool bDirect
     1
-include/sot/stg.hxx:267
+include/sot/stg.hxx:257
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bDirect
+    _Bool bIsRoot
     1
-include/sot/stg.hxx:272
+include/sot/stg.hxx:262
     void UCBStorage::UCBStorage(const class rtl::OUString &,enum StreamMode,_Bool,_Bool,_Bool,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XProgressHandler> &)
     _Bool bIsRoot
     0
@@ -1046,7 +1050,7 @@ include/svl/urihelper.hxx:149
     class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eEncodeMechanism
     1
-include/svl/zforlist.hxx:874
+include/svl/zforlist.hxx:875
     const class NfKeywordTable & SvNumberFormatter::GetKeywords(unsigned int)
     unsigned int nKey
     0
@@ -1082,7 +1086,7 @@ include/svtools/inettbc.hxx:63
     void SvtURLBox::SvtURLBox(class vcl::Window *,enum INetProtocol,_Bool)
     _Bool bSetDefaultHelpID
     1
-include/svtools/ruler.hxx:738
+include/svtools/ruler.hxx:740
     void Ruler::SetWinPos(long,long)
     long nWidth
     0
@@ -1098,7 +1102,7 @@ include/svtools/svmedit2.hxx:37
     void ExtMultiLineEdit::SetAttrib(const class TextAttrib &,unsigned int,int,int)
     int nStart
     0
-include/svtools/transfer.hxx:249
+include/svtools/transfer.hxx:250
     void TransferableHelper::StartDrag(class vcl::Window *,signed char,int)
     int nDragPointer
     0
@@ -1155,7 +1159,7 @@ include/svx/fmtools.hxx:163
     short _nId
     0
 include/svx/fmview.hxx:89
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrPage *,class SdrPage *,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
     int _nYOffsetMM
     0
 include/svx/framelink.hxx:153
@@ -1198,10 +1202,6 @@ include/svx/nbdtmg.hxx:136
     class rtl::OUString svx::sidebar::NBOTypeMgrBase::GetDescription(unsigned short,_Bool)
     _Bool isDefault
     1
-include/svx/orienthelper.hxx:75
-    void svx::OrientationHelper::Show(_Bool)
-    _Bool bShow
-    0
 include/svx/postattr.hxx:34
     void SvxPostItAuthorItem::SvxPostItAuthorItem(unsigned short)
     unsigned short nWhich
@@ -1262,11 +1262,7 @@ include/svx/svditer.hxx:56
     void SdrObjListIter::SdrObjListIter(const class SdrObject &,enum SdrIterMode,_Bool)
     _Bool bReverse
     0
-include/svx/svdlayer.hxx:143
-    void SdrLayerAdmin::NewStandardLayer(unsigned short)
-    unsigned short nPos
-    0
-include/svx/svdundo.hxx:102
+include/svx/svdundo.hxx:101
     class SdrUndoAction * SdrUndoGroup::GetAction(int) const
     int nNum
     0
@@ -1358,11 +1354,11 @@ include/test/sheet/xdocumentauditing.hxx:37
     _Bool apitest::XDocumentAuditing::hasRightAmountOfShapes(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> &,int,int)
     int nShapes
     1
-include/tools/date.hxx:72
+include/tools/date.hxx:71
     void Date::Date(enum Date::DateInitEmpty)
     enum Date::DateInitEmpty 
     0
-include/tools/date.hxx:73
+include/tools/date.hxx:72
     void Date::Date(enum Date::DateInitSystem)
     enum Date::DateInitSystem 
     0
@@ -1378,23 +1374,23 @@ include/tools/fract.hxx:44
     void Fraction::Fraction(type-parameter-?-?,type-parameter-?-?,typename enable_if<std::is_integral<T1>::value && std::is_integral<T2>::value, int>::type)
     typename enable_if<std::is_integral<T1>::value && std::is_integral<T2>::value, int>::type 
     0
-include/tools/stream.hxx:598
+include/tools/stream.hxx:590
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
     unsigned long nByteOffset
     0
-include/tools/stream.hxx:598
+include/tools/stream.hxx:590
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
     unsigned long nBytes
     0
-include/tools/stream.hxx:599
+include/tools/stream.hxx:591
     _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
     unsigned long nByteOffset
     0
-include/tools/stream.hxx:599
+include/tools/stream.hxx:591
     _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
     unsigned long nBytes
     0
-include/tools/stream.hxx:678
+include/tools/stream.hxx:670
     void SvMemoryStream::ObjectOwnsMemory(_Bool)
     _Bool bOwn
     1
@@ -1422,27 +1418,27 @@ include/tools/urlobj.hxx:840
     class rtl::OUString INetURLObject::encode(const class rtl::OUString &,enum INetURLObject::Part,enum INetURLObject::EncodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eMechanism
     0
-include/unotools/charclass.hxx:136
+include/unotools/charclass.hxx:135
     class rtl::OUString CharClass::titlecase(const class rtl::OUString &,int,int) const
     int nPos
     0
-include/unotools/charclass.hxx:179
+include/unotools/charclass.hxx:178
     _Bool CharClass::isAlphaNumeric(const class rtl::OUString &,int) const
     int nPos
     0
-include/unotools/cmdoptions.hxx:75
+include/unotools/cmdoptions.hxx:78
     _Bool SvtCommandOptions::HasEntries(enum SvtCommandOptions::CmdOption) const
     enum SvtCommandOptions::CmdOption eOption
     0
-include/unotools/cmdoptions.hxx:85
+include/unotools/cmdoptions.hxx:88
     _Bool SvtCommandOptions::Lookup(enum SvtCommandOptions::CmdOption,const class rtl::OUString &) const
     enum SvtCommandOptions::CmdOption eOption
     0
-include/unotools/confignode.hxx:267
+include/unotools/confignode.hxx:261
     class utl::OConfigurationTreeRoot utl::OConfigurationTreeRoot::tryCreateWithComponentContext(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,int,enum utl::OConfigurationTreeRoot::CREATION_MODE)
     enum utl::OConfigurationTreeRoot::CREATION_MODE _eMode
     1
-include/unotools/fontdefs.hxx:59
+include/unotools/fontdefs.hxx:52
     void ConvertChar::RecodeString(class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1450,7 +1446,7 @@ include/unotools/historyoptions.hxx:92
     void SvtHistoryOptions::DeleteItem(enum EHistoryType,const class rtl::OUString &)
     enum EHistoryType eHistory
     0
-include/unotools/localedatawrapper.hxx:299
+include/unotools/localedatawrapper.hxx:310
     double LocaleDataWrapper::stringToDouble(const char16_t *,const char16_t *,_Bool,enum rtl_math_ConversionStatus *,const char16_t **) const
     _Bool bUseGroupSep
     1
@@ -1458,7 +1454,7 @@ include/unotools/mediadescriptor.hxx:256
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::NamedValue> utl::MediaDescriptor::requestAndVerifyDocPassword(class comphelper::IDocPasswordVerifier &,enum comphelper::DocPasswordRequestType,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > *)
     enum comphelper::DocPasswordRequestType eRequestType
     1
-include/unotools/nativenumberwrapper.hxx:47
+include/unotools/nativenumberwrapper.hxx:50
     class rtl::OUString NativeNumberWrapper::getNativeNumberString(const class rtl::OUString &,const struct com::sun::star::lang::Locale &,short) const
     short nNativeNumberMode
     0
@@ -1478,17 +1474,17 @@ include/unotools/sharedunocomponent.hxx:184
     void utl::SharedUNOComponent::set(const SharedUNOComponent<INTERFACE, COMPONENT> &,enum com::sun::star::uno::UnoReference_SetThrow)
     enum com::sun::star::uno::UnoReference_SetThrow _setThrow
     0
-include/unotools/transliterationwrapper.hxx:83
+include/unotools/transliterationwrapper.hxx:87
     class rtl::OUString utl::TransliterationWrapper::transliterate(const class rtl::OUString &,int,int) const
     int nStart
     0
-include/unotools/transliterationwrapper.hxx:99
+include/unotools/transliterationwrapper.hxx:103
     _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
-    int nPos2
+    int nPos1
     0
-include/unotools/transliterationwrapper.hxx:99
+include/unotools/transliterationwrapper.hxx:103
     _Bool utl::TransliterationWrapper::equals(const class rtl::OUString &,int,int,int &,const class rtl::OUString &,int,int,int &) const
-    int nPos1
+    int nPos2
     0
 include/vbahelper/vbaeventshelperbase.hxx:93
     void VbaEventsHelperBase::checkArgumentType(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int)
@@ -1510,7 +1506,7 @@ include/vcl/combobox.hxx:81
     void ComboBox::EnableDDAutoWidth(_Bool)
     _Bool b
     0
-include/vcl/combobox.hxx:117
+include/vcl/combobox.hxx:122
     void ComboBox::EnableMultiSelection(_Bool)
     _Bool bMulti
     0
@@ -1542,24 +1538,24 @@ include/vcl/graphicfilter.hxx:290
     class ErrCode GraphicFilter::ImportGraphic(class Graphic &,const class rtl::OUString &,class SvStream &,unsigned short,unsigned short *,enum GraphicFilterImportFlags,class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *,const struct WmfExternal *)
     class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> * pFilterData
     0
-include/vcl/lstbox.hxx:152
+include/vcl/lstbox.hxx:151
     void ListBox::EnableDDAutoWidth(_Bool)
     _Bool b
     0
-include/vcl/lstbox.hxx:237
+include/vcl/lstbox.hxx:236
     void ListBox::EnableUserDraw(_Bool)
     _Bool bUserDraw
     1
-include/vcl/lstbox.hxx:282
+include/vcl/lstbox.hxx:281
     void ListBox::EnableQuickSelection(_Bool)
     _Bool b
     0
-include/vcl/outdev.hxx:551
+include/vcl/outdev.hxx:552
     _Bool OutputDevice::SupportsOperation(enum OutDevSupportType) const
     enum OutDevSupportType 
     0
-include/vcl/outdev.hxx:1154
-    void OutputDevice::DrawTextArray(const class Point &,const class rtl::OUString &,const long *,int,int,enum SalLayoutFlags,const class vcl::TextLayoutCache *,const class std::__debug::vector<struct GlyphItem, class std::allocator<struct GlyphItem> > *)
+include/vcl/outdev.hxx:1153
+    void OutputDevice::DrawTextArray(const class Point &,const class rtl::OUString &,const long *,int,int,enum SalLayoutFlags,const class vcl::TextLayoutCache *,const class SalLayoutGlyphs *)
     const class vcl::TextLayoutCache * 
     0
 include/vcl/outdev.hxx:1198
@@ -1578,11 +1574,11 @@ include/vcl/outdev.hxx:1201
     void OutputDevice::ImplDrawStrikeoutChar(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1226
+include/vcl/outdev.hxx:1223
     void OutputDevice::RefreshFontData(const _Bool)
     const _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1357
+include/vcl/outdev.hxx:1356
     _Bool OutputDevice::GetTextIsRTL(const class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1658,115 +1654,115 @@ include/vcl/weld.hxx:141
     void weld::ScrolledWindow::vadjustment_configure(int,int,int,int,int,int)
     int lower
     0
-include/vcl/weld.hxx:557
+include/vcl/weld.hxx:571
     void weld::Scale::set_range(int,int)
     int min
     1
-include/vcl/weld.hxx:892
+include/vcl/weld.hxx:908
     void weld::MetricSpinButton::get_increments(int &,int &,enum FieldUnit) const
     enum FieldUnit eDestUnit
     0
-include/vcl/weld.hxx:1109
+include/vcl/weld.hxx:1125
     void weld::Menu::set_sensitive(const class rtl::OString &,_Bool)
     _Bool bSensitive
     0
-include/vcl/weld.hxx:1111
+include/vcl/weld.hxx:1127
     void weld::Menu::show(const class rtl::OString &,_Bool)
     _Bool bShow
     0
-include/vcl/weld.hxx:1158
+include/vcl/weld.hxx:1174
     class std::unique_ptr<class weld::MessageDialog, struct std::default_delete<class weld::MessageDialog> > weld::Builder::weld_message_dialog(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     1
-include/vcl/weld.hxx:1161
+include/vcl/weld.hxx:1177
     class std::unique_ptr<class weld::Dialog, struct std::default_delete<class weld::Dialog> > weld::Builder::weld_dialog(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     1
-include/vcl/weld.hxx:1163
+include/vcl/weld.hxx:1179
     class std::unique_ptr<class weld::Widget, struct std::default_delete<class weld::Widget> > weld::Builder::weld_widget(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1164
+include/vcl/weld.hxx:1180
     class std::unique_ptr<class weld::Container, struct std::default_delete<class weld::Container> > weld::Builder::weld_container(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1167
+include/vcl/weld.hxx:1183
     class std::unique_ptr<class weld::Button, struct std::default_delete<class weld::Button> > weld::Builder::weld_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1168
+include/vcl/weld.hxx:1184
     class std::unique_ptr<class weld::MenuButton, struct std::default_delete<class weld::MenuButton> > weld::Builder::weld_menu_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1172
+include/vcl/weld.hxx:1188
     class std::unique_ptr<class weld::ScrolledWindow, struct std::default_delete<class weld::ScrolledWindow> > weld::Builder::weld_scrolled_window(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1175
+include/vcl/weld.hxx:1191
     class std::unique_ptr<class weld::Notebook, struct std::default_delete<class weld::Notebook> > weld::Builder::weld_notebook(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1177
+include/vcl/weld.hxx:1193
     class std::unique_ptr<class weld::ToggleButton, struct std::default_delete<class weld::ToggleButton> > weld::Builder::weld_toggle_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1180
+include/vcl/weld.hxx:1196
     class std::unique_ptr<class weld::RadioButton, struct std::default_delete<class weld::RadioButton> > weld::Builder::weld_radio_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1183
+include/vcl/weld.hxx:1199
     class std::unique_ptr<class weld::CheckButton, struct std::default_delete<class weld::CheckButton> > weld::Builder::weld_check_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1189
+include/vcl/weld.hxx:1206
     class std::unique_ptr<class weld::MetricSpinButton, struct std::default_delete<class weld::MetricSpinButton> > weld::Builder::weld_metric_spin_button(const class rtl::OString &,enum FieldUnit,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1195
+include/vcl/weld.hxx:1208
     class std::unique_ptr<class weld::TimeSpinButton, struct std::default_delete<class weld::TimeSpinButton> > weld::Builder::weld_time_spin_button(const class rtl::OString &,enum TimeFieldFormat,_Bool)
     enum TimeFieldFormat eFormat
     1
-include/vcl/weld.hxx:1195
+include/vcl/weld.hxx:1208
     class std::unique_ptr<class weld::TimeSpinButton, struct std::default_delete<class weld::TimeSpinButton> > weld::Builder::weld_time_spin_button(const class rtl::OString &,enum TimeFieldFormat,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1197
+include/vcl/weld.hxx:1210
     class std::unique_ptr<class weld::ComboBox, struct std::default_delete<class weld::ComboBox> > weld::Builder::weld_combo_box(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1201
+include/vcl/weld.hxx:1214
     class std::unique_ptr<class weld::Label, struct std::default_delete<class weld::Label> > weld::Builder::weld_label(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1202
+include/vcl/weld.hxx:1215
     class std::unique_ptr<class weld::TextView, struct std::default_delete<class weld::TextView> > weld::Builder::weld_text_view(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1204
+include/vcl/weld.hxx:1217
     class std::unique_ptr<class weld::Expander, struct std::default_delete<class weld::Expander> > weld::Builder::weld_expander(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1207
+include/vcl/weld.hxx:1220
     class std::unique_ptr<class weld::Scale, struct std::default_delete<class weld::Scale> > weld::Builder::weld_scale(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1208
+include/vcl/weld.hxx:1221
     class std::unique_ptr<class weld::ProgressBar, struct std::default_delete<class weld::ProgressBar> > weld::Builder::weld_progress_bar(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1211
+include/vcl/weld.hxx:1224
     class std::unique_ptr<class weld::Image, struct std::default_delete<class weld::Image> > weld::Builder::weld_image(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1213
+include/vcl/weld.hxx:1226
     class std::unique_ptr<class weld::DrawingArea, struct std::default_delete<class weld::DrawingArea> > weld::Builder::weld_drawing_area(const class rtl::OString &,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class std::function<class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > (class vcl::Window *)>,void *,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1218
+include/vcl/weld.hxx:1231
     class std::unique_ptr<class weld::EntryTreeView, struct std::default_delete<class weld::EntryTreeView> > weld::Builder::weld_entry_tree_view(const class rtl::OString &,const class rtl::OString &,const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:1221
+include/vcl/weld.hxx:1234
     class std::unique_ptr<class weld::Menu, struct std::default_delete<class weld::Menu> > weld::Builder::weld_menu(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     1
@@ -1774,6 +1770,10 @@ include/vcl/window.hxx:631
     void vcl::Window::ImplSetMouseTransparent(_Bool)
     _Bool bTransparent
     1
+include/vcl/window.hxx:1184
+    _Bool vcl::Window::IsChild(const class vcl::Window *,_Bool) const
+    _Bool bSystemWindow
+    0
 include/xmloff/numehelp.hxx:89
     void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(class SvXMLExport &,const class rtl::OUString &,const class rtl::OUString &,_Bool,_Bool)
     _Bool bExportTypeAttribute
@@ -1836,11 +1836,11 @@ lotuswordpro/inc/xfilter/xfframestyle.hxx:128
     1
 lotuswordpro/inc/xfilter/xfframestyle.hxx:128
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool content
+    _Bool pos
     1
 lotuswordpro/inc/xfilter/xfframestyle.hxx:128
     void XFFrameStyle::SetProtect(_Bool,_Bool,_Bool)
-    _Bool pos
+    _Bool content
     1
 lotuswordpro/inc/xfilter/xfindex.hxx:101
     void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
@@ -1850,7 +1850,7 @@ lotuswordpro/inc/xfilter/xfparastyle.hxx:174
     void XFParaStyle::SetDropCap(short,short,double)
     double fDistance
     0
-lotuswordpro/inc/xfilter/xfutil.hxx:96
+lotuswordpro/inc/xfilter/xfutil.hxx:92
     class rtl::OUString GetColorMode(enum enumXFColorMode)
     enum enumXFColorMode mode
     0
@@ -1910,7 +1910,7 @@ opencl/source/opencl_device.cxx:116
     double random(double,double)
     double min
     0
-opencl/source/openclwrapper.cxx:535
+opencl/source/openclwrapper.cxx:536
     _Bool initOpenCLRunEnv(int)
     int argc
     0
@@ -1962,7 +1962,7 @@ reportdesign/source/ui/report/SectionWindow.cxx:367
     void lcl_setOrigin(class vcl::Window &,long,long)
     long _nY
     0
-sal/osl/unx/file.cxx:94
+sal/osl/unx/file.cxx:95
     void FileHandle_Impl::FileHandle_Impl(int,enum FileHandle_Impl::Kind,const char *)
     enum FileHandle_Impl::Kind kind
     1
@@ -1974,11 +1974,11 @@ sal/qa/osl/file/osl_File.cxx:422
     void osl_FileBase::getAbsoluteFileURL::check_getAbsoluteFileURL(const class rtl::OUString &,const class rtl::OString &,enum osl::FileBase::RC,const class rtl::OUString &)
     enum osl::FileBase::RC _nAssumeError
     0
-sal/qa/osl/pipe/osl_Pipe.cxx:741
+sal/qa/osl/pipe/osl_Pipe.cxx:738
     void thread_sleep(unsigned int)
     unsigned int _nSec
     1
-sal/qa/osl/process/osl_Thread.cxx:162
+sal/qa/osl/process/osl_Thread.cxx:154
     void ThreadSafeValue::ThreadSafeValue<T>(type-parameter-?-?)
     type-parameter-?-? n
     0
@@ -2010,23 +2010,23 @@ sc/inc/ChartTools.hxx:48
     class SdrOle2Obj * getChartByIndex(class ScDocShell *,short,long,enum sc::tools::ChartSourceType)
     enum sc::tools::ChartSourceType eChartSourceType
     1
-sc/inc/chgtrack.hxx:708
+sc/inc/chgtrack.hxx:709
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    short nDx
+    int nDy
     0
-sc/inc/chgtrack.hxx:708
+sc/inc/chgtrack.hxx:709
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    int nDy
+    short nDx
     0
-sc/inc/column.hxx:245
+sc/inc/column.hxx:242
     void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
     int nStartRow
     0
-sc/inc/column.hxx:332
+sc/inc/column.hxx:329
     class ScFormulaCell * ScColumn::SetFormulaCell(int,class ScFormulaCell *,enum sc::StartListeningType,_Bool)
     _Bool bInheritNumFormatIfNeeded
     1
-sc/inc/column.hxx:696
+sc/inc/column.hxx:694
     void ScColumn::AttachNewFormulaCell(const class mdds::detail::mtv::iterator_base<struct mdds::multi_type_vector<struct mdds::mtv::custom_block_func3<struct mdds::mtv::default_element_block<52, class svl::SharedString>, struct mdds::mtv::noncopyable_managed_element_block<53, class EditTextObject>, struct mdds::mtv::noncopyable_managed_element_block<54, class ScFormulaCell> >, class sc::CellStoreEvent>::iterator_trait, struct mdds::detail::mtv::private_data_forward_update<struct mdds::detail::mtv::iterator_value_node<unsigned long, struct mdds::mtv::base_element_block> > > &,int,class ScFormulaCell &,_Bool,enum sc::StartListeningType)
     _Bool bJoin
     1
@@ -2034,6 +2034,10 @@ sc/inc/columnspanset.hxx:59
     void sc::ColumnSpanSet::ColumnType::ColumnType(int,int,_Bool)
     int nStart
     0
+sc/inc/columnspanset.hxx:84
+    void sc::ColumnSpanSet::ColumnAction::executeSum(int,int,_Bool,double &)
+    _Bool 
+    1
 sc/inc/columnspanset.hxx:92
     void sc::ColumnSpanSet::set(short,short,int,_Bool)
     _Bool bVal
@@ -2210,11 +2214,11 @@ sc/inc/document.hxx:2418
     void ScDocument::RestoreTabFromCache(short,class SvStream &)
     short nTab
     0
-sc/inc/document.hxx:2511
+sc/inc/document.hxx:2509
     void ScMutationDisable::ScMutationDisable(class ScDocument *,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
-sc/inc/document.hxx:2543
+sc/inc/document.hxx:2541
     void ScMutationGuard::ScMutationGuard(class ScDocument *,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
@@ -2242,7 +2246,7 @@ sc/inc/dpsave.hxx:229
     void ScDPSaveDimension::Dump(int) const
     int nIndent
     0
-sc/inc/dptabdat.hxx:134
+sc/inc/dptabdat.hxx:130
     const class ScDPItemData * ScDPTableData::GetMemberByIndex(long,long)
     long nIndex
     0
@@ -2266,11 +2270,11 @@ sc/inc/filter.hxx:85
     void ScFormatFilterPlugin::ScExportRTF(class SvStream &,class ScDocument *,const class ScRange &,const unsigned short)
     const unsigned short eDest
     0
-sc/inc/formulacell.hxx:184
+sc/inc/formulacell.hxx:183
     void ScFormulaCell::ScFormulaCell(class ScDocument *,const class ScAddress &,class ScTokenArray *,const enum formula::FormulaGrammar::Grammar,enum ScMatrixMode)
     enum ScMatrixMode cMatInd
     0
-sc/inc/formulacell.hxx:218
+sc/inc/formulacell.hxx:217
     class rtl::OUString ScFormulaCell::GetFormula(class sc::CompileFormulaContext &,const struct ScInterpreterContext *) const
     const struct ScInterpreterContext * pContext
     0
@@ -2334,27 +2338,27 @@ sc/inc/scabstdlg.hxx:453
     class VclPtr<class AbstractScMetricInputDlg> ScAbstractDialogFactory::CreateScMetricInputDlg(class weld::Window *,const class rtl::OString &,long,long,enum FieldUnit,unsigned short,long,long)
     long nMinimum
     0
-sc/inc/scmatrix.hxx:337
+sc/inc/scmatrix.hxx:335
     _Bool ScMatrix::IsEmptyResult(unsigned long,unsigned long) const
     unsigned long nR
     0
-sc/inc/scmatrix.hxx:337
+sc/inc/scmatrix.hxx:335
     _Bool ScMatrix::IsEmptyResult(unsigned long,unsigned long) const
     unsigned long nC
     0
-sc/inc/scmatrix.hxx:376
+sc/inc/scmatrix.hxx:374
     unsigned long ScMatrix::MatchDoubleInColumns(double,unsigned long,unsigned long) const
     unsigned long nCol2
     0
-sc/inc/scmatrix.hxx:376
+sc/inc/scmatrix.hxx:374
     unsigned long ScMatrix::MatchDoubleInColumns(double,unsigned long,unsigned long) const
     unsigned long nCol1
     0
-sc/inc/scmatrix.hxx:377
+sc/inc/scmatrix.hxx:375
     unsigned long ScMatrix::MatchStringInColumns(const class svl::SharedString &,unsigned long,unsigned long) const
     unsigned long nCol2
     0
-sc/inc/scmatrix.hxx:377
+sc/inc/scmatrix.hxx:375
     unsigned long ScMatrix::MatchStringInColumns(const class svl::SharedString &,unsigned long,unsigned long) const
     unsigned long nCol1
     0
@@ -2370,35 +2374,35 @@ sc/inc/stringutil.hxx:155
     class rtl::OUString ScStringUtil::GetQuotedToken(const class rtl::OUString &,int,const class rtl::OUString &,char16_t,int &)
     int nToken
     0
-sc/inc/table.hxx:778
+sc/inc/table.hxx:779
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nStartRow
     0
-sc/inc/table.hxx:893
+sc/inc/table.hxx:894
     _Bool ScTable::RowHiddenLeaf(int,int *,int *) const
     int * pFirstRow
     0
-sc/inc/table.hxx:898
+sc/inc/table.hxx:899
     void ScTable::CopyColHidden(const class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:899
+sc/inc/table.hxx:900
     void ScTable::CopyRowHidden(const class ScTable &,int,int)
     int nStartRow
     0
-sc/inc/table.hxx:909
+sc/inc/table.hxx:910
     _Bool ScTable::ColFiltered(short,short *,short *) const
     short * pFirstCol
     0
-sc/inc/table.hxx:911
+sc/inc/table.hxx:912
     void ScTable::CopyColFiltered(const class ScTable &,short,short)
     short nStartCol
     0
-sc/inc/table.hxx:912
+sc/inc/table.hxx:913
     void ScTable::CopyRowFiltered(const class ScTable &,int,int)
     int nStartRow
     0
-sc/inc/token.hxx:271
+sc/inc/token.hxx:265
     void ScRefListToken::ScRefListToken(_Bool)
     _Bool bArrayResult
     1
@@ -2414,15 +2418,15 @@ sc/qa/unit/helper/qahelper.hxx:223
     void testFormats(class ScBootstrapFixture *,class ScDocument *,int)
     int nFormat
     0
-sc/qa/unit/subsequent_export-test.cxx:1234
+sc/qa/unit/subsequent_export-test.cxx:1235
     void setAttribute(class ScFieldEditEngine &,int,int,int,unsigned short,class Color)
     int nPara
     0
-sc/qa/unit/subsequent_export-test.cxx:1291
+sc/qa/unit/subsequent_export-test.cxx:1292
     void setFont(class ScFieldEditEngine &,int,int,int,const class rtl::OUString &)
     int nPara
     0
-sc/qa/unit/subsequent_export-test.cxx:1304
+sc/qa/unit/subsequent_export-test.cxx:1305
     void setEscapement(class ScFieldEditEngine &,int,int,int,short,unsigned char)
     int nPara
     0
@@ -2458,7 +2462,7 @@ sc/source/core/opencl/opbase.hxx:113
     class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::DynamicKernelArgument::GenStringSlidingWindowDeclRef(_Bool) const
     _Bool 
     0
-sc/source/core/tool/compiler.cxx:748
+sc/source/core/tool/compiler.cxx:751
     void ConventionOOO_A1::ConventionOOO_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     1
@@ -2526,7 +2530,7 @@ sc/source/filter/inc/excrecds.hxx:180
     void XclExpSheetProtection::XclExpSheetProtection(_Bool,short)
     _Bool bValue
     1
-sc/source/filter/inc/formel.hxx:104
+sc/source/filter/inc/formel.hxx:103
     enum ConvErr ExcelConverterBase::Convert(class ScRangeListTabs &,class XclImpStream &,unsigned long,short,const enum FORMULA_TYPE)
     const enum FORMULA_TYPE eFT
     1
@@ -2631,6 +2635,10 @@ sc/source/filter/inc/xestream.hxx:336
     const char * value5
     0
 sc/source/filter/inc/xestream.hxx:336
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    const char * value8
+    0
+sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     const char * value13
     0
@@ -2660,10 +2668,6 @@ sc/source/filter/inc/xestream.hxx:336
     0
 sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    const char * value8
-    0
-sc/source/filter/inc/xestream.hxx:336
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     const char * value9
     0
 sc/source/filter/inc/xestream.hxx:336
@@ -2702,7 +2706,7 @@ sc/source/filter/inc/xetable.hxx:337
     void XclExpSingleCellBase::XclExpSingleCellBase(const class XclExpRoot &,unsigned short,unsigned long,const struct XclAddress &,const class ScPatternAttr *,short,unsigned int)
     short nScript
     1
-sc/source/filter/inc/xiescher.hxx:477
+sc/source/filter/inc/xiescher.hxx:475
     void XclImpControlHelper::ReadSourceRangeFormula(class XclImpStream &,_Bool)
     _Bool bWithBoundSize
     1
@@ -2786,19 +2790,19 @@ sc/source/ui/inc/AccessibleDocument.hxx:250
     void ScAccessibleDocument::RemoveChild(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,_Bool)
     _Bool bFireEvent
     1
-sc/source/ui/inc/acredlin.hxx:122
+sc/source/ui/inc/acredlin.hxx:115
     class SvTreeListEntry * ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,class SvTreeListEntry *,_Bool,_Bool)
-    _Bool bDelMaster
+    _Bool bDisabled
     0
-sc/source/ui/inc/acredlin.hxx:122
+sc/source/ui/inc/acredlin.hxx:115
     class SvTreeListEntry * ScAcceptChgDlg::AppendFilteredAction(const class ScChangeAction *,enum ScChangeActionState,class SvTreeListEntry *,_Bool,_Bool)
-    _Bool bDisabled
+    _Bool bDelMaster
     0
-sc/source/ui/inc/anyrefdg.hxx:93
+sc/source/ui/inc/anyrefdg.hxx:86
     void ScFormulaReferenceHelper::EnableSpreadsheets(_Bool)
     _Bool bFlag
     1
-sc/source/ui/inc/dbdocfun.hxx:86
+sc/source/ui/inc/dbdocfun.hxx:85
     _Bool ScDBDocFunc::RepeatDB(const class rtl::OUString &,_Bool,_Bool,short)
     _Bool bApi
     1
@@ -2842,11 +2846,11 @@ sc/source/ui/inc/drawutil.hxx:32
     void ScDrawUtil::CalcScale(const class ScDocument *,short,short,int,short,int,const class OutputDevice *,const class Fraction &,const class Fraction &,double,double,class Fraction &,class Fraction &)
     int nStartRow
     0
-sc/source/ui/inc/navipi.hxx:273
+sc/source/ui/inc/navipi.hxx:271
     void ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(class vcl::Window *,unsigned short,class SfxBindings *,struct SfxChildWinInfo *)
     unsigned short nId
     0
-sc/source/ui/inc/pvfundlg.hxx:153
+sc/source/ui/inc/pvfundlg.hxx:151
     int ScDPSubtotalOptDlg::FindListBoxEntry(const class ListBox &,const class rtl::OUString &,int) const
     int nStartPos
     1
@@ -2874,55 +2878,55 @@ sc/source/ui/inc/spellparam.hxx:47
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font &,int,_Bool)
     _Bool bIsInteractive
     0
-sc/source/ui/inc/TableFillingAndNavigationTools.hxx:74
+sc/source/ui/inc/TableFillingAndNavigationTools.hxx:69
     void AddressWalker::push(short,int,short)
     short aRelativeTab
     0
-sc/source/ui/inc/tabview.hxx:393
+sc/source/ui/inc/tabview.hxx:388
     void ScTabView::ClickCursor(short,int,_Bool)
     _Bool bControl
     0
-sc/source/ui/inc/tabview.hxx:434
+sc/source/ui/inc/tabview.hxx:429
     void ScTabView::MoveCursorAbs(short,int,enum ScFollowMode,_Bool,_Bool,_Bool,_Bool)
     _Bool bControl
     0
-sc/source/ui/inc/tabview.hxx:445
+sc/source/ui/inc/tabview.hxx:440
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
-    short nMovX
+    _Bool bShift
     0
-sc/source/ui/inc/tabview.hxx:445
+sc/source/ui/inc/tabview.hxx:440
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
-    _Bool bShift
+    short nMovX
     0
-sc/source/ui/inc/tabview.hxx:445
+sc/source/ui/inc/tabview.hxx:440
     void ScTabView::MoveCursorScreen(short,int,enum ScFollowMode,_Bool)
     enum ScFollowMode eMode
     1
-sc/source/ui/inc/undobase.hxx:144
+sc/source/ui/inc/undobase.hxx:140
     void ScMoveUndo::ScMoveUndo(class ScDocShell *,class std::unique_ptr<class ScDocument, struct o3tl::default_delete<class ScDocument> >,class std::unique_ptr<class ScRefUndoData, struct std::default_delete<class ScRefUndoData> >,enum ScMoveUndoMode)
     enum ScMoveUndoMode eRefMode
     1
-sc/source/ui/inc/viewdata.hxx:146
+sc/source/ui/inc/viewdata.hxx:145
     void ScPositionHelper::invalidateByPosition(long)
     long nPos
     0
-sc/source/ui/inc/viewdata.hxx:601
+sc/source/ui/inc/viewdata.hxx:600
     class Point ScViewData::GetScrPos(short,int,enum ScHSplitPos) const
     int nWhereY
     0
-sc/source/ui/inc/viewdata.hxx:602
+sc/source/ui/inc/viewdata.hxx:601
     class Point ScViewData::GetScrPos(short,int,enum ScVSplitPos) const
     short nWhereX
     0
-sc/source/ui/inc/viewdata.hxx:661
+sc/source/ui/inc/viewdata.hxx:660
     void ScViewData::AddPixelsWhileBackward(long &,long,int &,int,double,const class ScDocument *,short)
     int nStartRow
     0
-sc/source/ui/inc/viewfunc.hxx:165
+sc/source/ui/inc/viewfunc.hxx:164
     void ScViewFunc::ApplyAttributes(const class SfxItemSet *,const class SfxItemSet *,_Bool)
     _Bool bAdjustBlockHeight
     1
-sc/source/ui/inc/viewutil.hxx:71
+sc/source/ui/inc/viewutil.hxx:69
     void ScViewUtil::SetFullScreen(const class SfxViewShell &,_Bool)
     _Bool bSet
     0
@@ -2976,11 +2980,11 @@ scaddins/source/analysis/analysishelper.hxx:77
     1
 scaddins/source/analysis/analysishelper.hxx:91
     int GetDaysInYear(int,int,int)
-    int nDate
+    int nNullDate
     0
 scaddins/source/analysis/analysishelper.hxx:91
     int GetDaysInYear(int,int,int)
-    int nNullDate
+    int nDate
     0
 scaddins/source/analysis/analysishelper.hxx:271
     void sca::analysis::SortedIndividualInt32List::InsertHolidayList(const class sca::analysis::ScaAnyConverter &,const class com::sun::star::uno::Any &,int,_Bool)
@@ -3010,15 +3014,15 @@ sd/inc/shapelist.hxx:56
     void sd::ShapeList::seekShape(unsigned int)
     unsigned int nIndex
     0
-sd/qa/unit/sdmodeltestbase.hxx:365
+sd/qa/unit/sdmodeltestbase.hxx:366
     const class SdrPage * SdModelTestBase::GetPage(int,class tools::SvRef<class sd::DrawDocShell>)
     int nPage
     1
-sd/qa/unit/sdmodeltestbase.hxx:422
+sd/qa/unit/sdmodeltestbase.hxx:423
     class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
     int nPara
     0
-sd/qa/unit/sdmodeltestbase.hxx:422
+sd/qa/unit/sdmodeltestbase.hxx:423
     class com::sun::star::uno::Reference<class com::sun::star::text::XTextField> SdModelTestBase::getTextFieldFromPage(int,int,int,int,class tools::SvRef<class sd::DrawDocShell>)
     int nRun
     0
@@ -3070,7 +3074,7 @@ sd/source/ui/inc/ToolBarManager.hxx:217
     void sd::ToolBarManager::SetToolBarShell(enum sd::ToolBarManager::ToolBarGroup,enum ToolbarId)
     enum sd::ToolBarManager::ToolBarGroup eGroup
     1
-sd/source/ui/inc/tools/ConfigurationAccess.hxx:56
+sd/source/ui/inc/tools/ConfigurationAccess.hxx:58
     void sd::tools::ConfigurationAccess::ConfigurationAccess(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,const enum sd::tools::ConfigurationAccess::WriteMode)
     const enum sd::tools::ConfigurationAccess::WriteMode eMode
     1
@@ -3126,7 +3130,7 @@ sdext/source/minimizer/optimizerdialogcontrols.cxx:323
     class rtl::OUString InsertListBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,const _Bool,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,int,int,short)
     const _Bool bEnabled
     1
-sdext/source/pdfimport/wrapper/wrapper.cxx:984
+sdext/source/pdfimport/wrapper/wrapper.cxx:983
     oslFileError pdfi::Buffering::read(char *,short,unsigned long *)
     short count
     1
@@ -3134,7 +3138,7 @@ sdext/source/presenter/PresenterTextView.hxx:232
     void sdext::presenter::PresenterTextView::SetOffset(const double,const double)
     const double nLeft
     0
-sfx2/source/inc/workwin.hxx:273
+sfx2/source/inc/workwin.hxx:280
     void SfxWorkWindow::SetChildWindowVisible_Impl(unsigned int,_Bool,enum SfxVisibilityFlags)
     _Bool 
     1
@@ -3210,7 +3214,7 @@ svl/source/numbers/zforfind.hxx:387
     _Bool ImpSvNumberInputScan::IsDatePatternNumberOfType(unsigned short,char16_t)
     unsigned short nNumber
     0
-svl/source/passwordcontainer/passwordcontainer.hxx:151
+svl/source/passwordcontainer/passwordcontainer.hxx:153
     void NamePassRecord::RemovePasswords(signed char)
     signed char nStatus
     1
@@ -3254,7 +3258,7 @@ svx/source/customshapes/EnhancedCustomShape3d.cxx:142
     _Bool GetBool(const class SdrCustomShapeGeometryItem &,const class rtl::OUString &,const _Bool)
     const _Bool bDefault
     0
-svx/source/dialog/srchdlg.cxx:775
+svx/source/dialog/srchdlg.cxx:774
     void (anonymous namespace)::ToggleSaveToModule::ToggleSaveToModule(class SvxSearchDialog &,_Bool)
     _Bool bValue
     0
@@ -3274,7 +3278,7 @@ svx/source/inc/fmshimp.hxx:257
     void FmXFormShell::didPrepareClose_Lock(_Bool)
     _Bool bDid
     1
-svx/source/inc/fmvwimp.hxx:274
+svx/source/inc/fmvwimp.hxx:272
     _Bool FmXFormView::createControlLabelPair(const class OutputDevice &,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,const class rtl::OUString &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XDataSource> &,const class rtl::OUString &,const class rtl::OUString &,const int)
     int _nXOffsetMM
     0
@@ -3286,7 +3290,7 @@ sw/inc/calc.hxx:108
     void SwSbxValue::SwSbxValue(long)
     long n
     0
-sw/inc/charfmt.hxx:29
+sw/inc/charfmt.hxx:30
     void SwCharFormat::SwCharFormat(class SwAttrPool &,const char *,class SwCharFormat *)
     class SwCharFormat * pDerivedFrom
     0
@@ -3338,11 +3342,11 @@ sw/inc/doc.hxx:1588
     void SwDoc::dumpAsXml(struct _xmlTextWriter *) const
     struct _xmlTextWriter * 
     0
-sw/inc/docary.hxx:401
+sw/inc/docary.hxx:400
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,unsigned short)
     _Bool bSaveInUndo
     1
-sw/inc/docary.hxx:402
+sw/inc/docary.hxx:401
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,unsigned short)
     _Bool bSaveInUndo
     1
@@ -3374,15 +3378,15 @@ sw/inc/fesh.hxx:417
     class std::__debug::vector<const class SwFrameFormat *, class std::allocator<const class SwFrameFormat *> > SwFEShell::GetFlyFrameFormats(enum FlyCntType,_Bool)
     _Bool bIgnoreTextBoxes
     1
-sw/inc/fmtcol.hxx:68
+sw/inc/fmtcol.hxx:69
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     class SwTextFormatColl * pDerFrom
     0
-sw/inc/fmtcol.hxx:140
+sw/inc/fmtcol.hxx:141
     void SwGrfFormatColl::SwGrfFormatColl(class SwAttrPool &,const char *,class SwGrfFormatColl *)
     class SwGrfFormatColl * pDerFrom
     0
-sw/inc/frmfmt.hxx:85
+sw/inc/frmfmt.hxx:86
     void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
     const unsigned short * pWhichRange
     0
@@ -3406,7 +3410,7 @@ sw/inc/index.hxx:66
     int SwIndex::operator--(int)
      ###1
     0
-sw/inc/ndgrf.hxx:64
+sw/inc/ndgrf.hxx:63
     void SwGrfNode::SwGrfNode(const class SwNodeIndex &,const class GraphicObject &,class SwGrfFormatColl *,const class SwAttrSet *)
     const class SwAttrSet * pAutoAttr
     0
@@ -3482,11 +3486,11 @@ sw/qa/extras/inc/swmodeltestbase.hxx:295
     void SwModelTestBase::executeImportExport(const char *,const char *)
     const char * pPassword
     0
-sw/qa/extras/ooxmlimport/ooxmlimport.cxx:93
+sw/qa/extras/ooxmlimport/ooxmlimport.cxx:94
     void FailTest::executeImportTest(const char *,const char *)
     const char * 
     0
-sw/qa/extras/ooxmlimport/ooxmlimport.cxx:631
+sw/qa/extras/ooxmlimport/ooxmlimport.cxx:632
     void lcl_countTextFrames(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,int)
     int nExpected
     1
@@ -3534,7 +3538,7 @@ sw/source/core/txtnode/txtedt.cxx:171
     _Bool lcl_MaskRedlinesAndHiddenText(const class SwTextNode &,class rtl::OUStringBuffer &,int,int,const char16_t)
     int nStt
     0
-sw/source/core/undo/untbl.cxx:2278
+sw/source/core/undo/untbl.cxx:2276
     void RedlineFlagsInternGuard::RedlineFlagsInternGuard(class SwDoc &,enum RedlineFlags,enum RedlineFlags)
     enum RedlineFlags eNewRedlineFlags
     0
@@ -3590,7 +3594,7 @@ sw/source/filter/ww8/wrtww8.hxx:1345
     void WW8_WrMagicTable::Append(int,unsigned long)
     int nCp
     0
-sw/source/filter/ww8/ww8par.cxx:398
+sw/source/filter/ww8/ww8par.cxx:424
     class rtl::OUString Sttb::getStringAtIndex(unsigned int)
     unsigned int 
     1
@@ -3640,11 +3644,11 @@ sw/source/uibase/inc/FrameControlsManager.hxx:43
     0
 sw/source/uibase/inc/frmmgr.hxx:99
     void SwFlyFrameAttrMgr::SetLRSpace(long,long)
-    long nRight
+    long nLeft
     0
 sw/source/uibase/inc/frmmgr.hxx:99
     void SwFlyFrameAttrMgr::SetLRSpace(long,long)
-    long nLeft
+    long nRight
     0
 sw/source/uibase/inc/frmmgr.hxx:101
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
@@ -3654,6 +3658,10 @@ sw/source/uibase/inc/frmmgr.hxx:101
     void SwFlyFrameAttrMgr::SetULSpace(long,long)
     long nTop
     0
+sw/source/uibase/inc/mailmergehelper.hxx:104
+    void SwAddressPreview::SetLayout(unsigned short,unsigned short)
+    unsigned short nRows
+    1
 sw/source/uibase/inc/mmconfigitem.hxx:135
     void SwMailMergeConfigItem::SetIndividualGreeting(_Bool,_Bool)
     _Bool bInEMail
@@ -3678,13 +3686,13 @@ sw/source/uibase/inc/wrtsh.hxx:477
     const class SwRangeRedline * SwWrtShell::GotoRedline(unsigned long,_Bool)
     _Bool bSelect
     1
-test/source/sheet/xdatapilottable2.cxx:238
+test/source/sheet/xdatapilottable2.cxx:237
     struct com::sun::star::table::CellAddress getLastUsedCellAddress(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheet> &,int,int)
-    int nCol
+    int nRow
     0
-test/source/sheet/xdatapilottable2.cxx:238
+test/source/sheet/xdatapilottable2.cxx:237
     struct com::sun::star::table::CellAddress getLastUsedCellAddress(const class com::sun::star::uno::Reference<class com::sun::star::sheet::XSpreadsheet> &,int,int)
-    int nRow
+    int nCol
     0
 ucb/source/ucp/tdoc/tdoc_provider.hxx:112
     class com::sun::star::uno::Reference<class com::sun::star::io::XOutputStream> tdoc_ucp::ContentProvider::queryOutputStream(const class rtl::OUString &,const class rtl::OUString &,_Bool) const
@@ -3694,7 +3702,7 @@ ucb/source/ucp/tdoc/tdoc_provider.hxx:119
     class com::sun::star::uno::Reference<class com::sun::star::io::XStream> tdoc_ucp::ContentProvider::queryStream(const class rtl::OUString &,const class rtl::OUString &,_Bool) const
     _Bool bTruncate
     0
-ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx:107
+ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx:106
     void webdav_ucp::DAVResourceAccess::PROPFIND(const enum webdav_ucp::Depth,class std::__debug::vector<struct webdav_ucp::DAVResourceInfo, class std::allocator<struct webdav_ucp::DAVResourceInfo> > &,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &)
     const enum webdav_ucp::Depth nDepth
     0
@@ -3726,7 +3734,7 @@ vcl/backendtest/outputdevice/common.cxx:166
     enum vcl::test::TestResult checkDiamondLine(class Bitmap &,int,class Color)
     int aLayerNumber
     1
-vcl/inc/listbox.hxx:143
+vcl/inc/listbox.hxx:144
     class rtl::OUString ImplEntryList::GetSelectedEntry(int) const
     int nIndex
     0
@@ -3762,7 +3770,7 @@ vcl/inc/salgdi.hxx:133
     void SalGraphics::GetFontMetric(class tools::SvRef<class ImplFontMetricData> &,int)
     int nFallbackLevel
     0
-vcl/inc/salgdi.hxx:500
+vcl/inc/salgdi.hxx:497
     void SalGraphics::copyArea(long,long,long,long,long,long,_Bool)
     _Bool bWindowInvalidate
     1
@@ -3876,11 +3884,11 @@ vcl/inc/unx/x11/xrender_peer.hxx:46
     0
 vcl/inc/unx/x11/xrender_peer.hxx:62
     void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
-    int nYSrc
+    int nXSrc
     0
 vcl/inc/unx/x11/xrender_peer.hxx:62
     void XRenderPeer::CompositeTrapezoids(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTrapezoid *,int) const
-    int nXSrc
+    int nYSrc
     0
 vcl/inc/unx/x11/xrender_peer.hxx:65
     void XRenderPeer::CompositeTriangles(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTriangle *,int) const
@@ -3890,11 +3898,7 @@ vcl/inc/unx/x11/xrender_peer.hxx:65
     void XRenderPeer::CompositeTriangles(int,unsigned long,unsigned long,const XRenderPictFormat *,int,int,const struct _XTriangle *,int) const
     int nXSrc
     0
-vcl/opengl/x11/gdiimpl.cxx:120
-    struct __GLXFBConfigRec ** getFBConfig(struct _XDisplay *,unsigned long,int &,_Bool)
-    _Bool bUseDoubleBufferedRendering
-    1
-vcl/source/app/salvtables.cxx:870
+vcl/source/app/salvtables.cxx:918
     void SalInstanceFrame::SalInstanceFrame(class VclFrame *,_Bool)
     _Bool bTakeOwnership
     0
@@ -3902,7 +3906,7 @@ vcl/source/filter/FilterConfigCache.hxx:109
     class rtl::OUString FilterConfigCache::GetExportWildcard(unsigned short,int)
     int nEntry
     0
-vcl/source/filter/wmf/wmfwr.hxx:163
+vcl/source/filter/wmf/wmfwr.hxx:161
     void WMFWriter::WMFRecord_SetBkMode(_Bool)
     _Bool bTransparent
     1
@@ -3914,7 +3918,7 @@ vcl/source/gdi/bmpfast.cxx:34
     void BasePixelPtr::BasePixelPtr(unsigned char *)
     unsigned char * p
     0
-vcl/source/gdi/sallayout.cxx:600
+vcl/source/gdi/sallayout.cxx:602
     int lcl_CalcAsianKerning(unsigned int,_Bool,_Bool)
     _Bool 
     0
@@ -3922,7 +3926,7 @@ vcl/source/window/menufloatingwindow.hxx:107
     void MenuFloatingWindow::EnableScrollMenu(_Bool)
     _Bool b
     1
-vcl/source/window/menuitemlist.hxx:111
+vcl/source/window/menuitemlist.hxx:112
     struct MenuItemData * MenuItemList::Insert(unsigned short,enum MenuItemType,enum MenuItemBits,const class rtl::OUString &,class Menu *,unsigned long,const class rtl::OString &)
     enum MenuItemType eType
     1
@@ -3934,11 +3938,7 @@ vcl/unx/generic/app/randrwrapper.cxx:57
     void (anonymous namespace)::RandRWrapper::XRRSelectInput(struct _XDisplay *,unsigned long,int)
     int i_nMask
     1
-vcl/unx/generic/gdi/gdiimpl.hxx:97
-    _Bool X11SalGraphicsImpl::drawFilledTriangles(const class basegfx::B2DHomMatrix &,const class std::__debug::vector<class basegfx::triangulator::B2DTriangle, class std::allocator<class basegfx::triangulator::B2DTriangle> > &,double,_Bool)
-    _Bool bPixelOffset
-    1
-vcl/unx/gtk3/gtk3gtkinst.cxx:3988
+vcl/unx/gtk3/gtk3gtkinst.cxx:4119
     void GtkInstanceTreeView::move_before(int,int)
     int before
     0
@@ -3954,6 +3954,10 @@ writerfilter/inc/ooxml/OOXMLDocument.hxx:147
     void writerfilter::ooxml::OOXMLDocument::resolveEndnote(class writerfilter::Stream &,unsigned int,const int)
     unsigned int aNoteType
     0
+writerfilter/source/dmapper/DomainMapper.hxx:114
+    void writerfilter::dmapper::DomainMapper::hasControls(const _Bool)
+    const _Bool bSet
+    1
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:64
     void writerfilter::ooxml::OOXMLStreamImpl::OOXMLStreamImpl(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum writerfilter::ooxml::OOXMLStream::StreamType_t,_Bool)
     enum writerfilter::ooxml::OOXMLStream::StreamType_t nType
diff --git a/compilerplugins/clang/constantparam.constructors.results b/compilerplugins/clang/constantparam.constructors.results
index b08650328a51..775567d4d6d1 100644
--- a/compilerplugins/clang/constantparam.constructors.results
+++ b/compilerplugins/clang/constantparam.constructors.results
@@ -36,11 +36,11 @@ configmgr/source/dconf.cxx:201
     dconf_changeset_new()
 connectivity/source/commontools/sqlerror.cxx:64
     void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
-    const class connectivity::SQLError::ParamValue & _rParamValue2
+    const class connectivity::SQLError::ParamValue & _rParamValue3
     ParamValue()
 connectivity/source/commontools/sqlerror.cxx:64
     void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
-    const class connectivity::SQLError::ParamValue & _rParamValue3
+    const class connectivity::SQLError::ParamValue & _rParamValue2
     ParamValue()
 connectivity/source/commontools/sqlerror.cxx:64
     void connectivity::SQLError_Impl::raiseException(const int,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &)
@@ -138,7 +138,7 @@ dbaccess/source/ui/inc/TableWindowData.hxx:66
     _Bool dbaui::OTableWindowData::init(const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,_Bool)
     _Bool _bAllowQueries
     allowQueries()
-dbaccess/source/ui/uno/copytablewizard.cxx:205
+dbaccess/source/ui/uno/copytablewizard.cxx:204
     void dbaui::CopyTableWizard::impl_dialogToAttributes_nothrow(const class dbaui::OCopyTableWizard &)
     const class dbaui::OCopyTableWizard & _rDialog
     impl_getDialog_throw()
@@ -238,6 +238,10 @@ include/avmedia/mediaplayer.hxx:51
     void avmedia::MediaFloater::setURL(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     const class rtl::OUString & rReferer
     ""
+include/comphelper/property.hxx:37
+    _Bool comphelper::PropertyCompareByName::operator()(const struct com::sun::star::beans::Property &,const struct com::sun::star::beans::Property &) const
+    const struct com::sun::star::beans::Property & x
+    PropertyCompareByName()
 include/comphelper/propertybag.hxx:108
     void comphelper::PropertyBag::addVoidProperty(const class rtl::OUString &,const class com::sun::star::uno::Type &,int,int)
     int _nHandle
@@ -292,11 +296,11 @@ include/connectivity/sqlerror.hxx:158
     ParamValue()
 include/connectivity/sqlerror.hxx:241
     class com::sun::star::sdbc::SQLException connectivity::SQLError::getSQLException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &) const
-    const class connectivity::SQLError::ParamValue & _rParamValue3
+    const class connectivity::SQLError::ParamValue & _rParamValue2
     ParamValue()
 include/connectivity/sqlerror.hxx:241
     class com::sun::star::sdbc::SQLException connectivity::SQLError::getSQLException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &,const class connectivity::SQLError::ParamValue &) const
-    const class connectivity::SQLError::ParamValue & _rParamValue2
+    const class connectivity::SQLError::ParamValue & _rParamValue3
     ParamValue()
 include/editeng/brushitem.hxx:61
     void SvxBrushItem::SvxBrushItem(class SvStream &,unsigned short,unsigned short)
@@ -323,7 +327,7 @@ include/formula/FormulaCompiler.hxx:293
     _Bool _bIsEnglish
     isEnglish()
 include/i18nlangtag/languagetagicu.hxx:49
-    class icu_62::Locale LanguageTagIcu::getIcuLocale(const class LanguageTag &,const class rtl::OUString &,const class rtl::OUString &)
+    class icu_63::Locale LanguageTagIcu::getIcuLocale(const class LanguageTag &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rVariant
     ""
 include/o3tl/sorted_vector.hxx:285
@@ -350,18 +354,22 @@ include/oox/mathml/importutils.hxx:210
     void oox::formulaimport::XmlStream::skipElementInternal(int,_Bool)
     int token
     currentToken()
-include/opencl/openclconfig.hxx:34
+include/opencl/openclconfig.hxx:36
     void OpenCLConfig::ImplMatcher::ImplMatcher(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rOSVersion
+    const class rtl::OUString & rDevice
     ""
-include/opencl/openclconfig.hxx:34
+include/opencl/openclconfig.hxx:36
     void OpenCLConfig::ImplMatcher::ImplMatcher(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
-    const class rtl::OUString & rDevice
+    const class rtl::OUString & rOSVersion
     ""
-include/opencl/openclwrapper.hxx:63
+include/opencl/openclwrapper.hxx:61
     _Bool buildProgramFromBinary(const char *,struct openclwrapper::GPUEnv *,const char *,int)
     const char * buildOption
     ""
+include/registry/registry.hxx:410
+    enum RegError RegistryKey::getKeyNames(const class rtl::OUString &,class RegistryKeyNames &)
+    const class rtl::OUString & keyName
+    ""
 include/registry/registry.hxx:436
     enum RegError RegistryKey::setValue(const class rtl::OUString &,enum RegValueType,void *,unsigned int)
     const class rtl::OUString & keyName
@@ -378,6 +386,14 @@ include/registry/registry.hxx:476
     enum RegError RegistryKey::setUnicodeListValue(const class rtl::OUString &,char16_t **,unsigned int)
     const class rtl::OUString & keyName
     ""
+include/registry/registry.hxx:489
+    enum RegError RegistryKey::getValueInfo(const class rtl::OUString &,enum RegValueType *,unsigned int *)
+    const class rtl::OUString & keyName
+    ""
+include/registry/registry.hxx:501
+    enum RegError RegistryKey::getValue(const class rtl::OUString &,void *)
+    const class rtl::OUString & keyName
+    ""
 include/registry/registry.hxx:512
     enum RegError RegistryKey::getLongListValue(const class rtl::OUString &,class RegistryValueList<int> &)
     const class rtl::OUString & keyName
@@ -414,7 +430,11 @@ include/sfx2/docfile.hxx:266
     _Bool SfxMedium::SignContents_Impl(_Bool,_Bool,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::security::XCertificate> &,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,const class com::sun::star::uno::Reference<class com::sun::star::graphic::XGraphic> &,const class rtl::OUString &)
     _Bool bHasValidDocumentSignature
     HasValidSignatures()
-include/sfx2/objsh.hxx:637
+include/sfx2/docfile.hxx:277
+    _Bool SfxMedium::SignDocumentContentUsingCertificate(_Bool,const class com::sun::star::uno::Reference<class com::sun::star::security::XCertificate> &)
+    _Bool bHasValidDocumentSignature
+    HasValidSignatures()
+include/sfx2/objsh.hxx:641
     void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short)
     const class JobSetup & rSetup
     JobSetup()
@@ -422,7 +442,7 @@ include/sfx2/sfxhelp.hxx:37
     _Bool SfxHelp::Start_Impl(const class rtl::OUString &,class weld::Widget *,const class rtl::OUString &)
     const class rtl::OUString & rKeyword
     ""
-include/sfx2/sidebar/ResourceManager.hxx:93
+include/sfx2/sidebar/ResourceManager.hxx:94
     void sfx2::sidebar::ResourceManager::StorePanelExpansionState(const class rtl::OUString &,const _Bool,const class sfx2::sidebar::Context &)
     const class sfx2::sidebar::Context & rContext
     maContextAccess()
@@ -478,11 +498,11 @@ include/svtools/ehdl.hxx:37
     void SfxErrorContext::SfxErrorContext(unsigned short,class weld::Window *,const struct std::pair<const char *, class ErrCode> *,const class std::locale &)
     const class std::locale & rResLocaleP
     SvtResLocale()
-include/svtools/transfer.hxx:307
+include/svtools/transfer.hxx:308
     class com::sun::star::uno::Any TransferableDataHelper::GetAny(enum SotClipboardFormatId,const class rtl::OUString &) const
     const class rtl::OUString & rDestDoc
     ""
-include/svtools/transfer.hxx:345
+include/svtools/transfer.hxx:346
     class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
     const class rtl::OUString & rDestDoc
     ""
@@ -538,23 +558,23 @@ include/vcl/graphictools.hxx:280
     void SvtGraphicFill::SvtGraphicFill(const class tools::PolyPolygon &,class Color,double,enum SvtGraphicFill::FillRule,enum SvtGraphicFill::FillType,const struct SvtGraphicFill::Transform &,_Bool,enum SvtGraphicFill::HatchType,class Color,enum SvtGraphicFill::GradientType,class Color,class Color,int,const class Graphic &)
     class Color aFillColor
     Color()
-include/vcl/outdev.hxx:1568
+include/vcl/outdev.hxx:1567
     class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const class Point &,const class Size &,const class Bitmap &,long,long)
     const class Point & rSrcPt
     Point()
-include/vcl/print.hxx:646
+include/vcl/print.hxx:645
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setSubgroupControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rHelpId
     ""
-include/vcl/print.hxx:662
+include/vcl/print.hxx:661
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,const class com::sun::star::uno::Sequence<unsigned char> &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:673
+include/vcl/print.hxx:672
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:681
+include/vcl/print.hxx:680
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setEditControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
@@ -562,15 +582,15 @@ include/vcl/toolbox.hxx:421
     void ToolBox::SetHelpText(unsigned short,const class rtl::OUString &)
     const class rtl::OUString & rText
     ""
-include/vcl/unowrap.hxx:79
+include/vcl/toolkit/unowrap.hxx:79
     class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> UnoWrapperBase::CreateAccessible(class Menu *,_Bool)
     _Bool bIsMenuBar
     IsMenuBar()
-include/vcl/virdev.hxx:132
+include/vcl/virdev.hxx:157
     _Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(const class Size &,const class Fraction &,const class Point &,unsigned char *)
     const class Point & rNewOffset
     Point()
-include/vcl/weld.hxx:308
+include/vcl/weld.hxx:317
     void weld::ComboBox::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
     const class rtl::OUString & rId
     ""
@@ -642,7 +662,7 @@ opencl/source/opencl_device.cxx:432
     void (anonymous namespace)::LogWriter::text(const class rtl::OString &)
     const class rtl::OString & rText
     ""
-opencl/source/openclwrapper.cxx:713
+opencl/source/openclwrapper.cxx:714
     struct _cl_device_id * findDeviceIdByDeviceString(const class rtl::OUString &,const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > &)
     const class std::__debug::vector<struct OpenCLPlatformInfo, class std::allocator<struct OpenCLPlatformInfo> > & rPlatforms
     fillOpenCLInfo()
@@ -730,12 +750,12 @@ sd/source/filter/eppt/eppt.hxx:177
     unsigned int PPTWriter::ImplInsertBookmarkURL(const class rtl::OUString &,const unsigned int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rStringVer2
     ""
-sd/source/filter/eppt/pptx-animations.cxx:623
+sd/source/filter/eppt/pptx-animations.cxx:620
     void (anonymous namespace)::NodeContext::initValid(_Bool,_Bool)
     _Bool bHasValidChild
     initChildNodes()
 sd/source/filter/xml/sdxmlwrp.cxx:150
-    struct XML_SERVICES * getServices(_Bool,_Bool,unsigned long)
+    const struct XML_SERVICES * getServices(_Bool,_Bool,unsigned long)
     _Bool bDraw
     IsDraw()
 sd/source/ui/annotations/annotationtag.cxx:158
@@ -930,8 +950,8 @@ sw/source/filter/html/swcss1.hxx:75
     void SwCSS1Parser::SwCSS1Parser(class SwDoc *,const unsigned int *,const class rtl::OUString &,_Bool)
     _Bool bNewDoc
     IsNewDoc()
-sw/source/filter/html/swhtml.hxx:900
-    void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream &,const class rtl::OUString &,const class rtl::OUString &,_Bool,class SfxMedium *,_Bool,_Bool)
+sw/source/filter/html/swhtml.hxx:897
+    void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream &,const class rtl::OUString &,const class rtl::OUString &,_Bool,class SfxMedium *,_Bool,_Bool,const class rtl::OUString &)
     _Bool bReadUTF8
     IsReadUTF8()
 sw/source/filter/inc/wrtswtbl.hxx:203
@@ -978,7 +998,15 @@ sw/source/uibase/lingu/sdrhhcwrap.hxx:43
     void SdrHHCWrapper::SdrHHCWrapper(class SwView *,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font *,int,_Bool)
     _Bool bInteractive
     IsInteractive()
-vcl/inc/salgdi.hxx:596
+vcl/inc/fontinstance.hxx:73
+    _Bool LogicalFontInstance::GetGlyphBoundRect(unsigned short,class tools::Rectangle &,_Bool) const
+    _Bool 
+    IsVertical()
+vcl/inc/fontinstance.hxx:74
+    _Bool LogicalFontInstance::GetGlyphOutline(unsigned short,class basegfx::B2DPolyPolygon &,_Bool) const
+    _Bool 
+    IsVertical()
+vcl/inc/salgdi.hxx:593
     _Bool SalGraphics::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &)
     const class rtl::OUString & aCaption
     ""
@@ -996,14 +1024,14 @@ vcl/source/control/field2.cxx:366
     ImplIsSameMask()
 vcl/source/control/field2.cxx:453
     _Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
-    _Bool bSameMask
-    ImplIsSameMask()
-vcl/source/control/field2.cxx:453
-    _Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
     _Bool bStrictFormat
     IsStrictFormat()
 vcl/source/control/field2.cxx:453
     _Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
+    _Bool bSameMask
+    ImplIsSameMask()
+vcl/source/control/field2.cxx:453
+    _Bool ImplPatternProcessKeyInput(class Edit *,const class KeyEvent &,const class rtl::OString &,const class rtl::OUString &,_Bool,_Bool,_Bool &)
     _Bool & rbInKeyInput
     ImplGetInPattKeyInput()
 vcl/source/control/field2.cxx:997
@@ -1054,7 +1082,7 @@ writerfilter/source/rtftok/rtflookahead.hxx:32
     void writerfilter::rtftok::RTFLookahead::RTFLookahead(class SvStream &,unsigned long)
     class SvStream & rStream
     Strm()
-writerperfect/qa/unit/WpftLoader.hxx:72
+writerperfect/qa/unit/WpftLoader.hxx:71
     void writerperfect::test::WpftLoader::WpftLoader(const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::document::XFilter> &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::frame::XDesktop2> &,const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &)
     const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> & rxInputStream
     createDummyInput()
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index e1751c470191..d5333d8636a2 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -94,7 +94,7 @@ connectivity/source/drivers/mork/MorkParser.hxx:80
     struct MorkTableMap * MorkParser::getTables(int)
     int tableScope
     128
-connectivity/source/drivers/mork/MQueryHelper.hxx:173
+connectivity/source/drivers/mork/MQueryHelper.hxx:171
     _Bool connectivity::mork::MQueryHelper::getRowValue(class connectivity::ORowSetValue &,int,const class rtl::OUString &,int)
     int nType
     12
@@ -118,6 +118,10 @@ connectivity/source/inc/java/sql/ConnectionLog.hxx:118
     void connectivity::java::sql::ConnectionLog::log(const int,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const
     const int _nLogLevel
     300
+connectivity/source/inc/mysql/YTable.hxx:83
+    void connectivity::mysql::OMySQLTable::OMySQLTable(class connectivity::sdbcx::OCollection *,const class com::sun::star::uno::Reference<class com::sun::star::sdbc::XConnection> &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int)
+    int _nPrivileges
+    511
 connectivity/source/inc/odbc/OPreparedStatement.hxx:78
     void connectivity::odbc::OPreparedStatement::setParameter(int,int,const class com::sun::star::uno::Sequence<signed char> &)
     int _nType
@@ -130,7 +134,7 @@ cppcanvas/source/inc/implrenderer.hxx:235
     _Bool cppcanvas::internal::ImplRenderer::isActionContained(class GDIMetaFile &,const char *,enum MetaActionType)
     enum MetaActionType nType
     147
-cui/source/inc/autocdlg.hxx:398
+cui/source/inc/autocdlg.hxx:397
     class SvTreeListEntry * OfaQuoteTabPage::CreateEntry(class rtl::OUString &,unsigned short)
     unsigned short nCol
     2
@@ -142,11 +146,11 @@ cui/source/inc/cuihyperdlg.hxx:60
     void SvxHlinkCtrl::SvxHlinkCtrl(unsigned short,class SfxBindings &,class SvxHpLinkDlg *)
     unsigned short nId
     10361
-cui/source/inc/optlingu.hxx:157
+cui/source/inc/optlingu.hxx:156
     void SvxLinguTabPage::HideGroups(unsigned short)
     unsigned short nGrp
     8
-cui/source/inc/SpellDialog.hxx:115
+cui/source/inc/SpellDialog.hxx:114
     void svx::SentenceEditWindow_Impl::UndoActionStart(unsigned short)
     unsigned short nId
     205
@@ -182,7 +186,11 @@ dbaccess/source/ext/macromigration/progressmixer.hxx:37
     void dbmm::IProgressConsumer::start(unsigned int)
     unsigned int _nRange
     100000
-dbaccess/source/ui/dlg/adminpages.hxx:221
+dbaccess/source/ui/dlg/adminpages.hxx:253
+    void dbaui::OGenericAdministrationPage::fillString(class SfxItemSet &,const class dbaui::OConnectionURLEdit *,unsigned short,_Bool &)
+    unsigned short _nID
+    3
+dbaccess/source/ui/dlg/adminpages.hxx:275
     void dbaui::LayoutHelper::positionBelow(const class Control &,class Control &,const long)
     const long _nIndentAppFont
     10
@@ -190,7 +198,7 @@ dbaccess/source/ui/dlg/dsnItem.hxx:39
     void dbaui::DbuTypeCollectionItem::DbuTypeCollectionItem(short,class dbaccess::ODsnTypeCollection *)
     short nWhich
     5
-dbaccess/source/ui/inc/charsetlistbox.hxx:39
+dbaccess/source/ui/inc/charsetlistbox.hxx:37
     _Bool dbaui::CharSetListBox::StoreSelectedCharSet(class SfxItemSet &,const unsigned short)
     const unsigned short _nItemId
     11
@@ -206,18 +214,6 @@ dbaccess/source/ui/inc/JoinExchange.hxx:55
     void dbaui::OJoinExchObj::StartDrag(class vcl::Window *,signed char,class dbaui::IDragTransferableListener *)
     signed char nDragSourceActions
     4
-dbaccess/source/ui/inc/LimitBox.hxx:26
-    void dbaui::LimitBox::LimitBox(class vcl::Window *,long)
-    long nStyle
-    134225920
-dbaccess/source/ui/inc/propertysetitem.hxx:37
-    void dbaui::OPropertySetItem::OPropertySetItem(short)
-    short nWhich
-    25
-dbaccess/source/ui/inc/propertysetitem.hxx:38
-    void dbaui::OPropertySetItem::OPropertySetItem(short,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
-    short nWhich
-    25
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx:86
     class rtl::Reference<class dbaui::OTableFieldDesc> dbaui::OSelectionBrowseBox::InsertField(const class rtl::Reference<class dbaui::OTableFieldDesc> &,unsigned short,_Bool,_Bool)
     unsigned short _nColumnPosition
@@ -237,19 +233,19 @@ editeng/source/editeng/impedit.hxx:640
 editeng/source/editeng/impedit.hxx:957
     void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nFontWhichId
-    4038
+    4039
 editeng/source/editeng/impedit.hxx:957
     void ImpEditEngine::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
-    4036
+    4037
 editeng/source/editeng/textconv.hxx:89
     void TextConvWrapper::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
-    4036
+    4037
 editeng/source/editeng/textconv.hxx:89
     void TextConvWrapper::SetLanguageAndFont(const struct ESelection &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nFontWhichId
-    4038
+    4039
 editeng/source/outliner/outlundo.hxx:33
     void OutlinerUndoBase::OutlinerUndoBase(unsigned short,class Outliner *)
     unsigned short nId
@@ -302,7 +298,7 @@ forms/source/richtext/rtattributes.hxx:52
     void frm::AttributeState::AttributeState(enum frm::AttributeCheckState)
     enum frm::AttributeCheckState _eCheckState
     2
-formula/source/core/api/FormulaCompiler.cxx:245
+formula/source/core/api/FormulaCompiler.cxx:246
     const char16_t * lcl_UnicodeStrChr(const char16_t *,char16_t)
     char16_t c
     34
@@ -382,11 +378,11 @@ include/basegfx/curve/b2dbeziertools.hxx:45
     void basegfx::B2DCubicBezierHelper::B2DCubicBezierHelper(const class basegfx::B2DCubicBezier &,unsigned int)
     unsigned int nDivisions
     9
-include/basegfx/range/b2ibox.hxx:77
+include/basegfx/range/b2ibox.hxx:72
     void basegfx::B2IBox::B2IBox(int,int,int,int)
     int y2
     10
-include/basegfx/range/b2ibox.hxx:77
+include/basegfx/range/b2ibox.hxx:72
     void basegfx::B2IBox::B2IBox(int,int,int,int)
     int x2
     10
@@ -414,10 +410,6 @@ include/comphelper/docpasswordhelper.hxx:323
     class com::sun::star::uno::Sequence<signed char> comphelper::DocPasswordHelper::GenerateRandomByteSequence(int)
     int nLength
     16
-include/comphelper/logging.hxx:120
-    void comphelper::EventLogger::log(const int,const class rtl::OUString &) const
-    const int _nLogLevel
-    800
 include/comphelper/propagg.hxx:124
     void comphelper::OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class comphelper::IPropertyInfoService *,int)
     int _nFirstAggregateId
@@ -485,7 +477,7 @@ include/editeng/AccessibleParaManager.hxx:242
 include/editeng/bulletitem.hxx:60
     void SvxBulletItem::SvxBulletItem(unsigned short)
     unsigned short nWhich
-    4013
+    4014
 include/editeng/editeng.hxx:299
     struct ESelection EditEngine::GetWord(const struct ESelection &,unsigned short) const
     unsigned short nWordType
@@ -509,7 +501,7 @@ include/editeng/editund2.hxx:37
 include/editeng/editview.hxx:217
     void EditView::RemoveCharAttribs(int,unsigned short)
     unsigned short nWhich
-    4025
+    4026
 include/editeng/fhgtitem.hxx:80
     void SvxFontHeightItem::SetHeight(unsigned int,unsigned short,enum MapUnit,enum MapUnit)
     enum MapUnit eUnit
@@ -517,11 +509,11 @@ include/editeng/fhgtitem.hxx:80
 include/editeng/flditem.hxx:76
     void SvxFieldItem::SvxFieldItem(class std::unique_ptr<class SvxFieldData, struct std::default_delete<class SvxFieldData> >,const unsigned short)
     const unsigned short nId
-    4057
+    4058
 include/editeng/flditem.hxx:77
     void SvxFieldItem::SvxFieldItem(const class SvxFieldData &,const unsigned short)
     const unsigned short nId
-    4057
+    4058
 include/editeng/justifyitem.hxx:33
     void SvxHorJustifyItem::SvxHorJustifyItem(const unsigned short)
     const unsigned short nId
@@ -584,12 +576,12 @@ include/filter/msfilter/escherex.hxx:729
     3
 include/filter/msfilter/msdffimp.hxx:569
     _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
-    unsigned short nRecId1
-    4008
-include/filter/msfilter/msdffimp.hxx:569
-    _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
     unsigned short nRecId2
     4000
+include/filter/msfilter/msdffimp.hxx:569
+    _Bool SvxMSDffManager::SeekToRec2(unsigned short,unsigned short,unsigned long) const
+    unsigned short nRecId1
+    4008
 include/filter/msfilter/rtfutil.hxx:30
     class rtl::OString OutHex(unsigned long,unsigned char)
     unsigned char nLen
@@ -605,19 +597,19 @@ include/filter/msfilter/util.hxx:103
 include/formula/FormulaCompiler.hxx:100
     void formula::FormulaCompiler::OpCodeMap::OpCodeMap(unsigned short,_Bool,enum formula::FormulaGrammar::Grammar)
     unsigned short nSymbols
-    497
+    498
 include/formula/tokenarray.hxx:284
     unsigned short formula::FormulaTokenArray::RemoveToken(unsigned short,unsigned short)
     unsigned short nCount
     2
 include/formula/tokenarray.hxx:532
     void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
-    short stop
-    32767
-include/formula/tokenarray.hxx:532
-    void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
     short pc
     -1
+include/formula/tokenarray.hxx:532
+    void formula::FormulaTokenIterator::Item::Item(const class formula::FormulaTokenArray *,short,short)
+    short stop
+    32767
 include/formula/tokenarray.hxx:651
     void formula::FormulaTokenArrayPlainIterator::AfterRemoveToken(unsigned short,unsigned short)
     unsigned short nCount
@@ -656,11 +648,11 @@ include/o3tl/string_view.hxx:340
     2
 include/o3tl/string_view.hxx:343
     int o3tl::basic_string_view::compare(unsigned long,unsigned long,const type-parameter-?-? *,unsigned long) const
-    unsigned long n1
+    unsigned long n2
     2
 include/o3tl/string_view.hxx:343
     int o3tl::basic_string_view::compare(unsigned long,unsigned long,const type-parameter-?-? *,unsigned long) const
-    unsigned long n2
+    unsigned long n1
     2
 include/o3tl/string_view.hxx:368
     unsigned long o3tl::basic_string_view::find(type-parameter-?-?,unsigned long) const
@@ -770,7 +762,7 @@ include/oox/drawingml/drawingmltypes.hxx:219
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
     long nHeight
     -1
-include/oox/export/drawingml.hxx:189
+include/oox/export/drawingml.hxx:190
     void oox::drawingml::DrawingML::WriteBlipFill(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,int)
     int nXmlNamespace
     421
@@ -809,7 +801,7 @@ include/oox/helper/helper.hxx:107
 include/oox/helper/propertyset.hxx:110
     _Bool oox::PropertySet::setProperty(int,class Color)
     int nPropId
-    494
+    496
 include/oox/helper/textinputstream.hxx:42
     void oox::TextInputStream::TextInputStream(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,unsigned short)
     unsigned short eTextEnc
@@ -826,7 +818,7 @@ include/oox/mathml/importutils.hxx:154
     char16_t oox::formulaimport::XmlStream::Tag::attribute(int,char16_t) const
     int token
     1447389
-include/oox/ole/axcontrol.hxx:952
+include/oox/ole/axcontrol.hxx:950
     type-parameter-?-? & oox::ole::EmbeddedControl::createModel(const type-parameter-?-? &)
     const type-parameter-?-? & rParam
     6
@@ -872,12 +864,12 @@ include/sfx2/fcontnr.hxx:56
     393216
 include/sfx2/fcontnr.hxx:57
     class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
-    enum SfxFilterFlags nDont
-    393216
-include/sfx2/fcontnr.hxx:57
-    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nMust
     2
+include/sfx2/fcontnr.hxx:57
+    class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4EA(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
+    enum SfxFilterFlags nDont
+    393216
 include/sfx2/fcontnr.hxx:58
     class std::shared_ptr<const class SfxFilter> SfxFilterContainer::GetFilter4Extension(const class rtl::OUString &,enum SfxFilterFlags,enum SfxFilterFlags) const
     enum SfxFilterFlags nDont
@@ -930,10 +922,14 @@ include/sfx2/sidebar/Theme.hxx:138
     _Bool sfx2::sidebar::Theme::GetBoolean(const enum sfx2::sidebar::Theme::ThemeItem)
     const enum sfx2::sidebar::Theme::ThemeItem eItem
     50
-include/sfx2/tabdlg.hxx:81
+include/sfx2/tabdlg.hxx:56
     void SfxTabDialogItem::SfxTabDialogItem(unsigned short,const class SfxItemSet &)
     unsigned short nId
     11022
+include/sfx2/tabdlg.hxx:138
+    void SfxTabDialog::AddTabPage(unsigned short,const class rtl::OUString &,class VclPtr<class SfxTabPage> (*)(struct TabPageParent, const class SfxItemSet *),unsigned short)
+    unsigned short nPos
+    65535
 include/sfx2/tbxctrl.hxx:94
     void SfxPopupWindow::SfxPopupWindow(unsigned short,class vcl::Window *,const class com::sun::star::uno::Reference<class com::sun::star::frame::XFrame> &,long)
     long nBits
@@ -942,15 +938,15 @@ include/sfx2/thumbnailview.hxx:210
     void ThumbnailView::setItemDimensions(long,long,long,int)
     int itemPadding
     5
-include/sot/stg.hxx:108
+include/sot/stg.hxx:98
     class BaseStorage * BaseStorage::OpenUCBStorage(const class rtl::OUString &,enum StreamMode,_Bool)
     enum StreamMode 
     2050
-include/sot/stg.hxx:111
+include/sot/stg.hxx:101
     class BaseStorage * BaseStorage::OpenOLEStorage(const class rtl::OUString &,enum StreamMode,_Bool)
     enum StreamMode 
     2050
-include/sot/storage.hxx:47
+include/sot/storage.hxx:48
     void SotStorageStream::SotStorageStream(const class rtl::OUString &,enum StreamMode)
     enum StreamMode 
     2051
@@ -1030,19 +1026,19 @@ include/svtools/ctrlbox.hxx:202
     void LineListBox::LineListBox(class vcl::Window *,long)
     long nWinStyle
     8
-include/svtools/ctrlbox.hxx:522
+include/svtools/ctrlbox.hxx:508
     void SvtFontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nMax
     995
-include/svtools/ctrlbox.hxx:522
+include/svtools/ctrlbox.hxx:508
     void SvtFontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nStep
     5
-include/svtools/ctrlbox.hxx:522
+include/svtools/ctrlbox.hxx:508
     void SvtFontSizeBox::EnableRelativeMode(unsigned short,unsigned short,unsigned short)
     unsigned short nMin
     5
-include/svtools/ctrlbox.hxx:523
+include/svtools/ctrlbox.hxx:509
     void SvtFontSizeBox::EnablePtRelativeMode(short,short,short)
     short nStep
     10
@@ -1062,35 +1058,35 @@ include/svtools/sampletext.hxx:41
     class rtl::OUString makeMinimalTextForScript(enum UScriptCode)
     enum UScriptCode eScript
     19
-include/svtools/simptabl.hxx:97
+include/svtools/simptabl.hxx:98
     void SvSimpleTable::InsertHeaderEntry(const class rtl::OUString &,unsigned short,enum HeaderBarItemBits)
     unsigned short nCol
     65535
 include/svtools/svtabbx.hxx:105
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
-    enum SvTabJustify 
+    unsigned short nTab
     2
 include/svtools/svtabbx.hxx:105
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
-    unsigned short nTab
+    enum SvTabJustify 
     2
-include/svtools/transfer.hxx:219
+include/svtools/transfer.hxx:220
     void TransferableHelper::RemoveFormat(enum SotClipboardFormatId)
     enum SotClipboardFormatId nFormat
     59
-include/svtools/transfer.hxx:313
+include/svtools/transfer.hxx:314
     _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &)
     enum SotClipboardFormatId nFormat
     2
-include/svtools/transfer.hxx:324
+include/svtools/transfer.hxx:325
     _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long)
     enum SotClipboardFormatId nFormat
     3
-include/svtools/transfer.hxx:330
+include/svtools/transfer.hxx:331
     _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &)
     enum SotClipboardFormatId nFormat
     13
-include/svtools/transfer.hxx:345
+include/svtools/transfer.hxx:346
     class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
     enum SotClipboardFormatId nFormat
     59
@@ -1170,10 +1166,6 @@ include/svx/dlgctrl.hxx:223
     void FillTypeLB::FillTypeLB(class vcl::Window *,long)
     long aWB
     402653448
-include/svx/dlgctrl.hxx:237
-    void LineLB::LineLB(class vcl::Window *,long)
-    long aWB
-    402653192
 include/svx/drawitem.hxx:60
     void SvxGradientListItem::SvxGradientListItem(const class rtl::Reference<class XGradientList> &,unsigned short)
     unsigned short nWhich
@@ -1207,13 +1199,13 @@ include/svx/fmgridcl.hxx:42
     long nWinBits
     1051648
 include/svx/fmview.hxx:89
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrPage *,class SdrPage *,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
-    unsigned short _nLabelObjectID
-    37
-include/svx/fmview.hxx:89
-    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrPage *,class SdrPage *,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
     enum SdrInventor _nInventor
     827609170
+include/svx/fmview.hxx:89
+    void FmFormView::createControlLabelPair(const class OutputDevice *,int,int,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class com::sun::star::uno::Reference<class com::sun::star::util::XNumberFormats> &,unsigned short,enum SdrInventor,unsigned short,class SdrModel &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &,class std::unique_ptr<class SdrUnoObj, struct SdrObjectFreeOp> &)
+    unsigned short _nLabelObjectID
+    37
 include/svx/fntctrl.hxx:81
     void SvxFontPrevWindow::SetFontEscapement(unsigned char,unsigned char,short)
     unsigned char nProp
@@ -1301,11 +1293,11 @@ include/svx/sdtaitm.hxx:39
 include/svx/svdetc.hxx:106
     unsigned short * RemoveWhichRange(const unsigned short *,unsigned short,unsigned short)
     unsigned short nRangeEnd
-    4057
+    4058
 include/svx/svdetc.hxx:106
     unsigned short * RemoveWhichRange(const unsigned short *,unsigned short,unsigned short)
     unsigned short nRangeBeg
-    4003
+    4004
 include/svx/svdhdl.hxx:334
     void SdrHdlLine::SdrHdlLine(class SdrHdl &,class SdrHdl &,enum SdrHdlKind)
     enum SdrHdlKind eNewKind
@@ -1382,22 +1374,22 @@ include/toolkit/controls/unocontrolbase.hxx:48
     int UnoControlBase::ImplGetPropertyValue_INT32(unsigned short)
     unsigned short nProp
     74
-include/tools/b3dtrans.hxx:116
-    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
-    double fR
-    2
-include/tools/b3dtrans.hxx:116
+include/tools/b3dtrans.hxx:112
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fB
     -2
-include/tools/b3dtrans.hxx:116
-    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
-    double fT
-    2
-include/tools/b3dtrans.hxx:116
+include/tools/b3dtrans.hxx:112
     void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
     double fL
     -2
+include/tools/b3dtrans.hxx:112
+    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
+    double fR
+    2
+include/tools/b3dtrans.hxx:112
+    void B3dTransformationSet::SetDeviceRectangle(double,double,double,double)
+    double fT
+    2
 include/tools/datetime.hxx:87
     class DateTime operator+(const class DateTime &,int)
     int nDays
@@ -1406,19 +1398,19 @@ include/tools/fract.hxx:71
     class Fraction & Fraction::operator*=(double)
      ###1
     -1
-include/tools/gen.hxx:92
+include/tools/gen.hxx:91
     class Point & Point::operator*=(const long)
      ###1
     -1
-include/tools/gen.hxx:93
+include/tools/gen.hxx:92
     class Point & Point::operator/=(const long)
      ###1
     2
-include/tools/gen.hxx:98
+include/tools/gen.hxx:97
     class Point operator/(const class Point &,const long)
     const long nVal2
     3
-include/tools/poly.hxx:100
+include/tools/poly.hxx:98
     void tools::Polygon::Polygon(const class Point &,const class Point &,const class Point &,const class Point &,unsigned short)
     unsigned short nPoints
     25
@@ -1508,12 +1500,12 @@ include/tools/urlobj.hxx:624
     76
 include/tools/urlobj.hxx:653
     class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
-    unsigned short eCharset
-    76
-include/tools/urlobj.hxx:653
-    class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
     int nIndex
     -1
+include/tools/urlobj.hxx:653
+    class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
+    unsigned short eCharset
+    76
 include/tools/urlobj.hxx:677
     _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
     unsigned short eCharset
@@ -1566,23 +1558,23 @@ include/ucbhelper/simpleinteractionrequest.hxx:76
     void ucbhelper::SimpleInteractionRequest::SimpleInteractionRequest(const class com::sun::star::uno::Any &,const enum ContinuationFlags)
     const enum ContinuationFlags nContinuations
     12
-include/unotools/compatibility.hxx:205
+include/unotools/compatibility.hxx:206
     void SvtCompatibilityOptions::SetDefault(enum SvtCompatibilityEntry::Index,_Bool)
     enum SvtCompatibilityEntry::Index rIdx
     12
-include/unotools/confignode.hxx:267
+include/unotools/confignode.hxx:261
     class utl::OConfigurationTreeRoot utl::OConfigurationTreeRoot::tryCreateWithComponentContext(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,const class rtl::OUString &,int,enum utl::OConfigurationTreeRoot::CREATION_MODE)
     int _nDepth
     -1
-include/unotools/configvaluecontainer.hxx:80
+include/unotools/configvaluecontainer.hxx:82
     void utl::OConfigurationValueContainer::OConfigurationValueContainer(const class com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> &,class osl::Mutex &,const char *,const int)
     const int _nLevels
     2
-include/unotools/fontdefs.hxx:47
+include/unotools/fontdefs.hxx:40
     class rtl::OUString GetSubsFontName(const class rtl::OUString &,enum SubsFontFlags)
     enum SubsFontFlags nFlags
     3
-include/unotools/useroptions.hxx:89
+include/unotools/useroptions.hxx:90
     void SvtUserOptions::SetBoolValue(enum UserOptToken,_Bool)
     enum UserOptToken nToken
     19
@@ -1642,19 +1634,19 @@ include/vcl/listctrl.hxx:46
     void ListControl::addEntry(const class VclPtr<class vcl::Window> &,unsigned int)
     unsigned int nPos
     65535
-include/vcl/lstbox.hxx:114
+include/vcl/lstbox.hxx:113
     void ListBox::ListBox(enum WindowType)
     enum WindowType nType
     332
-include/vcl/outdev.hxx:1177
+include/vcl/outdev.hxx:1176
     int OutputDevice::GetTextBreak(const class rtl::OUString &,long,char16_t,int &,int,int,long,const class vcl::TextLayoutCache *) const
     char16_t nExtraChar
     45
-include/vcl/print.hxx:673
+include/vcl/print.hxx:672
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     int i_nMaxValue
     1000
-include/vcl/print.hxx:673
+include/vcl/print.hxx:672
     class com::sun::star::uno::Any vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     int i_nMinValue
     10
@@ -1666,19 +1658,23 @@ include/vcl/vclevent.hxx:228
     void VclAccessibleEvent::VclAccessibleEvent(enum VclEventId,const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &)
     enum VclEventId n
     38
-include/vcl/weld.hxx:239
+include/vcl/weld.hxx:248
     class weld::Button * weld::Dialog::get_widget_for_response(int)
     int response
     5
-include/vcl/weld.hxx:512
+include/vcl/weld.hxx:321
+    void weld::ComboBox::insert_separator(int)
+    int pos
+    -1
+include/vcl/weld.hxx:526
     void weld::MenuButton::insert_item(int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString *,class VirtualDevice *,_Bool)
     int pos
     -1
-include/vcl/weld.hxx:1113
+include/vcl/weld.hxx:1129
     void weld::Menu::insert(int,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString *,class VirtualDevice *,_Bool)
     int pos
     -1
-include/vcl/window.hxx:1592
+include/vcl/window.hxx:1594
     void vcl::Window::SimulateKeyPress(unsigned short) const
     unsigned short nKeyCode
     1312
@@ -1768,12 +1764,12 @@ lotuswordpro/inc/xfilter/xffont.hxx:202
     58
 lotuswordpro/inc/xfilter/xfindex.hxx:101
     void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
-    char16_t delimiter
-    100
-lotuswordpro/inc/xfilter/xfindex.hxx:101
-    void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
     enum enumXFTab type
     3
+lotuswordpro/inc/xfilter/xfindex.hxx:101
+    void XFIndexTemplate::AddTabEntry(enum enumXFTab,double,char16_t,char16_t,const class rtl::OUString &)
+    char16_t delimiter
+    100
 lotuswordpro/source/filter/bento.hxx:216
     void OpenStormBento::LtcBenContainer::SeekFromEnd(long)
     long Offset
@@ -1806,7 +1802,7 @@ oox/source/drawingml/table/tableproperties.cxx:102
     void SetTableStyleProperties(class oox::drawingml::table::TableStyle *&,int,int,int)
     int tblTextClr
     1844
-oox/source/export/vmlexport.cxx:330
+oox/source/export/vmlexport.cxx:331
     void impl_AddInt(class sax_fastparser::FastAttributeList *,int,unsigned int)
     int nElement
     5720
@@ -1842,7 +1838,7 @@ sal/osl/unx/nlsupport.cxx:106
     char * compose_locale(struct _rtl_Locale *,char *,unsigned long)
     unsigned long n
     64
-sal/osl/unx/profile.cxx:132
+sal/osl/unx/profile.cxx:133
     void osl_ProfileGenerateExtension(const char *,const char *,char *,int)
     int BufferMaxLen
     4096
@@ -1850,7 +1846,7 @@ sal/osl/unx/readwrite_helper.hxx:20
     _Bool safeRead(int,void *,unsigned int)
     unsigned int count
     511
-sal/osl/unx/socket.cxx:285
+sal/osl/unx/socket.cxx:290
     struct oslSocketImpl * createSocketImpl(int)
     int Socket
     -1
@@ -1870,7 +1866,7 @@ sax/source/tools/converter.cxx:997
     enum sax::Result readUnsignedNumberMaxDigits(int,const class rtl::OUString &,int &,int &)
     int maxDigits
     9
-sc/inc/AccessibleFilterMenu.hxx:47
+sc/inc/AccessibleFilterMenu.hxx:41
     void ScAccessibleFilterMenu::ScAccessibleFilterMenu(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class ScMenuFloatingWindow *,const class rtl::OUString &,unsigned long)
     unsigned long nMenuPos
     999
@@ -1898,7 +1894,7 @@ sc/inc/cellvalues.hxx:69
     void sc::CellValues::reset(unsigned long)
     unsigned long nSize
     1048576
-sc/inc/chgtrack.hxx:216
+sc/inc/chgtrack.hxx:217
     void ScChangeAction::ScChangeAction(enum ScChangeActionType,const class ScBigRange &,const unsigned long)
     enum ScChangeActionType 
     8
@@ -1906,19 +1902,19 @@ sc/inc/colcontainer.hxx:36
     void ScColContainer::ScColContainer(const unsigned long)
     const unsigned long nSize
     1024
-sc/inc/column.hxx:245
+sc/inc/column.hxx:242
     void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
     int nEndRow
     1048575
-sc/inc/column.hxx:259
+sc/inc/column.hxx:256
     void ScColumn::DeleteRanges(const class std::__debug::vector<struct sc::RowSpan, class std::allocator<struct sc::RowSpan> > &,enum InsertDeleteFlags)
     enum InsertDeleteFlags nDelFlag
     2071
-sc/inc/column.hxx:511
+sc/inc/column.hxx:509
     unsigned short ScColumn::GetOptimalColWidth(class OutputDevice *,double,double,const class Fraction &,const class Fraction &,_Bool,unsigned short,const class ScMarkData *,const struct ScColWidthParam *) const
     unsigned short nOldWidth
     1167
-sc/inc/column.hxx:595
+sc/inc/column.hxx:593
     void ScColumn::BroadcastRows(int,int,enum SfxHintId)
     enum SfxHintId nHint
     51
@@ -1926,10 +1922,18 @@ sc/inc/columnspanset.hxx:59
     void sc::ColumnSpanSet::ColumnType::ColumnType(int,int,_Bool)
     int nEnd
     1048575
-sc/inc/columnspanset.hxx:132
+sc/inc/columnspanset.hxx:131
     void sc::SingleColumnSpanSet::scan(struct sc::ColumnBlockConstPosition &,const class ScColumn &,int,int)
     int nEnd
     1048575
+sc/inc/compiler.hxx:457
+    void ScCompiler::MoveRelWrap(short,int)
+    short nMaxCol
+    1023
+sc/inc/compiler.hxx:457
+    void ScCompiler::MoveRelWrap(short,int)
+    int nMaxRow
+    1048575
 sc/inc/compiler.hxx:458
     void ScCompiler::MoveRelWrap(const class ScTokenArray &,const class ScDocument *,const class ScAddress &,short,int)
     int nMaxRow
@@ -1990,7 +1994,7 @@ sc/inc/externalrefmgr.hxx:786
     void ScExternalRefManager::purgeStaleSrcDocument(int)
     int nTimeOut
     30000
-sc/inc/formulacell.hxx:366
+sc/inc/formulacell.hxx:365
     void ScFormulaCell::AddRecalcMode(enum ScRecalcMode)
     enum ScRecalcMode 
     4
@@ -2054,7 +2058,7 @@ sc/inc/rangeutl.hxx:210
     void ScRangeStringConverter::GetStringFromRangeList(class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::table::CellRangeAddress> &,const class ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t)
     char16_t cSeparator
     32
-sc/inc/scmatrix.hxx:396
+sc/inc/scmatrix.hxx:394
     void ScMatrix::MergeDoubleArray(class std::__debug::vector<double, class std::allocator<double> > &,enum ScMatrix::Op) const
     enum ScMatrix::Op eOp
     2
@@ -2072,21 +2076,21 @@ sc/inc/stlpool.hxx:54
     2
 sc/inc/stringutil.hxx:151
     _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
-    char dsep
-    46
-sc/inc/stringutil.hxx:151
-    _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
     char gsep
     44
-sc/inc/table.hxx:412
+sc/inc/stringutil.hxx:151
+    _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
+    char dsep
+    46
+sc/inc/table.hxx:413
     void ScTable::SetFormula(short,int,const class ScTokenArray &,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGram
     65539
-sc/inc/table.hxx:671
+sc/inc/table.hxx:672
     _Bool ScTable::HasAttribSelection(const class ScMarkData &,enum HasAttrFlags) const
     enum HasAttrFlags nMask
     8
-sc/inc/table.hxx:778
+sc/inc/table.hxx:779
     void ScTable::SetOptimalHeightOnly(class sc::RowHeightContext &,int,int,class ScProgress *,unsigned long)
     int nEndRow
     1048575
@@ -2114,15 +2118,15 @@ sc/qa/extras/new_cond_format.cxx:377
     void testColorScaleEntries(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,int,int,const class rtl::OUString &,class Color,int,const class rtl::OUString &,class Color,int,const class rtl::OUString &,class Color)
     int nMediumType
     2
-sc/qa/unit/subsequent_export-test.cxx:1425
+sc/qa/unit/subsequent_export-test.cxx:1426
     _Bool ::isOverline(const struct editeng::Section &,enum FontLineStyle)
     enum FontLineStyle eStyle
     2
-sc/qa/unit/subsequent_export-test.cxx:1442
+sc/qa/unit/subsequent_export-test.cxx:1443
     _Bool ::isUnderline(const struct editeng::Section &,enum FontLineStyle)
     enum FontLineStyle eStyle
     2
-sc/qa/unit/ucalc.cxx:1156
+sc/qa/unit/ucalc.cxx:1158
     _Bool checkRelativeRefToken(class ScDocument &,const class ScAddress &,short,int)
     short nRelCol
     -1
@@ -2134,27 +2138,27 @@ sc/qa/unit/ucalc.hxx:52
     void Test::pasteOneCellFromClip(class ScDocument *,const class ScRange &,class ScDocument *,enum InsertDeleteFlags)
     enum InsertDeleteFlags eFlags
     2303
-sc/qa/unit/ucalc_formula.cxx:8081
+sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nEnd1
-    159
-sc/qa/unit/ucalc_formula.cxx:8081
+    int nStart2
+    169
+sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nTotalRows
     330
-sc/qa/unit/ucalc_formula.cxx:8081
+sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nStart1
     9
-sc/qa/unit/ucalc_formula.cxx:8081
+sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nEnd2
     319
-sc/qa/unit/ucalc_formula.cxx:8081
+sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
-    int nStart2
-    169
-sc/source/core/data/documen3.cxx:1725
+    int nEnd1
+    159
+sc/source/core/data/documen3.cxx:1724
     _Bool lcl_AddTwipsWhile(long &,long,int &,int,const class ScTable *,_Bool)
     int nEndRow
     1048575
@@ -2170,11 +2174,11 @@ sc/source/core/data/segmenttree.cxx:267
     void ScFlatUInt16SegmentsImpl::ScFlatUInt16SegmentsImpl(int,unsigned short)
     int nMax
     1048575
-sc/source/core/tool/compiler.cxx:1238
+sc/source/core/tool/compiler.cxx:1241
     void ConventionXL_A1::ConventionXL_A1(enum formula::FormulaGrammar::AddressConvention)
     enum formula::FormulaGrammar::AddressConvention eConv
     4
-sc/source/core/tool/compiler.cxx:1956
+sc/source/core/tool/compiler.cxx:1959
     _Bool lcl_isUnicodeIgnoreAscii(const char16_t *,const char *,unsigned long)
     unsigned long n
     4
@@ -2202,7 +2206,7 @@ sc/source/filter/excel/xelink.cxx:300
     void XclExpSupbook::XclExpSupbook(const class XclExpRoot &,const class rtl::OUString &,enum XclSupbookType)
     enum XclSupbookType 
     5
-sc/source/filter/excel/xepage.cxx:343
+sc/source/filter/excel/xepage.cxx:344
     void XclExpXmlStartHeaderFooterElementRecord::XclExpXmlStartHeaderFooterElementRecord(const int)
     const int nElement
     2612
@@ -2272,12 +2276,12 @@ sc/source/filter/inc/xeformula.hxx:70
     5
 sc/source/filter/inc/xehelper.hxx:243
     class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,char16_t,enum XclStrFlags,unsigned short)
-    enum XclStrFlags nFlags
-    2
-sc/source/filter/inc/xehelper.hxx:243
-    class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,char16_t,enum XclStrFlags,unsigned short)
     unsigned short nMaxLen
     32767
+sc/source/filter/inc/xehelper.hxx:243
+    class std::shared_ptr<class XclExpString> XclExpStringHelper::CreateString(const class XclExpRoot &,char16_t,enum XclStrFlags,unsigned short)
+    enum XclStrFlags nFlags
+    2
 sc/source/filter/inc/xelink.hxx:175
     unsigned short XclExpLinkManager::FindExtSheet(char16_t)
     char16_t cCode
@@ -2303,9 +2307,9 @@ sc/source/filter/inc/xestream.hxx:336
     int attribute13
     4112
 sc/source/filter/inc/xestream.hxx:336
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute11
-    4112
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute3
+    2550
 sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute4
@@ -2320,8 +2324,12 @@ sc/source/filter/inc/xestream.hxx:336
     5567
 sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute1
-    5808
+    int attribute14
+    4069
+sc/source/filter/inc/xestream.hxx:336
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute9
+    2138
 sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute2
@@ -2347,14 +2355,18 @@ sc/source/filter/inc/xestream.hxx:336
     int attribute9
     5628
 sc/source/filter/inc/xestream.hxx:336
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute14
-    4069
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute11
+    4112
 sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute3
     4565
 sc/source/filter/inc/xestream.hxx:336
+    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
+    int attribute1
+    5808
+sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute12
     4069
@@ -2367,14 +2379,6 @@ sc/source/filter/inc/xestream.hxx:336
     int attribute6
     1810
 sc/source/filter/inc/xestream.hxx:336
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute3
-    2550
-sc/source/filter/inc/xestream.hxx:336
-    class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
-    int attribute9
-    2138
-sc/source/filter/inc/xestream.hxx:336
     class std::shared_ptr<class sax_fastparser::FastSerializerHelper> & XclExpXmlStream::WriteAttributes(int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,int,const char *,struct FSEND_t)
     int attribute6
     5381
@@ -2442,7 +2446,7 @@ sc/source/filter/inc/xetable.hxx:80
     void XclExpRangeFmlaBase::XclExpRangeFmlaBase(unsigned short,unsigned int,const class ScRange &)
     unsigned short nRecId
     545
-sc/source/filter/inc/xiescher.hxx:1194
+sc/source/filter/inc/xiescher.hxx:1192
     unsigned int XclImpDffPropSet::GetPropertyValue(unsigned short) const
     unsigned short nPropId
     384
@@ -2486,15 +2490,15 @@ sc/source/ui/inc/AccessibleCell.hxx:157
     void ScAccessibleCell::AddRelation(const class ScAddress &,const unsigned short,class utl::AccessibleRelationSetHelper *)
     const unsigned short aRelationType
     4
-sc/source/ui/inc/AccessibleSpreadsheet.hxx:284
+sc/source/ui/inc/AccessibleSpreadsheet.hxx:283
     _Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(class ScRangeList *,class ScRangeList *,int,class std::__debug::vector<class ScMyAddress, class std::allocator<class ScMyAddress> > &)
     int nMax
     10
-sc/source/ui/inc/cellsh.hxx:59
+sc/source/ui/inc/cellsh.hxx:57
     _Bool ScCellShell::HasClipboardFormat(enum SotClipboardFormatId)
     enum SotClipboardFormatId nFormatId
     146
-sc/source/ui/inc/content.hxx:144
+sc/source/ui/inc/content.hxx:142
     void ScContentTree::SelectEntryByName(const enum ScContentId,const class rtl::OUString &)
     const enum ScContentId nRoot
     8
@@ -2502,11 +2506,11 @@ sc/source/ui/inc/docfunc.hxx:112
     _Bool ScDocFunc::SetCellText(const class ScAddress &,const class rtl::OUString &,_Bool,_Bool,_Bool,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
-sc/source/ui/inc/imoptdlg.hxx:37
+sc/source/ui/inc/imoptdlg.hxx:32
     void ScImportOptions::ScImportOptions(char16_t,char16_t,unsigned short)
     char16_t nTextSep
     34
-sc/source/ui/inc/select.hxx:35
+sc/source/ui/inc/select.hxx:34
     void ScViewSelectionEngine::ScViewSelectionEngine(class vcl::Window *,class ScTabView *,enum ScSplitPos)
     enum ScSplitPos eSplitPos
     2
@@ -2514,55 +2518,55 @@ sc/source/ui/inc/spellparam.hxx:47
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font &,int,_Bool)
     enum ScConversionType eConvType
     2
-sc/source/ui/inc/tabview.hxx:439
+sc/source/ui/inc/tabview.hxx:434
     void ScTabView::MoveCursorPage(short,int,enum ScFollowMode,_Bool,_Bool)
     enum ScFollowMode eMode
     2
-sc/source/ui/inc/tabview.hxx:441
+sc/source/ui/inc/tabview.hxx:436
     void ScTabView::MoveCursorArea(short,int,enum ScFollowMode,_Bool,_Bool)
     enum ScFollowMode eMode
     3
-sc/source/ui/inc/uiitems.hxx:56
+sc/source/ui/inc/uiitems.hxx:55
     void ScInputStatusItem::ScInputStatusItem(unsigned short,const class ScAddress &,const class ScAddress &,const class ScAddress &,const class rtl::OUString &,const class EditTextObject *)
     unsigned short nWhich
     26100
-sc/source/ui/inc/uiitems.hxx:121
+sc/source/ui/inc/uiitems.hxx:120
     void ScIndexHint::ScIndexHint(enum SfxHintId,unsigned short)
     enum SfxHintId nNewId
     42
-sc/source/ui/inc/uiitems.hxx:132
+sc/source/ui/inc/uiitems.hxx:131
     void ScSortItem::ScSortItem(unsigned short,class ScViewData *,const struct ScSortParam *)
     unsigned short nWhich
     1102
-sc/source/ui/inc/uiitems.hxx:135
+sc/source/ui/inc/uiitems.hxx:134
     void ScSortItem::ScSortItem(unsigned short,const struct ScSortParam *)
     unsigned short nWhich
     1102
-sc/source/ui/inc/uiitems.hxx:153
+sc/source/ui/inc/uiitems.hxx:152
     void ScQueryItem::ScQueryItem(unsigned short,class ScViewData *,const struct ScQueryParam *)
     unsigned short nWhich
     1103
-sc/source/ui/inc/uiitems.hxx:180
+sc/source/ui/inc/uiitems.hxx:179
     void ScSubTotalItem::ScSubTotalItem(unsigned short,class ScViewData *,const struct ScSubTotalParam *)
     unsigned short nWhich
     1104
-sc/source/ui/inc/uiitems.hxx:254
+sc/source/ui/inc/uiitems.hxx:253
     void ScSolveItem::ScSolveItem(unsigned short,const struct ScSolveParam *)
     unsigned short nWhich
     1107
-sc/source/ui/inc/uiitems.hxx:269
+sc/source/ui/inc/uiitems.hxx:268
     void ScTabOpItem::ScTabOpItem(unsigned short,const struct ScTabOpParam *)
     unsigned short nWhich
     26345
-sc/source/ui/inc/viewdata.hxx:183
+sc/source/ui/inc/viewdata.hxx:182
     void ScBoundsProvider::EnlargeBy(long)
     long nOffset
     2
-sc/source/ui/inc/viewdata.hxx:652
+sc/source/ui/inc/viewdata.hxx:651
     void ScViewData::AddPixelsWhile(long &,long,int &,int,double,const class ScDocument *,short)
     int nEndRow
     1048575
-sc/source/ui/inc/viewfunc.hxx:192
+sc/source/ui/inc/viewfunc.hxx:191
     void ScViewFunc::Protect(short,const class rtl::OUString &)
     short nTab
     32767
@@ -2570,7 +2574,7 @@ sc/source/ui/pagedlg/tptable.cxx:63
     _Bool lcl_PutScaleItem3(unsigned short,class SfxItemSet &,const class SfxItemSet &,const class weld::ComboBox &,unsigned short,const class weld::SpinButton &,unsigned short)
     unsigned short nLBEntry
     2
-sc/source/ui/unoobj/cellsuno.cxx:1239
+sc/source/ui/unoobj/cellsuno.cxx:1240
     _Bool lcl_PutFormulaArray(class ScDocShell &,const class ScRange &,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Sequence<class rtl::OUString> > &,const enum formula::FormulaGrammar::Grammar)
     const enum formula::FormulaGrammar::Grammar eGrammar
     16908294
@@ -2582,7 +2586,7 @@ sc/source/ui/view/printfun.cxx:86
     unsigned short lcl_GetUShort(const class SfxItemSet *,unsigned short)
     unsigned short nWhich
     176
-sc/source/ui/view/viewfun3.cxx:825
+sc/source/ui/view/viewfun3.cxx:821
     _Bool lcl_SelHasAttrib(const class ScDocument *,short,int,short,int,const class ScMarkData &,enum HasAttrFlags)
     enum HasAttrFlags nMask
     4
@@ -2614,7 +2618,7 @@ sccomp/source/solver/ParticelSwarmOptimization.hxx:68
     void ParticleSwarmOptimizationAlgorithm::ParticleSwarmOptimizationAlgorithm<DataProvider>(type-parameter-?-? &,unsigned long)
     unsigned long nNumOfParticles
     100
-sd/inc/Annotation.hxx:48
+sd/inc/Annotation.hxx:52
     void LOKCommentNotify(enum sd::CommentNotificationType,const class SfxViewShell *,const class com::sun::star::uno::Reference<class com::sun::star::office::XAnnotation> &)
     enum sd::CommentNotificationType nType
     2
@@ -2694,7 +2698,7 @@ sd/source/ui/sidebar/LayoutMenu.hxx:171
     class SfxRequest sd::sidebar::LayoutMenu::CreateRequest(unsigned short,enum AutoLayout)
     unsigned short nSlotId
     27014
-sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:117
+sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:118
     void sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(unsigned int,const struct AcceptDropEvent &,const signed char,const class sd::slidesorter::SlideSorter &)
     unsigned int nEventType
     2048
@@ -2706,6 +2710,10 @@ sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx:60
     void sd::slidesorter::view::LayeredDevice::RemovePainter(const class std::shared_ptr<class sd::slidesorter::view::ILayerPainter> &,const int)
     const int nLayer
     2
+sd/source/ui/slidesorter/view/SlsLayouter.cxx:144
+    int sd::slidesorter::view::Layouter::Implementation::ResolvePositionInGap(int,enum sd::slidesorter::view::Layouter::Implementation::GapMembership,int,int)
+    int nGap
+    4
 sdext/source/minimizer/configurationaccess.hxx:93
     short ConfigurationAccess::GetConfigProperty(const enum PPPOptimizerTokenEnum,const short) const
     const enum PPPOptimizerTokenEnum 
@@ -2716,14 +2724,14 @@ sdext/source/minimizer/informationdialog.hxx:39
     199
 sdext/source/minimizer/informationdialog.hxx:39
     class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
-    int nXPos
-    35
-sdext/source/minimizer/informationdialog.hxx:39
-    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
     int nHeight
     24
 sdext/source/minimizer/informationdialog.hxx:39
     class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
+    int nXPos
+    35
+sdext/source/minimizer/informationdialog.hxx:39
+    class rtl::OUString InsertFixedText(class UnoDialog &,const class rtl::OUString &,const class rtl::OUString &,int,int,int,int,_Bool,short)
     int nYPos
     6
 sdext/source/minimizer/informationdialog.hxx:42
@@ -2760,12 +2768,12 @@ sdext/source/minimizer/informationdialog.hxx:49
     50
 sdext/source/minimizer/informationdialog.hxx:49
     class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
-    int nXPos
-    95
-sdext/source/minimizer/informationdialog.hxx:49
-    class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
     short nTabIndex
     2
+sdext/source/minimizer/informationdialog.hxx:49
+    class rtl::OUString InsertButton(class UnoDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XActionListener> &,int,int,int,short,const class rtl::OUString &)
+    int nXPos
+    95
 sdext/source/minimizer/optimizerdialog.hxx:116
     void OptimizerDialog::EnablePage(short)
     short nStep
@@ -2780,16 +2788,16 @@ sdext/source/minimizer/optimizerdialogcontrols.cxx:160
     97
 sdext/source/minimizer/optimizerdialogcontrols.cxx:197
     class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
+    int nYPos
+    46
+sdext/source/minimizer/optimizerdialogcontrols.cxx:197
+    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
     double fEffectiveMax
     100
 sdext/source/minimizer/optimizerdialogcontrols.cxx:197
     class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
     int nXPos
     197
-sdext/source/minimizer/optimizerdialogcontrols.cxx:197
-    class rtl::OUString InsertFormattedField(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XSpinListener> &,int,int,double,double,short)
-    int nYPos
-    46
 sdext/source/minimizer/optimizerdialogcontrols.cxx:245
     class rtl::OUString InsertComboBox(class OptimizerDialog &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::awt::XTextListener> &,const _Bool,const class com::sun::star::uno::Sequence<class rtl::OUString> &,int,int,short)
     int nXPos
@@ -2954,7 +2962,7 @@ svtools/inc/table/tablecontrolinterface.hxx:225
     void svt::table::ITableControl::showTracking(const class tools::Rectangle &,const enum ShowTrackFlags)
     const enum ShowTrackFlags i_flags
     4099
-svtools/source/svhtml/htmlout.cxx:391
+svtools/source/svhtml/htmlout.cxx:392
     unsigned long lcl_FlushContext(struct HTMLOutContext &,char *,unsigned int)
     unsigned int nFlags
     6161
@@ -3006,10 +3014,6 @@ svx/source/inc/fmexch.hxx:105
     void svxform::OLocalExchangeHelper::startDrag(signed char)
     signed char nDragSourceActions
     3
-svx/source/inc/fmitems.hxx:32
-    void FmInterfaceItem::FmInterfaceItem(const unsigned short,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
-    const unsigned short nId
-    10703
 svx/source/inc/fmshimp.hxx:468
     void FmXFormShell::UpdateSlot_Lock(short)
     short nId
@@ -3030,15 +3034,15 @@ sw/inc/crsrsh.hxx:809
     void SwCursorShell::FireColumnChangeEvent(unsigned short,unsigned short)
     unsigned short nOldColumn
     2
-sw/inc/docary.hxx:400
+sw/inc/docary.hxx:399
     _Bool SwExtraRedlineTable::DeleteAllTableRedlines(class SwDoc *,const class SwTable &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:401
+sw/inc/docary.hxx:400
     _Bool SwExtraRedlineTable::DeleteTableRowRedline(class SwDoc *,const class SwTableLine &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
-sw/inc/docary.hxx:402
+sw/inc/docary.hxx:401
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,unsigned short)
     unsigned short nRedlineTypeToDelete
     65535
@@ -3054,7 +3058,7 @@ sw/inc/fesh.hxx:527
     _Bool SwFEShell::BeginCreate(unsigned short,enum SdrInventor,const class Point &)
     enum SdrInventor eObjInventor
     825249094
-sw/inc/fmtcol.hxx:68
+sw/inc/fmtcol.hxx:69
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     unsigned short nFormatWh
     154
@@ -3062,7 +3066,7 @@ sw/inc/fmteiro.hxx:32
     void SwFormatEditInReadonly::SwFormatEditInReadonly(unsigned short,_Bool)
     unsigned short nId
     111
-sw/inc/frmfmt.hxx:85
+sw/inc/frmfmt.hxx:86
     void SwFrameFormat::SwFrameFormat(class SwAttrPool &,const char *,class SwFrameFormat *,unsigned short,const unsigned short *)
     unsigned short nFormatWhich
     152
@@ -3162,7 +3166,7 @@ sw/source/core/inc/swcache.hxx:111
     void SwCache::DecreaseMax(const unsigned short)
     const unsigned short nSub
     100
-sw/source/core/inc/txtfrm.hxx:467
+sw/source/core/inc/txtfrm.hxx:468
     long SwTextFrame::GrowTst(const long)
     const long nGrow
     9223372036854775807
@@ -3190,11 +3194,11 @@ sw/source/core/txtnode/txtedt.cxx:171
     _Bool lcl_MaskRedlinesAndHiddenText(const class SwTextNode &,class rtl::OUStringBuffer &,int,int,const char16_t)
     const char16_t cChar
     65529
-sw/source/core/undo/untbl.cxx:2278
+sw/source/core/undo/untbl.cxx:2276
     void RedlineFlagsInternGuard::RedlineFlagsInternGuard(class SwDoc &,enum RedlineFlags,enum RedlineFlags)
     enum RedlineFlags eRedlineFlagsMask
     2
-sw/source/filter/html/htmlatr.cxx:1149
+sw/source/filter/html/htmlatr.cxx:1150
     _Bool HTMLEndPosLst::IsHTMLMode(unsigned long) const
     unsigned long nMode
     32
@@ -3202,10 +3206,6 @@ sw/source/filter/html/svxcss1.hxx:156
     void SvxCSS1PropertyInfo::SetBoxItem(class SfxItemSet &,unsigned short,const class SvxBoxItem *)
     unsigned short nMinBorderDist
     28
-sw/source/filter/html/svxcss1.hxx:242
-    void SvxCSS1Parser::SvxCSS1Parser(class SfxItemPool &,const class rtl::OUString &,unsigned short *,unsigned short)
-    unsigned short nWhichIds
-    3
 sw/source/filter/html/swhtml.hxx:621
     void SwHTMLParser::NewStdAttr(enum HtmlTokenId)
     enum HtmlTokenId nToken
@@ -3222,11 +3222,11 @@ sw/source/filter/inc/fltshell.hxx:228
     void SwFltRedline::SwFltRedline(unsigned short,unsigned long,const class DateTime &,unsigned short,unsigned long)
     unsigned long nAutorNoPrev_
     18446744073709551615
-sw/source/filter/ww8/docxattributeoutput.cxx:3425
+sw/source/filter/ww8/docxattributeoutput.cxx:3408
     class rtl::OString lcl_padStartToLength(const class rtl::OString &,int,char)
     char cFill
     48
-sw/source/filter/ww8/docxattributeoutput.cxx:3425
+sw/source/filter/ww8/docxattributeoutput.cxx:3408
     class rtl::OString lcl_padStartToLength(const class rtl::OString &,int,char)
     int nLen
     4
@@ -3258,7 +3258,7 @@ sw/source/filter/ww8/ww8par.hxx:1588
     class std::unique_ptr<class OutlinerParaObject, struct std::default_delete<class OutlinerParaObject> > SwWW8ImplReader::ImportAsOutliner(class rtl::OUString &,int,int,enum ManTypes)
     enum ManTypes eType
     4
-sw/source/filter/ww8/ww8scan.cxx:7127
+sw/source/filter/ww8/ww8scan.cxx:7114
     _Bool readS16(const unsigned char *,unsigned long,const unsigned char *,short *)
     unsigned long offset
     2
@@ -3282,14 +3282,6 @@ sw/source/filter/xml/xmlexpit.hxx:57
     void SvXMLExportItemMapper::exportElementItems(class SvXMLExport &,const class SvXMLUnitConverter &,const class SfxItemSet &,enum SvXmlExportFlags,const class std::__debug::vector<unsigned short, class std::allocator<unsigned short> > &) const
     enum SvXmlExportFlags nFlags
     8
-sw/source/ui/dbui/mmgreetingspage.cxx:47
-    void lcl_FillGreetingsBox(class ComboBox &,const class SwMailMergeConfigItem &,enum SwMailMergeConfigItem::Gender)
-    enum SwMailMergeConfigItem::Gender eType
-    2
-sw/source/ui/dbui/mmgreetingspage.cxx:69
-    void lcl_StoreGreetingsBox(const class ComboBox &,class SwMailMergeConfigItem &,enum SwMailMergeConfigItem::Gender)
-    enum SwMailMergeConfigItem::Gender eType
-    2
 sw/source/uibase/inc/frmmgr.hxx:121
     void SwFlyFrameAttrMgr::DelAttr(unsigned short)
     unsigned short nId
@@ -3298,6 +3290,14 @@ sw/source/uibase/inc/mailmergehelper.hxx:104
     void SwAddressPreview::SetLayout(unsigned short,unsigned short)
     unsigned short nColumns
     2
+sw/source/uibase/inc/mailmergehelper.hxx:151
+    void AddressPreview::SetLayout(unsigned short,unsigned short)
+    unsigned short nColumns
+    2
+sw/source/uibase/inc/mailmergehelper.hxx:151
+    void AddressPreview::SetLayout(unsigned short,unsigned short)
+    unsigned short nRows
+    2
 sw/source/uibase/inc/numpara.hxx:64
     _Bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
     unsigned short nId
@@ -3346,7 +3346,7 @@ tools/source/inet/inetmime.cxx:234
     _Bool translateUTF8Char(const char *&,const char *,unsigned short,unsigned int &)
     unsigned short eEncoding
     65534
-tools/source/stream/strmunx.cxx:180
+tools/source/stream/strmunx.cxx:165
     class ErrCode GetSvError(int)
     int nErrno
     21
@@ -3354,11 +3354,11 @@ ucbhelper/source/provider/resultset.cxx:97
     void ucbhelper_impl::PropertySetInfo::PropertySetInfo(const struct ucbhelper_impl::PropertyInfo *,int)
     int nProps
     2
-unotools/source/config/useroptions.cxx:101
+unotools/source/config/useroptions.cxx:102
     _Bool SvtUserOptions::Impl::GetBoolValue(enum UserOptToken) const
     enum UserOptToken nToken
     19
-unotools/source/misc/datetime.cxx:68
+unotools/source/misc/datetime.cxx:69
     _Bool convertNumber64(long &,const class rtl::OUString &,long,long)
     long 
     -1
@@ -3398,7 +3398,7 @@ vcl/inc/opengl/program.hxx:108
     void OpenGLProgram::DrawElements(unsigned int,unsigned int)
     unsigned int aMode
     4
-vcl/inc/salgdi.hxx:553
+vcl/inc/salgdi.hxx:550
     _Bool SalGraphics::hitTestNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,const class Point &,_Bool &)
     enum ControlType eType
     60
@@ -3462,7 +3462,7 @@ vcl/source/filter/wmf/emfwr.hxx:60
     void EMFWriter::ImplBeginCommentRecord(int)
     int nCommentType
     726027589
-vcl/source/filter/wmf/wmfwr.hxx:145
+vcl/source/filter/wmf/wmfwr.hxx:143
     void WMFWriter::WMFRecord_Escape(unsigned int,unsigned int,const signed char *)
     unsigned int nEsc
     2
@@ -3478,11 +3478,11 @@ vcl/source/fontsubset/ttcr.hxx:185
     void cmapAdd(struct vcl::TrueTypeTable *,unsigned int,unsigned int,unsigned int)
     unsigned int id
     65536
-vcl/source/gdi/pdfwriter_impl.hxx:1015
+vcl/source/gdi/pdfwriter_impl.hxx:993
     _Bool vcl::PDFWriterImpl::computeODictionaryValue(const unsigned char *,const unsigned char *,class std::__debug::vector<unsigned char, class std::allocator<unsigned char> > &,int)
     int i_nKeyLength
     16
-vcl/source/gdi/pdfwriter_impl.hxx:1066
+vcl/source/gdi/pdfwriter_impl.hxx:1041
     void vcl::PDFWriterImpl::insertError(enum vcl::PDFWriter::ErrorCode)
     enum vcl::PDFWriter::ErrorCode eErr
     3
@@ -3502,11 +3502,11 @@ vcl/source/opengl/OpenGLHelper.cxx:172
     class rtl::OString getHexString(const unsigned char *,unsigned int)
     unsigned int nLength
     16
-vcl/source/window/menu.cxx:552
+vcl/source/window/menu.cxx:548
     void ImplCopyItem(class Menu *,const class Menu &,unsigned short,unsigned short)
     unsigned short nNewPos
     65535
-vcl/source/window/printdlg.cxx:1327
+vcl/source/window/printdlg.cxx:1325
     class rtl::OUString searchAndReplace(const class rtl::OUString &,const char *,int,const class rtl::OUString &)
     int i_nReplLen
     2
@@ -3514,7 +3514,7 @@ vcl/unx/generic/app/i18n_status.cxx:51
     void vcl::StatusWindow::StatusWindow(long)
     long nWinBits
     38654705672
-vcl/unx/generic/app/saldisp.cxx:701
+vcl/unx/generic/app/saldisp.cxx:698
     unsigned int GetKeySymMask(struct _XDisplay *,unsigned long)
     unsigned long nKeySym
     65509
@@ -3546,7 +3546,7 @@ writerfilter/source/rtftok/rtfdocumentimpl.hxx:425
     class tools::SvRef<class writerfilter::rtftok::RTFValue> getNestedSprm(class writerfilter::rtftok::RTFSprms &,unsigned int,unsigned int)
     unsigned int nParent
     92164
-writerfilter/source/rtftok/rtfsprm.hxx:60
+writerfilter/source/rtftok/rtfsprm.hxx:61
     void writerfilter::rtftok::RTFSprms::eraseLast(unsigned int)
     unsigned int nKeyword
     92677
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 34b80d261f19..cc5106c986ab 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -86,7 +86,7 @@ void ODbAdminDialog::PageCreated(const OString& rId, SfxTabPage& _rPage)
 
 void ODbAdminDialog::addDetailPage(const OString& rPageId, const char* pTextId, CreateTabPage pCreateFunc)
 {
-    AddTabPage(rPageId, DBA_RES(pTextId), pCreateFunc, nullptr);
+    AddTabPage(rPageId, DBA_RES(pTextId), pCreateFunc);
 }
 
 void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName)
@@ -145,7 +145,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName
         case  ::dbaccess::DST_USERDEFINE10:
             {
                 OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED));
-                AddTabPage("user" + OString(static_cast<int>(eType)), aTitle, ODriversSettings::CreateUser, nullptr);
+                AddTabPage("user" + OString(static_cast<int>(eType)), aTitle, ODriversSettings::CreateUser);
             }
             break;
         default:
@@ -186,7 +186,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     if ( pCollection->determineType(getDatasourceType( *m_xExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
     {
         OString sMySqlNative("mysqlnative");
-        AddTabPage(sMySqlNative, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE, nullptr);
+        AddTabPage(sMySqlNative, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE);
         RemoveTabPage("advanced");
         m_sMainPageID = sMySqlNative;
     }
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index f57fc5949ace..d3a56e6a4cd3 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -265,8 +265,7 @@ public:
 
     void                AddTabPage(const OString& rName,           // Name of the label for the new page to create
                                    const OUString& rLabel,         // UI Label for the new page to create
-                                   CreateTabPage pCreateFunc,      // != 0
-                                   GetTabPageRanges pRangesFunc);  // can be 0
+                                   CreateTabPage pCreateFunc);     // != 0
 
     void                AddTabPage(const OString& rName,           // Name of the label for the new page to create
                                    const OUString& rLabel,         // UI Label for the new page to create
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 8f93be10c284..6d3bbb02e54d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1155,7 +1155,6 @@ public:
                                                sal_Int32 nIndex = 0,
                                                sal_Int32 nLen = -1,
                                                SalLayoutFlags flags = SalLayoutFlags::NONE,
-                                               vcl::TextLayoutCache const* = nullptr,
                                                const SalLayoutGlyphs* pLayoutCache = nullptr);
     long                        GetTextArray( const OUString& rStr, long* pDXAry,
                                               sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e1c49f44de5a..7975bd252df8 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1181,7 +1181,7 @@ public:
     sal_uInt16                          GetChildCount() const;
     vcl::Window*                        GetChild( sal_uInt16 nChild ) const;
     vcl::Window*                        GetWindow( GetWindowType nType ) const;
-    bool                                IsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const;
+    bool                                IsChild( const vcl::Window* pWindow ) const;
     bool                                IsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false  ) const;
 
     /// Add all children to rAllChildren recursively.
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c7471e4827a2..7095db44e930 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -454,7 +454,7 @@ public:
     ScTokenArray* CompileString( const OUString& rFormula, const OUString& rFormulaNmsp );
     const ScAddress& GetPos() const { return aPos; }
 
-    void MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow );
+    void MoveRelWrap();
     static void MoveRelWrap( const ScTokenArray& rArr, const ScDocument* pDoc, const ScAddress& rPos,
                              SCCOL nMaxCol, SCROW nMaxRow );
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 90377fd3dfa1..3c86ad2f5591 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4769,7 +4769,7 @@ bool ScCompiler::HandleRange()
                     AdjustSheetLocalNameRelReferences( nSheetTab - aPos.Tab());
 
                 SetRelNameReference();
-                MoveRelWrap(MAXCOL, MAXROW);
+                MoveRelWrap();
             }
             maArrIterator.Reset();
             if ( bAddPair )
@@ -4826,7 +4826,7 @@ bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
             if (FormulaTokenArrayPlainIterator(*pNew).GetNextReference() != nullptr)
             {
                 SetRelNameReference();
-                MoveRelWrap(MAXCOL, MAXROW);
+                MoveRelWrap();
             }
             maArrIterator.Reset();
             return GetToken();
@@ -4874,14 +4874,14 @@ void ScCompiler::SetRelNameReference()
 
 // Wrap-adjust relative references of a RangeName to current position,
 // don't call for other token arrays!
-void ScCompiler::MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow )
+void ScCompiler::MoveRelWrap()
 {
     for ( auto t: pArr->References() )
     {
         if ( t->GetType() == svSingleRef || t->GetType() == svExternalSingleRef )
-            ScRefUpdate::MoveRelWrap( pDoc, aPos, nMaxCol, nMaxRow, SingleDoubleRefModifier( *t->GetSingleRef() ).Ref() );
+            ScRefUpdate::MoveRelWrap( pDoc, aPos, MAXCOL, MAXROW, SingleDoubleRefModifier( *t->GetSingleRef() ).Ref() );
         else
-            ScRefUpdate::MoveRelWrap( pDoc, aPos, nMaxCol, nMaxRow, *t->GetDoubleRef() );
+            ScRefUpdate::MoveRelWrap( pDoc, aPos, MAXCOL, MAXROW, *t->GetDoubleRef() );
     }
 }
 
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 69e702d38f05..750cbdc9cca1 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -263,7 +263,7 @@ void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos )
 {
     std::unique_ptr<ScTokenArray> pTemp( pCode->Clone() );
     ScCompiler aComp(pDoc, rPos, *pTemp, formula::FormulaGrammar::GRAM_DEFAULT);
-    aComp.MoveRelWrap(MAXCOL, MAXROW);
+    aComp.MoveRelWrap();
     aComp.CreateStringFromTokenArray( rBuffer );
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b5e2719c4830..04e6f394d06e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2000,12 +2000,11 @@ void SfxTabDialogController::AddTabPage(const OString &rName /* Page ID */,
 
 void SfxTabDialogController::AddTabPage(const OString &rName, /* Page ID */
                                         const OUString& rRiderText,
-                                        CreateTabPage pCreateFunc  /* Pointer to the Factory Method */,
-                                        GetTabPageRanges pRangesFunc /* Pointer to the Method for querying Ranges onDemand */)
+                                        CreateTabPage pCreateFunc  /* Pointer to the Factory Method */)
 {
     assert(!m_xTabCtrl->get_page(rName) && "Double Page-Ids in the Tabpage");
     m_xTabCtrl->append_page(rName, rRiderText);
-    AddTabPage(rName, pCreateFunc, pRangesFunc);
+    AddTabPage(rName, pCreateFunc, nullptr);
 }
 
 void SfxTabDialogController::AddTabPage(const OString &rName, const OUString& rRiderText,
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index c93e51d0bf69..521fc12f4a30 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1815,7 +1815,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                 aGlyphsKey = SwTextGlyphsKey{ &rInf.GetOut(), *pStr, nTmpIdx, nLen };
                 pGlyphs = lcl_CreateLayout(aGlyphsKey, m_aTextGlyphs[aGlyphsKey]);
                 rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray.get(),
-                                             nTmpIdx , nLen, SalLayoutFlags::NONE, nullptr, pGlyphs );
+                                             nTmpIdx , nLen, SalLayoutFlags::NONE, pGlyphs );
                 if (bBullet)
                 {
                     rInf.GetOut().Push();
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 853ba065f7c7..c6dbedddbe5c 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -924,7 +924,6 @@ float OutputDevice::approximate_digit_width() const
 void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
                                   const long* pDXAry,
                                   sal_Int32 nIndex, sal_Int32 nLen, SalLayoutFlags flags,
-                                  vcl::TextLayoutCache const*const pLayoutCache,
                                   const SalLayoutGlyphs* pSalLayoutCache )
 {
     assert(!is_double_buffered_window());
@@ -945,7 +944,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
     if( mbOutputClipped )
         return;
 
-    std::unique_ptr<SalLayout> pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, pDXAry, flags, pLayoutCache, pSalLayoutCache);
+    std::unique_ptr<SalLayout> pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, pDXAry, flags, nullptr, pSalLayoutCache);
     if( pSalLayout )
     {
         ImplDrawText( *pSalLayout );
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index b268f14960e0..d00ad9f9b5ef 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -1111,11 +1111,11 @@ vcl::Window* Window::GetWindow( GetWindowType nType ) const
     return nullptr;
 }
 
-bool Window::IsChild( const vcl::Window* pWindow, bool bSystemWindow ) const
+bool Window::IsChild( const vcl::Window* pWindow ) const
 {
     do
     {
-        if ( !bSystemWindow && pWindow->ImplIsOverlapWindow() )
+        if ( pWindow->ImplIsOverlapWindow() )
             break;
 
         pWindow = pWindow->ImplGetParent();