loplugin:unusedfields

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

4 files changed, 246 insertions, 234 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 283d724286d2..03b5e6a65a27 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,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/noel/disk3/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/noel/disk3/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/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:202
@@ -128,17 +128,15 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/dialogs/colorpicker.cxx:719
+cui/source/dialogs/colorpicker.cxx:710
     cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1372
+cui/source/factory/dlgfact.cxx:1374
     SvxMacroAssignDialog m_aItems class SfxItemSet
-cui/source/inc/about.hxx:39
-    AboutDialog m_pCloseButton weld::Button *
-cui/source/inc/cfgutil.hxx:238
+cui/source/inc/cfgutil.hxx:237
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
-cui/source/inc/cuitabarea.hxx:229
+cui/source/inc/cuitabarea.hxx:227
     SvxAreaTabPage maFixed_ChangeType enum ChangeType
-cui/source/inc/cuitabarea.hxx:237
+cui/source/inc/cuitabarea.hxx:235
     SvxAreaTabPage m_aXFillAttr class XFillAttrSetItem
 cui/source/inc/tabstpge.hxx:88
     SvxTabulatorTabPage m_aLeftWin class TabWin_Impl
@@ -186,16 +184,6 @@ filter/source/graphicfilter/icgm/chart.hxx:46
     DataNode nBoxX2 sal_Int16
 filter/source/graphicfilter/icgm/chart.hxx:47
     DataNode nBoxY2 sal_Int16
-framework/inc/xml/imagesdocumenthandler.hxx:99
-    framework::OReadImagesDocumentHandler m_bExternalImagesStartFound _Bool
-framework/inc/xml/imagesdocumenthandler.hxx:100
-    framework::OReadImagesDocumentHandler m_bExternalImageStartFound _Bool
-framework/inc/xml/imagesdocumenthandler.hxx:101
-    framework::OReadImagesDocumentHandler m_nHashMaskModeBitmap sal_Int32
-framework/inc/xml/imagesdocumenthandler.hxx:102
-    framework::OReadImagesDocumentHandler m_nHashMaskModeColor sal_Int32
-framework/inc/xml/imagesdocumenthandler.hxx:133
-    framework::OWriteImagesDocumentHandler m_aXMLXlinkNS class rtl::OUString
 helpcompiler/inc/HelpCompiler.hxx:197
     HelpCompiler lang const std::string
 include/basic/basmgr.hxx:56
@@ -362,13 +350,13 @@ include/vcl/commandevent.hxx:315
     CommandGestureData meOrientation const enum PanningOrientation
 include/vcl/font/Feature.hxx:102
     vcl::font::Feature m_eType const enum vcl::font::FeatureType
-include/vcl/NotebookBarAddonsMerger.hxx:35
+include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:42
-    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sControlType class rtl::OUString
+    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:44
+    AddonsParams sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonsParams nWidth sal_uInt16
 include/vcl/svimpbox.hxx:127
     SvImpLBox m_aFctSet class ImpLBSelEng
@@ -524,9 +512,9 @@ sc/inc/token.hxx:400
     SingleDoubleRefModifier aDub struct ScComplexRefData
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1239
+sc/source/core/data/document.cxx:1257
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1240
+sc/source/core/data/document.cxx:1258
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -540,7 +528,7 @@ sc/source/filter/inc/xetable.hxx:1005
     XclExpCellTable maArrayBfr class XclExpArrayBuffer
 sc/source/filter/inc/xetable.hxx:1006
     XclExpCellTable maShrfmlaBfr class XclExpShrfmlaBuffer
-sc/source/filter/inc/xiescher.hxx:1200
+sc/source/filter/inc/xiescher.hxx:1207
     XclImpDffPropSet maDummyStrm class SvMemoryStream
 sc/source/filter/inc/xihelper.hxx:328
     XclImpCachedValue mxTokArr XclImpCachedValue::ScTokenArrayPtr
@@ -580,7 +568,7 @@ sc/source/ui/inc/msgpool.hxx:44
     ScMessagePool aCondFormatDlgItem class ScCondFormatDlgItem
 sc/source/ui/inc/notemark.hxx:46
     ScNoteMarker m_aTimer class Timer
-sc/source/ui/inc/PivotLayoutTreeListBase.hxx:49
+sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
 sc/source/ui/inc/xmlsourcedlg.hxx:62
     ScXMLSourceDlg maCustomCompare struct CustomCompare
@@ -604,16 +592,16 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:34
     sd::ZeroconfService port const uint
 sd/source/ui/table/TableDesignPane.hxx:100
     sd::TableDesignPane aImpl const class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1319
+sd/source/ui/view/DocumentRenderer.cxx:1343
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1165
-    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock const sd::slidesorter::view::class SlideSorterView::DrawLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1166
-    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock const sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1167
-    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock const sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1168
-    sd::KeepSlideSorterInSyncWithPageChanges m_aContext const sd::slidesorter::controller::class SelectionObserver::Context
+    sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
     PDFGrammar::definition comment rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
@@ -730,7 +718,9 @@ svx/source/dialog/framelinkarray.cxx:381
     svx::frame::MergedCellIterator mnFirstRow size_t
 svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/gallery2/galbrws2.cxx:116
