loplugin:unusedfields

Change-Id: Ia8e2a7ce75bfded98e85fa583d1404710069d335
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105249
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 321 insertions, 315 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 3ca3008bd423..09cc4676e06b 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -31,9 +31,9 @@ connectivity/source/commontools/RowFunctionParser.cxx:374
 connectivity/source/commontools/RowFunctionParser.cxx:374
     connectivity::(anonymous namespace)::ExpressionGrammar::definition argument ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:375
-    connectivity::(anonymous namespace)::ExpressionGrammar::definition orExpression ::boost::spirit::classic::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:375
     connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::classic::rule<ScannerT>
+connectivity/source/commontools/RowFunctionParser.cxx:375
+    connectivity::(anonymous namespace)::ExpressionGrammar::definition orExpression ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/inc/component/CResultSet.hxx:42
     connectivity::component::OComponentResultSet m_bBookmarkable _Bool
 connectivity/source/inc/dbase/DResultSet.hxx:41
@@ -110,12 +110,12 @@ cppu/source/uno/check.cxx:258
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
 cui/source/dialogs/colorpicker.cxx:736
     cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1389
+cui/source/factory/dlgfact.cxx:1390
     (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/AdditionsDialog.hxx:57
     AdditionInfo sReleaseVersion class rtl::OUString
 cui/source/inc/AdditionsDialog.hxx:94
-    AdditionsDialog m_sTag class rtl::OString
+    AdditionsDialog m_sTag class rtl::OUString
 cui/source/inc/cfgutil.hxx:233
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
 cui/source/inc/cuitabarea.hxx:223
@@ -154,7 +154,7 @@ dbaccess/source/core/dataaccess/connection.hxx:101
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2831
       class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:57
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
@@ -164,7 +164,7 @@ drawinglayer/source/tools/emfphelperdata.hxx:197
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
-editeng/source/editeng/impedit.hxx:516
+editeng/source/editeng/impedit.hxx:519
     ImpEditEngine aSelFuncSet class EditSelFunctionSet
 extensions/source/bibliography/datman.cxx:407
     (anonymous namespace)::DBChangeDialog_Impl aConfig class DBChangeDialogConfig_Impl
@@ -198,129 +198,127 @@ include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
 include/sfx2/classificationhelper.hxx:123
     sfx::ClassificationKeyCreator m_ePolicyType const enum SfxClassificationPolicyType
-include/sfx2/infobar.hxx:65
-    SfxInfoBarWindow m_aSize class Size
 include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
-include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
+    SfxType1 nAttribs sal_uInt16
+include/sfx2/msg.hxx:132
     SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:132
-    SfxType1 nAttribs sal_uInt16
+    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:133
-    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:133
-    SfxType2 nAttribs sal_uInt16
+    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
+    SfxType2 nAttribs sal_uInt16
+include/sfx2/msg.hxx:134
+    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
 include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
     SfxType3 pType const std::type_info *
-include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
     SfxType4 aAttrib struct SfxTypeAttrib [4]
 include/sfx2/msg.hxx:135
-    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:135
     SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:135
+    SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 nAttribs sal_uInt16
-include/sfx2/msg.hxx:136
-    SfxType5 pType const std::type_info *
-include/sfx2/msg.hxx:136
     SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
     SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:137
-    SfxType6 aAttrib struct SfxTypeAttrib [6]
-include/sfx2/msg.hxx:137
-    SfxType6 nAttribs sal_uInt16
+include/sfx2/msg.hxx:136
+    SfxType5 nAttribs sal_uInt16
+include/sfx2/msg.hxx:136
+    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:137
     SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
+    SfxType6 aAttrib struct SfxTypeAttrib [6]
+include/sfx2/msg.hxx:137
     SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
-    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:137
+    SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
     SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:138
-    SfxType7 nAttribs sal_uInt16
-include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
-include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
+include/sfx2/msg.hxx:138
+    SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:138
+    SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
     SfxType8 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType8 aAttrib struct SfxTypeAttrib [8]
 include/sfx2/msg.hxx:139
     SfxType8 nAttribs sal_uInt16
+include/sfx2/msg.hxx:139
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:140
-    SfxType10 aAttrib struct SfxTypeAttrib [10]
+    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:140
     SfxType10 nAttribs sal_uInt16
 include/sfx2/msg.hxx:140
-    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:140
     SfxType10 pType const std::type_info *
+include/sfx2/msg.hxx:140
+    SfxType10 aAttrib struct SfxTypeAttrib [10]
 include/sfx2/msg.hxx:141
-    SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
+    SfxType11 nAttribs sal_uInt16
 include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
-    SfxType11 nAttribs sal_uInt16
-include/sfx2/msg.hxx:143
-    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:143
-    SfxType13 pType const std::type_info *
+    SfxType11 aAttrib struct SfxTypeAttrib [11]
+include/sfx2/msg.hxx:141
+    SfxType11 pType const std::type_info *
 include/sfx2/msg.hxx:143
     SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
     SfxType13 aAttrib struct SfxTypeAttrib [13]
-include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
+include/sfx2/msg.hxx:143
+    SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:143
+    SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:144
     SfxType14 aAttrib struct SfxTypeAttrib [14]
 include/sfx2/msg.hxx:144
+    SfxType14 nAttribs sal_uInt16
+include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:144
-    SfxType14 nAttribs sal_uInt16
-include/sfx2/msg.hxx:145
-    SfxType16 nAttribs sal_uInt16
-include/sfx2/msg.hxx:145
-    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:145
     SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:145
+    SfxType16 nAttribs sal_uInt16
+include/sfx2/msg.hxx:145
     SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:146
-    SfxType17 pType const std::type_info *
+include/sfx2/msg.hxx:145
+    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:146
     SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:146
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:146
     SfxType17 nAttribs sal_uInt16
-include/sfx2/msg.hxx:147
-    SfxType23 pType const std::type_info *
+include/sfx2/msg.hxx:146
+    SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:147
+    SfxType23 pType const std::type_info *
+include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
     SfxType23 aAttrib struct SfxTypeAttrib [23]
@@ -342,6 +340,8 @@ include/vcl/font/Feature.hxx:100
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
+include/vcl/pdf/PDFAnnotationMarker.hxx:65
+    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
 include/xmloff/shapeimport.hxx:140
     SdXML3DLightContext mbSpecular _Bool
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
@@ -384,25 +384,25 @@ oox/source/drawingml/diagram/layoutnodecontext.cxx:135
     oox::drawingml::(anonymous namespace)::ChooseContext msName class rtl::OUString
 oox/source/drawingml/hyperlinkcontext.hxx:41
     oox::drawingml::HyperLinkContext maProperties class oox::PropertyMap &
-oox/source/ppt/timenodelistcontext.cxx:199
-    oox::ppt::(anonymous namespace)::MediaNodeContext mbIsNarration _Bool
 oox/source/ppt/timenodelistcontext.cxx:200
+    oox::ppt::(anonymous namespace)::MediaNodeContext mbIsNarration _Bool
+oox/source/ppt/timenodelistcontext.cxx:201
     oox::ppt::(anonymous namespace)::MediaNodeContext mbFullScrn _Bool
-oox/source/ppt/timenodelistcontext.cxx:394
-    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
 oox/source/ppt/timenodelistcontext.cxx:395
+    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
+oox/source/ppt/timenodelistcontext.cxx:396
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnNextAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:395
+oox/source/ppt/timenodelistcontext.cxx:396
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnPrevAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:631
+oox/source/ppt/timenodelistcontext.cxx:632
     oox::ppt::(anonymous namespace)::AnimContext mnValueType sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:713
+oox/source/ppt/timenodelistcontext.cxx:714
     oox::ppt::(anonymous namespace)::AnimScaleContext mbZoomContents _Bool
-oox/source/ppt/timenodelistcontext.cxx:853
-    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes class rtl::OUString
 oox/source/ppt/timenodelistcontext.cxx:854
-    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes class rtl::OUString
 oox/source/ppt/timenodelistcontext.cxx:855
+    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+oox/source/ppt/timenodelistcontext.cxx:856
     oox::ppt::(anonymous namespace)::AnimMotionContext mnAngle sal_Int32
 pyuno/source/module/pyuno_callable.cxx:45
     pyuno::(anonymous namespace)::PyUNO_callable ob_base PyObject
@@ -419,15 +419,15 @@ sal/qa/osl/condition/osl_Condition.cxx:202
 sal/qa/osl/condition/osl_Condition.cxx:273
     osl_Condition::check bRes2 _Bool
 sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1588
     osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1588
+    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1589
+    osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
@@ -448,16 +448,16 @@ sal/qa/osl/pipe/osl_Pipe.cxx:523
     osl_Pipe::getError bRes _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:561
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:849
+sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:849
+sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes _Bool
 sal/qa/osl/process/osl_process.cxx:151
     Test_osl_executeProcess env_param_ const class rtl::OUString
 sal/qa/osl/security/osl_Security.cxx:59
-    osl_Security::ctors bRes _Bool
-sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes1 _Bool
+sal/qa/osl/security/osl_Security.cxx:59
+    osl_Security::ctors bRes _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:154
@@ -571,47 +571,49 @@ sd/source/ui/view/viewshel.cxx:1168
 sd/source/ui/view/viewshel.cxx:1169
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition simple_type rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition name rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition stream rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition dict_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+    (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
-    (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition object_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition array_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
-    (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
-    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition trailer rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
+sfx2/inc/templatedefaultview.hxx:29
+    TemplateDefaultView mnItemMaxSize tools::Long
 sfx2/source/dialog/basedlgs.cxx:47
     SfxModelessDialog_Impl aMoveIdle class Idle
 sfx2/source/doc/doctempl.cxx:104
@@ -619,16 +621,16 @@ sfx2/source/doc/doctempl.cxx:104
 slideshow/source/engine/animationnodes/animationbasenode.hxx:88
     slideshow::internal::AnimationBaseNode mpSubsetManager slideshow::internal::SubsettableShapeManagerSharedPtr
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+    (anonymous namespace)::ThreeFloats x GLfloat
+slideshow/source/engine/opengl/TransitionImpl.cxx:1992
     (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
     (anonymous namespace)::ThreeFloats y GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
-    (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:302
     Vertex texcoord glm::vec2
-slideshow/source/engine/slide/slideimpl.cxx:197
+slideshow/source/engine/slide/slideimpl.cxx:200
     slideshow::internal::(anonymous namespace)::SlideImpl mpBox2DWorld box2d::utils::Box2DWorldSharedPtr
 slideshow/source/engine/smilfunctionparser.cxx:491
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
@@ -688,7 +690,7 @@ svx/source/dialog/framelinkarray.cxx:385
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow size_t
 svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/dialog/weldeditview.cxx:312
+svx/source/dialog/weldeditview.cxx:323
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/inc/datanavi.hxx:189
     svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
@@ -714,14 +716,14 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4379
+sw/qa/extras/uiwriter/uiwriter.cxx:4485
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
 sw/source/core/inc/swfont.hxx:980
     SvStatistics nGetStretchTextSize sal_uInt16
-sw/source/core/layout/dbg_lay.cxx:171
-    SwImplEnterLeave nAction enum DbgAction
+sw/source/core/layout/dbg_lay.cxx:179
+    SwImplEnterLeave m_nAction enum DbgAction
 sw/source/core/text/inftxt.cxx:565
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
 sw/source/core/text/inftxt.hxx:682
@@ -770,15 +772,17 @@ vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
 vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5Graphics.hxx:58
+    Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salmenu.hxx:42
     SalMenuButtonItem mnId sal_uInt16
 vcl/inc/salmenu.hxx:43
     SalMenuButtonItem maImage class Image
 vcl/inc/salmenu.hxx:44
     SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/salvtables.hxx:560
+vcl/inc/salvtables.hxx:532
     SalInstanceEntry m_aTextFilter class WeldTextFilter
-vcl/inc/salvtables.hxx:942
+vcl/inc/salvtables.hxx:914
     SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
 vcl/inc/svimpbox.hxx:120
     SvImpLBox m_aFctSet class ImpLBSelEng
@@ -826,17 +830,21 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4826
+vcl/unx/gtk3/gtk3gtkinst.cxx:4822
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:5199
+vcl/unx/gtk3/gtk3gtkinst.cxx:5195
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5343
+vcl/unx/gtk3/gtk3gtkinst.cxx:5339
     (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5351
+vcl/unx/gtk3/gtk3gtkinst.cxx:5347
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
-vcl/unx/gtk3/gtk3gtkinst.cxx:13422
+vcl/unx/gtk3/gtk3gtkinst.cxx:7638
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkContainer *
+vcl/unx/gtk3/gtk3gtkinst.cxx:7640
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pBox GtkBox *
+vcl/unx/gtk3/gtk3gtkinst.cxx:13955
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13428
+vcl/unx/gtk3/gtk3gtkinst.cxx:13961
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 584507fd4387..3a161fc77a93 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -172,7 +172,7 @@ drawinglayer/inc/processor3d/defaultprocessor3d.hxx:87
     drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer
 drawinglayer/source/processor2d/vclprocessor2d.hxx:77
     drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
-editeng/source/editeng/impedit.hxx:505
+editeng/source/editeng/impedit.hxx:508
     ImpEditEngine maColorConfig svtools::ColorConfig
 embeddedobj/source/inc/commonembobj.hxx:103
     OCommonEmbeddedObject m_aClassName class rtl::OUString
@@ -238,8 +238,6 @@ i18npool/inc/textconversion.hxx:80
     i18npool::(anonymous) address sal_Int16
 i18npool/inc/textconversion.hxx:81
     i18npool::(anonymous) count sal_Int16
-include/basic/codecompletecache.hxx:47
-    CodeCompleteOptions aMiscOptions class SvtMiscOptions
 include/basic/sbstar.hxx:50
     StarBASIC aErrorHdl Link<class StarBASIC *, _Bool>
 include/basic/sbstar.hxx:51
@@ -302,12 +300,8 @@ include/sfx2/msg.hxx:108
     SfxType aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:118
     SfxType0 pType const std::type_info *
-include/sfx2/sidebar/ResourceManager.hxx:110
-    sfx2::sidebar::ResourceManager maMiscOptions class SvtMiscOptions
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
-include/svx/galleryobjectcollection.hxx:52
-    GalleryObjectCollection m_aInvalidURL class INetURLObject
 include/svx/graphctl.hxx:52
     GraphCtrl xVD ScopedVclPtrInstance<class VirtualDevice>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49
@@ -350,9 +344,9 @@ include/vcl/opengl/OpenGLContext.hxx:48
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
 include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
-io/source/stm/odata.cxx:558
+io/source/stm/odata.cxx:559
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
-io/source/stm/odata.cxx:558
+io/source/stm/odata.cxx:559
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:47
     (anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
@@ -386,6 +380,8 @@ sal/osl/unx/process.cxx:829
     (anonymous namespace)::osl_procStat sigignore char [24]
 sal/osl/unx/process.cxx:830
     (anonymous namespace)::osl_procStat sigcatch char [24]
+sal/qa/OStringBuffer/rtl_OStringBuffer.cxx:1432
+    rtl_OStringBuffer::append_001 empty class rtl::OString
 sal/rtl/alloc_arena.hxx:100
     rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64]
 sal/rtl/digest.cxx:188
@@ -504,12 +500,10 @@ sdext/source/pdfimport/tree/style.hxx:43
     pdfi::StyleContainer::Style Contents class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:99
     sfx2::(anonymous namespace)::ImplDdeItem pLink class sfx2::SvBaseLink *
-slideshow/source/engine/slideshowimpl.cxx:136
+slideshow/source/engine/slideshowimpl.cxx:137
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:403
     UCBStorageStream_Impl m_aKey class rtl::OString
-starmath/source/view.cxx:862
-    SmViewShell_Impl aOpts class SvtMiscOptions
 store/source/storbios.cxx:59
     (anonymous namespace)::OStoreSuperBlock m_aMarked (anonymous namespace)::OStoreSuperBlock::L
 svl/source/crypto/cryptosign.cxx:283
@@ -564,11 +558,11 @@ sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
 sw/inc/breakit.hxx:38
     SwBreakIt m_xLanguageTag std::unique_ptr<LanguageTag>
-sw/inc/calc.hxx:203
+sw/inc/calc.hxx:204
     SwCalc m_aSysLocale class SvtSysLocale
 sw/inc/dpage.hxx:35
     SwDPage m_pGridLst std::unique_ptr<SdrPageGridFrameList>
-sw/inc/hints.hxx:230
+sw/inc/hints.hxx:237
     SwAttrSetChg m_bDelSet _Bool
 sw/inc/shellio.hxx:147
     SwReader mpStg tools::SvRef<SotStorage>
@@ -592,7 +586,7 @@ sw/source/core/doc/swstylemanager.cxx:61
     (anonymous namespace)::SwStyleManager m_aAutoParaPool class StylePool
 sw/source/core/inc/swblocks.hxx:69
     SwImpBlocks m_bInPutMuchBlocks _Bool
-sw/source/core/text/atrhndl.hxx:50
+sw/source/core/text/atrhndl.hxx:48
     SwAttrHandler m_pFnt std::unique_ptr<SwFont>
 sw/source/core/text/inftxt.cxx:565
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
@@ -702,24 +696,12 @@ vcl/inc/ppdparser.hxx:130
     psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
 vcl/inc/printerinfomanager.hxx:75
     psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString
-vcl/inc/salwtype.hxx:162
+vcl/inc/salwtype.hxx:164
     SalWheelMouseEvent mbDeltaIsPixel _Bool
-vcl/inc/salwtype.hxx:209
-    SalSurroundingTextSelectionChangeEvent mnStart sal_uLong
-vcl/inc/salwtype.hxx:210
-    SalSurroundingTextSelectionChangeEvent mnEnd sal_uLong
-vcl/inc/salwtype.hxx:216
+vcl/inc/salwtype.hxx:218
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:311
-    ImplSVNWFData mnMenuFormatBorderX int
-vcl/inc/svdata.hxx:312
-    ImplSVNWFData mnMenuFormatBorderY int
 vcl/inc/svdata.hxx:315
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:316
-    ImplSVNWFData mbDockingAreaSeparateTB _Bool
-vcl/inc/svdata.hxx:333
-    ImplSVNWFData mbRolloverMenubar _Bool
 vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
 vcl/inc/unx/saldisp.hxx:281
@@ -875,50 +857,50 @@ vcl/inc/WidgetThemeLibrary.hxx:121
 vcl/inc/WidgetThemeLibrary.hxx:122
     vcl::WidgetThemeLibrary_t getRegion _Bool (*)(enum ControlType, enum ControlPart, enum ControlState, const vcl::rectangle_t &, vcl::rectangle_t &, vcl::rectangle_t &)
 vcl/inc/WidgetThemeLibrary.hxx:126
-    vcl::WidgetThemeLibrary_t drawPushButton _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:127
-    vcl::WidgetThemeLibrary_t drawRadiobutton _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawPushButton _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:128
-    vcl::WidgetThemeLibrary_t drawCheckbox _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:129
-    vcl::WidgetThemeLibrary_t drawCombobox _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawRadiobutton _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:130
-    vcl::WidgetThemeLibrary_t drawEditbox _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:131
-    vcl::WidgetThemeLibrary_t drawScrollbar _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawCheckbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:132
-    vcl::WidgetThemeLibrary_t drawSpinButtons _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:133
-    vcl::WidgetThemeLibrary_t drawSpinbox _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawCombobox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:134
-    vcl::WidgetThemeLibrary_t drawTabItem _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:135
-    vcl::WidgetThemeLibrary_t drawTabPane _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawEditbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:136
-    vcl::WidgetThemeLibrary_t drawTabHeader _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:137
-    vcl::WidgetThemeLibrary_t drawTabBody _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawScrollbar _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:138
-    vcl::WidgetThemeLibrary_t drawSlider _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:139
-    vcl::WidgetThemeLibrary_t drawFixedline _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawSpinButtons _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:140
-    vcl::WidgetThemeLibrary_t drawToolbar _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:141
-    vcl::WidgetThemeLibrary_t drawProgress _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawSpinbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:142
-    vcl::WidgetThemeLibrary_t drawWindowsBackground _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawTabItem _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:144
-    vcl::WidgetThemeLibrary_t drawListbox _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:145
-    vcl::WidgetThemeLibrary_t drawFrame _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawTabPane _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:146
-    vcl::WidgetThemeLibrary_t drawListNode _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
-vcl/inc/WidgetThemeLibrary.hxx:147
-    vcl::WidgetThemeLibrary_t drawListNet _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawTabHeader _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:148
-    vcl::WidgetThemeLibrary_t drawListHeader _Bool (*)(const struct vcl::ControlDrawParameters &, long, long)
+    vcl::WidgetThemeLibrary_t drawTabBody _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
 vcl/inc/WidgetThemeLibrary.hxx:150
+    vcl::WidgetThemeLibrary_t drawSlider _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:152
+    vcl::WidgetThemeLibrary_t drawFixedline _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:154
+    vcl::WidgetThemeLibrary_t drawToolbar _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:156
+    vcl::WidgetThemeLibrary_t drawProgress _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:158
+    vcl::WidgetThemeLibrary_t drawWindowsBackground _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:160
+    vcl::WidgetThemeLibrary_t drawListbox _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:162
+    vcl::WidgetThemeLibrary_t drawFrame _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:164
+    vcl::WidgetThemeLibrary_t drawListNode _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:166
+    vcl::WidgetThemeLibrary_t drawListNet _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:168
+    vcl::WidgetThemeLibrary_t drawListHeader _Bool (*)(const struct vcl::ControlDrawParameters &, tools::Long, tools::Long)
+vcl/inc/WidgetThemeLibrary.hxx:171
     vcl::WidgetThemeLibrary_t updateSettings _Bool (*)(struct vcl::WidgetDrawStyle &)
 vcl/source/app/settings.cxx:196
     ImplStyleData maDialogStyle struct DialogStyle
@@ -926,13 +908,13 @@ vcl/source/control/roadmapwizard.cxx:63
     vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
 vcl/source/control/tabctrl.cxx:82
     ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
-vcl/source/filter/jpeg/Exif.hxx:53
-    Exif::ExifIFD tag sal_uInt8 [2]
 vcl/source/filter/jpeg/Exif.hxx:54
-    Exif::ExifIFD type sal_uInt8 [2]
+    Exif::ExifIFD tag sal_uInt8 [2]
 vcl/source/filter/jpeg/Exif.hxx:55
+    Exif::ExifIFD type sal_uInt8 [2]
+vcl/source/filter/jpeg/Exif.hxx:56
     Exif::ExifIFD count sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:60
+vcl/source/filter/jpeg/Exif.hxx:61
     Exif::TiffHeader byteOrder sal_uInt16
 vcl/source/filter/jpeg/transupp.h:132
     (anonymous) slow_hflip boolean
@@ -978,7 +960,7 @@ vcl/source/gdi/dibtools.cxx:119
     (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
 vcl/source/gdi/dibtools.cxx:120
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/gdi/pdfwriter_impl.hxx:268
+vcl/source/gdi/pdfwriter_impl.hxx:275
     vcl::pdf::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
 vcl/source/treelist/headbar.cxx:41
     ImplHeadItem maHelpId class rtl::OString
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index ff81433c4dd2..ecdf50f9605d 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -24,7 +24,7 @@ dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2831
       class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:49
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
@@ -46,36 +46,34 @@ include/oox/vml/vmlshapecontext.hxx:115
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
 include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/infobar.hxx:65
-    SfxInfoBarWindow m_aSize class Size
 include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 aAttrib struct SfxTypeAttrib [1]
-include/sfx2/msg.hxx:132
-    SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
     SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
+    SfxType1 aAttrib struct SfxTypeAttrib [1]
+include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:132
+    SfxType1 nAttribs sal_uInt16
 include/sfx2/msg.hxx:133
-    SfxType2 nAttribs sal_uInt16
-include/sfx2/msg.hxx:133
-    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
-include/sfx2/msg.hxx:134
-    SfxType3 pType const std::type_info *
+    SfxType2 nAttribs sal_uInt16
+include/sfx2/msg.hxx:133
+    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
 include/sfx2/msg.hxx:134
+    SfxType3 nAttribs sal_uInt16
+include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
+    SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:135
     SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:135
@@ -85,53 +83,53 @@ include/sfx2/msg.hxx:135
 include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 pType const std::type_info *
-include/sfx2/msg.hxx:136
     SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
+    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:137
     SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:137
     SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
-include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
 include/sfx2/msg.hxx:138
-    SfxType7 nAttribs sal_uInt16
-include/sfx2/msg.hxx:138
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:138
+    SfxType7 pType const std::type_info *
+include/sfx2/msg.hxx:138
+    SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
     SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:139
     SfxType8 pType const std::type_info *
+include/sfx2/msg.hxx:139
+    SfxType8 aAttrib struct SfxTypeAttrib [8]
 include/sfx2/msg.hxx:140
     SfxType10 nAttribs sal_uInt16
 include/sfx2/msg.hxx:140
-    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:140
     SfxType10 pType const std::type_info *
 include/sfx2/msg.hxx:140
     SfxType10 aAttrib struct SfxTypeAttrib [10]
+include/sfx2/msg.hxx:140
+    SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
-    SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
+    SfxType11 nAttribs sal_uInt16
 include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
-    SfxType11 nAttribs sal_uInt16
+    SfxType11 aAttrib struct SfxTypeAttrib [11]
+include/sfx2/msg.hxx:141
+    SfxType11 pType const std::type_info *
 include/sfx2/msg.hxx:143
     SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
@@ -141,37 +139,37 @@ include/sfx2/msg.hxx:143
 include/sfx2/msg.hxx:143
     SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
-include/sfx2/msg.hxx:144
     SfxType14 aAttrib struct SfxTypeAttrib [14]
 include/sfx2/msg.hxx:144
+    SfxType14 pType const std::type_info *
+include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:144
     SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
-include/sfx2/msg.hxx:145
-    SfxType16 nAttribs sal_uInt16
+    SfxType16 pType const std::type_info *
 include/sfx2/msg.hxx:145
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 pType const std::type_info *
+    SfxType16 aAttrib struct SfxTypeAttrib [16]
+include/sfx2/msg.hxx:145
+    SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
     SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:146
-    SfxType17 aAttrib struct SfxTypeAttrib [17]
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:146
-    SfxType17 nAttribs sal_uInt16
+    SfxType17 aAttrib struct SfxTypeAttrib [17]
+include/sfx2/msg.hxx:147
+    SfxType23 pType const std::type_info *
 include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
     SfxType23 aAttrib struct SfxTypeAttrib [23]
-include/sfx2/msg.hxx:147
-    SfxType23 pType const std::type_info *
 include/svtools/genericunodialog.hxx:155
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/unoevent.hxx:163
@@ -192,7 +190,9 @@ include/vcl/font/Feature.hxx:100
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
-include/vcl/uitest/uiobject.hxx:281
+include/vcl/pdf/PDFAnnotationMarker.hxx:65
+    vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
+include/vcl/uitest/uiobject.hxx:283
     TabPageUIObject mxTabPage VclPtr<class TabPage>
 include/xmloff/formlayerexport.hxx:172
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
@@ -243,15 +243,15 @@ sal/qa/osl/condition/osl_Condition.cxx:202
 sal/qa/osl/condition/osl_Condition.cxx:273
     osl_Condition::check bRes2 _Bool
 sal/qa/osl/file/osl_File.cxx:1588
-    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1588
     osl_FileStatus::getFileType m_aFifoItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1588
+    osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
+    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
+    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
@@ -267,19 +267,19 @@ sal/qa/osl/module/osl_Module.cxx:342
 sal/qa/osl/pipe/osl_Pipe.cxx:358
     osl_Pipe::clear bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:523
-    osl_Pipe::getError bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
     osl_Pipe::getError bRes _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:523
+    osl_Pipe::getError bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:561
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:849
+sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:849
+sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes _Bool
 sal/qa/osl/security/osl_Security.cxx:59
-    osl_Security::ctors bRes _Bool
-sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes1 _Bool
+sal/qa/osl/security/osl_Security.cxx:59
+    osl_Security::ctors bRes _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:154
@@ -296,7 +296,7 @@ sc/source/filter/html/htmlpars.cxx:3020
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:51
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:453
+sc/source/ui/inc/docsh.hxx:454
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
@@ -321,9 +321,9 @@ sd/source/ui/view/viewshel.cxx:1169
 sd/source/ui/view/ViewShellBase.cxx:188
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+    (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:47
@@ -333,11 +333,11 @@ sfx2/source/doc/doctempl.cxx:104
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
-    (anonymous namespace)::ThreeFloats z GLfloat
+    (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
     (anonymous namespace)::ThreeFloats y GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
-    (anonymous namespace)::ThreeFloats x GLfloat
+    (anonymous namespace)::ThreeFloats z GLfloat
 starmath/inc/smmod.hxx:70
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
 starmath/inc/view.hxx:216
@@ -356,7 +356,7 @@ svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/weldeditview.cxx:312
+svx/source/dialog/weldeditview.cxx:323
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/inc/datanavi.hxx:189
     svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
@@ -368,8 +368,8 @@ sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:75
     (anonymous namespace)::TableWait m_pWait const std::unique_ptr<SwWait>
-sw/source/core/layout/dbg_lay.cxx:171
-    SwImplEnterLeave nAction enum DbgAction
+sw/source/core/layout/dbg_lay.cxx:179
+    SwImplEnterLeave m_nAction enum DbgAction
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
 sw/source/uibase/inc/conttree.hxx:297
@@ -392,6 +392,14 @@ vcl/inc/opengl/gdiimpl.hxx:53
     TextureCombo mpMask std::unique_ptr<OpenGLTexture>
 vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
+    Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
+vcl/inc/qt5/Qt5Graphics.hxx:56
+    Qt5Graphics m_focusedButton std::unique_ptr<QPushButton>
+vcl/inc/qt5/Qt5Graphics.hxx:57
+    Qt5Graphics m_image std::unique_ptr<QImage>
+vcl/inc/qt5/Qt5Graphics.hxx:58
+    Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salprn.hxx:45
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
 vcl/inc/WidgetThemeLibrary.hxx:100
@@ -422,11 +430,11 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
     (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
 vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:5199
+vcl/unx/gtk3/gtk3gtkinst.cxx:5195
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5343
+vcl/unx/gtk3/gtk3gtkinst.cxx:5339
     (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5351
+vcl/unx/gtk3/gtk3gtkinst.cxx:5347
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 5860beec983e..e3e880caf9fe 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -55,13 +55,13 @@ bridges/source/jni_uno/jni_java2uno.cxx:153
 bridges/source/jni_uno/jni_java2uno.cxx:154
     jni_uno::(anonymous namespace)::largest a uno_Any
 canvas/inc/rendering/irendermodule.hxx:35
-    canvas::Vertex r float
-canvas/inc/rendering/irendermodule.hxx:35
     canvas::Vertex a float
 canvas/inc/rendering/irendermodule.hxx:35
     canvas::Vertex b float
 canvas/inc/rendering/irendermodule.hxx:35
     canvas::Vertex g float
+canvas/inc/rendering/irendermodule.hxx:35
+    canvas::Vertex r float
 canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex v float
 canvas/inc/rendering/irendermodule.hxx:36
@@ -69,9 +69,9 @@ canvas/inc/rendering/irendermodule.hxx:36
 canvas/inc/rendering/irendermodule.hxx:37
     canvas::Vertex x float
 canvas/inc/rendering/irendermodule.hxx:37
-    canvas::Vertex y float
-canvas/inc/rendering/irendermodule.hxx:37
     canvas::Vertex z float
+canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex y float
 canvas/source/cairo/cairo_canvasbitmap.hxx:119
     cairocanvas::CanvasBitmap mpBufferCairo ::cairo::CairoSharedPtr
 canvas/source/cairo/cairo_spritedevicehelper.hxx:73
@@ -96,7 +96,7 @@ chart2/source/controller/main/ElementSelector.hxx:37
     chart::ListBoxEntryData nHierarchyDepth sal_Int32
 chart2/source/inc/MediaDescriptorHelper.hxx:71
     apphelper::MediaDescriptorHelper ReadOnly _Bool
-chart2/source/view/charttypes/PieChart.hxx:129
+chart2/source/view/charttypes/PieChart.hxx:128
     chart::PieChart::PieLabelInfo fValue double
 codemaker/source/cppumaker/dependencies.hxx:107
     codemaker::cppumaker::Dependencies m_voidDependency _Bool
@@ -212,9 +212,9 @@ dbaccess/source/ui/browser/dbloader.cxx:62
     (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
 desktop/qa/desktop_lib/test_desktop_lib.cxx:237
     DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1213
+desktop/source/app/app.cxx:1209
     desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1214
+desktop/source/app/app.cxx:1210
     desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx:137
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
@@ -268,7 +268,7 @@ embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatusAspect sal_Int64
 embeddedobj/source/inc/oleembobj.hxx:189
     OleEmbeddedObject m_bFromClipboard _Bool
-emfio/inc/mtftools.hxx:512
+emfio/inc/mtftools.hxx:515
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:65
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
@@ -288,7 +288,7 @@ framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:276
     framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-i18nutil/source/utility/paper.cxx:305
+i18nutil/source/utility/paper.cxx:306
     paperword string char *
 include/basegfx/DrawCommands.hxx:81
     gfx::LinearGradientInfo maMatrix basegfx::B2DHomMatrix
@@ -345,9 +345,9 @@ include/sfx2/minfitem.hxx:35
 include/sfx2/templdlg.hxx:42
     SfxTemplatePanelControl pImpl std::unique_ptr<SfxTemplateDialog_Impl>
 include/svtools/brwbox.hxx:327
-    BrowseBox::CursorMoveAttempt m_nCol long
+    BrowseBox::CursorMoveAttempt m_nCol sal_Int32
 include/svtools/brwbox.hxx:328
-    BrowseBox::CursorMoveAttempt m_nRow long
+    BrowseBox::CursorMoveAttempt m_nRow sal_Int32
 include/svtools/brwbox.hxx:329
     BrowseBox::CursorMoveAttempt m_bScrolledToReachCell _Bool
 include/svtools/ctrltool.hxx:150
@@ -379,16 +379,16 @@ include/svx/svdmrkv.hxx:100
 include/svx/svdograf.hxx:95
     SdrGrafObj aReferer class rtl::OUString
 include/svx/viewpt3d.hxx:62
-    Viewport3D::(anonymous) X double
-include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) H double
 include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) Y double
+include/svx/viewpt3d.hxx:62
+    Viewport3D::(anonymous) X double
 include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:159
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/menu.hxx:455
+include/vcl/menu.hxx:456
     MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonNotebookBarItem sTarget class rtl::OUString
@@ -402,41 +402,33 @@ include/vcl/opengl/OpenGLContext.hxx:32
     GLWindow bMultiSampleSupported _Bool
 include/vcl/pdfextoutdevdata.hxx:83
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
-include/vcl/pdfread.hxx:46
-    vcl::PDFGraphicAnnotation meSubType pdf::PDFAnnotationSubType
-include/vcl/salnativewidgets.hxx:325
-    SliderValue mnMin long
-include/vcl/salnativewidgets.hxx:326
-    SliderValue mnMax long
-include/vcl/salnativewidgets.hxx:327
-    SliderValue mnCur long
 include/vcl/salnativewidgets.hxx:467
     ToolbarValue mbIsTopDockingArea _Bool
-include/vcl/salnativewidgets.hxx:532
-    PushButtonValue mbBevelButton _Bool
 include/vcl/salnativewidgets.hxx:533
+    PushButtonValue mbBevelButton _Bool
+include/vcl/salnativewidgets.hxx:534
     PushButtonValue mbSingleLine _Bool
 include/vcl/sysdata.hxx:65
     SystemEnvData pSalFrame void *
-include/vcl/textrectinfo.hxx:32
+include/vcl/textrectinfo.hxx:35
     TextRectInfo mnLineCount sal_uInt16
 include/vcl/vclenum.hxx:202
     ItalicMatrix xx double
 include/vcl/vclenum.hxx:202
-    ItalicMatrix yx double
+    ItalicMatrix yy double
 include/vcl/vclenum.hxx:202
     ItalicMatrix xy double
 include/vcl/vclenum.hxx:202
-    ItalicMatrix yy double
+    ItalicMatrix yx double
 include/xmloff/shapeimport.hxx:180
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 include/xmloff/shapeimport.hxx:181
     SdXML3DSceneAttributesHelper mbVPNUsed _Bool
 include/xmloff/shapeimport.hxx:182
     SdXML3DSceneAttributesHelper mbVUPUsed _Bool
-io/source/stm/odata.cxx:242
+io/source/stm/odata.cxx:243
     io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
-io/source/stm/odata.cxx:242
+io/source/stm/odata.cxx:243
     io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
 jvmfwk/inc/vendorbase.hxx:175
     jfw_plugin::VendorBase m_sArch class rtl::OUString
@@ -449,9 +441,9 @@ libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:62
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:37
     (anonymous namespace)::GtvMainToolbarPrivateImpl m_pPartModeSelector GtkWidget *
 package/inc/ByteChucker.hxx:38
-    ByteChucker p4Sequence sal_Int8 *const
-package/inc/ByteChucker.hxx:38
     ByteChucker p2Sequence sal_Int8 *const
+package/inc/ByteChucker.hxx:38
+    ByteChucker p4Sequence sal_Int8 *const
 registry/source/reflread.cxx:477
     (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(anonymous) b1 sal_uInt32
 registry/source/reflread.cxx:478
@@ -468,7 +460,7 @@ sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
 sal/rtl/alloc_arena.hxx:36
     rtl_arena_stat_type m_mem_alloc sal_Size
-sal/rtl/math.cxx:947
+sal/rtl/math.cxx:953
      md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:98
     (anonymous namespace)::ImplUTF7ToUCContextData mbShifted _Bool
@@ -496,13 +488,13 @@ sc/inc/compressedarray.hxx:70
     ScCompressedArray::RangeData mnRow2 A
 sc/inc/patattr.hxx:55
     ScPatternAttr mxHashCode std::optional<size_t>
-sc/inc/pivot.hxx:75
+sc/inc/pivot.hxx:76
     ScDPLabelData mnFlags sal_Int32
-sc/inc/pivot.hxx:78
+sc/inc/pivot.hxx:79
     ScDPLabelData mbIsValue _Bool
 sc/inc/scmatrix.hxx:118
     ScMatrix mbCloneIfConst _Bool
-sc/inc/scmod.hxx:103
+sc/inc/scmod.hxx:102
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
 sc/inc/tabopparams.hxx:38
     ScInterpreterTableOpParams bValid _Bool
@@ -560,7 +552,7 @@ sc/source/filter/xml/xmldrani.hxx:72
     ScXMLDatabaseRangeContext bIsSelection _Bool
 sc/source/filter/xml/xmlexternaltabi.hxx:111
     ScXMLExternalRefCellContext mnCellType sal_Int16
-sc/source/ui/inc/AccessibleText.hxx:194
+sc/source/ui/inc/AccessibleText.hxx:198
     ScAccessiblePreviewHeaderCellTextData mbRowHeader _Bool
 sc/source/ui/inc/datastream.hxx:105
     sc::DataStream mnSettings sal_uInt32
@@ -570,6 +562,8 @@ sc/source/ui/inc/drwtrans.hxx:45
     ScDrawTransferObj m_aDrawPersistRef SfxObjectShellRef
 sc/source/ui/inc/filtdlg.hxx:186
     ScSpecialFilterDlg pOptionsMgr std::unique_ptr<ScFilterOptionsMgr>
+sc/source/ui/inc/inputwin.hxx:145
+    ScTextWnd xAcc css::uno::WeakReference<css::accessibility::XAccessible>
 sc/source/ui/inc/instbdlg.hxx:57
     ScInsertTableDlg aDocShTablesRef SfxObjectShellRef
 sc/source/ui/inc/linkarea.hxx:38
@@ -581,7 +575,7 @@ sc/source/ui/inc/PivotLayoutTreeList.hxx:21
 sc/source/ui/inc/PivotLayoutTreeListData.hxx:38
     ScPivotLayoutTreeListData maDataItemValues std::vector<std::unique_ptr<ScItemValue> >
 sc/source/ui/inc/preview.hxx:47
-    ScPreview nTabPage long
+    ScPreview nTabPage tools::Long
 sc/source/ui/inc/tabvwsh.hxx:122
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
 sc/source/ui/inc/transobj.hxx:47
@@ -662,6 +656,8 @@ sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
     NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
+sfx2/source/control/thumbnailviewacc.hxx:126
+    ThumbnailViewAcc mbIsFocused _Bool
 sfx2/source/doc/sfxbasemodel.cxx:448
     (anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
 sfx2/source/inc/appdata.hxx:71
@@ -692,7 +688,7 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:302
     Vertex texcoord glm::vec2
-slideshow/source/engine/slideshowimpl.cxx:1044
+slideshow/source/engine/slideshowimpl.cxx:1045
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
 slideshow/test/testview.cxx:50
     (anonymous namespace)::ImplTestView maCreatedSprites std::vector<std::pair<basegfx::B2DVector, double> >
@@ -700,7 +696,7 @@ slideshow/test/testview.cxx:53
     (anonymous namespace)::ImplTestView maPriority basegfx::B1DRange
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
-starmath/inc/view.hxx:156
+starmath/inc/view.hxx:157
     SmCmdBoxWindow aController class SmEditController
 stoc/source/servicemanager/servicemanager.cxx:392
     (anonymous namespace)::OServiceManager m_SetLoadedFactories (anonymous namespace)::HashSet_Ref
@@ -746,7 +742,7 @@ svl/source/crypto/cryptosign.cxx:197
     (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
 svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
-svl/source/undo/undo.cxx:314
+svl/source/undo/undo.cxx:315
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
 svx/inc/galbrws2.hxx:82
     GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
@@ -770,12 +766,14 @@ svx/source/sdr/attribute/sdrtextattribute.cxx:49
     drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32
 svx/source/sdr/attribute/sdrtextattribute.cxx:63
     drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell _Bool
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:40
-    svx::sidebar::EffectPropertyPanel maGlowColorController sfx2::sidebar::ControllerItem
 svx/source/sidebar/effect/EffectPropertyPanel.hxx:41
-    svx::sidebar::GlowPropertyPanel maGlowRadiusController sfx2::sidebar::ControllerItem
+    svx::sidebar::EffectPropertyPanel maGlowColorController sfx2::sidebar::ControllerItem
 svx/source/sidebar/effect/EffectPropertyPanel.hxx:42
+    svx::sidebar::EffectPropertyPanel maGlowRadiusController sfx2::sidebar::ControllerItem
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:43
     svx::sidebar::EffectPropertyPanel maGlowTransparencyController sfx2::sidebar::ControllerItem
+svx/source/sidebar/effect/EffectPropertyPanel.hxx:45
+    svx::sidebar::EffectPropertyPanel maSoftEdgeRadiusController sfx2::sidebar::ControllerItem
 svx/source/sidebar/line/LinePropertyPanel.hxx:83
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
 svx/source/sidebar/line/LinePropertyPanel.hxx:84
@@ -816,8 +814,6 @@ svx/source/sidebar/possize/PosSizePropertyPanel.hxx:117
     svx::sidebar::PosSizePropertyPanel mxAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx:119
     svx::sidebar::PosSizePropertyPanel mxAlignDispatch2 std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/effect/EffectPropertyPanel.hxx:41
-    svx::sidebar::EffectPropertyPanel maSoftEdgeRadiusController sfx2::sidebar::ControllerItem
 svx/source/sidebar/styles/StylesPropertyPanel.hxx:13
     svx::sidebar::StylesPropertyPanel m_xFontStyleDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/sidebar/styles/StylesPropertyPanel.hxx:16
@@ -844,7 +840,7 @@ svx/source/sidebar/text/TextPropertyPanel.hxx:68
     svx::sidebar::TextPropertyPanel mxPositionBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/sidebar/text/TextPropertyPanel.hxx:70
     svx::sidebar::TextPropertyPanel mxSpacingBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/tbxctrls/tbcontrl.cxx:312
+svx/source/tbxctrls/tbcontrl.cxx:311
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -870,13 +866,13 @@ sw/source/core/inc/swfont.hxx:982
     SvStatistics nChangeFont sal_uInt16
 sw/source/core/inc/unoflatpara.hxx:135
     SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> >
-sw/source/core/layout/dbg_lay.cxx:132
-    SwImplProtocol aVars std::vector<long>
-sw/source/core/table/swtable.cxx:2610
+sw/source/core/layout/dbg_lay.cxx:133
+    SwImplProtocol m_aVars std::vector<tools::Long>
+sw/source/core/table/swtable.cxx:2588
     SwTableCellInfo::Impl m_HandledTableBoxes SwTableCellInfo::Impl::TableBoxes_t
 sw/source/core/text/porfld.hxx:61
     SwFieldPortion m_nAttrFieldType sal_uInt16
-sw/source/filter/html/swhtml.hxx:373
+sw/source/filter/html/swhtml.hxx:382
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> >
 sw/source/filter/inc/rtf.hxx:28
     RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
@@ -892,7 +888,7 @@ sw/source/uibase/inc/maildispatcher.hxx:146
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
 sw/source/uibase/inc/maildispatcher.hxx:152
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
-sw/source/uibase/inc/navipi.hxx:62
+sw/source/uibase/inc/navipi.hxx:61
     SwNavigationPI m_xContent1Dispatch std::unique_ptr<ToolbarUnoDispatcher>
 sw/source/uibase/inc/redlndlg.hxx:61
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
@@ -988,7 +984,7 @@ vcl/inc/accel.h:33
     ImplAccelEntry mpAutoAccel class Accelerator *
 vcl/inc/driverblocklist.hxx:114
     DriverBlocklist::DriverInfo maMsg class rtl::OUString
-vcl/inc/fontselect.hxx:61
+vcl/inc/fontselect.hxx:62
     FontSelectPattern mfExactHeight float
 vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
@@ -998,8 +994,18 @@ vcl/inc/pdf/BitmapID.hxx:23
     vcl::pdf::BitmapID m_nChecksum BitmapChecksum
 vcl/inc/pdf/BitmapID.hxx:24
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/inc/salmenu.hxx:32
-    SalItemParams aImage class Image
+vcl/inc/qt5/Qt5Frame.hxx:97
+    Qt5Frame m_pSalMenu class Qt5Menu *
+vcl/inc/qt5/Qt5Graphics.hxx:53
+    Qt5Graphics m_pFontCollection class PhysicalFontCollection *
+vcl/inc/qt5/Qt5Instance.hxx:62
+    Qt5Instance m_pQApplication std::unique_ptr<QApplication>
+vcl/inc/qt5/Qt5Instance.hxx:63
+    Qt5Instance m_pFakeArgvFreeable std::vector<FreeableCStr>
+vcl/inc/qt5/Qt5Instance.hxx:64
+    Qt5Instance m_pFakeArgv std::unique_ptr<char *[]>
+vcl/inc/qt5/Qt5Instance.hxx:65
+    Qt5Instance m_pFakeArgc std::unique_ptr<int>
 vcl/inc/salmenu.hxx:33
     SalItemParams pMenu VclPtr<class Menu>
 vcl/inc/salmenu.hxx:34
@@ -1012,29 +1018,27 @@ vcl/inc/salmenu.hxx:43
     SalMenuButtonItem maImage class Image
 vcl/inc/salmenu.hxx:44
     SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/salwtype.hxx:203
-    SalSurroundingTextRequestEvent mnStart sal_uLong
-vcl/inc/salwtype.hxx:204
+vcl/inc/salwtype.hxx:206
     SalSurroundingTextRequestEvent mnEnd sal_uLong
-vcl/inc/salwtype.hxx:215
-    SalQueryCharPositionEvent mbValid _Bool
 vcl/inc/salwtype.hxx:217
-    SalQueryCharPositionEvent mbVertical _Bool
-vcl/inc/salwtype.hxx:218
-    SalQueryCharPositionEvent mnCursorBoundX long
+    SalQueryCharPositionEvent mbValid _Bool
 vcl/inc/salwtype.hxx:219
-    SalQueryCharPositionEvent mnCursorBoundY long
+    SalQueryCharPositionEvent mbVertical _Bool
 vcl/inc/salwtype.hxx:220
-    SalQueryCharPositionEvent mnCursorBoundWidth long
+    SalQueryCharPositionEvent mnCursorBoundX tools::Long
 vcl/inc/salwtype.hxx:221
-    SalQueryCharPositionEvent mnCursorBoundHeight long
-vcl/inc/salwtype.hxx:248
+    SalQueryCharPositionEvent mnCursorBoundY tools::Long
+vcl/inc/salwtype.hxx:222
+    SalQueryCharPositionEvent mnCursorBoundWidth tools::Long
+vcl/inc/salwtype.hxx:223
+    SalQueryCharPositionEvent mnCursorBoundHeight tools::Long
+vcl/inc/salwtype.hxx:250
     SalInputContext mpFont rtl::Reference<LogicalFontInstance>
-vcl/inc/salwtype.hxx:255
+vcl/inc/salwtype.hxx:257
     SalSwipeEvent mnVelocityY double
 vcl/inc/scanlinewriter.hxx:36
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/inc/svdata.hxx:455
+vcl/inc/svdata.hxx:452
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
@@ -1042,7 +1046,9 @@ vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
 vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
-vcl/inc/unx/salgdi.h:314
+vcl/inc/unx/gtk/gtkframe.hxx:185
+    GtkSalFrame m_pCurrentCursor GdkCursor *
+vcl/inc/unx/salgdi.h:316
     X11SalGraphics nTextPixel_ Pixel
 vcl/inc/WidgetThemeLibrary.hxx:20
     vcl::WidgetDrawStyle nSize uint32_t
@@ -1058,23 +1064,23 @@ vcl/source/filter/graphicfilter.cxx:611
     (anonymous namespace)::ImpFilterLibCacheEntry maFiltername class rtl::OUString
 vcl/source/filter/graphicfilter.cxx:714
     (anonymous namespace)::ImpFilterLibCache mpLast struct (anonymous namespace)::ImpFilterLibCacheEntry *
-vcl/source/filter/jpeg/Exif.hxx:53
+vcl/source/filter/jpeg/Exif.hxx:54
     Exif::ExifIFD tag sal_uInt8 [2]
 vcl/source/filter/wmf/wmfwr.hxx:95
     WMFWriter aDstClipRegion vcl::Region
 vcl/source/fontsubset/sft.cxx:92
     vcl::(anonymous namespace)::TTGlyphMetrics lsb sal_Int16
-vcl/source/fontsubset/ttcr.cxx:351
+vcl/source/fontsubset/ttcr.cxx:350
     vcl::(anonymous namespace)::tdata_post ptr void *
-vcl/unx/generic/app/wmadaptor.cxx:1274
-    _mwmhints deco unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1274
-    _mwmhints flags unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1274
+vcl/unx/generic/app/wmadaptor.cxx:1270
     _mwmhints func unsigned long
-vcl/unx/generic/app/wmadaptor.cxx:1275
-    _mwmhints input_mode long
-vcl/unx/generic/app/wmadaptor.cxx:1276
+vcl/unx/generic/app/wmadaptor.cxx:1270
+    _mwmhints flags unsigned long
+vcl/unx/generic/app/wmadaptor.cxx:1270
+    _mwmhints deco unsigned long
+vcl/unx/generic/app/wmadaptor.cxx:1271
+    _mwmhints input_mode tools::Long
+vcl/unx/generic/app/wmadaptor.cxx:1272
     _mwmhints status unsigned long
 vcl/unx/generic/gdi/cairotextrender.cxx:39
     (anonymous namespace)::CairoFontsCache::CacheId maFace (anonymous namespace)::FT_Face
@@ -1087,12 +1093,14 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:47
 vcl/unx/gtk3/a11y/atkwrapper.hxx:75
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx:138
-    DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
+    DocumentFocusListener m_aRefList o3tl::sorted_vector<uno::Reference<uno::XInterface> >
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
 vcl/unx/gtk3/gtk3gtkinst.cxx:1613
      in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13432
+vcl/unx/gtk3/gtk3gtkinst.cxx:7640
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pBox GtkBox *
+vcl/unx/gtk3/gtk3gtkinst.cxx:13965
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/gtk3hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *