compilerplugins/clang/constantparam.bitmask.results      |    8 
 compilerplugins/clang/constantparam.booleans.results     |  194 +++++++--------
 compilerplugins/clang/constantparam.constructors.results |   30 +-
 compilerplugins/clang/constantparam.numbers.results      |  118 ++++-----
 include/vcl/vcllayout.hxx                                |    3 
 vcl/inc/listbox.hxx                                      |    2 
 vcl/inc/sallayout.hxx                                    |    6 
 vcl/source/control/combobox.cxx                          |    2 
 vcl/source/control/imp_listbox.cxx                       |    6 
 vcl/source/gdi/sallayout.cxx                             |    9 
 10 files changed, 181 insertions(+), 197 deletions(-)

New commits:
commit d86d7829978b325b03450eec6e83f6e1935c90ab
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 25 14:09:40 2020 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 25 16:03:11 2020 +0200

    loplugin:constantparam
    
    Change-Id: I8961b5df1b3a7ea9b7dd83114fce1555b9e4ffcc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94787
    Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/compilerplugins/clang/constantparam.bitmask.results 
b/compilerplugins/clang/constantparam.bitmask.results
index b6bf1c85253a..b353a253c529 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -31,16 +31,16 @@ sc/inc/rangeutl.hxx:162
 sc/inc/xmlwrap.hxx:90
     _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
     enum ImportFlags nMode setBits=0x1
-sc/source/ui/view/cellsh1.cxx:104
+sc/source/ui/view/cellsh1.cxx:103
     enum InsertDeleteFlags FlagsFromString(const class rtl::OUString &,enum 
InsertDeleteFlags)
     enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
-sc/source/ui/view/cellsh1.cxx:127
+sc/source/ui/view/cellsh1.cxx:126
     class rtl::OUString FlagsToString(enum InsertDeleteFlags,enum 
InsertDeleteFlags)
     enum InsertDeleteFlags nFlagsMask setBits=0x87f clearBits=0x700
 sw/source/core/view/viewsh.cxx:717
     void lcl_InvalidateAllContent(class SwViewShell &,enum SwInvalidateFlags)
     enum SwInvalidateFlags nInv setBits=0x2
-sw/source/filter/html/swhtml.hxx:673
+sw/source/filter/html/swhtml.hxx:678
     void SwHTMLParser::SetFrameFormatAttrs(class SfxItemSet &,enum 
HtmlFrameFormatFlags,class SfxItemSet &)
     enum HtmlFrameFormatFlags nFlags setBits=0x1
 sw/source/filter/ww8/wrtw8esh.cxx:1545
@@ -51,4 +51,4 @@ xmloff/inc/MetaExportComponent.hxx:32
     enum SvXMLExportFlags nFlags setBits=0x1
 xmloff/source/text/XMLAutoTextEventExport.hxx:51
     void XMLAutoTextEventExport::XMLAutoTextEventExport(const class 
com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> 
&,const class rtl::OUString &,enum SvXMLExportFlags)
-    enum SvXMLExportFlags nFlags setBits=0xdff clearBits=0x200
+    enum SvXMLExportFlags nFlags setBits=0x5ff clearBits=0x200
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index 5d14198e626a..29bc07bf4bd3 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -92,11 +92,11 @@ chart2/qa/extras/charttest.hxx:279
     0
 chart2/qa/extras/charttest.hxx:299
     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:299
     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:309
     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)
@@ -386,7 +386,7 @@ desktop/source/deployment/gui/dp_gui_updatedialog.hxx:103
     void dp_gui::UpdateDialog::addAdditional(struct 
dp_gui::UpdateDialog::Index *,_Bool)
     _Bool bEnableCheckBox
     0
-desktop/source/lib/init.cxx:6101
+desktop/source/lib/init.cxx:6105
     struct _LibreOfficeKit * libreofficekit_hook_2(const char *,const char *)
     const char * user_profile_url
     0
@@ -510,11 +510,11 @@ filter/source/graphicfilter/icgm/cgm.hxx:89
     unsigned char CGM::ImplGetByte(unsigned int,unsigned int)
     unsigned int nPrecision
     1
-filter/source/svg/svgfilter.hxx:240
+filter/source/svg/svgfilter.hxx:239
     _Bool SVGFilter::implExportMasterPages(const class 
std::__debug::vector<class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XDrawPage>, class std::allocator<class 
com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage> > > 
&,int,int)
     int nFirstPage
     0
-filter/source/svg/svgfilter.hxx:242
+filter/source/svg/svgfilter.hxx:241
     void SVGFilter::implExportDrawPages(const class std::__debug::vector<class 
com::sun::star::uno::Reference<class com::sun::star::drawing::XDrawPage>, class 
std::allocator<class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XDrawPage> > > &,int,int)
     int nFirstPage
     0
@@ -1056,11 +1056,11 @@ include/sot/stg.hxx:158
     1
 include/sot/stg.hxx:250
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class 
rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    enum StreamMode nMode
+    _Bool bIsRoot
     1
 include/sot/stg.hxx:250
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class 
rtl::OUString &,enum StreamMode,_Bool,_Bool)
-    _Bool bIsRoot
+    enum StreamMode nMode
     1
 include/sot/stg.hxx:250
     void UCBStorage::UCBStorage(const class ucbhelper::Content &,const class 
rtl::OUString &,enum StreamMode,_Bool,_Bool)
@@ -1378,14 +1378,14 @@ include/test/text/textcontent.hxx:25
     void apitest::TextContent::TextContent(const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::WrapTextMode,const enum 
com::sun::star::text::WrapTextMode)
     const enum com::sun::star::text::TextContentAnchorType aExpectedTCAT
     1
-include/test/text/textcontent.hxx:25
-    void apitest::TextContent::TextContent(const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::WrapTextMode,const enum 
com::sun::star::text::WrapTextMode)
-    const enum com::sun::star::text::TextContentAnchorType aNewTCAT
-    1
 include/test/text/textcontent.hxx:25
     void apitest::TextContent::TextContent(const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::WrapTextMode,const enum 
com::sun::star::text::WrapTextMode)
     const enum com::sun::star::text::WrapTextMode aExpectedWTM
     0
+include/test/text/textcontent.hxx:25
+    void apitest::TextContent::TextContent(const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::WrapTextMode,const enum 
com::sun::star::text::WrapTextMode)
+    const enum com::sun::star::text::TextContentAnchorType aNewTCAT
+    1
 include/test/text/textcontent.hxx:25
     void apitest::TextContent::TextContent(const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::TextContentAnchorType,const enum 
com::sun::star::text::WrapTextMode,const enum 
com::sun::star::text::WrapTextMode)
     const enum com::sun::star::text::WrapTextMode aNewWTM
@@ -1538,18 +1538,6 @@ include/vcl/BitmapBasicMorphologyFilter.hxx:46
     void BitmapErodeFilter::BitmapErodeFilter(int)
     int nRadius
     1
-include/vcl/combobox.hxx:100
-    void ComboBox::EnableUserDraw(_Bool)
-    _Bool bUserDraw
-    1
-include/vcl/combobox.hxx:102
-    void ComboBox::DrawEntry(const class UserDrawEvent &,_Bool,_Bool)
-    _Bool bDrawText
-    0
-include/vcl/combobox.hxx:102
-    void ComboBox::DrawEntry(const class UserDrawEvent &,_Bool,_Bool)
-    _Bool bDrawTextAtImagePos
-    0
 include/vcl/dibtools.hxx:40
     _Bool ReadDIB(class Bitmap &,class SvStream &,_Bool,_Bool)
     _Bool bMSOFormat
