loplugin:constantparam

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

16 files changed, 469 insertions, 491 deletions

diff --git a/compilerplugins/clang/constantparam.bitmask.results b/compilerplugins/clang/constantparam.bitmask.results
index 17bf470d3436..1b39fb87501e 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -16,7 +16,7 @@ include/basegfx/polygon/b2dpolygontools.hxx:144
 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:468
+include/sfx2/objsh.hxx:472
     void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
     enum SfxLoadedFlags nWhich setBits=0x1
 include/svtools/brwbox.hxx:438
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 3b0b836aa652..d083519708b4 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -64,11 +64,11 @@ chart2/qa/extras/charttest.hxx:280
     0
 chart2/qa/extras/charttest.hxx:300
     int getNumberOfDataSeries(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
-    int nChartType
+    int nCooSys
     0
 chart2/qa/extras/charttest.hxx:300
     int getNumberOfDataSeries(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int)
-    int nCooSys
+    int nChartType
     0
 chart2/qa/extras/charttest.hxx:310
     class com::sun::star::uno::Reference<class com::sun::star::chart2::XDataSeries> getDataSeriesFromDoc(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartDocument> &,int,int,int)
@@ -98,15 +98,15 @@ 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:52
+chart2/source/controller/dialogs/ChartTypeDialogController.hxx:54
     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
-chart2/source/controller/dialogs/DialogModel.cxx:172
+chart2/source/controller/dialogs/DialogModel.cxx:175
     struct (anonymous namespace)::lcl_DataSeriesContainerAppend & (anonymous namespace)::lcl_DataSeriesContainerAppend::operator++(int)
     int 
     0
-chart2/source/controller/dialogs/DialogModel.cxx:231
+chart2/source/controller/dialogs/DialogModel.cxx:234
     struct (anonymous namespace)::lcl_RolesWithRangeAppend & (anonymous namespace)::lcl_RolesWithRangeAppend::operator++(int)
     int 
     0
@@ -298,7 +298,7 @@ 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:4291
+desktop/source/lib/init.cxx:4337
     struct _LibreOfficeKit * libreofficekit_hook_2(const char *,const char *)
     const char * user_profile_url
     0
@@ -614,7 +614,7 @@ include/comphelper/lok.hxx:46
     void setLocalRendering(_Bool)
     _Bool bLocalRendering
     1
-include/comphelper/lok.hxx:67
+include/comphelper/lok.hxx:71
     void setRangeHeaders(_Bool)
     _Bool bTiledAnnotations
     1
@@ -728,12 +728,12 @@ include/editeng/editobj.hxx:117
     0
 include/editeng/editobj.hxx:117
     const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
-    int nType
-    1
-include/editeng/editobj.hxx:117
-    const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
     unsigned long nPos
     0
+include/editeng/editobj.hxx:117
+    const class SvxFieldData * EditTextObject::GetFieldData(int,unsigned long,int) const
+    int nType
+    1
 include/editeng/outliner.hxx:251
     void OutlinerView::SelectRange(int,int)
     int nFirst
@@ -982,10 +982,6 @@ 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
@@ -1030,39 +1026,39 @@ include/svl/gridprinter.hxx:29
     void svl::GridPrinter::GridPrinter(unsigned long,unsigned long,_Bool)
     _Bool bPrint
     0
-include/svl/itemset.hxx:174
+include/svl/itemset.hxx:172
     const type-parameter-?-? * SfxItemSet::GetItem(const class SfxItemSet *,TypedWhichId<type-parameter-?-?>,_Bool)
     _Bool bSearchInParent
     0
-include/svl/svdde.hxx:139
+include/svl/svdde.hxx:132
     void DdeLink::DdeLink(class DdeConnection &,const class rtl::OUString &,long)
     long 
     0
-include/svl/urihelper.hxx:52
+include/svl/urihelper.hxx:51
     class rtl::OUString SmartRel2Abs(const class INetURLObject &,const class rtl::OUString &,const class Link<class rtl::OUString *, _Bool> &,_Bool,_Bool,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
     enum INetURLObject::EncodeMechanism eEncodeMechanism
     1
-include/svl/urihelper.hxx:117
+include/svl/urihelper.hxx:116
     class rtl::OUString FindFirstURLInText(const class rtl::OUString &,int &,int &,const class CharClass &,enum INetURLObject::EncodeMechanism,unsigned short)
     enum INetURLObject::EncodeMechanism eMechanism
     1
-include/svl/urihelper.hxx:149
+include/svl/urihelper.hxx:148
     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:875
+include/svl/zforlist.hxx:874
     const class NfKeywordTable & SvNumberFormatter::GetKeywords(unsigned int)
     unsigned int nKey
     0
-include/svl/zformat.hxx:401
+include/svl/zformat.hxx:400
     int SvNumberformat::GetQuoteEnd(const class rtl::OUString &,int,char16_t,char16_t)
     char16_t cEscIn
     0
-include/svl/zformat.hxx:411
+include/svl/zformat.hxx:410
     int SvNumberformat::InsertBlanks(class rtl::OUString &,int,char16_t)
     int nPos
     0
-include/svl/zformat.hxx:477
+include/svl/zformat.hxx:476
     _Bool SvNumberformat::IsIso8601(unsigned short) const
     unsigned short nNumFor
     0
@@ -1086,7 +1082,7 @@ include/svtools/inettbc.hxx:63
     void SvtURLBox::SvtURLBox(class vcl::Window *,enum INetProtocol,_Bool)
     _Bool bSetDefaultHelpID
     1
-include/svtools/ruler.hxx:740
+include/svtools/ruler.hxx:738
     void Ruler::SetWinPos(long,long)
     long nWidth
     0
@@ -1094,30 +1090,10 @@ include/svtools/stringtransfer.hxx:65
     void svt::OStringTransfer::StartStringDrag(const class rtl::OUString &,class vcl::Window *,signed char)
     signed char _nDragSourceActions
     1
-include/svtools/svlbitm.hxx:75
-    void SvLBoxButtonData::SvLBoxButtonData(const class Control *,_Bool)
-    _Bool _bRadioBtn
-    1
 include/svtools/svmedit2.hxx:37
     void ExtMultiLineEdit::SetAttrib(const class TextAttrib &,unsigned int,int,int)
     int nStart
     0
-include/svtools/transfer.hxx:250
-    void TransferableHelper::StartDrag(class vcl::Window *,signed char,int)
-    int nDragPointer
-    0
-include/svtools/treelistbox.hxx:614
-    class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,const class Image &,const class Image &,class SvTreeListEntry *,_Bool,unsigned long,void *,enum SvLBoxButtonKind)
-    enum SvLBoxButtonKind eButtonKind
-    0
-include/svtools/treelistbox.hxx:690
-    void SvTreeListBox::MakeVisible(class SvTreeListEntry *,_Bool)
-    _Bool bMoveToTop
-    1
-include/svtools/treelistbox.hxx:716
-    unsigned long SvTreeListBox::SelectChildren(class SvTreeListEntry *,_Bool)
-    _Bool bSelect
-    0
 include/svtools/valueset.hxx:323
     void ValueSet::EnableFullItemMode(_Bool)
     _Bool bFullMode
@@ -1374,23 +1350,27 @@ 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:590
-    _Bool SvFileStream::LockRange(unsigned long,unsigned long)
-    unsigned long nByteOffset
-    0
-include/tools/stream.hxx:590
+include/tools/stream.hxx:188
+    void SvStream::FlushBuffer(_Bool)
+    _Bool isConsistent
+    1
+include/tools/stream.hxx:587
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
     unsigned long nBytes
     0
-include/tools/stream.hxx:591
-    _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
+include/tools/stream.hxx:587
+    _Bool SvFileStream::LockRange(unsigned long,unsigned long)
     unsigned long nByteOffset
     0
-include/tools/stream.hxx:591
+include/tools/stream.hxx:588
     _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
     unsigned long nBytes
     0
-include/tools/stream.hxx:670
+include/tools/stream.hxx:588
+    _Bool SvFileStream::UnlockRange(unsigned long,unsigned long)
+    unsigned long nByteOffset
+    0
+include/tools/stream.hxx:667
     void SvMemoryStream::ObjectOwnsMemory(_Bool)
     _Bool bOwn
     1
@@ -1526,11 +1506,11 @@ include/vcl/errcode.hxx:67
     void ErrCode::ErrCode(enum WarningFlag,enum ErrCodeArea,enum ErrCodeClass,unsigned short)
     enum WarningFlag 
     0
-include/vcl/field.hxx:515
+include/vcl/field.hxx:506
     double MetricField::ConvertDoubleValue(long,long,unsigned short,enum FieldUnit,enum FieldUnit)
     unsigned short nDecDigits
     0
-include/vcl/field.hxx:515
+include/vcl/field.hxx:506
     double MetricField::ConvertDoubleValue(long,long,unsigned short,enum FieldUnit,enum FieldUnit)
     long nBaseValue
     0
@@ -1538,15 +1518,15 @@ 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:151
+include/vcl/lstbox.hxx:149
     void ListBox::EnableDDAutoWidth(_Bool)
     _Bool b
     0
-include/vcl/lstbox.hxx:236
+include/vcl/lstbox.hxx:232
     void ListBox::EnableUserDraw(_Bool)
     _Bool bUserDraw
     1
-include/vcl/lstbox.hxx:281
+include/vcl/lstbox.hxx:277
     void ListBox::EnableQuickSelection(_Bool)
     _Bool b
     0
@@ -1554,31 +1534,27 @@ include/vcl/outdev.hxx:552
     _Bool OutputDevice::SupportsOperation(enum OutDevSupportType) const
     enum OutDevSupportType 
     0
-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
+include/vcl/outdev.hxx:1197
     void OutputDevice::ImplDrawWaveTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1199
+include/vcl/outdev.hxx:1198
     void OutputDevice::ImplDrawStraightTextLine(long,long,long,long,long,enum FontLineStyle,class Color,_Bool)
     long nY
     0
-include/vcl/outdev.hxx:1200
+include/vcl/outdev.hxx:1199
     void OutputDevice::ImplDrawStrikeoutLine(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1201
+include/vcl/outdev.hxx:1200
     void OutputDevice::ImplDrawStrikeoutChar(long,long,long,long,long,enum FontStrikeout,class Color)
     long nY
     0
-include/vcl/outdev.hxx:1223
+include/vcl/outdev.hxx:1222
     void OutputDevice::RefreshFontData(const _Bool)
     const _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1356
+include/vcl/outdev.hxx:1355
     _Bool OutputDevice::GetTextIsRTL(const class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1590,6 +1566,18 @@ include/vcl/splitwin.hxx:161
     long SplitWindow::GetItemSize(unsigned short,enum SplitWindowItemFlags) const
     enum SplitWindowItemFlags nBits
     1
+include/vcl/svimpbox.hxx:182
+    void SvImpLBox::FindMostRight(class SvTreeListEntry *,class SvTreeListEntry *)
+    class SvTreeListEntry * EntryToIgnore
+    0
+include/vcl/svimpbox.hxx:275
+    void SvImpLBox::SelectEntry(class SvTreeListEntry *,_Bool)
+    _Bool bSelect
+    0
+include/vcl/svlbitm.hxx:75
+    void SvLBoxButtonData::SvLBoxButtonData(const class Control *,_Bool)
+    _Bool _bRadioBtn
+    1
 include/vcl/syschild.hxx:50
     void SystemChildWindow::EnableEraseBackground(_Bool)
     _Bool bEnable
@@ -1622,6 +1610,22 @@ include/vcl/toolbox.hxx:456
     void ToolBox::EnableCustomize(_Bool)
     _Bool bEnable
     1
+include/vcl/transfer.hxx:250
+    void TransferableHelper::StartDrag(class vcl::Window *,signed char,int)
+    int nDragPointer
+    0
+include/vcl/treelistbox.hxx:615
+    class SvTreeListEntry * SvTreeListBox::InsertEntry(const class rtl::OUString &,const class Image &,const class Image &,class SvTreeListEntry *,_Bool,unsigned long,void *,enum SvLBoxButtonKind)
+    enum SvLBoxButtonKind eButtonKind
+    0
+include/vcl/treelistbox.hxx:691
+    void SvTreeListBox::MakeVisible(class SvTreeListEntry *,_Bool)
+    _Bool bMoveToTop
+    1
+include/vcl/treelistbox.hxx:717
+    unsigned long SvTreeListBox::SelectChildren(class SvTreeListEntry *,_Bool)
+    _Bool bSelect
+    0
 include/vcl/vclptr.hxx:45
     _Bool isIncompleteOrDerivedFromVclReferenceBase(int (*)[sizeof(T)])
     int (*)[sizeof(T)] 
@@ -1646,134 +1650,130 @@ include/vcl/vectorgraphicdata.hxx:83
     void VectorGraphicData::VectorGraphicData(const class rtl::OUString &,enum VectorGraphicDataType)
     enum VectorGraphicDataType eVectorDataType
     0
-include/vcl/weld.hxx:141
+include/vcl/weld.hxx:143
     void weld::ScrolledWindow::vadjustment_configure(int,int,int,int,int,int)
     int step_increment
     1
-include/vcl/weld.hxx:141
+include/vcl/weld.hxx:143
     void weld::ScrolledWindow::vadjustment_configure(int,int,int,int,int,int)
     int lower
     0
-include/vcl/weld.hxx:571
+include/vcl/weld.hxx:573
     void weld::Scale::set_range(int,int)
     int min
     1
-include/vcl/weld.hxx:908
-    void weld::MetricSpinButton::get_increments(int &,int &,enum FieldUnit) const
-    enum FieldUnit eDestUnit
-    0
-include/vcl/weld.hxx:1125
+include/vcl/weld.hxx:1151
     void weld::Menu::set_sensitive(const class rtl::OString &,_Bool)
     _Bool bSensitive
     0
-include/vcl/weld.hxx:1127
+include/vcl/weld.hxx:1153
     void weld::Menu::show(const class rtl::OString &,_Bool)
     _Bool bShow
     0
-include/vcl/weld.hxx:1174
+include/vcl/weld.hxx:1200
     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:1177
+include/vcl/weld.hxx:1203
     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:1179
+include/vcl/weld.hxx:1205
     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:1180
+include/vcl/weld.hxx:1206
     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:1183
+include/vcl/weld.hxx:1209
     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:1184
+include/vcl/weld.hxx:1210
     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:1188
+include/vcl/weld.hxx:1214
     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:1191
+include/vcl/weld.hxx:1217
     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:1193
+include/vcl/weld.hxx:1219
     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:1196
+include/vcl/weld.hxx:1222
     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:1199
+include/vcl/weld.hxx:1225
     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:1206
+include/vcl/weld.hxx:1232
     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: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:1208
+include/vcl/weld.hxx:1234
+    class std::unique_ptr<class weld::FormattedSpinButton, struct std::default_delete<class weld::FormattedSpinButton> > weld::Builder::weld_formatted_spin_button(const class rtl::OString &,_Bool)
+    _Bool bTakeOwnership
+    0
+include/vcl/weld.hxx:1236
     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:1210
+include/vcl/weld.hxx:1236
+    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:1238
     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:1214
+include/vcl/weld.hxx:1242
     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:1215
+include/vcl/weld.hxx:1243
     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:1217
+include/vcl/weld.hxx:1245
     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:1220
+include/vcl/weld.hxx:1248
     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:1221
+include/vcl/weld.hxx:1249
     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:1224
+include/vcl/weld.hxx:1252
     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:1226
+include/vcl/weld.hxx:1254
     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:1231
+include/vcl/weld.hxx:1259
     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:1234
+include/vcl/weld.hxx:1262
     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
-include/vcl/window.hxx:631
+include/vcl/window.hxx:633
     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
@@ -1898,7 +1898,7 @@ oox/source/ppt/timenodelistcontext.cxx:102
     void oox::ppt::AnimColor::AnimColor(short,int,int,int)
     int o
     0
-oox/source/vml/vmlformatting.cxx:538
+oox/source/vml/vmlformatting.cxx:543
     long lclGetEmu(const class oox::GraphicHelper &,const class oox::OptValue<class rtl::OUString> &,long)
     long nDefValue
     1
@@ -1986,15 +1986,15 @@ sal/qa/rtl/random/rtl_random.cxx:170
     void rtl_random::Statistics::addValue(unsigned char,int)
     int _nValue
     1
-sc/inc/address.hxx:328
+sc/inc/address.hxx:329
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     const class ScDocument * pDocument
     0
-sc/inc/address.hxx:494
+sc/inc/address.hxx:495
     void ScRange::ScRange(enum ScAddress::Uninitialized)
     enum ScAddress::Uninitialized eUninitialized
     0
-sc/inc/address.hxx:497
+sc/inc/address.hxx:498
     void ScRange::ScRange(enum ScAddress::InitializeInvalid)
     enum ScAddress::InitializeInvalid eInvalid
     0
@@ -2010,13 +2010,13 @@ 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:709
+sc/inc/chgtrack.hxx:710
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    int nDy
+    short nDx
     0
-sc/inc/chgtrack.hxx:709
+sc/inc/chgtrack.hxx:710
     void ScChangeActionContent::PutOldValueToDoc(class ScDocument *,short,int) const
-    short nDx
+    int nDy
     0
 sc/inc/column.hxx:242
     void ScColumn::GetUnprotectedCells(int,int,class ScRangeList &) const
@@ -2094,131 +2094,131 @@ sc/inc/dociter.hxx:536
     void ScUsedAreaIterator::ScUsedAreaIterator(class ScDocument *,short,short,int,short,int)
     short nCol1
     0
-sc/inc/document.hxx:912
+sc/inc/document.hxx:918
     void ScDocument::SetPendingRowHeights(short,_Bool)
     _Bool bSet
     0
-sc/inc/document.hxx:916
+sc/inc/document.hxx:922
     void ScDocument::SetScenario(short,_Bool)
     _Bool bFlag
     1
-sc/inc/document.hxx:1112
+sc/inc/document.hxx:1118
     class rtl::OUString ScDocument::GetString(short,int,short,const struct ScInterpreterContext *) const
     const struct ScInterpreterContext * pContext
     0
-sc/inc/document.hxx:1252
+sc/inc/document.hxx:1258
     void ScDocument::GetBorderLines(short,int,short,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **,const class editeng::SvxBorderLine **) const
     short nTab
     0
-sc/inc/document.hxx:1463
+sc/inc/document.hxx:1469
     void ScDocument::EnableUserInteraction(_Bool)
     _Bool bVal
     0
-sc/inc/document.hxx:1550
+sc/inc/document.hxx:1556
     void ScDocument::CopyMultiRangeFromClip(const class ScAddress &,const class ScMarkData &,enum InsertDeleteFlags,class ScDocument *,_Bool,_Bool,_Bool,_Bool)
     _Bool bResetCut
     1
-sc/inc/document.hxx:1599
+sc/inc/document.hxx:1605
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    short nCol1
+    _Bool bMarked
     0
-sc/inc/document.hxx:1599
+sc/inc/document.hxx:1605
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    _Bool bMarked
+    short nCol1
     0
-sc/inc/document.hxx:1606
+sc/inc/document.hxx:1612
     void ScDocument::UndoToDocument(const class ScRange &,enum InsertDeleteFlags,_Bool,class ScDocument &)
     _Bool bMarked
     0
-sc/inc/document.hxx:1651
+sc/inc/document.hxx:1657
     const class ScPatternAttr * ScDocument::GetMostUsedPattern(short,int,int,short) const
     int nStartRow
     0
-sc/inc/document.hxx:1795
+sc/inc/document.hxx:1801
     unsigned long ScDocument::GetColWidth(short,short,short) const
     short nStartCol
     0
-sc/inc/document.hxx:1836
+sc/inc/document.hxx:1842
     void ScDocument::ShowRow(int,short,_Bool)
     _Bool bShow
     0
-sc/inc/document.hxx:1839
+sc/inc/document.hxx:1845
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     int nStartRow
     0
-sc/inc/document.hxx:1844
-    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
-    _Bool bManual
-    1
-sc/inc/document.hxx:1844
+sc/inc/document.hxx:1850
     void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
     _Bool bPage
     0
-sc/inc/document.hxx:1845
+sc/inc/document.hxx:1850
+    void ScDocument::GetAllRowBreaks(class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > &,short,_Bool,_Bool) const
+    _Bool bManual
+    1
+sc/inc/document.hxx:1851
     void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
     _Bool bManual
     1
-sc/inc/document.hxx:1845
+sc/inc/document.hxx:1851
     void ScDocument::GetAllColBreaks(class std::__debug::set<short, struct std::less<short>, class std::allocator<short> > &,short,_Bool,_Bool) const
     _Bool bPage
     0
-sc/inc/document.hxx:1848
-    void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
-    _Bool bPage
-    0
-sc/inc/document.hxx:1848
+sc/inc/document.hxx:1854
     void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1849
+sc/inc/document.hxx:1854
+    void ScDocument::SetRowBreak(int,short,_Bool,_Bool)
+    _Bool bPage
+    0
+sc/inc/document.hxx:1855
     void ScDocument::SetColBreak(short,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1849
+sc/inc/document.hxx:1855
     void ScDocument::SetColBreak(short,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1850
+sc/inc/document.hxx:1856
     void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:1850
+sc/inc/document.hxx:1856
     void ScDocument::RemoveRowBreak(int,short,_Bool,_Bool)
     _Bool bManual
     1
-sc/inc/document.hxx:1851
-    void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
-    _Bool bManual
-    1
-sc/inc/document.hxx:1851
+sc/inc/document.hxx:1857
     void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
     _Bool bPage
     0
-sc/inc/document.hxx:2174
+sc/inc/document.hxx:1857
+    void ScDocument::RemoveColBreak(short,short,_Bool,_Bool)
+    _Bool bManual
+    1
+sc/inc/document.hxx:2180
     void ScDocument::UpdateBroadcastAreas(enum UpdateRefMode,const class ScRange &,short,int,short)
     enum UpdateRefMode eUpdateRefMode
     0
-sc/inc/document.hxx:2187
+sc/inc/document.hxx:2193
     void ScDocument::CollectAllAreaListeners(class std::__debug::vector<class SvtListener *, class std::allocator<class SvtListener *> > &,const class ScRange &,enum sc::AreaOverlapType)
     enum sc::AreaOverlapType eType
     1
-sc/inc/document.hxx:2206
+sc/inc/document.hxx:2212
     void ScDocument::CalcFormulaTree(_Bool,_Bool,_Bool)
     _Bool bSetAllDirty
     1
-sc/inc/document.hxx:2417
+sc/inc/document.hxx:2423
     void ScDocument::StoreTabToCache(short,class SvStream &) const
     short nTab
     0
-sc/inc/document.hxx:2418
+sc/inc/document.hxx:2424
     void ScDocument::RestoreTabFromCache(short,class SvStream &)
     short nTab
     0
-sc/inc/document.hxx:2509
+sc/inc/document.hxx:2515
     void ScMutationDisable::ScMutationDisable(class ScDocument *,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
-sc/inc/document.hxx:2541
+sc/inc/document.hxx:2547
     void ScMutationGuard::ScMutationGuard(class ScDocument *,enum ScMutationGuardFlags)
     enum ScMutationGuardFlags nFlags
     1
@@ -2250,7 +2250,7 @@ sc/inc/dptabdat.hxx:130
     const class ScDPItemData * ScDPTableData::GetMemberByIndex(long,long)
     long nIndex
     0
-sc/inc/dptabres.hxx:142
+sc/inc/dptabres.hxx:139
     void ScDPRelativePos::ScDPRelativePos(long,long)
     long nBase
     0
@@ -2270,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:183
+sc/inc/formulacell.hxx:184
     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:217
+sc/inc/formulacell.hxx:218
     class rtl::OUString ScFormulaCell::GetFormula(class sc::CompileFormulaContext &,const struct ScInterpreterContext *) const
     const struct ScInterpreterContext * pContext
     0
@@ -2438,19 +2438,19 @@ sc/qa/unit/ucalc.hxx:49
     class ScUndoCut * Test::cutToClip(class ScDocShell &,const class ScRange &,class ScDocument *,_Bool)
     _Bool bCreateUndo
     1
-sc/source/core/data/dociter.cxx:1271
+sc/source/core/data/dociter.cxx:1270
     void BoolResetter::BoolResetter(_Bool &,_Bool)
     _Bool b
     1
-sc/source/core/data/drwlayer.cxx:1942
+sc/source/core/data/drwlayer.cxx:1932
     void DeleteFirstUserDataOfType(class SdrObject *,unsigned short)
     unsigned short nId
     1
-sc/source/core/data/postit.cxx:421
+sc/source/core/data/postit.cxx:416
     void (anonymous namespace)::ScNoteCaptionCreator::ScNoteCaptionCreator(class ScDocument &,const class ScAddress &,const class std::shared_ptr<class SdrCaptionObj> &,_Bool)
     _Bool bShown
     1
-sc/source/core/opencl/formulagroupcl.cxx:967
+sc/source/core/opencl/formulagroupcl.cxx:974
     class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowDeclRef(_Bool) const
     _Bool nested
     0
@@ -2552,11 +2552,11 @@ sc/source/filter/inc/ftools.hxx:204
     0
 sc/source/filter/inc/htmlpars.hxx:189
     void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
-    unsigned short nWidth
+    unsigned short nWidthTol
     0
 sc/source/filter/inc/htmlpars.hxx:189
     void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
-    unsigned short nWidthTol
+    unsigned short nWidth
     0
 sc/source/filter/inc/htmlpars.hxx:189
     void ScHTMLLayoutParser::MakeColNoRef(class o3tl::sorted_vector<unsigned long, struct std::less<unsigned long>, find_unique, true> *,unsigned short,unsigned short,unsigned short,unsigned short)
@@ -2636,7 +2636,11 @@ 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
+    const char * value10
+    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 * value7
     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)
@@ -2660,10 +2664,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 * value10
-    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 * value11
     0
 sc/source/filter/inc/xestream.hxx:336
@@ -2672,7 +2672,7 @@ 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 * value7
+    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)
@@ -2766,15 +2766,15 @@ sc/source/filter/oox/formulaparser.cxx:465
     struct com::sun::star::sheet::FormulaToken & oox::xls::FormulaParserImpl::getOperandToken(unsigned long,unsigned long)
     unsigned long nTokenIndex
     0
-sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx:76
+sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx:75
     void ScMyGenerated::ScMyGenerated(class ScBigRange,unsigned int,class std::unique_ptr<struct ScMyCellInfo, struct std::default_delete<struct ScMyCellInfo> >)
     unsigned int id
     0
-sc/source/filter/xml/XMLExportSharedData.hxx:66
+sc/source/filter/xml/XMLExportSharedData.hxx:69
     void ScMySharedData::SetDrawPageHasForms(const int,_Bool)
     _Bool bHasForms
     1
-sc/source/filter/xml/xmlstyli.hxx:159
+sc/source/filter/xml/xmlstyli.hxx:155
     void XMLTableStylesContext::XMLTableStylesContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,const _Bool)
     unsigned short nPrfx
     0
@@ -3138,6 +3138,10 @@ sdext/source/presenter/PresenterTextView.hxx:232
     void sdext::presenter::PresenterTextView::SetOffset(const double,const double)
     const double nLeft
     0
+sfx2/source/control/thumbnailviewacc.hxx:57
+    void ThumbnailViewAcc::ThumbnailViewAcc(class ThumbnailView *,_Bool)
+    _Bool bIsTransientChildrenDisabled
+    0
 sfx2/source/inc/workwin.hxx:280
     void SfxWorkWindow::SetChildWindowVisible_Impl(unsigned int,_Bool,enum SfxVisibilityFlags)
     _Bool 
@@ -3190,19 +3194,19 @@ store/source/object.hxx:57
     type-parameter-?-? * query(class store::OStoreObject *,type-parameter-?-? *)
     type-parameter-?-? * 
     0
-svl/source/crypto/cryptosign.cxx:395
+svl/source/crypto/cryptosign.cxx:397
     enum _SECStatus my_SEC_StringToOID(struct SECItemStr *,const char *,unsigned int)
     unsigned int len
     0
-svl/source/crypto/cryptosign.cxx:487
+svl/source/crypto/cryptosign.cxx:490
     struct NSSCMSAttributeStr * my_NSS_CMSAttributeArray_FindAttrByOidTag(struct NSSCMSAttributeStr **,SECOidTag,int)
     int only
     0
-svl/source/crypto/cryptosign.cxx:1720
+svl/source/crypto/cryptosign.cxx:1723
     struct NSSCMSAttributeStr * CMSAttributeArray_FindAttrByOidData(struct NSSCMSAttributeStr **,const struct SECOidDataStr *,int)
     int only
     1
-svl/source/crypto/cryptosign.cxx:1759
+svl/source/crypto/cryptosign.cxx:1762
     enum _SECStatus StringToOID(struct SECItemStr *,const char *,unsigned int)
     unsigned int len
     0
@@ -3218,15 +3222,19 @@ svl/source/passwordcontainer/passwordcontainer.hxx:153
     void NamePassRecord::RemovePasswords(signed char)
     signed char nStatus
     1
-svtools/source/contnr/imivctl.hxx:407
+svtools/source/contnr/contentenumeration.hxx:212
+    void svt::FileViewContentEnumerator::FileViewContentEnumerator(const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &,class std::__debug::vector<class std::unique_ptr<struct svt::SortingData_Impl, struct std::default_delete<struct svt::SortingData_Impl> >, class std::allocator<class std::unique_ptr<struct svt::SortingData_Impl, struct std::default_delete<struct svt::SortingData_Impl> > > > &,class osl::Mutex &,const class svt::IContentTitleTranslation *)
+    const class svt::IContentTitleTranslation * _pTranslator
+    0
+svtools/source/contnr/imivctl.hxx:401
     const class Size & SvxIconChoiceCtrl_Impl::GetItemSize(enum IcnViewFieldType) const
     enum IcnViewFieldType 
     1
-svtools/source/contnr/imivctl.hxx:458
+svtools/source/contnr/imivctl.hxx:452
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     unsigned short nIndex
     0
-svtools/source/contnr/imivctl.hxx:459
+svtools/source/contnr/imivctl.hxx:453
     const class SvxIconChoiceCtrlColumnInfo * SvxIconChoiceCtrl_Impl::GetColumn(unsigned short) const
     unsigned short nIndex
     0
@@ -3238,14 +3246,6 @@ svtools/source/control/valueimp.hxx:412
     void SvtValueItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short nEventId
     1
-svtools/source/inc/svimpbox.hxx:185
-    void SvImpLBox::FindMostRight(class SvTreeListEntry *,class SvTreeListEntry *)
-    class SvTreeListEntry * EntryToIgnore
-    0
-svtools/source/inc/svimpbox.hxx:278
-    void SvImpLBox::SelectEntry(class SvTreeListEntry *,_Bool)
-    _Bool bSelect
-    0
 svx/inc/sxmtaitm.hxx:30
     void SdrMeasureTextAutoAngleItem::SdrMeasureTextAutoAngleItem(_Bool)
     _Bool bOn
@@ -3286,6 +3286,10 @@ svx/source/svdraw/svdoole2.cxx:631
     void SdrOle2ObjImpl::SdrOle2ObjImpl(_Bool,const class svt::EmbeddedObjectRef &)
     _Bool bFrame
     0
+sw/inc/authfld.hxx:169
+    class rtl::OUString SwAuthorityField::ExpandCitation(enum ToxAuthorityField,const class SwRootFrame *) const
+    const class SwRootFrame * pLayout
+    0
 sw/inc/calc.hxx:108
     void SwSbxValue::SwSbxValue(long)
     long n
@@ -3294,6 +3298,10 @@ sw/inc/charfmt.hxx:30
     void SwCharFormat::SwCharFormat(class SwAttrPool &,const char *,class SwCharFormat *)
     class SwCharFormat * pDerivedFrom
     0
+sw/inc/chpfld.hxx:81
+    const class rtl::OUString & SwChapterField::GetTitle(const class SwRootFrame *) const
+    const class SwRootFrame * pLayout
+    0
 sw/inc/crsrsh.hxx:552
     _Bool SwCursorShell::GotoMark(const class sw::mark::IMark *const,_Bool)
     _Bool bAtStart
@@ -3310,35 +3318,35 @@ sw/inc/dbfld.hxx:83
     void SwDBField::ChgValue(double,_Bool)
     _Bool bVal
     1
-sw/inc/doc.hxx:970
+sw/inc/doc.hxx:971
     void SwDoc::CorrAbs(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
     _Bool bMoveCursor
     1
-sw/inc/doc.hxx:984
+sw/inc/doc.hxx:985
     void SwDoc::CorrAbs(const class SwPaM &,const struct SwPosition &,_Bool)
     _Bool bMoveCursor
     1
-sw/inc/doc.hxx:990
+sw/inc/doc.hxx:991
     void SwDoc::CorrRel(const class SwNodeIndex &,const struct SwPosition &,const int,_Bool)
     const int nOffset
     0
-sw/inc/doc.hxx:1028
+sw/inc/doc.hxx:1030
     void SwDoc::SetCounted(const class SwPaM &,_Bool)
     _Bool bCounted
     1
-sw/inc/doc.hxx:1094
-    const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const _Bool)
-    const _Bool bForward
-    0
-sw/inc/doc.hxx:1094
-    const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const _Bool)
+sw/inc/doc.hxx:1099
+    const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const class SwRootFrame *,const _Bool)
     const _Bool bOutline
     0
-sw/inc/doc.hxx:1375
+sw/inc/doc.hxx:1099
+    const class SwNumRule * SwDoc::SearchNumRule(const struct SwPosition &,const _Bool,const _Bool,const _Bool,int,class rtl::OUString &,const class SwRootFrame *,const _Bool)
+    const _Bool bForward
+    0
+sw/inc/doc.hxx:1382
     const class SvNumberFormatter * SwDoc::GetNumberFormatter(_Bool) const
     _Bool bCreate
     1
-sw/inc/doc.hxx:1588
+sw/inc/doc.hxx:1595
     void SwDoc::dumpAsXml(struct _xmlTextWriter *) const
     struct _xmlTextWriter * 
     0
@@ -3350,15 +3358,15 @@ sw/inc/docary.hxx:401
     _Bool SwExtraRedlineTable::DeleteTableCellRedline(class SwDoc *,const class SwTableBox &,_Bool,unsigned short)
     _Bool bSaveInUndo
     1
-sw/inc/docufld.hxx:307
-    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned short)
-    _Bool bHidden
-    0
-sw/inc/docufld.hxx:307
+sw/inc/docufld.hxx:308
     void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned short)
     _Bool bConditional
     1
-sw/inc/docufld.hxx:518
+sw/inc/docufld.hxx:308
+    void SwHiddenTextField::SwHiddenTextField(class SwHiddenTextFieldType *,_Bool,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned short)
+    _Bool bHidden
+    0
+sw/inc/docufld.hxx:519
     void SwDocInfoField::SwDocInfoField(class SwDocInfoFieldType *,unsigned short,const class rtl::OUString &,const class rtl::OUString &,unsigned int)
     unsigned int nFormat
     0
@@ -3378,11 +3386,11 @@ 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:69
+sw/inc/fmtcol.hxx:70
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     class SwTextFormatColl * pDerFrom
     0
-sw/inc/fmtcol.hxx:141
+sw/inc/fmtcol.hxx:142
     void SwGrfFormatColl::SwGrfFormatColl(class SwAttrPool &,const char *,class SwGrfFormatColl *)
     class SwGrfFormatColl * pDerFrom
     0
@@ -3430,12 +3438,16 @@ sw/inc/ndole.hxx:94
     void SwOLENode::SwOLENode(const class SwNodeIndex &,const class svt::EmbeddedObjectRef &,class SwGrfFormatColl *,const class SwAttrSet *)
     const class SwAttrSet * pAutoAttr
     0
-sw/inc/ndtxt.hxx:328
+sw/inc/ndtxt.hxx:321
     void SwTextNode::CopyText(class SwTextNode *const,const class SwIndex &,const int,const _Bool)
     const _Bool bForceCopyOfAllAttrs
     1
-sw/inc/ndtxt.hxx:690
-    _Bool SwTextNode::GetExpandText(class SwTextNode &,const class SwIndex *,int,int,_Bool,_Bool,_Bool) const
+sw/inc/ndtxt.hxx:683
+    _Bool SwTextNode::CopyExpandText(class SwTextNode &,const class SwIndex *,int,int,const class SwRootFrame *,_Bool,_Bool,_Bool) const
+    const class SwRootFrame * pLayout
+    0
+sw/inc/ndtxt.hxx:683
+    _Bool SwTextNode::CopyExpandText(class SwTextNode &,const class SwIndex *,int,int,const class SwRootFrame *,_Bool,_Bool,_Bool) const
     _Bool bWithNum
     0
 sw/inc/pam.hxx:160
@@ -3454,15 +3466,15 @@ sw/inc/pam.hxx:191
     _Bool SwPaM::Find(const class SfxPoolItem &,_Bool,const struct SwMoveFnCollection &,const class SwPaM *,_Bool)
     _Bool bValue
     0
-sw/inc/shellio.hxx:512
+sw/inc/shellio.hxx:517
     void SwWriter::SwWriter(class SvStream &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:514
+sw/inc/shellio.hxx:519
     void SwWriter::SwWriter(class SvStream &,class SwPaM &,_Bool)
     _Bool bWriteAll
     0
-sw/inc/shellio.hxx:518
+sw/inc/shellio.hxx:523
     void SwWriter::SwWriter(class SfxMedium &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     1
@@ -3526,7 +3538,7 @@ sw/source/core/inc/txmsrt.hxx:112
     class rtl::OUString SwTOXInternational::ToUpper(const class rtl::OUString &,int) const
     int nPos
     0
-sw/source/core/inc/wrong.hxx:332
+sw/source/core/inc/wrong.hxx:334
     void SwWrongList::InsertSubList(int,int,unsigned short,class SwWrongList *)
     int nNewLen
     1
@@ -3586,11 +3598,11 @@ sw/source/filter/ww8/wrtww8.hxx:866
     void MSWordExportBase::NearestAnnotationMark(int &,const int,_Bool)
     _Bool bNextPositionOnly
     0
-sw/source/filter/ww8/wrtww8.hxx:1345
+sw/source/filter/ww8/wrtww8.hxx:1346
     void WW8_WrMagicTable::Append(int,unsigned long)
     unsigned long nData
     0
-sw/source/filter/ww8/wrtww8.hxx:1345
+sw/source/filter/ww8/wrtww8.hxx:1346
     void WW8_WrMagicTable::Append(int,unsigned long)
     int nCp
     0
@@ -3734,11 +3746,11 @@ vcl/backendtest/outputdevice/common.cxx:166
     enum vcl::test::TestResult checkDiamondLine(class Bitmap &,int,class Color)
     int aLayerNumber
     1
-vcl/inc/listbox.hxx:144
+vcl/inc/listbox.hxx:140
     class rtl::OUString ImplEntryList::GetSelectedEntry(int) const
     int nIndex
     0
-vcl/inc/listbox.hxx:336
+vcl/inc/listbox.hxx:332
     void ImplListBoxWindow::EnableMouseMoveSelect(_Bool)
     _Bool bMouseMoveSelect
     1
@@ -3766,11 +3778,11 @@ vcl/inc/openglgdiimpl.hxx:137
     void OpenGLSalGraphicsImpl::DrawAlphaTexture(class OpenGLTexture &,const struct SalTwoRect &,_Bool,_Bool)
     _Bool pPremultiplied
     1
-vcl/inc/salgdi.hxx:133
+vcl/inc/salgdi.hxx:134
     void SalGraphics::GetFontMetric(class tools::SvRef<class ImplFontMetricData> &,int)
     int nFallbackLevel
     0
-vcl/inc/salgdi.hxx:497
+vcl/inc/salgdi.hxx:498
     void SalGraphics::copyArea(long,long,long,long,long,long,_Bool)
     _Bool bWindowInvalidate
     1
@@ -3898,7 +3910,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/source/app/salvtables.cxx:918
+vcl/source/app/salvtables.cxx:922
     void SalInstanceFrame::SalInstanceFrame(class VclFrame *,_Bool)
     _Bool bTakeOwnership
     0
@@ -3938,7 +3950,7 @@ vcl/unx/generic/app/randrwrapper.cxx:57
     void (anonymous namespace)::RandRWrapper::XRRSelectInput(struct _XDisplay *,unsigned long,int)
     int i_nMask
     1
-vcl/unx/gtk3/gtk3gtkinst.cxx:4119
+vcl/unx/gtk3/gtk3gtkinst.cxx:4140
     void GtkInstanceTreeView::move_before(int,int)
     int before
     0
@@ -4014,7 +4026,7 @@ xmlscript/source/xmldlg_imexp/exp_share.hxx:225
     void xmlscript::ElementDescriptor::read(const class rtl::OUString &,const class rtl::OUString &,_Bool)
     _Bool forceAttribute
     0
-xmlsecurity/source/component/documentdigitalsignatures.cxx:81
+xmlsecurity/source/component/documentdigitalsignatures.cxx:82
     void DocumentDigitalSignatures::ImplViewSignatures(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XInputStream> &,enum DocumentSignatureMode,_Bool)
     _Bool bReadOnly
     1
diff --git a/compilerplugins/clang/constantparam.constructors.results b/compilerplugins/clang/constantparam.constructors.results
index 775567d4d6d1..0d4e4e6f3e3f 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 & _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 &)
-    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 &)
@@ -434,7 +434,7 @@ 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
+include/sfx2/objsh.hxx:645
     void SfxObjectShell::DoDraw(class OutputDevice *,const class Point &,const class Size &,const class JobSetup &,unsigned short)
     const class JobSetup & rSetup
     JobSetup()
@@ -446,7 +446,7 @@ 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()
-include/svl/aeitem.hxx:54
+include/svl/aeitem.hxx:52
     void SfxAllEnumItem::SfxAllEnumItem(unsigned short,class SvStream &)
     unsigned short nWhich
     Which()
@@ -474,11 +474,11 @@ include/svl/lckbitem.hxx:33
     void SfxLockBytesItem::SfxLockBytesItem(unsigned short,class SvStream &)
     unsigned short nWhich
     Which()
-include/svl/sharecontrolfile.hxx:63
+include/svl/sharecontrolfile.hxx:62
     void svt::ShareControlFile::RemoveEntry(const class o3tl::enumarray<enum LockFileComponent, class rtl::OUString> &)
     const class o3tl::enumarray<enum LockFileComponent, class rtl::OUString> & aOptionalSpecification
     GenerateOwnEntry()
-include/svl/slstitm.hxx:38
+include/svl/slstitm.hxx:39
     void SfxStringListItem::SfxStringListItem(unsigned short,class SvStream &)
     unsigned short nWhich
     Which()
@@ -498,18 +498,6 @@ 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: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:346
-    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
-    const class rtl::OUString & rDestDoc
-    ""
-include/svtools/treelistbox.hxx:746
-    void SvTreeListBox::ShowFocusRect(const class SvTreeListEntry *)
-    const class SvTreeListEntry * pEntry
-    FirstSelected()
 include/svx/charmap.hxx:156
     void SvxShowCharSet::DrawChars_Impl(class OutputDevice &,int,int)
     int n2
@@ -542,14 +530,14 @@ include/vcl/dockwin.hxx:49
     void EndDockingData::EndDockingData(const class tools::Rectangle &,_Bool,_Bool)
     _Bool bCancelled
     IsDockingCanceled()
-include/vcl/field.hxx:389
-    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
-    const class LocaleDataWrapper & rLocaleDataWrapper
-    ImplGetLocaleDataWrapper()
-include/vcl/field.hxx:389
+include/vcl/field.hxx:380
     class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
     _Bool bDuration
     IsDuration()
+include/vcl/field.hxx:380
+    class tools::Time TimeFormatter::SpinTime(_Bool,const class tools::Time &,enum TimeFieldFormat,_Bool,const class rtl::OUString &,int,const class LocaleDataWrapper &)
+    const class LocaleDataWrapper & rLocaleDataWrapper
+    ImplGetLocaleDataWrapper()
 include/vcl/FilterConfigItem.hxx:74
     class rtl::OUString FilterConfigItem::ReadString(const class rtl::OUString &,const class rtl::OUString &)
     const class rtl::OUString & rDefault
@@ -558,7 +546,7 @@ 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:1567
+include/vcl/outdev.hxx:1566
     class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const class Point &,const class Size &,const class Bitmap &,long,long)
     const class Point & rSrcPt
     Point()
@@ -586,11 +574,23 @@ 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/transfer.hxx:308
+    class com::sun::star::uno::Any TransferableDataHelper::GetAny(enum SotClipboardFormatId,const class rtl::OUString &) const
+    const class rtl::OUString & rDestDoc
+    ""
+include/vcl/transfer.hxx:346
+    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
+    const class rtl::OUString & rDestDoc
+    ""
+include/vcl/treelistbox.hxx:747
+    void SvTreeListBox::ShowFocusRect(const class SvTreeListEntry *)
+    const class SvTreeListEntry * pEntry
+    FirstSelected()
 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:317
+include/vcl/weld.hxx:319
     void weld::ComboBox::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &)
     const class rtl::OUString & rId
     ""
@@ -682,7 +682,7 @@ sc/qa/unit/helper/qahelper.hxx:201
     class tools::SvRef<class ScDocShell> ScBootstrapFixture::saveAndReload(class ScDocShell *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,enum SfxFilterFlags)
     const class rtl::OUString & rUserData
     ""
-sc/source/core/tool/token.cxx:4894
+sc/source/core/tool/token.cxx:4898
     void appendTokenByType(struct sc::TokenStringContext &,class rtl::OUStringBuffer &,const class formula::FormulaToken &,const class ScAddress &,_Bool)
     _Bool bFromRangeName
     IsFromRangeName()
@@ -690,7 +690,7 @@ sc/source/filter/excel/xeformula.cxx:152
     void (anonymous namespace)::XclExpFuncData::FinishParam(unsigned short)
     unsigned short nTokPos
     PopOperandPos()
-sc/source/filter/excel/xltoolbar.hxx:46
+sc/source/filter/excel/xltoolbar.hxx:47
     _Bool ScTBC::ImportToolBarControl(class ScCTBWrapper &,const class com::sun::star::uno::Reference<class com::sun::star::container::XIndexContainer> &,class CustomToolBarImportHelper &,_Bool)
     _Bool bIsMenuBar
     IsMenuToolbar()
@@ -826,7 +826,7 @@ store/source/lockbyte.cxx:815
     void store::ResourceHolder::ResourceHolder<T>(const type-parameter-?-? &)
     const type-parameter-?-? & value
     T()
