loplugin:unusedfields

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

6 files changed, 133 insertions, 124 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 72335ea1c78a..069b0766f54f 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,12 +9,12 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
-basegfx/source/polygon/b2dtrapezoid.cxx:207
+basegfx/source/polygon/b2dtrapezoid.cxx:205
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
 basic/qa/cppunit/basictest.hxx:28
     MacroSnippet maDll class BasicDLL
@@ -124,7 +124,7 @@ cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
 cui/source/dialogs/colorpicker.cxx:737
     cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1394
+cui/source/factory/dlgfact.cxx:1408
     (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/cfgutil.hxx:239
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
@@ -164,8 +164,6 @@ dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2771
-      class AllSettings &
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
@@ -188,7 +186,7 @@ helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basic/basmgr.hxx:56
     BasicError nReason enum BasicErrorReason
-include/drawinglayer/primitive2d/textlayoutdevice.hxx:58
+include/drawinglayer/primitive2d/textlayoutdevice.hxx:57
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
 include/drawinglayer/texture/texture3d.hxx:62
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
@@ -311,31 +309,33 @@ include/sfx2/msg.hxx:144
 include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
-include/sfx2/msg.hxx:145
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 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 pType const std::type_info *
 include/sfx2/msg.hxx:146
-    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:146
     SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
+    SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:146
     SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 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 aAttrib struct SfxTypeAttrib [23]
+include/sfx2/msg.hxx:147
+    SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
+include/svtools/valueset.hxx:199
+    ValueSet maTimer class Timer
 include/svx/ClassificationDialog.hxx:31
     svx::ClassificationDialog m_bPerParagraph const _Bool
 include/svx/imapdlg.hxx:91
@@ -636,17 +636,17 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:300
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex texcoord glm::vec2
-slideshow/source/engine/smilfunctionparser.cxx:493
+slideshow/source/engine/smilfunctionparser.cxx:491
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:494
+slideshow/source/engine/smilfunctionparser.cxx:492
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:495
+slideshow/source/engine/smilfunctionparser.cxx:493
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:496
+slideshow/source/engine/smilfunctionparser.cxx:494
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:497
+slideshow/source/engine/smilfunctionparser.cxx:495
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:498
+slideshow/source/engine/smilfunctionparser.cxx:496
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 starmath/inc/view.hxx:216
     SmViewShell maGraphicController const class SmGraphicController
@@ -664,6 +664,8 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
+svtools/source/control/valueimp.hxx:62
+    ValueSetItem mpData void *
 svx/inc/GalleryControl.hxx:42
     svx::sidebar::GalleryControl mpGallery class Gallery *
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
@@ -712,7 +714,9 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:145
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4137
+sw/qa/extras/uiwriter/uiwriter2.cxx:70
+      class SwUiWriterTest2 *
+sw/qa/extras/uiwriter/uiwriter.cxx:4159
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
@@ -722,7 +726,7 @@ sw/source/core/layout/dbg_lay.cxx:170
     SwImplEnterLeave nAction const enum DbgAction
 sw/source/core/text/inftxt.cxx:567
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
-sw/source/core/text/inftxt.hxx:679
+sw/source/core/text/inftxt.hxx:682
     SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:143
     (anonymous namespace)::SwFieldSlot aText class rtl::OUString
@@ -750,7 +754,7 @@ ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
 ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-vcl/headless/svpgdi.cxx:317
+vcl/headless/svpgdi.cxx:319
     (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
 vcl/inc/canvasbitmap.hxx:42
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
@@ -760,7 +764,7 @@ vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
 vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
-vcl/inc/opengl/zone.hxx:62
+vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone const class OpenGLZone
 vcl/inc/qt5/Qt5Graphics.hxx:58
     Qt5Graphics m_lastPopupRect class QRect
@@ -800,9 +804,9 @@ vcl/inc/WidgetThemeLibrary.hxx:93
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:109
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:3357
+vcl/source/app/salvtables.cxx:3387
     (anonymous namespace)::SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:6195
+vcl/source/app/salvtables.cxx:6274
     (anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -824,9 +828,9 @@ 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:5071
+vcl/unx/gtk3/gtk3gtkinst.cxx:5120
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-writerfilter/source/dmapper/PropertyMap.hxx:204
+writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 xmloff/source/chart/transporttypes.hxx:149
     CustomLabelField sRuns std::vector<OUString>
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index f124f1da711b..6a4b26146d35 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -4,7 +4,7 @@ avmedia/source/vlc/wrapper/Types.hxx:52
     libvlc_track_description_t i_id int
 avmedia/source/vlc/wrapper/Types.hxx:54
     libvlc_track_description_t p_next struct libvlc_track_description_t *
-basegfx/source/polygon/b2dtrapezoid.cxx:207
+basegfx/source/polygon/b2dtrapezoid.cxx:205
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
 basic/source/inc/expr.hxx:93
     SbiExprNode::(anonymous) nTypeStrId sal_uInt16
@@ -58,6 +58,16 @@ codemaker/source/javamaker/classfile.cxx:508
      uint32Bytes sal_uInt32
 codemaker/source/javamaker/classfile.cxx:540
      uint64Bytes sal_uInt64
+connectivity/inc/sdbcx/VCatalog.hxx:67
+    connectivity::sdbcx::OCatalog m_pViews std::unique_ptr<OCollection>
+connectivity/inc/sdbcx/VCatalog.hxx:68
+    connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
+connectivity/inc/sdbcx/VGroup.hxx:54
+    connectivity::sdbcx::OGroup m_pUsers std::unique_ptr<OUsers>
+connectivity/inc/sdbcx/VKey.hxx:71
+    connectivity::sdbcx::OKey m_pColumns std::unique_ptr<OCollection>
+connectivity/inc/sdbcx/VUser.hxx:54
+    connectivity::sdbcx::OUser m_pGroups std::unique_ptr<OGroups>
 connectivity/qa/connectivity/resource/sharedresources_test.cxx:53
     connectivity_test::SharedResourcesTest m_aResource ::connectivity::SharedResources
 connectivity/source/drivers/evoab2/EApi.h:125
@@ -260,22 +270,12 @@ include/comphelper/parallelsort.hxx:164
     comphelper::(anonymous namespace)::Binner maLabels uint8_t [mnMaxStaticSize]
 include/connectivity/DriversConfig.hxx:75
     connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
-include/connectivity/sdbcx/VCatalog.hxx:68
-    connectivity::sdbcx::OCatalog m_pViews std::unique_ptr<OCollection>
-include/connectivity/sdbcx/VCatalog.hxx:69
-    connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
 include/connectivity/sdbcx/VDescriptor.hxx:53
     connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
-include/connectivity/sdbcx/VGroup.hxx:55
-    connectivity::sdbcx::OGroup m_pUsers std::unique_ptr<OUsers>
-include/connectivity/sdbcx/VKey.hxx:72
-    connectivity::sdbcx::OKey m_pColumns std::unique_ptr<OCollection>
 include/connectivity/sdbcx/VTable.hxx:78
     connectivity::sdbcx::OTable m_xColumns rtl::Reference<OCollection>
 include/connectivity/sdbcx/VTable.hxx:79
     connectivity::sdbcx::OTable m_xIndexes rtl::Reference<OCollection>
-include/connectivity/sdbcx/VUser.hxx:55
-    connectivity::sdbcx::OUser m_pGroups std::unique_ptr<OGroups>
 include/connectivity/sqlparse.hxx:109
     connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
 include/drawinglayer/processor3d/defaultprocessor3d.hxx:90
@@ -324,8 +324,6 @@ include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:32
     MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
-include/svtools/valueset.hxx:223
-    ValueSet maHighlightHdl Link<class ValueSet *, void>
 include/svx/colorwindow.hxx:67
     SvxColorWindow maSelectedLink Link<const NamedColor &, void>
 include/svx/graphctl.hxx:52
@@ -342,8 +340,16 @@ include/svx/svdoedge.hxx:160
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
 include/svx/svdpntv.hxx:160
     SdrPaintView maDrawinglayerOpt const class SvtOptionsDrawinglayer
+include/test/sheet/xdatapilottable.hxx:31
+    apitest::XDataPilotTable xCellForChange css::uno::Reference<css::table::XCell>
+include/test/sheet/xdatapilottable.hxx:32
+    apitest::XDataPilotTable xCellForCheck css::uno::Reference<css::table::XCell>
+include/test/sheet/xnamedranges.hxx:49
+    apitest::XNamedRanges xSheet css::uno::Reference<css::sheet::XSpreadsheet>
+include/test/sheet/xspreadsheets2.hxx:47
+    apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo7/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -370,8 +376,6 @@ include/vcl/opengl/OpenGLContext.hxx:48
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
 include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
-include/vcl/ppdparser.hxx:130
-    psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
 io/source/stm/odata.cxx:578
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
 io/source/stm/odata.cxx:578
@@ -423,15 +427,13 @@ sc/inc/attarray.hxx:68
 sc/inc/compiler.hxx:129
     ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
 sc/inc/compiler.hxx:130
-    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo7/sc/inc/compiler.hxx:127:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:127:9)
 sc/inc/compiler.hxx:135
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
     sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **const
 sc/inc/reordermap.hxx:21
     sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/qa/extras/anchor.cxx:57
-    sc_apitest::ScAnchorTest mxComponent uno::Reference<lang::XComponent>
 sc/qa/unit/scshapetest.cxx:43
     sc_apitest::ScShapeTest mxComponent uno::Reference<lang::XComponent>
 sc/source/core/inc/adiasync.hxx:42
@@ -528,12 +530,8 @@ sdext/source/pdfimport/tree/style.hxx:43
     pdfi::StyleContainer::Style Contents const class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:99
     sfx2::(anonymous namespace)::ImplDdeItem pLink class sfx2::SvBaseLink *
-slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx:58
-    slideshow::internal::SequentialTimeContainer mpCurrentRewindEvent slideshow::internal::EventSharedPtr
 slideshow/source/engine/slideshowimpl.cxx:132
     (anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
-slideshow/source/inc/usereventqueue.hxx:260
-    slideshow::internal::UserEventQueue mpDoubleClickEventHandler ::std::shared_ptr<ClickEventHandler>
 sot/source/sdstor/ucbstorage.cxx:403
     UCBStorageStream_Impl m_aKey const class rtl::OString
 starmath/source/view.cxx:862
@@ -599,7 +597,7 @@ sw/inc/dpage.hxx:35
 sw/inc/hints.hxx:230
     SwAttrSetChg m_bDelSet const _Bool
 sw/inc/shellio.hxx:153
-    SwReader pStg const tools::SvRef<SotStorage>
+    SwReader mpStg const tools::SvRef<SotStorage>
 sw/inc/swevent.hxx:71
     SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat *
 sw/source/core/access/accfrmobjmap.hxx:100
@@ -644,7 +642,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:115
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
 sw/source/uibase/inc/fldmgr.hxx:79
     SwInsertField_Data m_aDBDataSource const css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:432
+toolkit/source/awt/vclxtoolkit.cxx:434
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
@@ -726,7 +724,9 @@ unotools/source/config/saveopt.cxx:82
     (anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave _Bool
 vcl/inc/BitmapFastScaleFilter.hxx:31
     BitmapFastScaleFilter maSize const class Size
-vcl/inc/printerinfomanager.hxx:74
+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:157
     SalWheelMouseEvent mbDeltaIsPixel _Bool
@@ -738,7 +738,7 @@ vcl/inc/salwtype.hxx:211
     SalQueryCharPositionEvent mnCharPos sal_uLong
 vcl/inc/svdata.hxx:278
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/toolbox.h:107
+vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
 vcl/inc/unx/saldisp.hxx:282
     SalDisplay m_aInvalidScreenData const struct SalDisplay::ScreenData
@@ -978,15 +978,15 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:75
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1605
+vcl/unx/gtk3/gtk3gtkinst.cxx:1610
      out gpointer *
-writerfilter/inc/ooxml/QNameToString.hxx:41
+writerfilter/inc/ooxml/QNameToString.hxx:38
     writerfilter::QNameToString mMap writerfilter::QNameToString::Map
-writerfilter/source/ooxml/OOXMLFactory.hxx:63
+writerfilter/source/ooxml/OOXMLFactory.hxx:58
     writerfilter::ooxml::AttributeInfo m_nToken const writerfilter::Token_t
-writerfilter/source/ooxml/OOXMLFactory.hxx:64
+writerfilter/source/ooxml/OOXMLFactory.hxx:59
     writerfilter::ooxml::AttributeInfo m_nResource const enum writerfilter::ooxml::ResourceType
-writerfilter/source/ooxml/OOXMLFactory.hxx:65
+writerfilter/source/ooxml/OOXMLFactory.hxx:60
     writerfilter::ooxml::AttributeInfo m_nRef const Id
 xmloff/inc/MultiPropertySetHelper.hxx:78
     MultiPropertySetHelper aEmptyAny const css::uno::Any
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 900d39f4e5b1..cafa4fcd4517 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basctl/source/inc/dlged.hxx:122
@@ -40,9 +40,7 @@ dbaccess/source/core/inc/databasecontext.hxx:95
     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:2771
-      class AllSettings &
-emfio/source/emfuno/xemfparser.cxx:52
+emfio/source/emfuno/xemfparser.cxx:50
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:45
     ScannerManager maProtector osl::Mutex
@@ -50,7 +48,7 @@ helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basegfx/DrawCommands.hxx:142
     gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo>
-include/drawinglayer/primitive2d/textlayoutdevice.hxx:58
+include/drawinglayer/primitive2d/textlayoutdevice.hxx:57
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
 include/editeng/unotext.hxx:606
     SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
@@ -67,29 +65,29 @@ include/sfx2/msg.hxx:117
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs const sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:132
     SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
+    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:132
     SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:133
     SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
-include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
 include/sfx2/msg.hxx:133
+    SfxType2 pType const std::type_info *
+include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:134
+    SfxType3 pType const std::type_info *
+include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 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 pType const std::type_info *
 include/sfx2/msg.hxx:135
     SfxType4 aAttrib struct SfxTypeAttrib [4]
 include/sfx2/msg.hxx:135
@@ -101,19 +99,19 @@ include/sfx2/msg.hxx:135
 include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
-    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:136
     SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
     SfxType5 pType const std::type_info *
+include/sfx2/msg.hxx:136
+    SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
     SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
@@ -151,9 +149,9 @@ include/sfx2/msg.hxx:143
 include/sfx2/msg.hxx:143
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:143
-    SfxType13 aAttrib struct SfxTypeAttrib [13]
-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:144
@@ -190,6 +188,8 @@ include/svtools/genericunodialog.hxx:156
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/unoevent.hxx:163
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
+include/svtools/valueset.hxx:199
+    ValueSet maTimer class Timer
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
 include/unotest/macros_test.hxx:50
@@ -349,11 +349,11 @@ sfx2/source/doc/doctempl.cxx:102
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
 slideshow/source/engine/opengl/TransitionImpl.cxx:1989
+    (anonymous namespace)::ThreeFloats x GLfloat
+slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats y GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1989
-    (anonymous namespace)::ThreeFloats x GLfloat
 starmath/inc/smmod.hxx:69
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
 starmath/inc/view.hxx:216
@@ -370,12 +370,16 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
+svtools/source/control/valueimp.hxx:62
+    ValueSetItem mpData void *
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
 svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/tbxctrls/layctrl.cxx:432
+svx/source/tbxctrls/layctrl.cxx:433
     (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
+sw/qa/extras/uiwriter/uiwriter2.cxx:70
+      class SwUiWriterTest2 *
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:75
@@ -400,7 +404,7 @@ vcl/inc/opengl/gdiimpl.hxx:52
     TextureCombo mpTexture std::unique_ptr<OpenGLTexture>
 vcl/inc/opengl/gdiimpl.hxx:53
     TextureCombo mpMask std::unique_ptr<OpenGLTexture>
-vcl/inc/opengl/zone.hxx:62
+vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone const class OpenGLZone
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
@@ -442,7 +446,7 @@ 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:5071
+vcl/unx/gtk3/gtk3gtkinst.cxx:5120
     (anonymous namespace)::CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     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 3d7e367ed58f..dd69a4baad20 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1,12 +1,10 @@
-basctl/source/basicide/moduldlg.hxx:130
+basctl/source/basicide/moduldlg.hxx:131
     basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget>
 basctl/source/inc/basidesh.hxx:87
     basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/bastype2.hxx:180
-    basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/bastype2.hxx:249
+basctl/source/inc/bastype2.hxx:183
     basctl::SbTreeListBox m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/IDEComboBox.hxx:104
+basctl/source/inc/IDEComboBox.hxx:121
     basctl::DocListenerBox maNotifier class basctl::DocumentEventNotifier
 basegfx/source/polygon/b2dpolygontriangulator.cxx:113
     basegfx::(anonymous namespace)::Triangulator maNewEdgeEntries std::vector<std::unique_ptr<EdgeEntry> >
@@ -58,6 +56,24 @@ bridges/source/jni_uno/jni_java2uno.cxx:153
     jni_uno::(anonymous namespace)::largest p void *
 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 g 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:36
+    canvas::Vertex v float
+canvas/inc/rendering/irendermodule.hxx:36
+    canvas::Vertex u float
+canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex z float
+canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex x float
+canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex y float
 canvas/source/cairo/cairo_canvasbitmap.hxx:120
     cairocanvas::CanvasBitmap mpBufferCairo ::cairo::CairoSharedPtr
 canvas/source/cairo/cairo_spritedevicehelper.hxx:74
@@ -310,31 +326,13 @@ include/basic/basmgr.hxx:56
     BasicError nReason enum BasicErrorReason
 include/basic/sbxvar.hxx:73
     SbxValues::(anonymous) pData void *
-include/canvas/rendering/irendermodule.hxx:36
-    canvas::Vertex a float
-include/canvas/rendering/irendermodule.hxx:36
-    canvas::Vertex b float
-include/canvas/rendering/irendermodule.hxx:36
-    canvas::Vertex g float
-include/canvas/rendering/irendermodule.hxx:36
-    canvas::Vertex r float
-include/canvas/rendering/irendermodule.hxx:37
-    canvas::Vertex v float
-include/canvas/rendering/irendermodule.hxx:37
-    canvas::Vertex u float
-include/canvas/rendering/irendermodule.hxx:38
-    canvas::Vertex x float
-include/canvas/rendering/irendermodule.hxx:38
-    canvas::Vertex y float
-include/canvas/rendering/irendermodule.hxx:38
-    canvas::Vertex z float
 include/comphelper/parallelsort.hxx:89
     comphelper::(anonymous namespace)::ProfileZone mbDummy _Bool
 include/comphelper/unique_disposing_ptr.hxx:30
     comphelper::unique_disposing_ptr m_xTerminateListener css::uno::Reference<css::frame::XTerminateListener>
 include/drawinglayer/attribute/sdrallattribute3d.hxx:44
     drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const class drawinglayer::attribute::SdrLineStartEndAttribute
-include/drawinglayer/primitive2d/mediaprimitive2d.hxx:51
+include/drawinglayer/primitive2d/mediaprimitive2d.hxx:50
     drawinglayer::primitive2d::MediaPrimitive2D maURL class rtl::OUString
 include/drawinglayer/texture/texture.hxx:77
     drawinglayer::texture::GeoTexSvxGradient maDefinitionRange basegfx::B2DRange
@@ -380,8 +378,6 @@ include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
 include/sfx2/minfitem.hxx:35
     SfxMacroInfoItem aCommentText const class rtl::OUString
-include/sfx2/notebookbar/NotebookbarTabControl.hxx:44
-    NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 include/svtools/brwbox.hxx:247
     BrowseBox::CursorMoveAttempt m_nCol const long
 include/svtools/brwbox.hxx:248
@@ -394,6 +390,8 @@ include/svx/AccessibilityCheckDialog.hxx:46
     svx::AccessibilityCheckDialog m_aAccessibilityCheckEntries std::vector<std::unique_ptr<AccessibilityCheckEntry> >
 include/svx/bmpmask.hxx:128
     SvxBmpMask aSelItem class SvxBmpMaskSelectItem
+include/svx/fillctrl.hxx:83
+    FillControl mxColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
 include/svx/float3d.hxx:204
     Svx3DWin pControllerItem std::unique_ptr<Svx3DCtrlItem>
 include/svx/fmtools.hxx:134
@@ -402,7 +400,7 @@ include/svx/galctrl.hxx:39
     GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 include/svx/galctrl.hxx:92
     GalleryIconView mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
-include/svx/gridctrl.hxx:254
+include/svx/gridctrl.hxx:256
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaRefItem mxRef rtl::Reference<reference_type>
@@ -598,7 +596,7 @@ sc/source/ui/inc/filtdlg.hxx:174
     ScSpecialFilterDlg pOptionsMgr std::unique_ptr<ScFilterOptionsMgr>
 sc/source/ui/inc/instbdlg.hxx:57
     ScInsertTableDlg aDocShTablesRef SfxObjectShellRef
-sc/source/ui/inc/linkarea.hxx:37
+sc/source/ui/inc/linkarea.hxx:38
     ScLinkedAreaDlg aSourceRef SfxObjectShellRef
 sc/source/ui/inc/pfuncache.hxx:49
     ScPrintSelectionStatus aRanges class ScRangeList
@@ -674,6 +672,8 @@ sd/source/ui/view/ToolBarManager.cxx:315
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
 sdext/source/presenter/PresenterTimer.cxx:104
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
+sfx2/inc/notebookbar/NotebookbarTabControl.hxx:43
+    NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:38
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
 sfx2/source/doc/sfxbasemodel.cxx:449
@@ -688,7 +688,7 @@ sfx2/source/inc/appdata.hxx:89
     SfxAppData_Impl mxAppPickList std::unique_ptr<SfxPickList>
 sfx2/source/inc/splitwin.hxx:52
     SfxSplitWindow pActive VclPtr<class SfxDockingWindow>
-sfx2/source/view/classificationcontroller.cxx:72
+sfx2/source/view/classificationcontroller.cxx:73
     sfx2::(anonymous namespace)::ClassificationCategoriesController m_aPropertyListener class sfx2::(anonymous namespace)::ClassificationPropertyListener
 slideshow/source/engine/opengl/TransitionImpl.hxx:300
     Vertex normal glm::vec3
@@ -804,7 +804,7 @@ svx/source/sidebar/possize/PosSizePropertyPanel.hxx:105
     svx::sidebar::PosSizePropertyPanel mxArrangeDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/svdraw/svdpdf.hxx:193
     ImpSdrPdfImport mdPageWidthPts double
-svx/source/tbxctrls/tbcontrl.cxx:203
+svx/source/tbxctrls/tbcontrl.cxx:202
     (anonymous namespace)::SvxFontNameBox_Impl m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -813,7 +813,7 @@ sw/inc/swmodule.hxx:96
 sw/inc/swmodule.hxx:109
     SwModule m_xLinguServiceEventListener css::uno::Reference<css::linguistic2::XLinguServiceEventListener>
 sw/inc/swwait.hxx:45
-    SwWait mpLockedDispatchers std::unordered_set<SfxDispatcher *>
+    SwWait mpLockedDispatchers o3tl::sorted_vector<SfxDispatcher *>
 sw/inc/unoframe.hxx:311
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
 sw/inc/view.hxx:184
@@ -845,15 +845,13 @@ sw/source/filter/inc/rtf.hxx:29
 sw/source/filter/inc/rtf.hxx:30
     RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo7/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/glossary.hxx:63
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
 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:70
-    SwNavigationPI m_xNaviListener std::unique_ptr<NaviStateListener>
 sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
 sw/source/uibase/sidebar/TableEditPanel.hxx:51
@@ -948,6 +946,8 @@ vbahelper/source/vbahelper/vbafillformat.hxx:36
     ScVbaFillFormat m_nForeColor sal_Int32
 vcl/inc/accel.h:33
     ImplAccelEntry mpAutoAccel class Accelerator *
+vcl/inc/driverblocklist.hxx:97
+    DriverBlocklist::DriverInfo maMsg class rtl::OUString
 vcl/inc/fontselect.hxx:61
     FontSelectPattern mfExactHeight float
 vcl/inc/opengl/RenderList.hxx:29
@@ -1014,7 +1014,7 @@ 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:310
+vcl/inc/unx/salgdi.h:311
     X11SalGraphics nTextPixel_ Pixel
 vcl/inc/WidgetThemeLibrary.hxx:20
     vcl::WidgetDrawStyle nSize uint32_t
@@ -1024,9 +1024,9 @@ vcl/inc/WidgetThemeLibrary.hxx:95
     vcl::ControlDrawParameters bIsAction _Bool
 vcl/inc/WidgetThemeLibrary.hxx:96
     vcl::ControlDrawParameters nValue int64_t
-vcl/source/filter/graphicfilter.cxx:659
+vcl/source/filter/graphicfilter.cxx:660
     (anonymous namespace)::ImpFilterLibCacheEntry maFiltername const class rtl::OUString
-vcl/source/filter/graphicfilter.cxx:762
+vcl/source/filter/graphicfilter.cxx:763
     (anonymous namespace)::ImpFilterLibCache mpLast struct (anonymous namespace)::ImpFilterLibCacheEntry *
 vcl/source/filter/jpeg/Exif.hxx:51
     Exif::ExifIFD tag sal_uInt8 [2]
@@ -1060,7 +1060,7 @@ vcl/unx/gtk3/a11y/gtk3atkutil.cxx:138
     DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1605
+vcl/unx/gtk3/gtk3gtkinst.cxx:1610
      in char *
 vcl/unx/gtk3/gtk3hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
@@ -1068,9 +1068,11 @@ vcl/unx/gtk3/gtk3hudawareness.cxx:21
     (anonymous namespace)::HudAwarenessHandle notify GDestroyNotify
 vcl/workben/vcldemo.cxx:1750
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
-writerfilter/source/dmapper/PropertyMap.hxx:204
+writerfilter/source/dmapper/DomainMapperTableHandler.cxx:232
+    writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
+writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-writerfilter/source/dmapper/SettingsTable.cxx:260
+writerfilter/source/dmapper/SettingsTable.cxx:261
     writerfilter::dmapper::SettingsTable_Impl m_sRedlineProtectionKey class rtl::OUString
 xmlhelp/source/cxxhelp/provider/databases.hxx:251
     chelp::Databases m_aDatabases chelp::Databases::DatabasesTable
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index fa825b92f207..70fa752f62c8 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_CUI_SOURCE_INC_CFG_HXX
 
 #include <vcl/transfer.hxx>
+#include <vcl/timer.hxx>
 #include <vcl/weld.hxx>
 #include <svtools/valueset.hxx>
 
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 66ca5faf0efd..579d8c29be75 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -23,7 +23,6 @@
 #include <svtools/svtdllapi.h>
 
 #include <vcl/ctrl.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/customweld.hxx>
 #include <memory>
 #include <vector>
@@ -196,7 +195,6 @@ typedef std::vector<std::unique_ptr<SvtValueSetItem>> SvtValueItemList;
 class SVT_DLLPUBLIC ValueSet : public Control
 {
 private:
-    Timer           maTimer;
     ValueItemList   mItemList;
     std::unique_ptr<ValueSetItem> mpNoneItem;
     VclPtr<ScrollBar> mxScrollBar;