@@ -1638,7 +1626,7 @@ include/vcl/outdev.hxx:1224
     void OutputDevice::RefreshFontData(const _Bool)
     const _Bool bNewFontLists
     1
-include/vcl/outdev.hxx:1365
+include/vcl/outdev.hxx:1352
     _Bool OutputDevice::GetTextIsRTL(const class rtl::OUString &,int,int) const
     int nIndex
     0
@@ -1698,10 +1686,10 @@ include/vcl/toolbox.hxx:443
     void ToolBox::EnableCustomize(_Bool)
     _Bool bEnable
     1
-include/vcl/treelistbox.hxx:648
-    void SvTreeListBox::SetEntryHeight(short,_Bool)
-    _Bool bForce
-    0
+include/vcl/toolkit/combobox.hxx:104
+    void ComboBox::EnableUserDraw(_Bool)
+    _Bool bUserDraw
+    1
 include/vcl/treelistbox.hxx:656
     void SvTreeListBox::MakeVisible(class SvTreeListEntry *,_Bool)
     _Bool bMoveToTop
@@ -1714,6 +1702,10 @@ include/vcl/treelistbox.hxx:692
     void SvTreeListBox::SetHighlightRange(unsigned short,unsigned short)
     unsigned short nFirstTab
     0
+include/vcl/vcllayout.hxx:91
+    _Bool SalLayout::GetNextGlyph(const class GlyphItem **,class Point &,int 
&,const class PhysicalFontFace **,int *const) const
+    int *const pFallbackLevel
+    0
 include/vcl/vclptr.hxx:43
     _Bool isIncompleteOrDerivedFromVclReferenceBase(int (*)[sizeof(T)])
     int (*)[sizeof(T)] 
@@ -1742,155 +1734,155 @@ include/vcl/vectorgraphicdata.hxx:90
     void VectorGraphicData::VectorGraphicData(const class rtl::OUString &,enum 
VectorGraphicDataType)
     enum VectorGraphicDataType eVectorDataType
     0
-include/vcl/weld.hxx:318
+include/vcl/weld.hxx:321
     void weld::ScrolledWindow::hadjustment_configure(int,int,int,int,int,int)
     int step_increment
     1
-include/vcl/weld.hxx:337
+include/vcl/weld.hxx:340
     void weld::ScrolledWindow::vadjustment_configure(int,int,int,int,int,int)
     int lower
     0
-include/vcl/weld.hxx:349
+include/vcl/weld.hxx:352
     void weld::ScrolledWindow::vadjustment_set_lower(int)
     int upper
     0
-include/vcl/weld.hxx:937
+include/vcl/weld.hxx:938
     _Bool weld::TreeView::get_text_emphasis(int,int) const
     int col
     0
-include/vcl/weld.hxx:938
+include/vcl/weld.hxx:939
     void weld::TreeView::set_text_align(int,double,int)
     int col
     0
-include/vcl/weld.hxx:1156
+include/vcl/weld.hxx:1157
     void weld::TreeView::set_column_custom_renderer(int,_Bool)
     int nColumn
     0
-include/vcl/weld.hxx:1216
+include/vcl/weld.hxx:1217
     class std::unique_ptr<class weld::TreeIter, struct 
std::default_delete<class weld::TreeIter> > weld::IconView::make_iterator(const 
class weld::TreeIter *) const
     const class weld::TreeIter * pOrig
     0
-include/vcl/weld.hxx:2192
+include/vcl/weld.hxx:2193
     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:2195
+include/vcl/weld.hxx:2196
     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:2196
+include/vcl/weld.hxx:2197
     class std::unique_ptr<class weld::Assistant, struct 
std::default_delete<class weld::Assistant> > 
weld::Builder::weld_assistant(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     1
-include/vcl/weld.hxx:2199
+include/vcl/weld.hxx:2200
     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:2200
+include/vcl/weld.hxx:2201
     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:2203
+include/vcl/weld.hxx:2204
     class std::unique_ptr<class weld::Box, struct std::default_delete<class 
weld::Box> > weld::Builder::weld_box(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2204
+include/vcl/weld.hxx:2205
     class std::unique_ptr<class weld::Paned, struct std::default_delete<class 
weld::Paned> > weld::Builder::weld_paned(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2205
+include/vcl/weld.hxx:2206
     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:2206
+include/vcl/weld.hxx:2207
     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:2210
+include/vcl/weld.hxx:2211
     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:2213
+include/vcl/weld.hxx:2214
     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:2218
+include/vcl/weld.hxx:2219
     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:2221
+include/vcl/weld.hxx:2222
     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:2224
+include/vcl/weld.hxx:2225
     class std::unique_ptr<class weld::LinkButton, struct 
std::default_delete<class weld::LinkButton> > 
weld::Builder::weld_link_button(const class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2231
+include/vcl/weld.hxx:2232
     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:2233
+include/vcl/weld.hxx:2234
     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:2235
+include/vcl/weld.hxx:2236
     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:2237
+include/vcl/weld.hxx:2238
     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:2241
+include/vcl/weld.hxx:2242
     class std::unique_ptr<class weld::IconView, struct 
std::default_delete<class weld::IconView> > weld::Builder::weld_icon_view(const 
class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2243
+include/vcl/weld.hxx:2244
     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:2244
+include/vcl/weld.hxx:2245
     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:2246
+include/vcl/weld.hxx:2247
     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:2249
+include/vcl/weld.hxx:2250
     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:2250
+include/vcl/weld.hxx:2251
     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:2253
+include/vcl/weld.hxx:2254
     class std::unique_ptr<class weld::Spinner, struct 
std::default_delete<class weld::Spinner> > weld::Builder::weld_spinner(const 
class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2255
+include/vcl/weld.hxx:2256
     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:2256
+include/vcl/weld.hxx:2257
     class std::unique_ptr<class weld::Calendar, struct 
std::default_delete<class weld::Calendar> > weld::Builder::weld_calendar(const 
class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
-include/vcl/weld.hxx:2259
+include/vcl/weld.hxx:2260
     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:2264
+include/vcl/weld.hxx:2265
     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:2267
+include/vcl/weld.hxx:2268
     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/weld.hxx:2268
+include/vcl/weld.hxx:2269
     class std::unique_ptr<class weld::Toolbar, struct 
std::default_delete<class weld::Toolbar> > weld::Builder::weld_toolbar(const 
class rtl::OString &,_Bool)
     _Bool bTakeOwnership
     0
@@ -1898,10 +1890,6 @@ include/vcl/window.hxx:607
     void vcl::Window::ImplSetMouseTransparent(_Bool)
     _Bool bTransparent
     1
-include/vcl/window.hxx:720
-    class tools::Rectangle vcl::Window::ImplGetWindowExtentsRelative(class 
vcl::Window *,_Bool) const
-    _Bool bClientOnly
-    0
 include/xmloff/numehelp.hxx:92
     void 
XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(class 
SvXMLExport &,const class rtl::OUString &,const class rtl::OUString 
&,_Bool,_Bool)
     _Bool bExportTypeAttribute
@@ -2678,7 +2666,7 @@ sc/qa/unit/subsequent_export-test.cxx:1411
     void setEscapement(class ScFieldEditEngine &,int,int,int,short,unsigned 
char)
     int nPara
     0
-sc/qa/unit/ucalc.hxx:49
+sc/qa/unit/ucalc.hxx:51
     void Test::clearSheet(class ScDocument *,short)
     short nTab
     0
@@ -2828,11 +2816,11 @@ sc/source/filter/inc/xechart.hxx:338
     1
 sc/source/filter/inc/xechart.hxx:366
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
-    _Bool bAutoPos
+    _Bool bAutoSize
     0
 sc/source/filter/inc/xechart.hxx:366
     void XclExpChFrame::SetAutoFlags(_Bool,_Bool)
-    _Bool bAutoSize
+    _Bool bAutoPos
     0
 sc/source/filter/inc/xeextlst.hxx:200
     class XclExpExt * XclExtLst::GetItem(enum XclExpExtType)
@@ -2890,11 +2878,11 @@ sc/source/filter/inc/xestyle.hxx:231
     unsigned short XclExpFontBuffer::Insert(const class SfxItemSet 
&,short,enum XclExpColorType,_Bool)
     enum XclExpColorType eColorType
     0
-sc/source/filter/inc/xetable.hxx:334
+sc/source/filter/inc/xetable.hxx:333
     void XclExpSingleCellBase::XclExpSingleCellBase(unsigned short,unsigned 
long,const struct XclAddress &,unsigned int)
     unsigned long nContSize
     0
-sc/source/filter/inc/xetable.hxx:337
+sc/source/filter/inc/xetable.hxx:336
     void XclExpSingleCellBase::XclExpSingleCellBase(const class XclExpRoot 
&,unsigned short,unsigned long,const struct XclAddress &,const class 
ScPatternAttr *,short,unsigned int)
     short nScript
     1
@@ -3058,6 +3046,10 @@ sc/source/ui/inc/spellparam.hxx:37
     void ScConversionParam::ScConversionParam(enum ScConversionType)
     enum ScConversionType eConvType
     0
+sc/source/ui/inc/spellparam.hxx:40
+    void ScConversionParam::ScConversionParam(enum ScConversionType,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
+    int nOptions
+    0
 sc/source/ui/inc/spellparam.hxx:40
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     _Bool bIsInteractive
@@ -3066,10 +3058,6 @@ sc/source/ui/inc/spellparam.hxx:40
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
     enum ScConversionType eConvType
     1
-sc/source/ui/inc/spellparam.hxx:40
-    void ScConversionParam::ScConversionParam(enum ScConversionType,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,int,_Bool)
-    int nOptions
-    0
 sc/source/ui/inc/spellparam.hxx:47
     void ScConversionParam::ScConversionParam(enum ScConversionType,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,struct 
o3tl::strong_int<unsigned short, struct LanguageTypeTag>,const class vcl::Font 
&,int,_Bool)
     _Bool bIsInteractive
@@ -3104,11 +3092,11 @@ sc/source/ui/inc/undoblk.hxx:323
     0
 sc/source/ui/inc/undoblk.hxx:323
     void ScUndoSelectionAttr::ScUndoSelectionAttr(class ScDocShell *,const 
class ScMarkData &,short,int,short,short,int,short,class std::unique_ptr<class 
ScDocument, struct o3tl::default_delete<class ScDocument> >,_Bool,const class 
ScPatternAttr *,const class SvxBoxItem *,const class SvxBoxInfoItem *,const 
class ScRange *)
-    const class ScRange * pRangeCover
+    const class SvxBoxItem * pNewOuter
     0
 sc/source/ui/inc/undoblk.hxx:323
     void ScUndoSelectionAttr::ScUndoSelectionAttr(class ScDocShell *,const 
class ScMarkData &,short,int,short,short,int,short,class std::unique_ptr<class 
ScDocument, struct o3tl::default_delete<class ScDocument> >,_Bool,const class 
ScPatternAttr *,const class SvxBoxItem *,const class SvxBoxInfoItem *,const 
class ScRange *)
-    const class SvxBoxItem * pNewOuter
+    const class ScRange * pRangeCover
     0
 sc/source/ui/inc/undotab.hxx:120
     void ScUndoRenameTab::ScUndoRenameTab(class ScDocShell *,short,const class 
rtl::OUString &,const class rtl::OUString &)
@@ -3258,14 +3246,14 @@ sd/source/ui/inc/DrawDocShell.hxx:64
     void sd::DrawDocShell::DrawDocShell(enum SfxModelFlags,_Bool,enum 
DocumentType)
     _Bool bSdDataObj
     0
-sd/source/ui/inc/DrawDocShell.hxx:69
-    void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum 
SfxObjectCreateMode,_Bool,enum DocumentType)
-    _Bool bSdDataObj
-    1
 sd/source/ui/inc/DrawDocShell.hxx:69
     void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum 
SfxObjectCreateMode,_Bool,enum DocumentType)
     enum SfxObjectCreateMode eMode
     0
+sd/source/ui/inc/DrawDocShell.hxx:69
+    void sd::DrawDocShell::DrawDocShell(class SdDrawDocument *,enum 
SfxObjectCreateMode,_Bool,enum DocumentType)
+    _Bool bSdDataObj
+    1
 sd/source/ui/inc/DrawViewShell.hxx:90
     void sd::DrawViewShell::DrawViewShell(class sd::ViewShellBase &,class 
vcl::Window *,enum PageKind,class sd::FrameView *)
     enum PageKind ePageKind
@@ -3674,7 +3662,7 @@ sw/inc/shellio.hxx:526
     void SwWriter::SwWriter(class SfxMedium &,class SwCursorShell &,_Bool)
     _Bool bWriteAll
     1
-sw/inc/swabstdlg.hxx:293
+sw/inc/swabstdlg.hxx:295
     void AbstractSwSelGlossaryDlg::SelectEntryPos(int)
     int nIdx
     0
@@ -3802,7 +3790,7 @@ sw/source/filter/html/htmltab.cxx:501
     class SwTableLine * HTMLTable::MakeTableLine(class SwTableBox *,unsigned 
short,unsigned short,unsigned short,unsigned short)
     unsigned short nLeftCol
     0
-sw/source/filter/html/swhtml.hxx:818
+sw/source/filter/html/swhtml.hxx:823
     void SwHTMLParser::BuildTableCell(class HTMLTable *,_Bool,_Bool)
     _Bool bReadOptions
     1
@@ -3854,7 +3842,7 @@ sw/source/filter/ww8/ww8par.cxx:438
     class rtl::OUString (anonymous namespace)::Sttb::getStringAtIndex(unsigned 
int)
     unsigned int 
     1
-sw/source/filter/ww8/ww8par.hxx:1685
+sw/source/filter/ww8/ww8par.hxx:1684
     _Bool SwWW8ImplReader::SetUpperSpacing(class SwPaM &,int)
     int nSpace
     0
@@ -3878,7 +3866,7 @@ sw/source/filter/ww8/WW8TableInfo.hxx:303
     class ww8::WW8TableNodeInfo * ww8::WW8TableInfo::processTableLine(const 
class SwTable *,const class SwTableLine *,unsigned int,unsigned int,class 
ww8::WW8TableNodeInfo *,class std::__debug::map<unsigned int, class 
ww8::WW8TableNodeInfoInner *, struct std::greater<unsigned int>, class 
std::allocator<struct std::pair<const unsigned int, class 
ww8::WW8TableNodeInfoInner *> > > &)
     unsigned int nDepth
     1
-sw/source/filter/xml/xmlfmt.cxx:403
+sw/source/filter/xml/xmlfmt.cxx:405
     void (anonymous 
namespace)::SwXMLCellStyleContext::XMLPropStyleContext(class SvXMLImport 
&,unsigned short,const class rtl::OUString &,const class 
com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> 
&,class SvXMLStylesContext &,enum XmlStyleFamily,_Bool)
     _Bool 
     0
@@ -3886,7 +3874,7 @@ sw/source/ui/misc/impfnote.hxx:64
     void SwEndNoteOptionPage::SwEndNoteOptionPage(class weld::Container 
*,class weld::DialogController *,_Bool,const class SfxItemSet &)
     _Bool bEndNote
     0
-sw/source/ui/table/instable.cxx:168
+sw/source/ui/table/instable.cxx:173
     void lcl_SetProperties(class SwTableAutoFormat *,_Bool)
     _Bool bVal
     0
@@ -4022,6 +4010,10 @@ vcl/inc/listbox.hxx:143
     class rtl::OUString ImplEntryList::GetSelectedEntry(int) const
     int nIndex
     0
+vcl/inc/listbox.hxx:278
+    void ImplListBoxWindow::DrawEntry(class OutputDevice 
&,int,_Bool,_Bool,_Bool)
+    _Bool bDrawTextAtImagePos
+    0
 vcl/inc/listbox.hxx:336
     void ImplListBoxWindow::EnableMouseMoveSelect(_Bool)
     _Bool bMouseMoveSelect
@@ -4078,11 +4070,11 @@ vcl/inc/qt5/Qt5Widget.hxx:47
     _Bool Qt5Widget::handleKeyEvent(class Qt5Frame &,const class QWidget 
&,class QKeyEvent *,const enum Qt5Widget::ButtonKeyState)
     const enum Qt5Widget::ButtonKeyState 
     1
-vcl/inc/salgdi.hxx:134
+vcl/inc/salgdi.hxx:130
     void SalGraphics::GetFontMetric(class tools::SvRef<class 
ImplFontMetricData> &,int)
     int nFallbackLevel
     0
-vcl/inc/salgdi.hxx:503
+vcl/inc/salgdi.hxx:497
     void SalGraphics::copyArea(long,long,long,long,long,long,_Bool)
     _Bool bWindowInvalidate
     1
@@ -4128,15 +4120,15 @@ vcl/inc/unx/gtk/glomenu.h:49
     0
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:41
     void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void 
(*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void 
*)) const
-    void * user_data
+    void (*)(void *) dnotify
     0
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:41
     void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void 
(*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void 
*)) const
-    void (*)(struct _GtkPrintJob *, void *, const struct _GError *) callback
+    void * user_data
     0
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:41
     void vcl::unx::GtkPrintWrapper::print_job_send(struct _GtkPrintJob *,void 
(*)(struct _GtkPrintJob *, void *, const struct _GError *),void *,void (*)(void 
*)) const
-    void (*)(void *) dnotify
+    void (*)(struct _GtkPrintJob *, void *, const struct _GError *) callback
     0
 vcl/inc/unx/gtk/gtkprintwrapper.hxx:60
     void 
vcl::unx::GtkPrintWrapper::print_unix_dialog_set_support_selection(struct 
_GtkPrintUnixDialog *,int) const
@@ -4210,11 +4202,11 @@ vcl/qa/cppunit/BitmapTest.cxx:68
     void assertColorsAreSimilar(int,const class 
std::__cxx11::basic_string<char, struct std::char_traits<char>, class 
std::allocator<char> > &,const class BitmapColor &,const class BitmapColor &)
     int maxDifference
     1
-vcl/source/app/salvtables.cxx:1645
+vcl/source/app/salvtables.cxx:1654
     void (anonymous 
namespace)::SalInstanceAssistant::SalInstanceAssistant(class vcl::RoadmapWizard 
*,class SalInstanceBuilder *,_Bool)
     _Bool bTakeOwnership
     0
-vcl/source/app/salvtables.cxx:1844
+vcl/source/app/salvtables.cxx:1853
     void (anonymous namespace)::SalInstanceFrame::SalInstanceFrame(class 
VclFrame *,class SalInstanceBuilder *,_Bool)
     _Bool bTakeOwnership
     0
@@ -4294,19 +4286,19 @@ vcl/unx/generic/print/psputil.hxx:46
     _Bool WritePS(class osl::File *,const char *,unsigned long)
     unsigned long nInLength
     1
-vcl/unx/gtk3/gtk3gtkinst.cxx:4719
+vcl/unx/gtk3/gtk3gtkinst.cxx:4763
     void (anonymous 
namespace)::GtkInstanceMessageDialog::GtkInstanceMessageDialog(struct 
_GtkMessageDialog *,class (anonymous namespace)::GtkInstanceBuilder *,_Bool)
     _Bool bTakeOwnership
     1
-vcl/unx/gtk3/gtk3gtkinst.cxx:4719
+vcl/unx/gtk3/gtk3gtkinst.cxx:4763
     void (anonymous 
namespace)::GtkInstanceMessageDialog::GtkInstanceMessageDialog(struct 
_GtkMessageDialog *,class (anonymous namespace)::GtkInstanceBuilder *,_Bool)
     class (anonymous namespace)::GtkInstanceBuilder * pBuilder
     0
-vcl/unx/gtk3/gtk3gtkinst.cxx:11058
+vcl/unx/gtk3/gtk3gtkinst.cxx:11102
     int (anonymous namespace)::GtkInstanceTreeView::starts_with(const class 
rtl::OUString &,int,int,_Bool)
     int col
     0
-vcl/unx/gtk3/gtk3gtkinst.cxx:13565
+vcl/unx/gtk3/gtk3gtkinst.cxx:13609
     int (anonymous 
namespace)::GtkInstanceComboBox::find_text_including_mru(const class 
rtl::OUString &,_Bool) const
     _Bool bSearchMRU
     0
diff --git a/compilerplugins/clang/constantparam.constructors.results 
b/compilerplugins/clang/constantparam.constructors.results
index f3eae19a55db..cd6915746dd9 100644
--- a/compilerplugins/clang/constantparam.constructors.results
+++ b/compilerplugins/clang/constantparam.constructors.results
@@ -158,7 +158,7 @@ editeng/source/editeng/impedit3.cxx:154
     void lcl_DrawRedLines(class OutputDevice *,long,const class Point 
&,unsigned long,unsigned long,const long *,const class WrongList *,short,const 
class Point &,_Bool,_Bool)
     _Bool bVertical
     IsVertical()
-editeng/source/misc/svxacorr.cxx:2667
+editeng/source/misc/svxacorr.cxx:2666
     _Bool SvxAutocorrWordList::CompareSvxAutocorrWordList::operator()(const 
class SvxAutocorrWord &,const class SvxAutocorrWord &) const
     const class SvxAutocorrWord & lhs
     CompareSvxAutocorrWordList()
@@ -208,11 +208,11 @@ extensions/source/propctrlr/formlinkdialog.hxx:65
     ""
 extensions/source/propctrlr/formlinkdialog.hxx:65
     void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class 
com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> 
&,const class com::sun::star::uno::Reference<class 
com::sun::star::beans::XPropertySet> &,const class 
com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> 
&,const class rtl::OUString &,const class rtl::OUString &,const class 
rtl::OUString &)
-    const class rtl::OUString & _sExplanation
+    const class rtl::OUString & _sDetailLabel
     ""
 extensions/source/propctrlr/formlinkdialog.hxx:65
     void pcr::FormLinkDialog::FormLinkDialog(class weld::Window *,const class 
com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> 
&,const class com::sun::star::uno::Reference<class 
com::sun::star::beans::XPropertySet> &,const class 
com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> 
&,const class rtl::OUString &,const class rtl::OUString &,const class 
rtl::OUString &)
-    const class rtl::OUString & _sDetailLabel
+    const class rtl::OUString & _sExplanation
     ""
 extensions/source/propctrlr/listselectiondlg.hxx:38
     void pcr::ListSelectionDialog::ListSelectionDialog(class weld::Window 
*,const class com::sun::star::uno::Reference<class 
com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class 
rtl::OUString &)
@@ -486,23 +486,23 @@ include/vcl/graphictools.hxx:278
     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:1578
+include/vcl/outdev.hxx:1565
     class Bitmap OutputDevice::GetDownsampledBitmap(const class Size &,const 
class Point &,const class Size &,const class Bitmap &,long,long)
     const class Point & rSrcPt
     Point()
-include/vcl/print.hxx:650
+include/vcl/print.hxx:652
     class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setSubgroupControlOpt(const class rtl::OUString 
&,const class rtl::OUString &,const class rtl::OUString &,const struct 
vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rHelpId
     ""
-include/vcl/print.hxx:666
+include/vcl/print.hxx:668
     class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(const class 
com::sun::star::uno::Sequence<class rtl::OUString> &,const class rtl::OUString 
&,const class com::sun::star::uno::Sequence<class rtl::OUString> &,const class 
rtl::OUString &,const class com::sun::star::uno::Sequence<class rtl::OUString> 
&,int,const class com::sun::star::uno::Sequence<unsigned char> &,const struct 
vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:677
+include/vcl/print.hxx:679
     class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const 
class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString 
&,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
-include/vcl/print.hxx:685
+include/vcl/print.hxx:687
     class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setEditControlOpt(const class rtl::OUString &,const 
class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString 
&,const class rtl::OUString &,const struct 
vcl::PrinterOptionsHelper::UIControlOptions &)
     const class rtl::OUString & i_rTitle
     ""
@@ -530,11 +530,11 @@ include/vcl/virdev.hxx:162
     _Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(const class 
Size &,const class Fraction &,const class Point &,unsigned char *)
     const class Point & rNewOffset
     Point()
-include/vcl/weld.hxx:575
+include/vcl/weld.hxx:576
     void weld::ComboBoxEntry::ComboBoxEntry(const class rtl::OUString &)
     const class rtl::OUString & rString
     ""
-include/vcl/weld.hxx:652
+include/vcl/weld.hxx:653
     void weld::ComboBox::append(const class rtl::OUString &,const class 
rtl::OUString &,class VirtualDevice &)
     const class rtl::OUString & rId
     ""
@@ -550,7 +550,7 @@ include/xmloff/txtparae.hxx:483
     void XMLTextParagraphExport::exportText(const class 
com::sun::star::uno::Reference<class com::sun::star::text::XText> &,const class 
com::sun::star::uno::Reference<class com::sun::star::text::XTextSection> 
&,_Bool)
     _Bool bIsProgress
     IsShowProgress()
-include/xmloff/xmlexp.hxx:280
+include/xmloff/xmlexp.hxx:279
     void SvXMLExport::SvXMLExport(const class 
com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> 
&,const class rtl::OUString &,const class rtl::OUString &,const class 
com::sun::star::uno::Reference<class 
com::sun::star::xml::sax::XDocumentHandler> &,const class 
com::sun::star::uno::Reference<class com::sun::star::frame::XModel> &,const 
enum FieldUnit,enum SvXMLExportFlags)
     const class rtl::OUString & implementationName
     ""
@@ -642,7 +642,7 @@ sc/source/core/tool/token.cxx:4825
     void appendTokenByType(struct ScSheetLimits &,struct 
sc::TokenStringContext &,class rtl::OUStringBuffer &,const class 
formula::FormulaToken &,const class ScAddress &,_Bool)
     _Bool bFromRangeName
     IsFromRangeName()
-sc/source/filter/excel/xeformula.cxx:151
+sc/source/filter/excel/xeformula.cxx:150
     void (anonymous namespace)::XclExpFuncData::FinishParam(unsigned short)
     unsigned short nTokPos
     PopOperandPos()
@@ -846,7 +846,7 @@ sw/inc/tblsel.hxx:47
     _Bool CompareSwSelBoxes::operator()(class SwTableBox *const &,class 
SwTableBox *const &) const
     class SwTableBox *const & lhs
     Compare()
-sw/source/core/access/acctable.cxx:104
+sw/source/core/access/acctable.cxx:103
     void SwAccessibleTableData_Impl::SwAccessibleTableData_Impl(class 
SwAccessibleMap &,const class SwTabFrame *,_Bool,_Bool)
     _Bool bIsInPagePreview
     IsInPagePreview()
@@ -914,7 +914,7 @@ sw/source/filter/html/swcss1.hxx:80
     void SwCSS1Parser::SwCSS1Parser(class SwDoc *,const class SwHTMLParser 
&,const unsigned int *,const class rtl::OUString &,_Bool)
     _Bool bNewDoc
     IsNewDoc()
-sw/source/filter/html/swhtml.hxx:898
+sw/source/filter/html/swhtml.hxx:903
     void SwHTMLParser::SwHTMLParser(class SwDoc *,class SwPaM &,class SvStream 
&,const class rtl::OUString &,const class rtl::OUString &,_Bool,class SfxMedium 
*,_Bool,_Bool,const class rtl::OUString &)
     _Bool bReadUTF8
     IsReadUTF8()
@@ -1062,7 +1062,7 @@ vcl/source/edit/vclmedit.cxx:99
     void ImpVclMEdit::Enable(_Bool)
     _Bool bEnable
     IsEnabled()
-vcl/unx/gtk3/gtk3gtkinst.cxx:8973
+vcl/unx/gtk3/gtk3gtkinst.cxx:9017
     _Bool (anonymous namespace)::CompareGtkTreePath::operator()(const struct 
_GtkTreePath *,const struct _GtkTreePath *) const
     const struct _GtkTreePath * lhs
     Compare()
diff --git a/compilerplugins/clang/constantparam.numbers.results 
b/compilerplugins/clang/constantparam.numbers.results
index 199954a33919..dd73f620e594 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -106,7 +106,7 @@ connectivity/source/drivers/mork/MorkParser.hxx:79
     struct MorkTableMap * MorkParser::getTables(int)
     int tableScope
     128
-connectivity/source/drivers/mork/MQueryHelper.hxx:172
+connectivity/source/drivers/mork/MQueryHelper.hxx:171
     _Bool connectivity::mork::MQueryHelper::getRowValue(class 
connectivity::ORowSetValue &,int,const class rtl::OUString &,int)
     int nType
     12
@@ -570,14 +570,14 @@ include/editeng/txtrange.hxx:61
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const 
class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned 
short,_Bool,_Bool,_Bool)
     unsigned short nLeft
     2
-include/editeng/txtrange.hxx:61
-    void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const 
class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned 
short,_Bool,_Bool,_Bool)
-    unsigned short nCacheSize
-    30
 include/editeng/txtrange.hxx:61
     void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const 
class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned 
short,_Bool,_Bool,_Bool)
     unsigned short nRight
     2
+include/editeng/txtrange.hxx:61
+    void TextRanger::TextRanger(const class basegfx::B2DPolyPolygon &,const 
class basegfx::B2DPolyPolygon *,unsigned short,unsigned short,unsigned 
short,_Bool,_Bool,_Bool)
+    unsigned short nCacheSize
+    30
 include/editeng/unoedhlp.hxx:45
     void SvxEditSourceHint::SvxEditSourceHint(enum SfxHintId)
     enum SfxHintId nId
@@ -641,7 +641,7 @@ include/linguistic/spelldta.hxx:87
 include/o3tl/typed_flags_set.hxx:136
     typename typed_flags<type-parameter-?-?>::Wrap 
operator^(type-parameter-?-?,typename typed_flags<type-parameter-?-?>::Wrap)
     type-parameter-?-? lhs
-    3583
+    1535
 include/oox/core/contexthandler2.hxx:169
     _Bool oox::core::ContextHandler2Helper::isParentElement(int,int) const
     int nElement
@@ -656,11 +656,11 @@ include/oox/drawingml/drawingmltypes.hxx:229
     -1
 include/oox/drawingml/drawingmltypes.hxx:229
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nHeight
+    long nWidth
     -1
 include/oox/drawingml/drawingmltypes.hxx:229
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
-    long nWidth
+    long nHeight
     -1
 include/oox/drawingml/drawingmltypes.hxx:229
     void oox::drawingml::EmuRectangle::EmuRectangle(long,long,long,long)
@@ -952,11 +952,11 @@ include/svtools/ctrlbox.hxx:459
     995
 include/svtools/ctrlbox.hxx:459
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned 
short,unsigned short)
-    unsigned short nMin
+    unsigned short nStep
     5
 include/svtools/ctrlbox.hxx:459
     void FontSizeBox::EnableRelativeMode(unsigned short,unsigned 
short,unsigned short)
-    unsigned short nStep
+    unsigned short nMin
     5
 include/svtools/ctrlbox.hxx:460
     void FontSizeBox::EnablePtRelativeMode(short,short,short)
@@ -1158,7 +1158,7 @@ include/svx/svdmodel.hxx:119
     void SdrHint::SdrHint(enum SdrHintKind,const class SdrPage *)
     enum SdrHintKind eNewHint
     2
-include/svx/svdmrkv.hxx:284
+include/svx/svdmrkv.hxx:286
     _Bool SdrMarkView::PickMarkedObj(const class Point &,class SdrObject 
*&,class SdrPageView *&,enum SdrSearchOptions) const
     enum SdrSearchOptions nOptions
     128
@@ -1196,20 +1196,20 @@ include/svx/xpoly.hxx:73
     65535
 include/test/helper/form.hxx:37
     class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XControlShape> createCommandButton(const class 
com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const 
int,const int,const int,const int)
-    const int nWidth
-    4500
+    const int nHeight
+    3000
 include/test/helper/form.hxx:37
     class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XControlShape> createCommandButton(const class 
com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const 
int,const int,const int,const int)
-    const int nY
-    10000
+    const int nWidth
+    4500
 include/test/helper/form.hxx:37
     class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XControlShape> createCommandButton(const class 
com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const 
int,const int,const int,const int)
     const int nX
     15000
 include/test/helper/form.hxx:37
     class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XControlShape> createCommandButton(const class 
com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const 
int,const int,const int,const int)
-    const int nHeight
-    3000
+    const int nY
+    10000
 include/test/helper/shape.hxx:52
     class com::sun::star::uno::Reference<class 
com::sun::star::drawing::XShape> createLine(const class 
com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const 
int,const int,const int,const int)
     const int nHeight
@@ -1514,10 +1514,6 @@ include/vcl/font/Feature.hxx:77
     void vcl::font::FeatureDefinition::FeatureDefinition(unsigned int,const 
char *,class std::__debug::vector<struct vcl::font::FeatureParameter, class 
std::allocator<struct vcl::font::FeatureParameter> >)
     unsigned int nCode
     1718772067
-include/vcl/IDialogRenderable.hxx:40
-    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
@@ -1534,14 +1530,14 @@ include/vcl/outdev.hxx:1176
     int OutputDevice::GetTextBreak(const class rtl::OUString 
&,long,char16_t,int &,int,int,long,const class vcl::TextLayoutCache *) const
     char16_t nExtraChar
     45
-include/vcl/print.hxx:677
-    class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const 
class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString 
&,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
-    int i_nMinValue
-    10
-include/vcl/print.hxx:677
+include/vcl/print.hxx:679
     class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const 
class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString 
&,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
     int i_nMaxValue
     1000
+include/vcl/print.hxx:679
+    class com::sun::star::uno::Any 
vcl::PrinterOptionsHelper::setRangeControlOpt(const class rtl::OUString &,const 
class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString 
&,int,int,int,const struct vcl::PrinterOptionsHelper::UIControlOptions &)
+    int i_nMinValue
+    10
 include/vcl/svapp.hxx:752
     struct ImplSVEvent * Application::PostGestureEvent(enum VclEventId,class 
vcl::Window *,const class GestureEvent *)
     enum VclEventId nEvent
@@ -1602,31 +1598,31 @@ include/vcl/vclmedit.hxx:115
     void VclMultiLineEdit::EnableUpdateData(unsigned long)
     unsigned long nTimeout
     300
-include/vcl/weld.hxx:927
+include/vcl/weld.hxx:928
     void weld::TreeView::set_sensitive(int,_Bool,int)
     int col
     -1
-include/vcl/weld.hxx:1032
+include/vcl/weld.hxx:1033
     void weld::TreeView::set_image(const class weld::TreeIter &,const class 
rtl::OUString &,int)
     int col
     -1
-include/vcl/weld.hxx:1181
+include/vcl/weld.hxx:1182
     void weld::IconView::insert(int,const class rtl::OUString *,const class 
rtl::OUString *,const class rtl::OUString *,class weld::TreeIter *)
     int pos
     -1
-include/vcl/weld.hxx:1212
+include/vcl/weld.hxx:1213
     void weld::IconView::select(int)
     int pos
     -1
-include/vcl/weld.hxx:1213
+include/vcl/weld.hxx:1214
     void weld::IconView::unselect(int)
     int pos
     -1
-include/vcl/weld.hxx:2084
+include/vcl/weld.hxx:2085
     void weld::Menu::insert(int,const class rtl::OUString &,const class 
rtl::OUString &,const class rtl::OUString *,class VirtualDevice *,enum TriState)
     int pos
     -1
-include/vcl/weld.hxx:2093
+include/vcl/weld.hxx:2094
     void weld::Menu::insert_separator(int,const class rtl::OUString &)
     int pos
     -1
@@ -1662,15 +1658,15 @@ include/xmloff/xmlerror.hxx:135
     void XMLErrors::ThrowErrorAsSAXException(int)
     int nIdMask
     1073741824
-include/xmloff/xmlexp.hxx:273
+include/xmloff/xmlexp.hxx:272
     void SvXMLExport::SvXMLExport(const class 
com::sun::star::uno::Reference<class com::sun::star::uno::XComponentContext> 
&,const class rtl::OUString &,const class rtl::OUString &,const short,const 
class com::sun::star::uno::Reference<class 
com::sun::star::xml::sax::XDocumentHandler> &)
     const short eDefaultMeasureUnit
     3
-include/xmloff/xmlexp.hxx:338
+include/xmloff/xmlexp.hxx:337
     void SvXMLExport::AddAttributeASCII(unsigned short,const char *,const char 
*)
     unsigned short nPrefix
     34
-include/xmloff/xmlexp.hxx:513
+include/xmloff/xmlexp.hxx:512
     void SvXMLExport::SetError(int,const class 
com::sun::star::uno::Sequence<class rtl::OUString> &)
     int nId
     1074266113
@@ -1697,7 +1693,7 @@ include/xmloff/xmlnumfi.hxx:195
 include/xmloff/XMLSettingsExportContext.hxx:37
     void xmloff::XMLSettingsExportContext::AddAttribute(enum 
xmloff::token::XMLTokenEnum,const class rtl::OUString &)
     enum xmloff::token::XMLTokenEnum i_eName
-    1222
+    1221
 include/xmloff/XMLSettingsExportContext.hxx:39
     void xmloff::XMLSettingsExportContext::AddAttribute(enum 
xmloff::token::XMLTokenEnum,enum xmloff::token::XMLTokenEnum)
     enum xmloff::token::XMLTokenEnum i_eName
@@ -1826,7 +1822,7 @@ sax/inc/xml2utf.hxx:96
     int sax_expatwrap::XMLFile2UTFConverter::readAndConvert(class 
com::sun::star::uno::Sequence<signed char> &,int)
     int nMaxToRead
     16384
-sax/source/tools/converter.cxx:983
+sax/source/tools/converter.cxx:994
     enum sax::(anonymous namespace)::Result 
readUnsignedNumberMaxDigits(int,const class rtl::OUString &,int &,int &)
     int maxDigits
     9
@@ -1922,6 +1918,14 @@ sc/inc/formulacell.hxx:375
     void ScFormulaCell::AddRecalcMode(enum ScRecalcMode)
     enum ScRecalcMode 
     4
+sc/inc/global.hxx:643
+    void ScGlobal::AddQuotes(class rtl::OUString &,char16_t,_Bool)
+    char16_t cQuote
+    34
+sc/inc/global.hxx:650
+    void ScGlobal::EraseQuotes(class rtl::OUString &,char16_t,_Bool)
+    char16_t cQuote
+    34
 sc/inc/global.hxx:666
     const char16_t * ScGlobal::FindUnquoted(const char16_t *,char16_t)
     char16_t cChar
@@ -2026,14 +2030,14 @@ sc/inc/tokenarray.hxx:262
     void ScTokenArray::WrapReference(const class ScAddress &,short,int)
     int nMaxRow
     65535
-sc/inc/tokenarray.hxx:263
-    _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) 
const
-    int nMaxRow
-    65535
 sc/inc/tokenarray.hxx:263
     _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) 
const
     short nMaxCol
     255
+sc/inc/tokenarray.hxx:263
+    _Bool ScTokenArray::NeedsWrapReference(const class ScAddress &,short,int) 
const
+    int nMaxRow
+    65535
 sc/inc/zforauto.hxx:38
     void ScNumFormatAbbrev::Save(class SvStream &,unsigned short) const
     unsigned short eByteStrSet
@@ -2078,11 +2082,11 @@ sc/qa/unit/ucalc.cxx:1154
     _Bool checkRelativeRefToken(class ScDocument &,const class ScAddress 
&,short,int)
     short nRelCol
     -1
-sc/qa/unit/ucalc.hxx:31
+sc/qa/unit/ucalc.hxx:32
     void FormulaGrammarSwitch::FormulaGrammarSwitch(class ScDocument *,enum 
formula::FormulaGrammar::Grammar)
     enum formula::FormulaGrammar::Grammar eGrammar
     17104900
-sc/qa/unit/ucalc.hxx:53
+sc/qa/unit/ucalc.hxx:57
     void Test::pasteOneCellFromClip(class ScDocument *,const class ScRange 
&,class ScDocument *,enum InsertDeleteFlags)
     enum InsertDeleteFlags eFlags
     2303
@@ -2142,7 +2146,7 @@ sc/source/filter/excel/xechart.cxx:561
     class rtl::Reference<class XclExpChLineFormat> lclCreateLineFormat(const 
class XclExpChRoot &,const class ScfPropertySet &,enum XclChObjectType)
     enum XclChObjectType eObjType
     9
-sc/source/filter/excel/xelink.cxx:300
+sc/source/filter/excel/xelink.cxx:296
     void (anonymous namespace)::XclExpSupbook::XclExpSupbook(const class 
XclExpRoot &,const class rtl::OUString &,enum XclSupbookType)
     enum XclSupbookType 
     5
@@ -2314,14 +2318,14 @@ sc/source/ui/inc/content.hxx:163
     void ScContentTree::SelectEntryByName(const enum ScContentId,const class 
rtl::OUString &)
     const enum ScContentId nRoot
     8
-sc/source/ui/inc/datatransformation.hxx:83
-    void 
sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
-    char16_t cSeparator
-    44
 sc/source/ui/inc/datatransformation.hxx:83
     void 
sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
     short nCol
     2
+sc/source/ui/inc/datatransformation.hxx:83
+    void 
sc::SplitColumnTransformation::SplitColumnTransformation(short,char16_t)
+    char16_t cSeparator
+    44
 sc/source/ui/inc/datatransformation.hxx:149
     void sc::NumberTransformation::NumberTransformation(const class 
std::__debug::set<short, struct std::less<short>, class std::allocator<short> > 
&,const enum sc::NUMBER_TRANSFORM_TYPE,int)
     int nPrecision
@@ -3006,7 +3010,7 @@ sw/source/core/inc/swcache.hxx:112
     void SwCache::DecreaseMax(const unsigned short)
     const unsigned short nSub
     100