+svx/source/form/databaselocationinput.cxx:77
+    svx::DatabaseLocationInputController_Impl m_rBrowseButton weld::Button &
+svx/source/gallery2/galbrws2.cxx:114
     (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
 svx/source/stbctrls/pszctrl.cxx:99
     FunctionPopup_Impl m_aBuilder class VclBuilder
@@ -746,13 +736,13 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:139
     ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter2.cxx:65
-      class SwUiWriterTest2 *
+sw/qa/extras/layout/layout.cxx:2522
+      class SvtSysLocaleOptions &
 sw/qa/extras/uiwriter/uiwriter.cxx:4065
     IdleTask maIdle class Idle
-sw/source/core/crsr/crbm.cxx:66
+sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
-sw/source/core/inc/swfont.hxx:985
+sw/source/core/inc/swfont.hxx:988
     SvStatistics nGetStretchTextSize sal_uInt16
 sw/source/core/layout/dbg_lay.cxx:172
     SwImplEnterLeave nAction const enum DbgAction
@@ -760,19 +750,19 @@ sw/source/core/text/inftxt.hxx:679
     SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:143
     SwFieldSlot aText class rtl::OUString
-sw/source/uibase/docvw/romenu.hxx:35
+sw/source/uibase/docvw/romenu.hxx:34
     SwReadOnlyPopup m_aBuilder class VclBuilder
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/olmenu.hxx:77
+sw/source/uibase/inc/olmenu.hxx:78
     SwSpellPopup m_aBuilder class VclBuilder
-sw/source/uibase/inc/olmenu.hxx:86
+sw/source/uibase/inc/olmenu.hxx:87
     SwSpellPopup m_nLangParaMenuId const sal_uInt16
-sw/source/uibase/inc/swuicnttab.hxx:242
+sw/source/uibase/inc/swuicnttab.hxx:243
     SwTokenWindow m_aAdjustPositionsIdle class Idle
-sw/source/uibase/inc/uivwimp.hxx:95
+sw/source/uibase/inc/uivwimp.hxx:93
     SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:46
+sw/source/uibase/inc/unodispatch.hxx:45
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard const class SolarMutexGuard
 toolkit/source/awt/stylesettings.cxx:92
     toolkit::StyleMethodGuard m_aGuard const class SolarMutexGuard
@@ -786,7 +776,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:312
+vcl/headless/svpgdi.cxx:314
     (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
 vcl/inc/canvasbitmap.hxx:42
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
@@ -834,9 +824,9 @@ vcl/inc/WidgetThemeLibrary.hxx:90
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:106
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:2568
+vcl/source/app/salvtables.cxx:2835
     SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:5012
+vcl/source/app/salvtables.cxx:5291
     SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:35
     ImplOldJobSetupData cDeviceName char [32]
@@ -848,14 +838,14 @@ vcl/source/gdi/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
 vcl/source/gdi/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int [256]
-vcl/unx/gtk3/gtk3gtkinst.cxx:3597
+vcl/unx/gtk3/gtk3gtkinst.cxx:3890
     CrippledViewport viewport GtkViewport
 vcl/unx/gtk/a11y/atkhypertext.cxx:29
     HyperLink atk_hyper_link const AtkHyperlink
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass const AtkObjectClass
 vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 5b2e69a009c2..bc81f81c554a 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -158,12 +158,10 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/options/optcolor.cxx:258
+cui/source/options/optcolor.cxx:253
     ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
-cui/source/options/optpath.cxx:81
+cui/source/options/optpath.cxx:67
     OptPath_Impl m_aDefOpt class SvtDefaultOptions
-cui/source/options/personalization.hxx:28
-    SvxPersonalizationTabPage m_vDefaultPersonaImages VclPtr<class PushButton> [6]
 dbaccess/source/core/api/RowSetBase.hxx:85
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
 dbaccess/source/core/api/RowSetBase.hxx:96
@@ -292,6 +290,8 @@ include/basic/sbstar.hxx:50
     StarBASIC aErrorHdl Link<class StarBASIC *, _Bool>
 include/basic/sbstar.hxx:51
     StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags>
+include/comphelper/interfacecontainer3.hxx:232
+    comphelper::OInterfaceContainerHelper3::NotifySingleListener m_pMethod const comphelper::OInterfaceContainerHelper3::NotifySingleListener::NotificationMethod
 include/connectivity/DriversConfig.hxx:75
     connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
 include/connectivity/sdbcx/VCatalog.hxx:69
@@ -352,6 +352,8 @@ include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:32
     MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
+include/svtools/genericunodialog.hxx:121
+    svt::OGenericUnoDialog m_bNeedInitialization _Bool
 include/svx/dialcontrol.hxx:112
     svx::DialControl::DialControl_Impl mnLinkedFieldValueMultiplyer sal_Int32
 include/svx/graphctl.hxx:52
@@ -377,7 +379,7 @@ include/test/sheet/xnamedranges.hxx:49
 include/test/sheet/xspreadsheets2.hxx:46
     apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/noel/disk3/libo6/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo7/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -428,7 +430,7 @@ oox/qa/token/tokenmap-test.cxx:34
     oox::TokenmapTest tokenMap const class oox::TokenMap
 oox/qa/unit/vba_compression.cxx:71
     TestVbaCompression m_directories const test::Directories
-oox/source/drawingml/chart/objectformatter.cxx:712
+oox/source/drawingml/chart/objectformatter.cxx:713
     oox::drawingml::chart::ObjectFormatterData maFromLocale const struct com::sun::star::lang::Locale
 registry/source/reflwrit.cxx:140
     writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
@@ -438,13 +440,13 @@ registry/source/reflwrit.cxx:180
     CPInfo::(anonymous) aUik struct RTUik *
 reportdesign/source/ui/inc/ColorListener.hxx:35
     rptui::OColorListener m_aColorConfig const svtools::ColorConfig
-sal/osl/unx/process.cxx:824
-    osl_procStat signal char [24]
 sal/osl/unx/process.cxx:825
-    osl_procStat blocked char [24]
+    osl_procStat signal char [24]
 sal/osl/unx/process.cxx:826
-    osl_procStat sigignore char [24]
+    osl_procStat blocked char [24]
 sal/osl/unx/process.cxx:827
+    osl_procStat sigignore char [24]
+sal/osl/unx/process.cxx:828
     osl_procStat sigcatch char [24]
 sal/rtl/alloc_arena.hxx:100
     rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64]
@@ -459,7 +461,7 @@ sal/rtl/uuid.cxx:65
 sc/inc/compiler.hxx:126
     ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
 sc/inc/compiler.hxx:127
-    ScRawToken::(anonymous) table const struct (anonymous struct at /media/noel/disk3/libo6/sc/inc/compiler.hxx:124:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo7/sc/inc/compiler.hxx:124:9)
 sc/inc/compiler.hxx:132
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
@@ -532,17 +534,17 @@ sd/source/ui/inc/unopage.hxx:165
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
 sd/source/ui/inc/unopage.hxx:226
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/sidebar/MasterPageContainer.cxx:153
+sd/source/ui/sidebar/MasterPageContainer.cxx:140
     sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:154
+sd/source/ui/sidebar/MasterPageContainer.cxx:141
     sd::sidebar::MasterPageContainer::Implementation maSmallPreviewBeingCreated class Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:159
+sd/source/ui/sidebar/MasterPageContainer.cxx:146
     sd::sidebar::MasterPageContainer::Implementation maLargePreviewNotAvailable class Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:160
+sd/source/ui/sidebar/MasterPageContainer.cxx:147
     sd::sidebar::MasterPageContainer::Implementation maSmallPreviewNotAvailable class Image
 sd/source/ui/slideshow/showwindow.hxx:99
     sd::ShowWindow mbMouseCursorHidden _Bool
-sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx:144
+sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx:142
     sd::slidesorter::cache::PageCacheManager::RecentlyUsedPageCaches maMap std::map<key_type, mapped_type>
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx:97
     sd::slidesorter::controller::Animator maElapsedTime const ::canvas::tools::ElapsedTime
@@ -560,8 +562,8 @@ slideshow/source/engine/slideshowimpl.cxx:156
     (anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:399
     UCBStorageStream_Impl m_aKey const class rtl::OString
-starmath/source/view.cxx:866
-    SmViewShell_Impl aOpts const class SvtMiscOptions
+starmath/source/view.cxx:861
+    SmViewShell_Impl aOpts class SvtMiscOptions
 store/source/storbios.cxx:57
     OStoreSuperBlock m_aMarked OStoreSuperBlock::L
 svl/source/crypto/cryptosign.cxx:283
@@ -598,6 +600,8 @@ svtools/source/table/gridtablerenderer.cxx:71
     svt::table::CachedSortIndicator m_sortDescending class BitmapEx
 svx/inc/sdr/overlay/overlayrectangle.hxx:44
     sdr::overlay::OverlayRectangle mbOverlayState _Bool
+svx/source/dialog/fntctrl.cxx:174
+    FontPrevWin_Impl mbUseResText _Bool
 svx/source/inc/datanavi.hxx:215
     svxform::XFormsPage m_aMethodString const class svxform::MethodString
 svx/source/inc/datanavi.hxx:216
@@ -620,7 +624,7 @@ sw/inc/calc.hxx:197
     SwCalc m_aSysLocale const class SvtSysLocale
 sw/inc/hints.hxx:230
     SwAttrSetChg m_bDelSet const _Bool
-sw/inc/shellio.hxx:145
+sw/inc/shellio.hxx:146
     SwReader pStg const tools::SvRef<SotStorage>
 sw/inc/swevent.hxx:71
     SwCallMouseEvent::(anonymous union)::(anonymous) pFormat const class SwFrameFormat *
@@ -628,13 +632,13 @@ sw/source/core/access/accfrmobjmap.hxx:100
     SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/access/acchypertextdata.hxx:40
     SwAccessibleHyperTextData maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:105
+sw/source/core/access/accmap.cxx:102
     SwAccessibleContextMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:241
+sw/source/core/access/accmap.cxx:278
     SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type, SwShapeFunc>
-sw/source/core/access/accmap.cxx:594
+sw/source/core/access/accmap.cxx:631
     SwAccessibleEventMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:634
+sw/source/core/access/accmap.cxx:671
     SwAccessibleSelectedParas_Impl maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/doc/swstylemanager.cxx:58
     SwStyleManager aAutoCharPool class StylePool
@@ -646,9 +650,9 @@ sw/source/core/inc/swblocks.hxx:69
     SwImpBlocks m_bInPutMuchBlocks _Bool
 sw/source/filter/inc/rtf.hxx:32
     RTFSurround::(anonymous) nVal sal_uInt8
-sw/source/ui/dbui/dbinsdlg.cxx:119
+sw/source/ui/dbui/dbinsdlg.cxx:120
     DB_Column::(anonymous) pText class rtl::OUString *const
-sw/source/ui/dbui/dbinsdlg.cxx:121
+sw/source/ui/dbui/dbinsdlg.cxx:122
     DB_Column::(anonymous) nFormat const sal_uInt32
 sw/source/uibase/dbui/mmconfigitem.cxx:109
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
@@ -656,9 +660,9 @@ sw/source/uibase/dbui/mmconfigitem.cxx:111
     SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString>
 sw/source/uibase/dbui/mmconfigitem.cxx:113
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
-sw/source/uibase/inc/fldmgr.hxx:78
+sw/source/uibase/inc/fldmgr.hxx:79
     SwInsertField_Data m_aDBDataSource const css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:435
+toolkit/source/awt/vclxtoolkit.cxx:439
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
@@ -928,11 +932,11 @@ vcl/source/filter/jpeg/transupp.h:148
     (anonymous) crop_xoffset_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:150
     (anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1060
-    vcl::subHeader2 firstCode const sal_uInt16
 vcl/source/fontsubset/sft.cxx:1061
-    vcl::subHeader2 entryCount const sal_uInt16
+    vcl::subHeader2 firstCode const sal_uInt16
 vcl/source/fontsubset/sft.cxx:1062
+    vcl::subHeader2 entryCount const sal_uInt16
+vcl/source/fontsubset/sft.cxx:1063
     vcl::subHeader2 idDelta const sal_uInt16
 vcl/source/gdi/dibtools.cxx:52
     (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
@@ -970,26 +974,24 @@ vcl/source/gdi/dibtools.cxx:119
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
 vcl/source/gdi/pdfwriter_impl.hxx:279
     vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
-vcl/source/treelist/headbar.cxx:41
+vcl/source/treelist/headbar.cxx:40
     ImplHeadItem maHelpId const class rtl::OString
-vcl/source/treelist/headbar.cxx:42
+vcl/source/treelist/headbar.cxx:41
     ImplHeadItem maImage const class Image
-vcl/source/window/menuitemlist.hxx:58
+vcl/source/window/menuitemlist.hxx:56
     MenuItemData aAccessibleName const class rtl::OUString
-vcl/unx/gtk3/gtk3gtkinst.cxx:1167
+vcl/unx/gtk3/gtk3gtkinst.cxx:1168
      out gpointer *
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass const AtkObjectClass
 vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
     GLOMenu parent_instance const GMenuModel
 writerfilter/inc/ooxml/QNameToString.hxx:41
     writerfilter::QNameToString mMap writerfilter::QNameToString::Map
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:410
-    writerfilter::dmapper::DomainMapper_Impl m_aSaveOpt const class SvtSaveOptions
 writerfilter/source/ooxml/OOXMLFactory.hxx:63
     writerfilter::ooxml::AttributeInfo m_nToken const writerfilter::Token_t
 writerfilter/source/ooxml/OOXMLFactory.hxx:64
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 9de3830016c3..a3c84a5897c4 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/noel/disk3/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/noel/disk3/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basctl/source/basicide/moduldlg.hxx:113
@@ -38,7 +38,7 @@ chart2/source/controller/dialogs/tp_AxisLabel.hxx:60
     chart::SchAxisLabelTabPage m_xFlOrient std::unique_ptr<weld::Label>
 chart2/source/controller/dialogs/tp_AxisPositions.hxx:62
     chart::AxisPositionsTabPage m_xCB_AxisBetweenCategories std::unique_ptr<weld::CheckButton>
-chart2/source/controller/dialogs/tp_RangeChooser.hxx:86
+chart2/source/controller/dialogs/tp_RangeChooser.hxx:84
     chart::RangeChooserTabPage m_xFT_Range std::unique_ptr<weld::Label>
 chart2/source/controller/dialogs/tp_TitleRotation.hxx:44
     chart::SchAlignmentTabPage m_xFtTextDirection std::unique_ptr<weld::Label>
@@ -58,51 +58,55 @@ cppu/source/threadpool/threadpool.cxx:354
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:57
     AlignSize_Impl nInt16 sal_Int16
-cui/source/dialogs/colorpicker.cxx:721
+cui/source/dialogs/colorpicker.cxx:712
     cui::ColorPickerDialog m_xColorField std::unique_ptr<weld::CustomWeld>
-cui/source/dialogs/colorpicker.cxx:723
+cui/source/dialogs/colorpicker.cxx:714
     cui::ColorPickerDialog m_xColorPreview std::unique_ptr<weld::CustomWeld>
 cui/source/inc/align.hxx:102
     svx::AlignmentTabPage m_xBoxDirection std::unique_ptr<weld::Widget>
-cui/source/inc/cfg.hxx:580
+cui/source/inc/cfg.hxx:572
     SvxNewToolbarDialog m_xBtnOK std::unique_ptr<weld::Button>
-cui/source/inc/cfg.hxx:613
+cui/source/inc/cfg.hxx:605
     SvxIconSelectorDialog m_xTbSymbolWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigaldlg.hxx:245
+cui/source/inc/cuigaldlg.hxx:241
     TPGalleryThemeProperties m_xWndPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigrfflt.hxx:78
+cui/source/inc/cuigrfflt.hxx:75
     GraphicFilterDialog mxPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuigrfflt.hxx:175
+cui/source/inc/cuigrfflt.hxx:172
     GraphicFilterEmboss mxCtlLight std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:713
+cui/source/inc/cuitabarea.hxx:711
     SvxColorTabPage m_xCtlPreviewOld std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:714
+cui/source/inc/cuitabarea.hxx:712
     SvxColorTabPage m_xCtlPreviewNew std::unique_ptr<weld::CustomWeld>
-cui/source/inc/FontFeaturesDialog.hxx:53
+cui/source/inc/DiagramDialog.hxx:27
+    DiagramDialog mpBtnOk std::unique_ptr<weld::Button>
+cui/source/inc/DiagramDialog.hxx:28
+    DiagramDialog mpBtnCancel std::unique_ptr<weld::Button>
+cui/source/inc/FontFeaturesDialog.hxx:52
     cui::FontFeaturesDialog m_xContentWindow std::unique_ptr<weld::ScrolledWindow>
-cui/source/inc/FontFeaturesDialog.hxx:55
+cui/source/inc/FontFeaturesDialog.hxx:54
     cui::FontFeaturesDialog m_xPreviewWindow std::unique_ptr<weld::CustomWeld>
 cui/source/inc/hlmailtp.hxx:35
     SvxHyperlinkMailTp m_xFtSubject std::unique_ptr<weld::Label>
-cui/source/inc/page.hxx:101
+cui/source/inc/page.hxx:100
     SvxPageDescPage m_xOrientationFT std::unique_ptr<weld::Label>
-cui/source/inc/page.hxx:131
+cui/source/inc/page.hxx:130
     SvxPageDescPage m_xBspWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:64
+cui/source/inc/paragrph.hxx:62
     SvxStdParagraphTabPage m_xRightLabel std::unique_ptr<weld::Label>
-cui/source/inc/paragrph.hxx:88
+cui/source/inc/paragrph.hxx:86
     SvxStdParagraphTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:151
+cui/source/inc/paragrph.hxx:152
     SvxParaAlignTabPage m_xExampleWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/paragrph.hxx:156
+cui/source/inc/paragrph.hxx:157
     SvxParaAlignTabPage m_xPropertiesFL std::unique_ptr<weld::Widget>
-cui/source/inc/SpellDialog.hxx:161
+cui/source/inc/SpellDialog.hxx:149
     svx::SpellDialog m_xIgnoreOnceFT std::unique_ptr<weld::Label>
-cui/source/inc/SpellDialog.hxx:183
+cui/source/inc/SpellDialog.hxx:171
     svx::SpellDialog m_xSentenceEDWeld std::unique_ptr<weld::CustomWeld>
-cui/source/inc/swpossizetabpage.hxx:88
+cui/source/inc/swpossizetabpage.hxx:87
     SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/textattr.hxx:65
+cui/source/inc/textattr.hxx:64
     SvxTextAttrPage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
 cui/source/inc/transfrm.hxx:101
     SvxPositionSizeTabPage m_xCtlPos std::unique_ptr<weld::CustomWeld>
@@ -110,21 +114,27 @@ cui/source/inc/transfrm.hxx:187
     SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld>
 cui/source/inc/transfrm.hxx:190
     SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld>
+cui/source/options/optinet2.hxx:105
+    SvxSecurityTabPage m_xCertFrame std::unique_ptr<weld::Container>
+cui/source/options/optinet2.hxx:108
+    SvxSecurityTabPage m_xTSAURLsFrame std::unique_ptr<weld::Container>
+cui/source/options/optjava.hxx:84
+    SvxJavaOptionsPage m_xJavaFrame std::unique_ptr<weld::Widget>
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
 dbaccess/source/ui/dlg/advancedsettings.hxx:97
     dbaui::GeneratedValuesPage m_xAutoIncrementLabel std::unique_ptr<weld::Label>
 dbaccess/source/ui/dlg/advancedsettings.hxx:99
     dbaui::GeneratedValuesPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:63
+dbaccess/source/ui/dlg/detailpages.hxx:59
     dbaui::OCommonBehaviourTabPage m_xAutoRetrievingEnabled std::unique_ptr<weld::CheckButton>
-dbaccess/source/ui/dlg/detailpages.hxx:64
+dbaccess/source/ui/dlg/detailpages.hxx:60
     dbaui::OCommonBehaviourTabPage m_xAutoIncrementLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:65
+dbaccess/source/ui/dlg/detailpages.hxx:61
     dbaui::OCommonBehaviourTabPage m_xAutoIncrement std::unique_ptr<weld::Entry>
-dbaccess/source/ui/dlg/detailpages.hxx:66
+dbaccess/source/ui/dlg/detailpages.hxx:62
     dbaui::OCommonBehaviourTabPage m_xAutoRetrievingLabel std::unique_ptr<weld::Label>
-dbaccess/source/ui/dlg/detailpages.hxx:67
+dbaccess/source/ui/dlg/detailpages.hxx:63
     dbaui::OCommonBehaviourTabPage m_xAutoRetrieving std::unique_ptr<weld::Entry>
 dbaccess/source/ui/dlg/dsselect.hxx:40
     dbaui::ODatasourceSelectDialog m_xOk std::unique_ptr<weld::Button>
@@ -132,13 +142,21 @@ dbaccess/source/ui/dlg/dsselect.hxx:41
     dbaui::ODatasourceSelectDialog m_xCancel std::unique_ptr<weld::Button>
 dbaccess/source/ui/dlg/dsselect.hxx:42
     dbaui::ODatasourceSelectDialog m_xManageDatasources std::unique_ptr<weld::Button>
+dbaccess/source/ui/dlg/generalpage.hxx:137
+    dbaui::OGeneralPageWizard m_xFT_HelpText std::unique_ptr<weld::Label>
 desktop/source/deployment/gui/dp_gui_dialog2.hxx:120
     dp_gui::ExtMgrDialog m_xExtensionBoxWnd std::unique_ptr<weld::CustomWeld>
 desktop/source/deployment/gui/dp_gui_dialog2.hxx:206
     dp_gui::UpdateRequiredDialog m_xExtensionBoxWnd std::unique_ptr<weld::CustomWeld>
 emfio/source/emfuno/xemfparser.cxx:61
     emfio::emfreader::XEmfParser context_ uno::Reference<uno::XComponentContext>
-extensions/source/scanner/scanner.hxx:44
+extensions/source/scanner/grid.hxx:37
+    GridDialog m_xOKButton std::unique_ptr<weld::Button>
+extensions/source/scanner/grid.hxx:41
+    GridDialog m_xGridWindowWND std::unique_ptr<weld::CustomWeld>
+extensions/source/scanner/sanedlg.hxx:76
+    SaneDlg mxPreviewWnd std::unique_ptr<weld::CustomWeld>
+extensions/source/scanner/scanner.hxx:46
     ScannerManager maProtector osl::Mutex
 filter/source/pdf/impdialog.hxx:178
     ImpPDFTabGeneralPage mxSelectedSheets std::unique_ptr<weld::Label>
@@ -283,9 +301,9 @@ include/sfx2/msg.hxx:145
 include/sfx2/msg.hxx:145
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
-    SfxType16 pType const std::type_info *
-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
@@ -314,8 +332,6 @@ include/svtools/PlaceEditDialog.hxx:45
     PlaceEditDialog m_xBTCancel std::unique_ptr<weld::Button>
 include/svtools/unoevent.hxx:163
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
-include/svtools/wizardmachine.hxx:119
-    svt::OWizardPage m_xContainer std::unique_ptr<weld::Container>
 include/svx/ClassificationDialog.hxx:54
     svx::ClassificationDialog m_xEditWindowWeld std::unique_ptr<weld::CustomWeld>
 include/svx/colorwindow.hxx:133
@@ -346,13 +362,13 @@ include/vcl/filter/PngImageReader.hxx:31
     vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
 include/vcl/font/Feature.hxx:102
     vcl::font::Feature m_eType const enum vcl::font::FeatureType
-include/vcl/NotebookBarAddonsMerger.hxx:35
+include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:42
-    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sControlType class rtl::OUString
+    AddonsParams sImageId class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:44
+    AddonsParams sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonsParams nWidth sal_uInt16
 include/vcl/uitest/uiobject.hxx:272
     TabPageUIObject mxTabPage VclPtr<class TabPage>
@@ -455,9 +471,9 @@ sal/qa/osl/pipe/osl_Pipe.cxx:846
 sal/qa/osl/pipe/osl_Pipe.cxx:846
     osl_StreamPipe::recv 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:59
+    osl_Security::ctors bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:155
@@ -466,9 +482,9 @@ sal/qa/osl/security/osl_Security.cxx:189
     osl_Security::getConfigDir bRes1 _Bool
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1239
+sc/source/core/data/document.cxx:1257
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch const sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1240
+sc/source/core/data/document.cxx:1258
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3004
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -476,7 +492,7 @@ sc/source/filter/html/htmlpars.cxx:3005
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:62
     oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
-sc/source/ui/inc/colorformat.hxx:32
+sc/source/ui/inc/colorformat.hxx:31
     ScDataBarSettingsDlg mxBtnCancel std::unique_ptr<weld::Button>
 sc/source/ui/inc/consdlg.hxx:71
     ScConsolidateDlg m_xExpander std::unique_ptr<weld::Expander>
@@ -486,21 +502,21 @@ sc/source/ui/inc/dbnamdlg.hxx:86
     ScDbNameDlg m_xExpander std::unique_ptr<weld::Expander>
 sc/source/ui/inc/delcodlg.hxx:39
     ScDeleteContentsDlg m_xBtnOk std::unique_ptr<weld::Button>
-sc/source/ui/inc/docsh.hxx:453
+sc/source/ui/inc/docsh.hxx:455
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
 sc/source/ui/inc/instbdlg.hxx:66
     ScInsertTableDlg m_xBtnBehind std::unique_ptr<weld::RadioButton>
-sc/source/ui/inc/namedefdlg.hxx:60
+sc/source/ui/inc/namedefdlg.hxx:57
     ScNameDefDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/namedlg.hxx:76
+sc/source/ui/inc/namedlg.hxx:73
     ScNameDlg m_xExpander std::unique_ptr<weld::Expander>
-sc/source/ui/inc/optsolver.hxx:147
+sc/source/ui/inc/optsolver.hxx:145
     ScOptSolverDlg m_xFtOperator std::unique_ptr<weld::Label>
-sc/source/ui/inc/PivotLayoutDialog.hxx:89
+sc/source/ui/inc/PivotLayoutDialog.hxx:88
     ScPivotLayoutDialog mxOptions std::unique_ptr<weld::Expander>
-sc/source/ui/inc/PivotLayoutDialog.hxx:90
+sc/source/ui/inc/PivotLayoutDialog.hxx:89
     ScPivotLayoutDialog mxMore std::unique_ptr<weld::Expander>
-sc/source/ui/inc/PivotLayoutTreeListBase.hxx:49
+sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
 sc/source/ui/inc/pvfundlg.hxx:83
     ScDPFunctionDlg mxBtnOk std::unique_ptr<weld::Button>
@@ -532,15 +548,15 @@ sd/source/ui/animations/CustomAnimationDialog.cxx:2635
     sd::CustomAnimationTextAnimTabPage mxFTGroupText std::unique_ptr<weld::Label>
 sd/source/ui/animations/CustomAnimationDialog.hxx:141
     sd::SdPropertySubControl mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/dlg/headerfooterdlg.cxx:122
+sd/source/ui/dlg/headerfooterdlg.cxx:116
     sd::HeaderFooterTabPage mxContainer std::unique_ptr<weld::Container>
-sd/source/ui/dlg/headerfooterdlg.cxx:142
+sd/source/ui/dlg/headerfooterdlg.cxx:136
     sd::HeaderFooterTabPage mxCTPreviewWin std::unique_ptr<weld::CustomWeld>
 sd/source/ui/dlg/PhotoAlbumDialog.hxx:53
     sd::SdPhotoAlbumDialog m_xImg std::unique_ptr<weld::CustomWeld>
-sd/source/ui/inc/BulletAndPositionDlg.hxx:99
+sd/source/ui/inc/BulletAndPositionDlg.hxx:100
     SvxBulletAndPositionDlg m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-sd/source/ui/inc/BulletAndPositionDlg.hxx:103
+sd/source/ui/inc/BulletAndPositionDlg.hxx:104
     SvxBulletAndPositionDlg m_xIndentFT std::unique_ptr<weld::Label>
 sd/source/ui/inc/custsdlg.hxx:42
     SdCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
@@ -552,20 +568,20 @@ sd/source/ui/inc/custsdlg.hxx:75
     SdDefineCustomShowDlg m_xBtnHelp std::unique_ptr<weld::Button>
 sd/source/ui/remotecontrol/ZeroconfService.hxx:34
     sd::ZeroconfService port const uint
-sd/source/ui/slidesorter/view/SlsLayouter.cxx:64
+sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
 sd/source/ui/table/TableDesignPane.hxx:100
     sd::TableDesignPane aImpl const class sd::TableDesignWidget
-sd/source/ui/view/DocumentRenderer.cxx:1319
+sd/source/ui/view/DocumentRenderer.cxx:1343
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1165
-    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock const sd::slidesorter::view::class SlideSorterView::DrawLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1166
-    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock const sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1167
-    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock const sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1168
-    sd::KeepSlideSorterInSyncWithPageChanges m_aContext const sd::slidesorter::controller::class SelectionObserver::Context
+    sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:196
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
@@ -646,9 +662,9 @@ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:154
     textconversiondlgs::ChineseDictionaryDialog m_xFT_Mapping std::unique_ptr<weld::Label>
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx:157
     textconversiondlgs::ChineseDictionaryDialog m_xFT_Property std::unique_ptr<weld::Label>
-sw/qa/extras/uiwriter/uiwriter2.cxx:65
-      class SwUiWriterTest2 *
-sw/source/core/crsr/crbm.cxx:66
+sw/qa/extras/layout/layout.cxx:2522
+      class SvtSysLocaleOptions &
+sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:78
     TableWait m_pWait const std::unique_ptr<SwWait>
@@ -658,29 +674,29 @@ sw/source/ui/config/mailconfigpage.cxx:54
     SwTestAccountSettingsDialog m_xEstablish std::unique_ptr<weld::Label>
 sw/source/ui/config/mailconfigpage.cxx:55
     SwTestAccountSettingsDialog m_xFind std::unique_ptr<weld::Label>
-sw/source/ui/dbui/mmaddressblockpage.hxx:265
+sw/source/ui/dbui/mmaddressblockpage.hxx:267
     SwAssignFieldsDialog m_xLabelGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmaddressblockpage.hxx:266
+sw/source/ui/dbui/mmaddressblockpage.hxx:268
     SwAssignFieldsDialog m_xComboGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmaddressblockpage.hxx:267
+sw/source/ui/dbui/mmaddressblockpage.hxx:269
     SwAssignFieldsDialog m_xPreviewGroup std::unique_ptr<weld::SizeGroup>
-sw/source/ui/dbui/mmgreetingspage.hxx:113
+sw/source/ui/dbui/mmgreetingspage.hxx:116
     SwMailBodyDialog m_xBodyFT std::unique_ptr<weld::Label>
-sw/source/ui/envelp/labfmt.hxx:75
+sw/source/ui/envelp/labfmt.hxx:77
     SwLabFormatPage m_xPreview std::unique_ptr<weld::CustomWeld>
-sw/source/ui/fldui/fldfunc.hxx:57
+sw/source/ui/fldui/fldfunc.hxx:52
     SwFieldFuncPage m_xListItemFT std::unique_ptr<weld::Label>
-sw/source/ui/fldui/fldfunc.hxx:60
+sw/source/ui/fldui/fldfunc.hxx:55
     SwFieldFuncPage m_xListItemsFT std::unique_ptr<weld::Label>
-sw/source/ui/fldui/fldfunc.hxx:65
+sw/source/ui/fldui/fldfunc.hxx:60
     SwFieldFuncPage m_xListNameFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:70
+sw/source/ui/inc/mmresultdialogs.hxx:67
     SwMMResultPrintDialog m_xPrinterFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:100
+sw/source/ui/inc/mmresultdialogs.hxx:97
     SwMMResultEmailDialog m_xMailToFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:103
+sw/source/ui/inc/mmresultdialogs.hxx:100
     SwMMResultEmailDialog m_xSubjectFT std::unique_ptr<weld::Label>
-sw/source/ui/inc/mmresultdialogs.hxx:105
+sw/source/ui/inc/mmresultdialogs.hxx:102
     SwMMResultEmailDialog m_xSendAsFT std::unique_ptr<weld::Label>
 sw/source/ui/misc/impfnote.hxx:44
     SwEndNoteOptionPage m_xPosFT std::unique_ptr<weld::Label>
@@ -714,19 +730,19 @@ sw/source/uibase/inc/outline.hxx:85
     SwOutlineSettingsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/pggrid.hxx:44
     SwTextGridPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
-sw/source/uibase/inc/regionsw.hxx:221
+sw/source/uibase/inc/regionsw.hxx:214
     SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/splittbl.hxx:30
     SwSplitTableDlg m_xHorzBox std::unique_ptr<weld::RadioButton>
 sw/source/uibase/inc/splittbl.hxx:31
     SwSplitTableDlg m_xContentCopyRB std::unique_ptr<weld::RadioButton>
-sw/source/uibase/inc/swuicnttab.hxx:242
+sw/source/uibase/inc/swuicnttab.hxx:243
     SwTokenWindow m_aAdjustPositionsIdle class Idle
-sw/source/uibase/inc/swuicnttab.hxx:247
+sw/source/uibase/inc/swuicnttab.hxx:248
     SwTokenWindow m_xContainer std::unique_ptr<weld::Container>
-sw/source/uibase/inc/uivwimp.hxx:95
+sw/source/uibase/inc/uivwimp.hxx:93
     SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:46
+sw/source/uibase/inc/unodispatch.hxx:45
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard const class SolarMutexGuard
 toolkit/source/awt/stylesettings.cxx:92
     toolkit::StyleMethodGuard m_aGuard const class SolarMutexGuard
@@ -762,8 +778,6 @@ vcl/inc/WidgetThemeLibrary.hxx:90
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:106
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:958
-    SalInstanceContainer m_xContainer VclPtr<vcl::Window>
 vcl/source/gdi/jobset.cxx:35
     ImplOldJobSetupData cDeviceName char [32]
 vcl/source/gdi/jobset.cxx:36
@@ -780,7 +794,7 @@ vcl/unx/generic/print/prtsetup.hxx:73
     RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
 vcl/unx/generic/print/prtsetup.hxx:108
     RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/gtk3/gtk3gtkinst.cxx:3597
+vcl/unx/gtk3/gtk3gtkinst.cxx:3890
     CrippledViewport viewport GtkViewport
 vcl/unx/gtk/a11y/atkhypertext.cxx:29
     HyperLink atk_hyper_link const AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 7d41f0b84f7a..241d6dce5c89 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -208,35 +208,35 @@ cui/source/inc/backgrnd.hxx:132
     SvxBackgroundTabPage m_xBackgroundColorSetWin std::unique_ptr<weld::CustomWeld>
 cui/source/inc/backgrnd.hxx:133
     SvxBackgroundTabPage m_xPreviewWin1 std::unique_ptr<weld::CustomWeld>
-cui/source/inc/border.hxx:133
+cui/source/inc/border.hxx:131
     SvxBorderTabPage m_xWndPresetsWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/border.hxx:154
+cui/source/inc/border.hxx:152
     SvxBorderTabPage m_xWndShadowsWin std::unique_ptr<weld::CustomWeld>
 cui/source/inc/chardlg.hxx:39
     SvxCharBasePage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
 cui/source/inc/connect.hxx:52
     SvxConnectionPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuihyperdlg.hxx:57
+cui/source/inc/cuihyperdlg.hxx:46
     SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
-cui/source/inc/cuihyperdlg.hxx:88
+cui/source/inc/cuihyperdlg.hxx:77
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-cui/source/inc/cuitabarea.hxx:327
+cui/source/inc/cuitabarea.hxx:325
     SvxShadowTabPage m_xCtlXRectPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:393
+cui/source/inc/cuitabarea.hxx:391
     SvxGradientTabPage m_xGradientLBWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:613
+cui/source/inc/cuitabarea.hxx:611
     SvxPatternTabPage m_xCtlPixelWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:615
+cui/source/inc/cuitabarea.hxx:613
     SvxPatternTabPage m_xPatternLBWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:715
+cui/source/inc/cuitabarea.hxx:713
     SvxColorTabPage m_xValSetColorListWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabarea.hxx:716
+cui/source/inc/cuitabarea.hxx:714
     SvxColorTabPage m_xValSetRecentListWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:152
+cui/source/inc/cuitabline.hxx:156
     SvxLineTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:273
+cui/source/inc/cuitabline.hxx:277
     SvxLineDefTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/cuitabline.hxx:349
+cui/source/inc/cuitabline.hxx:353
     SvxLineEndDefTabPage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
 cui/source/inc/grfpage.hxx:87
     SvxGrfCropPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
@@ -244,22 +244,24 @@ cui/source/inc/measure.hxx:56
     SvxMeasurePage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
 cui/source/inc/measure.hxx:57
     SvxMeasurePage m_xCtlPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numfmt.hxx:122
+cui/source/inc/numfmt.hxx:120
     SvxNumberFormatTabPage m_xWndPreview std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:74
+cui/source/inc/numpages.hxx:73
     SvxSingleNumPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:108
+cui/source/inc/numpages.hxx:107
     SvxBulletPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:149
+cui/source/inc/numpages.hxx:148
     SvxNumPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:191
+cui/source/inc/numpages.hxx:190
     SvxBitmapPickTabPage m_xExamplesVSWin std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:273
+cui/source/inc/numpages.hxx:272
     SvxNumOptionsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
-cui/source/inc/numpages.hxx:369
+cui/source/inc/numpages.hxx:368
     SvxNumPositionTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
 cui/source/inc/screenshotannotationdlg.hxx:30
     ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
+cui/source/options/optchart.hxx:50
+    SvxDefaultColorOptPage m_xValSetColorBoxWin std::unique_ptr<weld::CustomWeld>
 dbaccess/source/core/dataaccess/databasedocument.hxx:176
     dbaccess::ODatabaseDocument m_pEventExecutor ::rtl::Reference<DocumentEventExecutor>
 dbaccess/source/core/dataaccess/documentdefinition.cxx:287
@@ -276,7 +278,7 @@ dbaccess/source/ui/browser/dbloader.cxx:69
     DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
 dbaccess/source/ui/inc/RelationController.hxx:33
     dbaui::ORelationController m_pWaitObject std::unique_ptr<WaitObject>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:216
+desktop/qa/desktop_lib/test_desktop_lib.cxx:218
     DesktopLOKTest m_bModified _Bool
 desktop/source/app/app.cxx:1228
     desktop::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
@@ -334,7 +336,7 @@ emfio/inc/mtftools.hxx:512
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:63
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
-extensions/source/scanner/scanner.hxx:45
+extensions/source/scanner/scanner.hxx:48
     ScannerManager mpData void *
 framework/inc/services/layoutmanager.hxx:259
     framework::LayoutManager m_bGlobalSettings _Bool
@@ -346,16 +348,6 @@ framework/inc/uielement/langselectionmenucontroller.hxx:83
     framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
 framework/inc/uielement/langselectionmenucontroller.hxx:85
     framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
-framework/inc/xml/imagesdocumenthandler.hxx:99
-    framework::OReadImagesDocumentHandler m_bExternalImagesStartFound _Bool
-framework/inc/xml/imagesdocumenthandler.hxx:100
-    framework::OReadImagesDocumentHandler m_bExternalImageStartFound _Bool
-framework/inc/xml/imagesdocumenthandler.hxx:101
-    framework::OReadImagesDocumentHandler m_nHashMaskModeBitmap sal_Int32
-framework/inc/xml/imagesdocumenthandler.hxx:102
-    framework::OReadImagesDocumentHandler m_nHashMaskModeColor sal_Int32
-framework/inc/xml/imagesdocumenthandler.hxx:133
-    framework::OWriteImagesDocumentHandler m_aXMLXlinkNS class rtl::OUString
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:280
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:284
@@ -468,13 +460,15 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:158
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/NotebookBarAddonsMerger.hxx:52
-    AddonNotebookBarItem sTarget class rtl::OUString
+include/vcl/button.hxx:284
+    RadioButton mbSaveValue _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:53
-    AddonNotebookBarItem sContext class rtl::OUString
+    AddonNotebookBarItem sTarget class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:54
-    AddonNotebookBarItem sControlType class rtl::OUString
+    AddonNotebookBarItem sContext class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:55
+    AddonNotebookBarItem sControlType class rtl::OUString
+include/vcl/NotebookBarAddonsMerger.hxx:56
     AddonNotebookBarItem nWidth sal_uInt16
 include/vcl/opengl/OpenGLContext.hxx:32
     GLWindow bMultiSampleSupported _Bool
@@ -538,7 +532,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:1015
+sal/rtl/math.cxx:1025
      md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:96
     ImplUTF7ToUCContextData mbShifted _Bool
@@ -580,7 +574,7 @@ sc/source/core/data/column.cxx:1397
     (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
 sc/source/core/data/column.cxx:1398
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags const enum ScCloneFlags
-sc/source/core/data/table2.cxx:3598
+sc/source/core/data/table2.cxx:3647
     (anonymous namespace)::OutlineArrayFinder mpArray class ScOutlineArray *
 sc/source/filter/excel/xltoolbar.hxx:25
     TBCCmd A _Bool
@@ -608,11 +602,11 @@ sc/source/filter/inc/namebuff.hxx:36
     StringHashEntry aString const class rtl::OUString
 sc/source/filter/inc/namebuff.hxx:37
     StringHashEntry nHash const sal_uInt32
-sc/source/filter/inc/orcusinterface.hxx:376
+sc/source/filter/inc/orcusinterface.hxx:378
     ScOrcusStyles::fill maBgColor class Color
-sc/source/filter/inc/orcusinterface.hxx:446
+sc/source/filter/inc/orcusinterface.hxx:448
     ScOrcusStyles::xf mnStyleXf size_t
-sc/source/filter/inc/orcusinterface.hxx:466
+sc/source/filter/inc/orcusinterface.hxx:468
     ScOrcusStyles::cell_style mnBuiltInId size_t
 sc/source/filter/inc/root.hxx:91
     LOTUS_ROOT eActType enum Lotus123Typ
@@ -652,7 +646,7 @@ 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
-sc/source/ui/inc/tabvwsh.hxx:120
+sc/source/ui/inc/tabvwsh.hxx:121
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
 sc/source/ui/inc/transobj.hxx:47
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
@@ -664,6 +658,8 @@ sc/source/ui/vba/vbachartobject.hxx:44
     ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
 sd/inc/sdmod.hxx:132
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
+sd/source/ui/dlg/RemoteDialogClientBox.hxx:68
+    sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
 sd/source/ui/framework/module/ToolBarModule.hxx:75
     sd::framework::ToolBarModule mpToolBarManagerLock std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx:245
@@ -676,6 +672,10 @@ sd/source/ui/inc/navigatr.hxx:124
     SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
 sd/source/ui/inc/navigatr.hxx:125
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
+sd/source/ui/inc/pubdlg.hxx:126
+    SdPublishingDlg m_xPage5_ButtonsWnd std::unique_ptr<weld::CustomWeld>
+sd/source/ui/inc/pubdlg.hxx:140
+    SdPublishingDlg m_xPage6_PreviewWnd std::unique_ptr<weld::CustomWeld>
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
 sd/source/ui/inc/unopage.hxx:279
@@ -704,7 +704,7 @@ sdext/source/presenter/PresenterTimer.cxx:106
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
 sfx2/source/appl/fileobj.hxx:37
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/doc/sfxbasemodel.cxx:447
+sfx2/source/doc/sfxbasemodel.cxx:449
     SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
 sfx2/source/inc/appdata.hxx:76
     SfxAppData_Impl pDocTopics std::unique_ptr<SfxDdeDocTopics_Impl>
@@ -830,15 +830,15 @@ sw/inc/unoframe.hxx:314
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
 sw/inc/view.hxx:184
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
-sw/source/core/inc/swfont.hxx:983
+sw/source/core/inc/swfont.hxx:986
     SvStatistics nGetTextSize sal_uInt16
-sw/source/core/inc/swfont.hxx:984
+sw/source/core/inc/swfont.hxx:987
     SvStatistics nDrawText sal_uInt16
-sw/source/core/inc/swfont.hxx:985
+sw/source/core/inc/swfont.hxx:988
     SvStatistics nGetStretchTextSize sal_uInt16
-sw/source/core/inc/swfont.hxx:986
+sw/source/core/inc/swfont.hxx:989
     SvStatistics nDrawStretchText sal_uInt16
-sw/source/core/inc/swfont.hxx:987
+sw/source/core/inc/swfont.hxx:990
     SvStatistics nChangeFont sal_uInt16
 sw/source/core/inc/unoflatpara.hxx:140
     SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> >
@@ -857,7 +857,7 @@ 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/noel/disk3/libo6/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo7/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/column.hxx:131
     SwColumnPage m_xDefaultVS std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/frmpage.hxx:224
@@ -870,11 +870,19 @@ 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/redlndlg.hxx:66
+sw/source/uibase/inc/optpage.hxx:297
+    SwRedlineOptionsTabPage m_xInsertedPreview std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/optpage.hxx:302
+    SwRedlineOptionsTabPage m_xDeletedPreview std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/optpage.hxx:307
+    SwRedlineOptionsTabPage m_xChangedPreview std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/optpage.hxx:312
+    SwRedlineOptionsTabPage m_xMarkPreview std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
-sw/source/uibase/inc/swuicnttab.hxx:79
+sw/source/uibase/inc/swuicnttab.hxx:80
     SwMultiTOXTabDialog m_xExampleFrameWin std::unique_ptr<weld::CustomWeld>
-testtools/source/bridgetest/cppobj.cxx:149
+testtools/source/bridgetest/cppobj.cxx:148
     bridge_object::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
@@ -938,9 +946,9 @@ unotools/source/config/defaultoptions.cxx:90
     SvtDefaultOptions_Impl m_aWorkPath class rtl::OUString
 unotools/source/config/defaultoptions.cxx:91
     SvtDefaultOptions_Impl m_aClassificationPath class rtl::OUString
-unoxml/source/rdf/librdf_repository.cxx:471
+unoxml/source/rdf/librdf_repository.cxx:472
     (anonymous namespace)::librdf_GraphResult m_pQuery const std::shared_ptr<librdf_query>
-unoxml/source/rdf/librdf_repository.cxx:621
+unoxml/source/rdf/librdf_repository.cxx:625
     (anonymous namespace)::librdf_QuerySelectResult m_pQuery const std::shared_ptr<librdf_query>
 unoxml/source/xpath/nodelist.hxx:52
     XPath::CNodeList m_pXPathObj std::shared_ptr<xmlXPathObject>
@@ -954,9 +962,7 @@ vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
 vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
-vcl/inc/qt5/Qt5DragAndDrop.hxx:80
-    Qt5DropTarget mnDropAction sal_Int8
-vcl/inc/qt5/Qt5Frame.hxx:95
+vcl/inc/qt5/Qt5Frame.hxx:97
     Qt5Frame m_pSalMenu class Qt5Menu *
 vcl/inc/qt5/Qt5Graphics.hxx:53
     Qt5Graphics m_pFontCollection class PhysicalFontCollection *
@@ -1018,7 +1024,7 @@ vcl/inc/WidgetThemeLibrary.hxx:92
     vcl::ControlDrawParameters bIsAction _Bool
 vcl/inc/WidgetThemeLibrary.hxx:93
     vcl::ControlDrawParameters nValue int64_t
-vcl/opengl/salbmp.cxx:446
+vcl/opengl/salbmp.cxx:445
     (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
 vcl/source/filter/graphicfilter.cxx:653
     ImpFilterLibCacheEntry maFiltername const class rtl::OUString
@@ -1052,16 +1058,16 @@ vcl/unx/generic/gdi/cairotextrender.cxx:55
     (anonymous namespace)::CairoFontsCache::CacheId mbEmbolden _Bool
 vcl/unx/generic/gdi/cairotextrender.cxx:56
     (anonymous namespace)::CairoFontsCache::CacheId mbVerticalMetrics _Bool
-vcl/unx/gtk3/gtk3gtkinst.cxx:1167
+vcl/unx/gtk3/gtk3gtkinst.cxx:1168
      in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:3105
+vcl/unx/gtk3/gtk3gtkinst.cxx:3156
     GtkInstanceDialog m_xDialogController std::shared_ptr<weld::DialogController>
 vcl/unx/gtk/a11y/atkutil.cxx:142
     DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent const AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass const AtkObjectClass
 vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
@@ -1070,7 +1076,7 @@ vcl/unx/gtk/hudawareness.cxx:20
     HudAwarenessHandle connection GDBusConnection *
 vcl/unx/gtk/hudawareness.cxx:23
     HudAwarenessHandle notify GDestroyNotify
-vcl/workben/vcldemo.cxx:1741
+vcl/workben/vcldemo.cxx:1740
     DemoWin mxThread rtl::Reference<RenderThread>
 writerfilter/source/dmapper/PropertyMap.hxx:198
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
@@ -1092,7 +1098,7 @@ xmloff/source/forms/elementexport.hxx:104
     xmloff::OControlExport m_pOuterElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/forms/officeforms.hxx:65
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
-xmloff/source/text/txtimp.cxx:523
+xmloff/source/text/txtimp.cxx:524
     XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper>
 xmlsecurity/inc/certificatechooser.hxx:55
     CertificateChooser mvUserData std::vector<std::shared_ptr<UserData> >