-svtools/source/contnr/imivctl.hxx:458
+svtools/source/contnr/imivctl.hxx:452
     void SvxIconChoiceCtrl_Impl::SetColumn(unsigned short,const class SvxIconChoiceCtrlColumnInfo &)
     const class SvxIconChoiceCtrlColumnInfo & 
     SvxIconChoiceCtrlColumnInfo()
@@ -850,11 +850,11 @@ svx/source/inc/xmlxtimp.hxx:43
     _Bool SvxXMLXTableImport::load(const class rtl::OUString &,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> &,_Bool *)
     const class com::sun::star::uno::Reference<class com::sun::star::container::XNameContainer> & xTable
     createInstance()
-sw/inc/doc.hxx:906
+sw/inc/doc.hxx:907
     const class SwTOXMark & SwDoc::GotoTOXMark(const class SwTOXMark &,enum SwTOXSearch,_Bool)
     _Bool bInReadOnly
     IsReadOnlyAvailable()
-sw/inc/ftnidx.hxx:37
+sw/inc/ftnidx.hxx:38
     _Bool CompareSwFootnoteIdxs::operator()(class SwTextFootnote *const &,class SwTextFootnote *const &) const
     class SwTextFootnote *const & lhs
     Compare()
@@ -862,19 +862,19 @@ sw/inc/ndarr.hxx:74
     _Bool CompareSwOutlineNodes::operator()(class SwNode *const &,class SwNode *const &) const
     class SwNode *const & lhs
     Compare()
-sw/inc/shellio.hxx:160
+sw/inc/shellio.hxx:165
     void SwReader::SwReader(class SvStream &,const class rtl::OUString &,const class rtl::OUString &,class SwPaM &)
     const class rtl::OUString & rFilename
     ""
-sw/inc/shellio.hxx:162
+sw/inc/shellio.hxx:167
     void SwReader::SwReader(const class com::sun::star::uno::Reference<class com::sun::star::embed::XStorage> &,const class rtl::OUString &,class SwPaM &)
     const class rtl::OUString & rFilename
     ""
-sw/inc/shellio.hxx:459
+sw/inc/shellio.hxx:464
     class SvStream & Writer::OutLong(class SvStream &,long)
     class SvStream & rStrm
     Strm()
-sw/inc/shellio.hxx:460
+sw/inc/shellio.hxx:465
     class SvStream & Writer::OutULong(class SvStream &,unsigned long)
     class SvStream & rStrm
     Strm()
@@ -906,11 +906,11 @@ sw/source/core/inc/swfont.hxx:75
     void SwSubFont::DrawText_(class SwDrawTextInfo &,const _Bool)
     const _Bool bGrey
     IsGreyWave()
-sw/source/core/inc/wrong.hxx:80
+sw/source/core/inc/wrong.hxx:82
     void SwWrongArea::SwWrongArea(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::container::XStringKeyMap> &,int,int,class SwWrongList *)
     const class rtl::OUString & rType
     ""
-sw/source/core/inc/wrong.hxx:310
+sw/source/core/inc/wrong.hxx:312
     void SwWrongList::Insert(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::container::XStringKeyMap> &,int,int,unsigned short)
     const class rtl::OUString & rType
     ""
@@ -1006,7 +1006,7 @@ vcl/inc/fontinstance.hxx:74
     _Bool LogicalFontInstance::GetGlyphOutline(unsigned short,class basegfx::B2DPolyPolygon &,_Bool) const
     _Bool 
     IsVertical()
-vcl/inc/salgdi.hxx:593
+vcl/inc/salgdi.hxx:594
     _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
     ""
@@ -1024,53 +1024,53 @@ 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 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 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 & rbInKeyInput
     ImplGetInPattKeyInput()