-sw/source/core/inc/txtfrm.hxx:491
+sw/source/core/inc/txtfrm.hxx:490
     long SwTextFrame::GrowTst(const long)
     const long nGrow
     9223372036854775807
@@ -3038,15 +3042,15 @@ sw/source/core/undo/untbl.cxx:2193
     void (anonymous 
namespace)::RedlineFlagsInternGuard::RedlineFlagsInternGuard(class SwDoc &,enum 
RedlineFlags,enum RedlineFlags)
     enum RedlineFlags eRedlineFlagsMask
     2
-sw/source/filter/html/htmlatr.cxx:1160
+sw/source/filter/html/htmlatr.cxx:1149
     _Bool (anonymous namespace)::HTMLEndPosLst::IsHTMLMode(unsigned long) const
     unsigned long nMode
     32
-sw/source/filter/html/svxcss1.hxx:157
+sw/source/filter/html/svxcss1.hxx:159
     void SvxCSS1PropertyInfo::SetBoxItem(class SfxItemSet &,unsigned 
short,const class SvxBoxItem *)
     unsigned short nMinBorderDist
     28
-sw/source/filter/html/swhtml.hxx:623
+sw/source/filter/html/swhtml.hxx:628
     void SwHTMLParser::NewStdAttr(enum HtmlTokenId)
     enum HtmlTokenId nToken
     414
@@ -3094,7 +3098,7 @@ sw/source/filter/ww8/ww8glsy.hxx:63
     void WW8Glossary::WW8Glossary(class tools::SvRef<class SotStorageStream> 
&,unsigned char,class SotStorage *)
     unsigned char nVersion
     8
-sw/source/filter/ww8/ww8par.hxx:1596
+sw/source/filter/ww8/ww8par.hxx:1595
     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
@@ -3154,7 +3158,7 @@ toolkit/source/awt/vclxspinbutton.cxx:40
     void lcl_modifyStyle(class vcl::Window *,long,_Bool)
     long _nStyleBits
     4096
-toolkit/source/awt/vclxwindows.cxx:6928
+toolkit/source/awt/vclxwindows.cxx:6920
     void lcl_setWinBits(class vcl::Window *,long,_Bool)
     long _nBits
     68719476736
@@ -3446,10 +3450,6 @@ xmloff/source/draw/ximpcustomshape.cxx:553
     void GetEnhancedRectangleSequence(class std::__debug::vector<struct 
com::sun::star::beans::PropertyValue, class std::allocator<struct 
com::sun::star::beans::PropertyValue> > &,const class rtl::OUString &,const 
enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
     const enum xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum 
eDestProp
     111
-xmloff/source/draw/ximpstyl.cxx:136
-    void (anonymous 
namespace)::SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(class 
SvXMLImport &,unsigned short,const class rtl::OUString &,const class 
com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> 
&,class SvXMLStylesContext &,enum XmlStyleFamily)
-    enum XmlStyleFamily nFamily
-    305
 xmloff/source/forms/elementimport.cxx:1361
     void xmloff::(anonymous namespace)::EqualHandle::EqualHandle(int)
     int _nHandle
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 99884011e928..1d6aa9f174f5 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -89,8 +89,7 @@ public:
 
     // methods using glyph indexing
     virtual bool    GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& 
nStart,
-                                 const PhysicalFontFace** pFallbackFont = 
nullptr,
-                                 int* const pFallbackLevel = nullptr) const = 
0;
+                                 const PhysicalFontFace** pFallbackFont = 
nullptr) const = 0;
     virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const;
     bool GetBoundRect(tools::Rectangle&) const;
 
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 71612358be6e..1e4512eef338 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -275,7 +275,7 @@ public:
     sal_uInt16      GetDisplayLineCount() const;
     void            SetEntryFlags( sal_Int32  nPos, ListBoxEntryFlags nFlags );
 