-vcl/source/control/field2.cxx:997
+vcl/source/control/field2.cxx:998
     _Bool ImplDateProcessKeyInput(const class KeyEvent &,enum ExtDateFieldFormat,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field2.cxx:1009
+vcl/source/control/field2.cxx:1010
     _Bool ImplDateGetValue(const class rtl::OUString &,class Date &,enum ExtDateFieldFormat,const class LocaleDataWrapper &,const class CalendarWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field2.cxx:1893
-    _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
-    _Bool bStrictFormat
-    IsStrictFormat()
-vcl/source/control/field2.cxx:1893
+vcl/source/control/field2.cxx:1894
     _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
     _Bool bDuration
     IsDuration()
-vcl/source/control/field2.cxx:1893
+vcl/source/control/field2.cxx:1894
     _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rLocaleDataWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:985
+vcl/source/control/field2.cxx:1894
+    _Bool ImplTimeProcessKeyInput(const class KeyEvent &,_Bool,_Bool,enum TimeFieldFormat,const class LocaleDataWrapper &)
+    _Bool bStrictFormat
+    IsStrictFormat()
+vcl/source/control/field.cxx:953
     _Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     _Bool bUseThousandSep
     IsUseThousandSep()
-vcl/source/control/field.cxx:985
+vcl/source/control/field.cxx:953
     _Bool ImplMetricProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rWrapper
     ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:1770
-    _Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
-    const class LocaleDataWrapper & rWrapper
-    ImplGetLocaleDataWrapper()
-vcl/source/control/field.cxx:1770
+vcl/source/control/field.cxx:1730
     _Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
     _Bool bUseThousandSep
     IsUseThousandSep()
-vcl/source/control/field.cxx:1777
+vcl/source/control/field.cxx:1730
+    _Bool ImplCurrencyProcessKeyInput(const class KeyEvent &,_Bool,const class LocaleDataWrapper &)
+    const class LocaleDataWrapper & rWrapper
+    ImplGetLocaleDataWrapper()
+vcl/source/control/field.cxx:1737
     _Bool ImplCurrencyGetValue(const class rtl::OUString &,long &,unsigned short,const class LocaleDataWrapper &)
     const class LocaleDataWrapper & rWrapper
     ImplGetLocaleDataWrapper()
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index d5333d8636a2..452dfa9218f3 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -450,7 +450,7 @@ include/connectivity/sqlerror.hxx:206
     void connectivity::SQLError::raiseTypedException(const int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &,const class com::sun::star::uno::Type &) const
     const int _eCondition
     100
-include/dbaccess/genericcontroller.hxx:346
+include/dbaccess/genericcontroller.hxx:315
     _Bool dbaui::OGenericUnoController::isFeatureSupported(int)
     int _nId
     5502
@@ -502,7 +502,7 @@ include/editeng/editview.hxx:217
     void EditView::RemoveCharAttribs(int,unsigned short)
     unsigned short nWhich
     4026
-include/editeng/fhgtitem.hxx:80
+include/editeng/fhgtitem.hxx:82
     void SvxFontHeightItem::SetHeight(unsigned int,unsigned short,enum MapUnit,enum MapUnit)
     enum MapUnit eUnit
     8
@@ -648,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 n2
+    unsigned long n1
     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:368
     unsigned long o3tl::basic_string_view::find(type-parameter-?-?,unsigned long) const
@@ -672,12 +672,12 @@ include/o3tl/string_view.hxx:403
     111
 include/o3tl/string_view.hxx:406
     unsigned long o3tl::basic_string_view::rfind(const type-parameter-?-? *,unsigned long,unsigned long) const
-    unsigned long n
-    2
-include/o3tl/string_view.hxx:406
-    unsigned long o3tl::basic_string_view::rfind(const type-parameter-?-? *,unsigned long,unsigned long) const
     unsigned long pos
     18446744073709551615
+include/o3tl/string_view.hxx:406
+    unsigned long o3tl::basic_string_view::rfind(const type-parameter-?-? *,unsigned long,unsigned long) const
+    unsigned long n
+    2
 include/o3tl/string_view.hxx:409
     unsigned long o3tl::basic_string_view::rfind(const type-parameter-?-? *,unsigned long) const
     unsigned long pos
@@ -846,7 +846,7 @@ include/sfx2/controlwrapper.hxx:82
     void sfx::PosValueMapper::PosValueMapper<PosT, ValueT>(type-parameter-?-?,const struct sfx::PosValueMapper::MapEntryType *)
     type-parameter-?-? nNFPos
     65535
-include/sfx2/ctrlitem.hxx:88
+include/sfx2/ctrlitem.hxx:89
     void SfxStatusForwarder::SfxStatusForwarder(unsigned short,class SfxControllerItem &)
     unsigned short nSlotId
     10930
@@ -926,7 +926,11 @@ include/sfx2/tabdlg.hxx:56
     void SfxTabDialogItem::SfxTabDialogItem(unsigned short,const class SfxItemSet &)
     unsigned short nId
     11022
-include/sfx2/tabdlg.hxx:138
+include/sfx2/tabdlg.hxx:124
+    void SfxTabDialog::SetPageName(unsigned short,const class rtl::OString &) const
+    unsigned short nPageId
+    99
+include/sfx2/tabdlg.hxx:139
     void SfxTabDialog::AddTabPage(unsigned short,const class rtl::OUString &,class VclPtr<class SfxTabPage> (*)(struct TabPageParent, const class SfxItemSet *),unsigned short)
     unsigned short nPos
     65535
@@ -970,7 +974,7 @@ include/svl/int64item.hxx:21
     void SfxInt64Item::SfxInt64Item(unsigned short,long)
     unsigned short nWhich
     11141
-include/svl/itemset.hxx:204
+include/svl/itemset.hxx:201
     void SfxItemSet::PutExtended(const class SfxItemSet &,enum SfxItemState,enum SfxItemState)
     enum SfxItemState eDontCareAs
     16
@@ -978,43 +982,43 @@ include/svl/languageoptions.hxx:120
     _Bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(short) const
     short scriptType
     2
-include/svl/svdde.hxx:165
+include/svl/svdde.hxx:158
     void DdePoke::DdePoke(class DdeConnection &,const class rtl::OUString &,const class DdeData &,long)
     long 
     30000
-include/svl/svdde.hxx:172
+include/svl/svdde.hxx:165
     void DdeExecute::DdeExecute(class DdeConnection &,const class rtl::OUString &,long)
     long 
     30000
-include/svl/urihelper.hxx:52
-    class rtl::OUString SmartRel2Abs(const class INetURLObject &,const class rtl::OUString &,const class Link<class rtl::OUString *, _Bool> &,_Bool,_Bool,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
-    enum FSysStyle eStyle
-    7
-include/svl/urihelper.hxx:52
+include/svl/urihelper.hxx:51
     class rtl::OUString SmartRel2Abs(const class INetURLObject &,const class rtl::OUString &,const class Link<class rtl::OUString *, _Bool> &,_Bool,_Bool,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
     unsigned short eCharset
     76
-include/svl/urihelper.hxx:117
+include/svl/urihelper.hxx:51
+    class rtl::OUString SmartRel2Abs(const class INetURLObject &,const class rtl::OUString &,const class Link<class rtl::OUString *, _Bool> &,_Bool,_Bool,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short,enum FSysStyle)
+    enum FSysStyle eStyle
+    7
+include/svl/urihelper.hxx:116
     class rtl::OUString FindFirstURLInText(const class rtl::OUString &,int &,int &,const class CharClass &,enum INetURLObject::EncodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/svl/urihelper.hxx:149
+include/svl/urihelper.hxx:148
     class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     unsigned short eCharset
     76
-include/svl/urihelper.hxx:149
+include/svl/urihelper.hxx:148
     class rtl::OUString removePassword(const class rtl::OUString &,enum INetURLObject::EncodeMechanism,enum INetURLObject::DecodeMechanism,unsigned short)
     enum INetURLObject::DecodeMechanism eDecodeMechanism
     3
-include/svl/zformat.hxx:386
+include/svl/zformat.hxx:385
     _Bool SvNumberformat::IsInQuote(const class rtl::OUString &,int,char16_t,char16_t,char16_t)
     char16_t cEscOut
     92
-include/svl/zformat.hxx:401
+include/svl/zformat.hxx:400
     int SvNumberformat::GetQuoteEnd(const class rtl::OUString &,int,char16_t,char16_t)
     char16_t cQuote
     34
-include/svtools/accessiblefactory.hxx:115
+include/svtools/accessiblefactory.hxx:109
     class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> svt::IAccessibleFactory::createAccessibleBrowseBoxHeaderBar(const class com::sun::star::uno::Reference<class com::sun::star::accessibility::XAccessible> &,class svt::IAccessibleTableProvider &,enum svt::AccessibleBrowseBoxObjType) const
     enum svt::AccessibleBrowseBoxObjType _eObjType
     3
@@ -1046,10 +1050,6 @@ include/svtools/htmlout.hxx:68
     class SvStream & HTMLOutFuncs::Out_Hex(class SvStream &,unsigned long,unsigned char)
     unsigned char nLen
     2
-include/svtools/imap.hxx:117
-    unsigned long ImageMap::Read(class SvStream &,unsigned long)
-    unsigned long nFormat
-    4294967295
 include/svtools/roadmapwizard.hxx:203
     void svt::RoadmapWizard::updateRoadmapItemLabel(short)
     short _nState
@@ -1070,34 +1070,6 @@ include/svtools/svtabbx.hxx:105
     void SvTabListBox::SetTabJustify(unsigned short,enum SvTabJustify)
     enum SvTabJustify 
     2
-include/svtools/transfer.hxx:220
-    void TransferableHelper::RemoveFormat(enum SotClipboardFormatId)
-    enum SotClipboardFormatId nFormat
-    59
-include/svtools/transfer.hxx:314
-    _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &)
-    enum SotClipboardFormatId nFormat
-    2
-include/svtools/transfer.hxx:325
-    _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long)
-    enum SotClipboardFormatId nFormat
-    3
-include/svtools/transfer.hxx:331
-    _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &)
-    enum SotClipboardFormatId nFormat
-    13
-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
-include/svtools/treelistbox.hxx:548
-    class SvLBoxTab * SvTreeListBox::GetFirstTab(enum SvLBoxTabFlags,unsigned short &)
-    enum SvLBoxTabFlags nFlagMask
-    64
-include/svtools/treelistbox.hxx:549
-    void SvTreeListBox::GetLastTab(enum SvLBoxTabFlags,unsigned short &)
-    enum SvLBoxTabFlags nFlagMask
-    64
 include/svtools/unitconv.hxx:42
     long ControlToItem(long,enum FieldUnit,enum MapUnit)
     enum FieldUnit eCtrl
@@ -1190,7 +1162,7 @@ include/svx/drawitem.hxx:183
     void SvxLineEndListItem::SvxLineEndListItem(const class rtl::Reference<class XLineEndList> &,unsigned short)
     unsigned short nWhich
     10185
-include/svx/float3d.hxx:243
+include/svx/float3d.hxx:242
     void Svx3DCtrlItem::Svx3DCtrlItem(unsigned short,class SfxBindings *)
     unsigned short 
     10645
@@ -1500,12 +1472,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
-    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:653
+    class rtl::OUString INetURLObject::getExtension(int,_Bool,enum INetURLObject::DecodeMechanism,unsigned short) const
+    int nIndex
+    -1
 include/tools/urlobj.hxx:677
     _Bool INetURLObject::setExtension(const class rtl::OUString &,int,_Bool,unsigned short)
     unsigned short eCharset
@@ -1602,7 +1574,7 @@ include/vcl/errinf.hxx:188
     void TwoStringErrorInfo::TwoStringErrorInfo(class ErrCode,const class rtl::OUString &,const class rtl::OUString &,enum DialogMask)
     enum DialogMask nMask
     4097
-include/vcl/field.hxx:518
+include/vcl/field.hxx:509
     double MetricField::ConvertDoubleValue(long,unsigned short,enum FieldUnit,enum MapUnit)
     enum MapUnit eOutUnit
     9
@@ -1630,15 +1602,19 @@ include/vcl/IDialogRenderable.hxx:38
     void vcl::ILibreOfficeKitNotifier::libreOfficeKitViewCallback(int,const char *) const
     int nType
     18
+include/vcl/imap.hxx:117
+    unsigned long ImageMap::Read(class SvStream &,unsigned long)
+    unsigned long nFormat
+    4294967295
 include/vcl/listctrl.hxx:46
     void ListControl::addEntry(const class VclPtr<class vcl::Window> &,unsigned int)
     unsigned int nPos
     65535
-include/vcl/lstbox.hxx:113
+include/vcl/lstbox.hxx:111
     void ListBox::ListBox(enum WindowType)
     enum WindowType nType
     332
-include/vcl/outdev.hxx:1176
+include/vcl/outdev.hxx:1175
     int OutputDevice::GetTextBreak(const class rtl::OUString &,long,char16_t,int &,int,int,long,const class vcl::TextLayoutCache *) const
     char16_t nExtraChar
     45
@@ -1654,27 +1630,55 @@ include/vcl/texteng.hxx:140
     class TextPaM TextEngine::ImpInsertText(const class TextSelection &,char16_t,_Bool)
     char16_t c
     9
+include/vcl/transfer.hxx:220
+    void TransferableHelper::RemoveFormat(enum SotClipboardFormatId)
+    enum SotClipboardFormatId nFormat
+    59
+include/vcl/transfer.hxx:314
+    _Bool TransferableDataHelper::GetBitmapEx(enum SotClipboardFormatId,class BitmapEx &)
+    enum SotClipboardFormatId nFormat
+    2
+include/vcl/transfer.hxx:325
+    _Bool TransferableDataHelper::GetGDIMetaFile(enum SotClipboardFormatId,class GDIMetaFile &,unsigned long)
+    enum SotClipboardFormatId nFormat
+    3
+include/vcl/transfer.hxx:331
+    _Bool TransferableDataHelper::GetImageMap(enum SotClipboardFormatId,class ImageMap &)
+    enum SotClipboardFormatId nFormat
+    13
+include/vcl/transfer.hxx:346
+    class com::sun::star::uno::Sequence<signed char> TransferableDataHelper::GetSequence(enum SotClipboardFormatId,const class rtl::OUString &)
+    enum SotClipboardFormatId nFormat
+    59
+include/vcl/treelistbox.hxx:549
+    class SvLBoxTab * SvTreeListBox::GetFirstTab(enum SvLBoxTabFlags,unsigned short &)
+    enum SvLBoxTabFlags nFlagMask
+    64
+include/vcl/treelistbox.hxx:550
+    void SvTreeListBox::GetLastTab(enum SvLBoxTabFlags,unsigned short &)
+    enum SvLBoxTabFlags nFlagMask
+    64
 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:248
+include/vcl/weld.hxx:250
     class weld::Button * weld::Dialog::get_widget_for_response(int)
     int response
     5
-include/vcl/weld.hxx:321
+include/vcl/weld.hxx:323
     void weld::ComboBox::insert_separator(int)
     int pos
     -1
-include/vcl/weld.hxx:526
+include/vcl/weld.hxx:528
     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:1129
+include/vcl/weld.hxx:1155
     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:1594
+include/vcl/window.hxx:1596
     void vcl::Window::SimulateKeyPress(unsigned short) const
     unsigned short nKeyCode
     1312
@@ -1798,6 +1802,10 @@ oox/source/core/xmlfilterbase.cxx:602
     void writeElement(const class std::shared_ptr<class sax_fastparser::FastSerializerHelper> &,int,const class LanguageTag &)
     int nXmlElement
     109972365
+oox/source/drawingml/diagram/diagramlayoutatoms.cxx:42
+    class oox::OptValue<int> findProperty(const class std::__debug::map<class rtl::OUString, class std::__debug::map<int, int, struct std::less<int>, class std::allocator<struct std::pair<const int, int> > >, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class std::__debug::map<int, int, struct std::less<int>, class std::allocator<struct std::pair<const int, int> > > > > > &,const class rtl::OUString &,int)
+    int nProperty
+    5670
 oox/source/drawingml/table/tableproperties.cxx:102
     void SetTableStyleProperties(class oox::drawingml::table::TableStyle *&,int,int,int)
     int tblTextClr
@@ -1870,7 +1878,7 @@ 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
-sc/inc/address.hxx:328
+sc/inc/address.hxx:329
     void ScAddress::Format(class rtl::OStringBuffer &,enum ScRefFlags,const class ScDocument *,const struct ScAddress::Details &) const
     enum ScRefFlags nFlags
     32768
@@ -1894,11 +1902,11 @@ sc/inc/cellvalues.hxx:69
     void sc::CellValues::reset(unsigned long)
     unsigned long nSize
     1048576
-sc/inc/chgtrack.hxx:217
+sc/inc/chgtrack.hxx:218
     void ScChangeAction::ScChangeAction(enum ScChangeActionType,const class ScBigRange &,const unsigned long)
     enum ScChangeActionType 
     8
-sc/inc/colcontainer.hxx:36
+sc/inc/colcontainer.hxx:35
     void ScColContainer::ScColContainer(const unsigned long)
     const unsigned long nSize
     1024
@@ -1926,14 +1934,6 @@ 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
@@ -1954,35 +1954,35 @@ sc/inc/compressedarray.hxx:186
     type-parameter-?-? ScBitMaskCompressedArray::GetLastAnyBitAccess(const type-parameter-?-? &) const
     const type-parameter-?-? & rBitMask
     15
-sc/inc/document.hxx:1280
+sc/inc/document.hxx:1286
     _Bool ScDocument::CompileErrorCells(enum FormulaError)
     enum FormulaError nErrCode
     525
-sc/inc/document.hxx:1599
-    void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
-    enum InsertDeleteFlags nFlags
-    2303
-sc/inc/document.hxx:1599
+sc/inc/document.hxx:1605
     void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
     short nCol2
     1023
-sc/inc/document.hxx:1782
+sc/inc/document.hxx:1605
+    void ScDocument::UndoToDocument(short,int,short,short,int,short,enum InsertDeleteFlags,_Bool,class ScDocument &)
+    enum InsertDeleteFlags nFlags
+    2303
+sc/inc/document.hxx:1788
     void ScDocument::DeleteSelectionTab(short,enum InsertDeleteFlags,const class ScMarkData &)
     enum InsertDeleteFlags nDelFlag
     2303
-sc/inc/document.hxx:1839
+sc/inc/document.hxx:1845
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     enum CRFlags nNewFlags
     8
-sc/inc/document.hxx:1839
+sc/inc/document.hxx:1845
     void ScDocument::SetRowFlags(int,int,short,enum CRFlags)
     int nEndRow
     1048575
-sc/inc/document.hxx:1869
+sc/inc/document.hxx:1875
     int ScDocument::LastNonFilteredRow(int,int,short) const
     int nEndRow
     1048575
-sc/inc/document.hxx:2168
+sc/inc/document.hxx:2174
     void ScDocument::BroadcastCells(const class ScRange &,enum SfxHintId,_Bool)
     enum SfxHintId nHint
     31
@@ -1994,11 +1994,11 @@ sc/inc/externalrefmgr.hxx:786
     void ScExternalRefManager::purgeStaleSrcDocument(int)
     int nTimeOut
     30000
-sc/inc/formulacell.hxx:365
+sc/inc/formulacell.hxx:371
     void ScFormulaCell::AddRecalcMode(enum ScRecalcMode)
     enum ScRecalcMode 
     4
-sc/inc/global.hxx:659
+sc/inc/global.hxx:661
     const char16_t * ScGlobal::FindUnquoted(const char16_t *,char16_t)
     char16_t cChar
     46
@@ -2076,12 +2076,12 @@ sc/inc/stlpool.hxx:54
     2
 sc/inc/stringutil.hxx:151
     _Bool ScStringUtil::parseSimpleNumber(const char *,unsigned long,char,char,double &)
-    char gsep
-    44
-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:413
     void ScTable::SetFormula(short,int,const class ScTokenArray &,enum formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGram
@@ -2126,7 +2126,7 @@ 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:1158
+sc/qa/unit/ucalc.cxx:1159
     _Bool checkRelativeRefToken(class ScDocument &,const class ScAddress &,short,int)
     short nRelCol
     -1
@@ -2158,11 +2158,11 @@ sc/qa/unit/ucalc_formula.cxx:8083
     void (anonymous namespace)::ColumnTest::ColumnTest(class ScDocument *,int,int,int,int,int)
     int nEnd1
     159
-sc/source/core/data/documen3.cxx:1724
+sc/source/core/data/documen3.cxx:1713
     _Bool lcl_AddTwipsWhile(long &,long,int &,int,const class ScTable *,_Bool)
     int nEndRow
     1048575
-sc/source/core/data/documen8.cxx:530
+sc/source/core/data/documen8.cxx:521
     void (anonymous namespace)::IdleCalcTextWidthScope::incCol(short)
     short nInc
     -1
@@ -2248,12 +2248,12 @@ sc/source/filter/inc/unitconverter.hxx:79
     8
 sc/source/filter/inc/xechart.hxx:197
     void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
-    unsigned long nRecSize
-    4
-sc/source/filter/inc/xechart.hxx:197
-    void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
     unsigned short nRecId
     2155
+sc/source/filter/inc/xechart.hxx:197
+    void XclExpChFutureRecordBase::XclExpChFutureRecordBase(const class XclExpChRoot &,enum XclFutureRecType,unsigned short,unsigned long)
+    unsigned long nRecSize
+    4
 sc/source/filter/inc/xeescher.hxx:154
     void XclExpImgData::XclExpImgData(const class Graphic &,unsigned short)
     unsigned short nRecId
@@ -2276,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)
-    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/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/xelink.hxx:175
     unsigned short XclExpLinkManager::FindExtSheet(char16_t)
     char16_t cCode
@@ -2324,10 +2324,6 @@ 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 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
@@ -2348,6 +2344,10 @@ sc/source/filter/inc/xestream.hxx:336
     4311
 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 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 attribute4
     2966
 sc/source/filter/inc/xestream.hxx:336
@@ -2375,10 +2375,6 @@ sc/source/filter/inc/xestream.hxx:336
     int attribute2
     2966
 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 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 *,struct FSEND_t)
     int attribute6
     5381
@@ -2403,6 +2399,10 @@ sc/source/filter/inc/xestream.hxx:336
     int attribute4
     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 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 *,struct FSEND_t)
     int attribute8
     4311
@@ -2474,7 +2474,7 @@ sc/source/filter/xml/xmlfonte.cxx:39
     void ScXMLFontAutoStylePool_Impl::AddFontItems(const unsigned short *,unsigned char,const class SfxItemPool *,const _Bool)
     unsigned char nIdCount
     3
-sc/source/filter/xml/xmlstyli.cxx:279
+sc/source/filter/xml/xmlstyli.cxx:280
     void XMLTableCellPropsContext::XMLTableCellPropsContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,unsigned int,class std::__debug::vector<struct XMLPropertyState, class std::allocator<struct XMLPropertyState> > &,const class rtl::Reference<class SvXMLImportPropertyMapper> &)
     unsigned int nFamily
     196608
@@ -2494,7 +2494,7 @@ 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:57
+sc/source/ui/inc/cellsh.hxx:58
     _Bool ScCellShell::HasClipboardFormat(enum SotClipboardFormatId)
     enum SotClipboardFormatId nFormatId
     146
@@ -2710,7 +2710,7 @@ 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
+sd/source/ui/slidesorter/view/SlsLayouter.cxx:146
     int sd::slidesorter::view::Layouter::Implementation::ResolvePositionInGap(int,enum sd::slidesorter::view::Layouter::Implementation::GapMembership,int,int)
     int nGap
     4
@@ -2788,25 +2788,21 @@ 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 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)
     int nXPos
     197
 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
     197
-sfx2/source/control/thumbnailviewacc.hxx:183
-    void ThumbnailViewItemAcc::FireAccessibleEvent(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
-    short nEventId
-    4
-sfx2/source/dialog/filedlghelper.cxx:1932
+sfx2/source/dialog/filedlghelper.cxx:1931
     void SetToken(class rtl::OUString &,int,char16_t,const class rtl::OUString &)
     char16_t cTok
     32
@@ -3022,7 +3018,7 @@ svx/source/inc/GraphCtlAccessibleContext.hxx:183
     void SvxGraphCtrlAccessibleContext::CommitChange(short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
     short aEventId
     7
-sw/inc/authfld.hxx:131
+sw/inc/authfld.hxx:133
     void SwAuthorityFieldType::SetSortKeys(unsigned short,const struct SwTOXSortKey *)
     unsigned short nKeyCount
     3
@@ -3058,7 +3054,7 @@ sw/inc/fesh.hxx:527
     _Bool SwFEShell::BeginCreate(unsigned short,enum SdrInventor,const class Point &)
     enum SdrInventor eObjInventor
     825249094
-sw/inc/fmtcol.hxx:69
+sw/inc/fmtcol.hxx:70
     void SwTextFormatColl::SwTextFormatColl(class SwAttrPool &,const char *,class SwTextFormatColl *,unsigned short)
     unsigned short nFormatWh
     154
@@ -3074,11 +3070,11 @@ sw/inc/IDocumentRedlineAccess.hxx:185
     _Bool IDocumentRedlineAccess::DeleteRedline(const class SwStartNode &,_Bool,unsigned short)
     unsigned short nDelType
     65535
-sw/inc/ndtxt.hxx:160
+sw/inc/ndtxt.hxx:159
     void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nFontWhichId
     22
-sw/inc/ndtxt.hxx:160
+sw/inc/ndtxt.hxx:159
     void SwTextNode::SetLanguageAndFont(const class SwPaM &,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,unsigned short,const class vcl::Font *,unsigned short)
     unsigned short nLangWhichId
     24
@@ -3166,7 +3162,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:468
+sw/source/core/inc/txtfrm.hxx:476
     long SwTextFrame::GrowTst(const long)
     const long nGrow
     9223372036854775807
@@ -3242,11 +3238,11 @@ sw/source/filter/ww8/writerhelper.hxx:474
     const type-parameter-?-? * HasItem(const class std::__debug::map<unsigned short, const class SfxPoolItem *, class sw::util::ItemSort, class std::allocator<struct std::pair<const unsigned short, const class SfxPoolItem *> > > &,unsigned short)
     unsigned short eType
     52
-sw/source/filter/ww8/wrtww8.hxx:1330
+sw/source/filter/ww8/wrtww8.hxx:1331
     void WW8_WrPlcField::WW8_WrPlcField(unsigned short,unsigned char)
     unsigned short nStructSz
     2
-sw/source/filter/ww8/wrtww8.hxx:1387
+sw/source/filter/ww8/wrtww8.hxx:1388
     void SwWW8WrGrf::WritePICBulletFHeader(class SvStream &,const class Graphic &,unsigned short,unsigned short,unsigned short)
     unsigned short mm
     100
@@ -3258,7 +3254,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:7114
+sw/source/filter/ww8/ww8scan.cxx:7108
     _Bool readS16(const unsigned char *,unsigned long,const unsigned char *,short *)
     unsigned long offset
     2
@@ -3290,13 +3286,13 @@ 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
+sw/source/uibase/inc/mailmergehelper.hxx:150
     void AddressPreview::SetLayout(unsigned short,unsigned short)
-    unsigned short nColumns
+    unsigned short nRows
     2
-sw/source/uibase/inc/mailmergehelper.hxx:151
+sw/source/uibase/inc/mailmergehelper.hxx:150
     void AddressPreview::SetLayout(unsigned short,unsigned short)
-    unsigned short nRows
+    unsigned short nColumns
     2
 sw/source/uibase/inc/numpara.hxx:64
     _Bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(unsigned short,const class rtl::OUString &,enum SfxStyleFamily)
@@ -3358,7 +3354,7 @@ unotools/source/config/useroptions.cxx:102
     _Bool SvtUserOptions::Impl::GetBoolValue(enum UserOptToken) const
     enum UserOptToken nToken
     19
-unotools/source/misc/datetime.cxx:69
+unotools/source/misc/datetime.cxx:71
     _Bool convertNumber64(long &,const class rtl::OUString &,long,long)
     long 
     -1
@@ -3374,11 +3370,11 @@ vcl/inc/fontsubset.hxx:53
     void FontSubsetInfo::LoadFont(enum FontType,const unsigned char *,int)
     enum FontType eInFontType
     32
-vcl/inc/listbox.hxx:496
+vcl/inc/listbox.hxx:490
     void ImplListBox::SetMRUEntries(const class rtl::OUString &,char16_t)
     char16_t cSep
     59
-vcl/inc/listbox.hxx:497
+vcl/inc/listbox.hxx:491
     class rtl::OUString ImplListBox::GetMRUEntries(char16_t) const
     char16_t cSep
     59
@@ -3398,7 +3394,7 @@ vcl/inc/opengl/program.hxx:108
     void OpenGLProgram::DrawElements(unsigned int,unsigned int)
     unsigned int aMode
     4
-vcl/inc/salgdi.hxx:550
+vcl/inc/salgdi.hxx:551
     _Bool SalGraphics::hitTestNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,const class Point &,_Bool &)
     enum ControlType eType
     60
@@ -3506,7 +3502,7 @@ 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:1325
+vcl/source/window/printdlg.cxx:1327
     class rtl::OUString searchAndReplace(const class rtl::OUString &,const char *,int,const class rtl::OUString &)
     int i_nReplLen
     2
@@ -3542,7 +3538,7 @@ writerfilter/source/ooxml/OOXMLPropertySet.hxx:388
     void writerfilter::ooxml::OOXMLPropertySetEntryToBool::OOXMLPropertySetEntryToBool(unsigned int)
     unsigned int nId
     92221
-writerfilter/source/rtftok/rtfdocumentimpl.hxx:425
+writerfilter/source/rtftok/rtfdocumentimpl.hxx:424
     class tools::SvRef<class writerfilter::rtftok::RTFValue> getNestedSprm(class writerfilter::rtftok::RTFSprms &,unsigned int,unsigned int)
     unsigned int nParent
     92164
@@ -3650,7 +3646,7 @@ xmloff/source/style/xmlbahdl.hxx:118
     void XMLMeasurePxPropHdl::XMLMeasurePxPropHdl(signed char)
     signed char nB
     4
-xmloff/source/text/XMLIndexMarkExport.cxx:203
+xmloff/source/text/XMLIndexMarkExport.cxx:200
     void lcl_ExportPropertyBool(class SvXMLExport &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,enum xmloff::token::XMLTokenEnum,class com::sun::star::uno::Any &)
     enum xmloff::token::XMLTokenEnum eToken
     2136
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 370372aba454..42f4231addd7 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -185,7 +185,7 @@ protected:
     virtual void    FlushData();
     virtual void    SetSize(sal_uInt64 nSize);
 
-    void            FlushBuffer(bool isConsistent);
+    void            FlushBuffer();
     void            ClearError();
     void            ClearBuffer();
 
@@ -666,7 +666,7 @@ public:
 
     void            ObjectOwnsMemory( bool bOwn ) { bOwnsData = bOwn; }
     void            SetResizeOffset( std::size_t nNewResize ) { nResize = nNewResize; }
-    virtual sal_uInt64 TellEnd() override { FlushBuffer(true); return nEndOfData; }
+    virtual sal_uInt64 TellEnd() override { FlushBuffer(); return nEndOfData; }
 };
 
 #endif
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 7539048d18f6..8da3e4ec7a8a 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -247,8 +247,7 @@ public:
 
     void                CopyToClipboard( vcl::Window *pWindow ) const;
     void                CopyToSelection( vcl::Window *pWindow ) const;