-    void            DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32  
nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos);
+    void            DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32  
nPos, bool bDrawImage, bool bDrawText);
 
     void            SelectEntry( sal_Int32  nPos, bool bSelect );
     void            DeselectAll();
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index e94b4c20531e..9ab526365ea7 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -130,8 +130,7 @@ public:
     DeviceCoordinate FillDXArray(DeviceCoordinate* pDXArray) const override;
     void            GetCaretPositions(int nArraySize, long* pCaretXArray) 
const override;
     bool            GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& 
nStart,
-                                 const PhysicalFontFace** pFallbackFont = 
nullptr,
-                                 int* const pFallbackLevel = nullptr) const 
override;
+                                 const PhysicalFontFace** pFallbackFont = 
nullptr) const override;
     bool            GetOutline(basegfx::B2DPolyPolygonVector&) const override;
     bool            IsKashidaPosValid(int nCharPos) const override;
 
@@ -184,8 +183,7 @@ public:
         { return m_GlyphItems.Impl()->GetFont(); }
 
     bool            GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& 
nStart,
-                                 const PhysicalFontFace** pFallbackFont = 
nullptr,
-                                 int* const pFallbackLevel = nullptr) const 
override;
+                                 const PhysicalFontFace** pFallbackFont = 
nullptr) const override;
 
 private:
     // for glyph+font+script fallback
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 18913f77eafd..13a3bc8dfeaa 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1271,7 +1271,7 @@ void ComboBox::EnableUserDraw( bool bUserDraw )
 void ComboBox::DrawEntry(const UserDrawEvent& rEvt)
 {
     SAL_WARN_IF(rEvt.GetWindow() != m_pImpl->m_pImplLB->GetMainWindow(), 
"vcl", "DrawEntry?!");
-    m_pImpl->m_pImplLB->GetMainWindow()->DrawEntry(*rEvt.GetRenderContext(), 
rEvt.GetItemId(), /*bDrawImage*/false, /*bDrawText*/false, 
/*bDrawTextAtImagePos*/false);
+    m_pImpl->m_pImplLB->GetMainWindow()->DrawEntry(*rEvt.GetRenderContext(), 
rEvt.GetItemId(), /*bDrawImage*/false, /*bDrawText*/false);
 }
 
 void ComboBox::AddSeparator( sal_Int32 n )
diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 9a5963e0a8e0..b174d21c0f2e 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -1741,11 +1741,11 @@ void ImplListBoxWindow::ImplPaint(vcl::RenderContext& 
rRenderContext, sal_Int32
     }
     else
     {
-        DrawEntry(rRenderContext, nPos, true, true, 
/*bDrawTextAtImagePos*/false);
+        DrawEntry(rRenderContext, nPos, true, true);
     }
 }
 
-void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, 
sal_Int32 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos)
+void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, 
sal_Int32 nPos, bool bDrawImage, bool bDrawText)
 {
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr(nPos);
     if (!pEntry)
@@ -1816,7 +1816,7 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& 
rRenderContext, sal_Int32
             tools::Rectangle aTextRect(Point(gnBorder - mnLeft, nY),
                                 Size(nMaxWidth, nEntryHeight));
 
-            if (!bDrawTextAtImagePos && (mpEntryList->HasEntryImage(nPos) || 
IsUserDrawEnabled()))
+            if (mpEntryList->HasEntryImage(nPos) || IsUserDrawEnabled())
             {
                 long nImageWidth = std::max(mnMaxImgWidth, 
maUserItemSize.Width());
                 aTextRect.AdjustLeft(nImageWidth + IMG_TXT_DISTANCE );
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index eaa016ed1927..55aa145095be 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -895,7 +895,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoor
 
 bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
                                     Point& rPos, int& nStart,
-                                    const PhysicalFontFace**, int* const 
pFallbackLevel) const
+                                    const PhysicalFontFace**) const
 {
     std::vector<GlyphItem>::const_iterator pGlyphIter = 
m_GlyphItems.Impl()->begin();
     std::vector<GlyphItem>::const_iterator pGlyphIterEnd = 
m_GlyphItems.Impl()->end();
@@ -918,8 +918,6 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
 
     // update return data with glyph info
     *pGlyph = &(*pGlyphIter);
-    if (pFallbackLevel)
-        *pFallbackLevel = 0;
     ++nStart;
 
     // calculate absolute position in pixel units
@@ -1506,8 +1504,7 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, 
long* pCaretXArray ) cons
 
 bool MultiSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
                                   Point& rPos, int& nStart,
-                                  const PhysicalFontFace** pFallbackFont,
-                                  int* const pFallbackLevel) const
+                                  const PhysicalFontFace** pFallbackFont) const
 {
     // NOTE: nStart is tagged with current font index
     int nLevel = static_cast<unsigned>(nStart) >> GF_FONTSHIFT;
@@ -1523,8 +1520,6 @@ bool MultiSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
             nStart |= nFontTag;
             if (pFallbackFont)
                 *pFallbackFont = pFontFace;
-            if (pFallbackLevel)
-                *pFallbackLevel = nLevel;
             rPos += maDrawBase;
             rPos += maDrawOffset;
             return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to