-    void                StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions,
-                                   sal_Int32 nDragPointer = DND_POINTER_NONE );
+    void                StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions );
 
     static void         ClearSelection( vcl::Window *pWindow );
 
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 0cee2cb06130..649490e0f87f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -224,7 +224,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*)
 
 css::uno::Reference< css::accessibility::XAccessible > ThumbnailView::CreateAccessible()
 {
-    return new ThumbnailViewAcc( this, false );
+    return new ThumbnailViewAcc( this );
 }
 
 void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 532823332c1e..0198d2333889 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -34,10 +34,9 @@
 
 using namespace ::com::sun::star;
 
-ThumbnailViewAcc::ThumbnailViewAcc( ThumbnailView* pParent, bool bIsTransientChildrenDisabled ) :
+ThumbnailViewAcc::ThumbnailViewAcc( ThumbnailView* pParent ) :
     ValueSetAccComponentBase (m_aMutex),
     mpParent( pParent ),
-    mbIsTransientChildrenDisabled( bIsTransientChildrenDisabled ),
     mbIsFocused(false)
 {
 }
@@ -143,7 +142,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
     if( !pItem )
         throw lang::IndexOutOfBoundsException();
 
-    uno::Reference< accessibility::XAccessible >  xRet = pItem->GetAccessible( mbIsTransientChildrenDisabled );
+    uno::Reference< accessibility::XAccessible >  xRet = pItem->GetAccessible( /*bIsTransientChildrenDisabled*/false );
     return xRet;
 }
 
@@ -189,9 +188,7 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
     ThrowIfDisposed();
     // #i73746# As the Java Access Bridge (v 2.0.1) uses "managesDescendants"
     // always if the role is LIST, we need a different role in this case
-    return (mbIsTransientChildrenDisabled
-            ? accessibility::AccessibleRole::PANEL
-            : accessibility::AccessibleRole::LIST );
+    return accessibility::AccessibleRole::LIST;
 }
 
 OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
@@ -236,8 +233,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::
     pStateSet->AddState (accessibility::AccessibleStateType::SENSITIVE);
     pStateSet->AddState (accessibility::AccessibleStateType::SHOWING);
     pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE);
-    if ( !mbIsTransientChildrenDisabled )
-        pStateSet->AddState (accessibility::AccessibleStateType::MANAGES_DESCENDANTS);
+    pStateSet->AddState (accessibility::AccessibleStateType::MANAGES_DESCENDANTS);
     pStateSet->AddState (accessibility::AccessibleStateType::FOCUSABLE);
     if (mbIsFocused)
         pStateSet->AddState (accessibility::AccessibleStateType::FOCUSED);
@@ -325,7 +321,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
         if( THUMBNAILVIEW_ITEM_NONEITEM != nItemPos )
         {
             ThumbnailViewItem *const pItem = mpParent->mFilteredItemList[nItemPos];
-            xRet = pItem->GetAccessible( mbIsTransientChildrenDisabled );
+            xRet = pItem->GetAccessible( /*bIsTransientChildrenDisabled*/false );
         }
     }
 
@@ -469,7 +465,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelec
         ThumbnailViewItem* pItem = getItem(i);
 
         if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int32 >( nSel++ ) ) )
-            xRet = pItem->GetAccessible( mbIsTransientChildrenDisabled );
+            xRet = pItem->GetAccessible( /*bIsTransientChildrenDisabled*/false );
     }
 
     return xRet;
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 12015243635e..ecddba7efce0 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -54,7 +54,7 @@ class ThumbnailViewAcc :
 {
 public:
 
-    ThumbnailViewAcc( ThumbnailView* pParent, bool bIsTransientChildrenDisabled );
+    ThumbnailViewAcc( ThumbnailView* pParent );
     virtual ~ThumbnailViewAcc() override;
 
     void FireAccessibleEvent( short nEventId,
@@ -123,7 +123,6 @@ private:
     ::std::vector< css::uno::Reference<
         css::accessibility::XAccessibleEventListener > >   mxEventListeners;
     VclPtr<ThumbnailView>                                               mpParent;
-    bool const                                             mbIsTransientChildrenDisabled;
     /// The current FOCUSED state.
     bool mbIsFocused;
 
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index bc78bddbbe04..2325d261108d 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -185,7 +185,7 @@ sal_uInt64 SotStorageStream::TellEnd()
 {
     // Need to flush the buffer so we materialise the stream and return the correct answer
     // otherwise we return a 0 value from StgEntry::GetSize
-    FlushBuffer(true);
+    FlushBuffer();
 
     if (pOwnStm)
         return pOwnStm->GetSize();
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 17bd7ba2eeb0..c6667d66c1cc 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -73,13 +73,11 @@ namespace svt
 
     FileViewContentEnumerator::FileViewContentEnumerator(
             const Reference< XCommandEnvironment >& _rxCommandEnv,
-            ContentData& _rContentToFill, ::osl::Mutex& _rContentMutex,
-            const IContentTitleTranslation* _pTranslator )
+            ContentData& _rContentToFill, ::osl::Mutex& _rContentMutex )
         :Thread                  ( "FileViewContentEnumerator" )
         ,m_rContent              ( _rContentToFill )
         ,m_rContentMutex         ( _rContentMutex  )
         ,m_xCommandEnv           ( _rxCommandEnv   )
-        ,m_pTranslator           ( _pTranslator    )
         ,m_pResultHandler        ( nullptr            )
         ,m_bCancelled            ( false           )
         ,m_rBlackList            ( css::uno::Sequence< OUString >() )
@@ -97,7 +95,6 @@ namespace svt
         ::osl::MutexGuard aGuard( m_aMutex );
         m_bCancelled = true;
         m_pResultHandler = nullptr;
-        m_pTranslator = nullptr;
         m_aFolder.aContent = ::ucbhelper::Content();
         m_aFolder.sURL.clear();
     }
@@ -267,24 +264,6 @@ namespace svt
                                 pData->maType = SvFileInformationManager::GetFileDescription(
                                     INetURLObject( pData->maTargetURL ) );
 
-                            // replace names on demand
-                            {
-                                ::osl::MutexGuard aGuard( m_aMutex );
-                                if( m_pTranslator )
-                                {
-                                    OUString sNewTitle;
-                                    bool bTranslated = false;
-
-                                    if ( pData->mbIsFolder )
-                                        bTranslated = m_pTranslator->GetTranslation( pData->GetTitle(), sNewTitle );
-                                    else
-                                        bTranslated = implGetDocTitle( pData->maTargetURL, sNewTitle );
-
-                                    if ( bTranslated )
-                                        pData->ChangeTitle( sNewTitle );
-                                }
-                            }
-
                             {
                                 ::osl::MutexGuard aGuard( m_rContentMutex );
                                 m_rContent.push_back( std::move(pData) );
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index e43e42de2e00..201f6012a2df 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -188,7 +188,6 @@ namespace svt
         FolderDescriptor                m_aFolder;
         css::uno::Reference< css::ucb::XCommandEnvironment >
                                         m_xCommandEnv;
-        const IContentTitleTranslation* m_pTranslator;
         IEnumerationResultHandler*      m_pResultHandler;
         bool                            m_bCancelled;
 
@@ -212,8 +211,7 @@ namespace svt
         FileViewContentEnumerator(
             const css::uno::Reference< css::ucb::XCommandEnvironment >& _rxCommandEnv,
             ContentData& _rContentToFill,
-            ::osl::Mutex& _rContentMutex,
-            const IContentTitleTranslation* _pTranslator
+            ::osl::Mutex& _rContentMutex
         );
 
         /** enumerates the content of a given folder
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index d5421ca47222..2c69ef1dd2c7 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1358,7 +1358,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
 
     OSL_ENSURE( !m_xContentEnumerator.is(), "SvtFileView_Impl::GetFolderContent_Impl: still running another enumeration!" );
     m_xContentEnumerator.set(new ::svt::FileViewContentEnumerator(
-        mpView->GetCommandEnvironment(), maContent, maMutex, nullptr));
+        mpView->GetCommandEnvironment(), maContent, maMutex));
         // TODO: should we cache and re-use this thread?
 
     if ( !pAsyncDescriptor )
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index 438b764ac949..b5bf64dcd859 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -57,7 +57,7 @@ void FolderTree::FillTreeEntry( SvTreeListEntry* pEntry )
 
         ::rtl::Reference< ::svt::FileViewContentEnumerator >
             xContentEnumerator(new FileViewContentEnumerator(
-            m_xEnv, aContent, m_aMutex, nullptr));
+            m_xEnv, aContent, m_aMutex));
 
         FolderDescriptor aFolder( *pURL );
 
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index ea9f533b3af3..b00c0d024c86 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1211,9 +1211,9 @@ SvStream& SvStream::WriteUniOrByteString( const OUString& rStr, rtl_TextEncoding
     return *this;
 }
 
-void SvStream::FlushBuffer(bool isConsistent)
+void SvStream::FlushBuffer()
 {
-    if (m_isDirty && isConsistent) // Does stream require a flush?
+    if (m_isDirty) // Does stream require a flush?
     {
         SeekPos(m_nBufFilePos);
         if (m_nCryptMask)
@@ -1251,7 +1251,7 @@ std::size_t SvStream::ReadBytes( void* pData, std::size_t nCount )
         }
         else
         {
-            FlushBuffer(true);
+            FlushBuffer();
 
             // Does data block fit into buffer?
             if (nCount > m_nBufSize)
@@ -1338,7 +1338,7 @@ std::size_t SvStream::WriteBytes( const void* pData, std::size_t nCount )
     }
     else
     {
-        FlushBuffer(true);
+        FlushBuffer();
 
         // Does data block fit into buffer?
         if (nCount > m_nBufSize)
@@ -1393,7 +1393,7 @@ sal_uInt64 SvStream::Seek(sal_uInt64 const nFilePos)
     }
     else
     {
-        FlushBuffer(true);
+        FlushBuffer();
         m_nBufActualLen = 0;
         m_nBufActualPos = 0;
         m_pBufPos     = m_pRWBuf.get();
@@ -1422,7 +1422,7 @@ sal_uInt64 SvStream::remainingSize()
 
 sal_uInt64 SvStream::TellEnd()
 {
-    FlushBuffer(true);
+    FlushBuffer();
     sal_uInt64 const nCurr = Tell();
     sal_uInt64 const nEnd = Seek(STREAM_SEEK_TO_END);
     Seek(nCurr);
@@ -1431,14 +1431,14 @@ sal_uInt64 SvStream::TellEnd()
 
 void SvStream::Flush()
 {
-    FlushBuffer(true);
+    FlushBuffer();
     if (m_isWritable)
         FlushData();
 }
 
 void SvStream::RefreshBuffer()
 {
-    FlushBuffer(true);
+    FlushBuffer();
     SeekPos(m_nBufFilePos);
     m_nBufActualLen = static_cast<sal_uInt16>(GetData( m_pRWBuf.get(), m_nBufSize ));
     if (m_nBufActualLen && m_nError == ERRCODE_IO_PENDING)
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 28fe43fda5f3..4d6ef1f9b1cf 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -952,8 +952,7 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const
 }
 
 
-void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions,
-                                    sal_Int32 nDnDPointer )
+void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions )
 
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
@@ -987,7 +986,7 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct
         aEvt.DragOriginY = aPt.Y();
         aEvt.DragSource = xDragSource;
 
-        xDragSource->startDrag( aEvt, nDnDSourceActions, nDnDPointer, DND_IMAGE_NONE, this, this );
+        xDragSource->startDrag( aEvt, nDnDSourceActions, DND_POINTER_NONE, DND_IMAGE_NONE, this, this );
     }
     catch( const css::uno::Exception& )
     {