loplugin:unusedfields

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

4 files changed, 250 insertions, 232 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 84c03e089975..b50c4546394b 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -144,7 +144,7 @@ cui/source/inc/tabstpge.hxx:86
     SvxTabulatorTabPage m_aCenterWin TabWin_Impl
 cui/source/inc/tabstpge.hxx:87
     SvxTabulatorTabPage m_aDezWin TabWin_Impl
-cui/source/options/optcolor.cxx:241
+cui/source/options/optcolor.cxx:240
     (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor Color
 dbaccess/source/core/api/RowSet.hxx:108
     dbaccess::ORowSet m_aURL OUString
@@ -158,15 +158,15 @@ dbaccess/source/core/api/RowSet.hxx:139
     dbaccess::ORowSet m_bIsBookmarkable _Bool
 dbaccess/source/core/api/RowSet.hxx:141
     dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:457
+dbaccess/source/core/api/RowSet.hxx:453
     dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:458
+dbaccess/source/core/api/RowSet.hxx:454
     dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:459
+dbaccess/source/core/api/RowSet.hxx:455
     dbaccess::ORowSetClone m_bIsBookmarkable _Bool
 dbaccess/source/core/dataaccess/connection.hxx:101
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
-dbaccess/source/core/inc/databasecontext.hxx:84
+dbaccess/source/core/inc/databasecontext.hxx:82
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
 drawinglayer/inc/texture/texture3d.hxx:54
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmapEx BitmapEx
@@ -368,6 +368,8 @@ include/svx/ClassificationDialog.hxx:35
     svx::ClassificationDialog maInternationalHelper SfxClassificationHelper
 include/svx/ClassificationDialog.hxx:37
     svx::ClassificationDialog m_bPerParagraph const _Bool
+include/svx/dialog/ThemeDialog.hxx:25
+    svx::ThemeDialog mpTheme model::Theme *
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem SvxIMapDlgItem
 include/test/screenshot_test.hxx:36
@@ -534,15 +536,15 @@ sal/qa/osl/security/osl_Security.cxx:188
     osl_Security::getConfigDir bRes1 _Bool
 sal/textenc/textenc.cxx:405
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
-sc/inc/compiler.hxx:268
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:269
+sc/inc/compiler.hxx:268
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:271
+sc/inc/compiler.hxx:270
     ScCompiler::AddInMap pUpper const char *
 sc/inc/editutil.hxx:113
     ScEnginePoolHelper bDeleteEnginePool _Bool
-sc/inc/mtvelements.hxx:156
+sc/inc/mtvelements.hxx:171
     sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator
 sc/inc/queryevaluator.hxx:61
     ScQueryEvaluator mnEntryCount const SCSIZE
@@ -552,7 +554,7 @@ sc/inc/queryevaluator.hxx:66
     ScQueryEvaluator maTest _Bool[32]
 sc/inc/token.hxx:402
     SingleDoubleRefModifier aDub ScComplexRefData
-sc/qa/unit/tiledrendering/tiledrendering.cxx:584
+sc/qa/unit/tiledrendering/tiledrendering.cxx:585
     (anonymous namespace)::ViewCallback m_callbackWrapper TestLokCallbackWrapper
 sc/source/core/data/document.cxx:1246
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
@@ -642,20 +644,14 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
 sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1180
+sd/source/ui/view/viewshel.cxx:1185
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1181
+sd/source/ui/view/viewshel.cxx:1186
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1182
+sd/source/ui/view/viewshel.cxx:1187
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1183
+sd/source/ui/view/viewshel.cxx:1188
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sdext/source/minimizer/optimizerdialog.hxx:191
-    OptimizerDialog mnCurrentStep sal_Int16
-sdext/source/minimizer/optimizerdialog.hxx:192
-    OptimizerDialog mnTabIndex sal_Int16
-sdext/source/minimizer/optimizerdialog.hxx:202
-    OptimizerDialog maControlPages std::vector<std::vector<OUString> >
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
@@ -700,6 +696,8 @@ sfx2/inc/autoredactdialog.hxx:99
     SfxAutoRedactDialog m_xDocShell SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:46
     SfxModelessDialog_Impl aMoveIdle Idle
+sfx2/source/doc/docmacromode.cxx:75
+    sfx2::DocumentMacroMode_Data m_bMacroDisabledMessageShown _Bool
 sfx2/source/doc/doctempl.cxx:106
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell SfxObjectShellLock
 sfx2/source/inc/templdgi.hxx:91
@@ -742,7 +740,7 @@ starmath/inc/mathml/mathmlMo.hxx:68
     moOperatorData m_rspace sal_uInt16
 starmath/inc/mathml/mathmlMo.hxx:69
     moOperatorData m_properties moOpDP
-starmath/inc/view.hxx:247
+starmath/inc/view.hxx:249
     SmViewShell maGraphicController SmGraphicController
 svgio/inc/svgcharacternode.hxx:84
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
@@ -782,7 +780,7 @@ svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1098
     (anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::classic::rule<ScannerT>
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem SvxContourDlgItem
-svx/source/dialog/framelinkarray.cxx:476
+svx/source/dialog/framelinkarray.cxx:477
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow sal_Int32
 svx/source/dialog/imapwnd.hxx:88
     IMapWindow maItemInfos SfxItemInfo[1]
@@ -800,11 +798,13 @@ svx/source/xml/xmleohlp.cxx:71
     OutputStorageWrapper_Impl aTempFile TempFileFast
 svx/source/xml/xmlgrhlp.cxx:93
     (anonymous namespace)::GraphicInputStream maTempFile utl::TempFileFast
-sw/inc/unosett.hxx:146
+sw/inc/unosett.hxx:144
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter7.cxx:2261
+sw/qa/extras/uiwriter/uiwriter5.cxx:66
+    SwUiWriterTest5 m_aSavedSettings AllSettings
+sw/qa/extras/uiwriter/uiwriter7.cxx:2264
     (anonymous namespace)::IdleTask maIdle Idle
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
@@ -826,25 +826,25 @@ sw/source/core/text/porrst.hxx:191
     SwBookmarkPortion m_bHasCustomColor _Bool
 sw/source/core/text/redlnitr.hxx:78
     SwRedlineItr m_nNdIdx const SwNodeOffset
-sw/source/uibase/docvw/romenu.hxx:34
+sw/source/uibase/docvw/romenu.hxx:35
     SwReadOnlyPopup m_aBuilder VclBuilder
-sw/source/uibase/docvw/romenu.hxx:46
+sw/source/uibase/docvw/romenu.hxx:47
     SwReadOnlyPopup m_nReadonlyGraphictogallery sal_uInt16
-sw/source/uibase/docvw/romenu.hxx:50
+sw/source/uibase/docvw/romenu.hxx:51
     SwReadOnlyPopup m_nReadonlyBackgroundtogallery sal_uInt16
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:307
+sw/source/uibase/inc/conttree.hxx:321
     SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
-sw/source/uibase/inc/olmenu.hxx:77
+sw/source/uibase/inc/olmenu.hxx:78
     SwSpellPopup m_aBuilder VclBuilder
-sw/source/uibase/inc/swuicnttab.hxx:241
+sw/source/uibase/inc/swuicnttab.hxx:245
     SwTokenWindow m_aAdjustPositionsIdle Idle
 sw/source/uibase/inc/tmpdlg.hxx:35
     SwTemplateDlgController m_bNewStyle _Bool
-sw/source/uibase/inc/uivwimp.hxx:93
+sw/source/uibase/inc/uivwimp.hxx:95
     SwView_Impl m_xTmpSelDocShell SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:45
+sw/source/uibase/inc/unodispatch.hxx:43
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard SolarMutexGuard
 toolkit/source/awt/stylesettings.cxx:74
     toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard SolarMutexGuard
@@ -862,7 +862,7 @@ vcl/inc/graphic/Manager.hxx:41
     vcl::graphic::Manager maSwapOutTimer Timer
 vcl/inc/headless/BitmapHelper.hxx:32
     BitmapHelper aTmpBmp SvpSalBitmap
-vcl/inc/jsdialog/jsdialogbuilder.hxx:615
+vcl/inc/jsdialog/jsdialogbuilder.hxx:632
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
@@ -870,9 +870,17 @@ vcl/inc/pdf/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
 vcl/inc/pdf/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int[256]
+vcl/inc/pdf/pdfwriter_impl.hxx:607
+    vcl::pdf::PDFAddStream m_aMimeType OUString
+vcl/inc/pdf/pdfwriter_impl.hxx:608
+    vcl::pdf::PDFAddStream m_pStream PDFOutputStream *
+vcl/inc/pdf/pdfwriter_impl.hxx:609
+    vcl::pdf::PDFAddStream m_nStreamObject sal_Int32
+vcl/inc/pdf/pdfwriter_impl.hxx:610
+    vcl::pdf::PDFAddStream m_bCompress _Bool
 vcl/inc/salvtables.hxx:564
     SalInstanceEntry m_aTextFilter WeldTextFilter
-vcl/inc/salvtables.hxx:951
+vcl/inc/salvtables.hxx:955
     SalInstanceComboBoxWithEdit m_aTextFilter WeldTextFilter
 vcl/inc/sft.hxx:177
     vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
@@ -902,7 +910,7 @@ vcl/source/gdi/jobset.cxx:39
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char[32]
 vcl/source/gdi/jobset.cxx:40
     (anonymous namespace)::ImplOldJobSetupData cPortName char[32]
-vcl/source/pdf/PDFiumLibrary.cxx:429
+vcl/source/pdf/PDFiumLibrary.cxx:430
     vcl::pdf::(anonymous namespace)::PDFiumDocumentImpl m_aFormCallbacks FPDF_FORMFILLINFO
 vcl/unx/gtk3/a11y/atkhypertext.cxx:31
     (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
@@ -918,15 +926,15 @@ vcl/unx/gtk3/gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtkinst.cxx:7330
+vcl/unx/gtk3/gtkinst.cxx:7345
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtkinst.cxx:10980
+vcl/unx/gtk3/gtkinst.cxx:10996
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox *
-vcl/unx/gtk3/gtkinst.cxx:10982
+vcl/unx/gtk3/gtkinst.cxx:10998
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton GtkMenuButton *
-vcl/unx/gtk3/gtkinst.cxx:20620
+vcl/unx/gtk3/gtkinst.cxx:20800
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtkinst.cxx:20626
+vcl/unx/gtk3/gtkinst.cxx:20806
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 770c733fda1a..7df6cb17b408 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1,7 +1,7 @@
 basegfx/source/polygon/b2dtrapezoid.cxx:205
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock B2DPoint[32]
 basic/source/inc/expr.hxx:111
-    SbiExprNode::(anonymous union at /home/noel/libo/basic/source/inc/expr.hxx:110:5) nTypeStrId sal_uInt16
+    SbiExprNode::(anonymous union at /home/noel/libo2/basic/source/inc/expr.hxx:110:5) nTypeStrId sal_uInt16
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:63
     Data rdx sal_uInt64
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:64
@@ -49,9 +49,9 @@ bridges/source/jni_uno/jni_java2uno.cxx:154
 chart2/source/model/main/DataPoint.hxx:104
     chart::DataPoint m_bNoParentPropAllowed _Bool
 codemaker/source/javamaker/classfile.cxx:508
-    (unnamed union at /home/noel/libo/codemaker/source/javamaker/classfile.cxx:508:5) uint32Bytes sal_uInt32
+    (unnamed union at /home/noel/libo2/codemaker/source/javamaker/classfile.cxx:508:5) uint32Bytes sal_uInt32
 codemaker/source/javamaker/classfile.cxx:540
-    (unnamed union at /home/noel/libo/codemaker/source/javamaker/classfile.cxx:540:5) uint64Bytes sal_uInt64
+    (unnamed union at /home/noel/libo2/codemaker/source/javamaker/classfile.cxx:540:5) uint64Bytes sal_uInt64
 connectivity/inc/sdbcx/VCatalog.hxx:66
     connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
 connectivity/inc/sdbcx/VGroup.hxx:52
@@ -176,15 +176,15 @@ cppu/source/uno/check.cxx:267
     (anonymous namespace)::Char4 chars Char3
 cppu/source/uno/check.cxx:271
     (anonymous namespace)::Char4 c char
-cui/source/options/optcolor.cxx:260
+cui/source/options/optcolor.cxx:259
     (anonymous namespace)::ColorConfigWindow_Impl aModuleOptions SvtModuleOptions
-dbaccess/source/core/api/RowSetBase.hxx:84
+dbaccess/source/core/api/RowSetBase.hxx:82
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
-dbaccess/source/core/api/RowSetBase.hxx:95
+dbaccess/source/core/api/RowSetBase.hxx:93
     dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
 dbaccess/source/core/dataaccess/documentcontainer.cxx:68
     dbaccess::(anonymous namespace)::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:103
+dbaccess/source/core/inc/ContentHelper.hxx:101
     dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
 dbaccess/source/filter/hsqldb/parseschema.hxx:34
     dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
@@ -288,6 +288,8 @@ include/basic/sbstar.hxx:50
     StarBASIC aErrorHdl Link<StarBASIC *, _Bool>
 include/basic/sbstar.hxx:51
     StarBASIC aBreakHdl Link<StarBASIC *, BasicDebugFlags>
+include/comphelper/guarding.hxx:40
+    comphelper::ORelease m_rMutex MUTEX &
 include/comphelper/parallelsort.hxx:164
     comphelper::(anonymous namespace)::Binner maLabels uint8_t[51200]
 include/comphelper/servicedecl.hxx:130
@@ -296,9 +298,11 @@ include/comphelper/servicedecl.hxx:131
     comphelper::service_decl::ServiceDecl m_pImplName const char *const
 include/comphelper/servicedecl.hxx:132
     comphelper::service_decl::ServiceDecl m_pServiceNames const char *const
+include/comphelper/stl_types.hxx:115
+    comphelper::mem_fun1_t M_f const _fun_type
 include/connectivity/DriversConfig.hxx:76
     connectivity::DriversConfig m_aNode OSharedConfigNode
-include/connectivity/sdbcx/VDescriptor.hxx:51
+include/connectivity/sdbcx/VDescriptor.hxx:49
     connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
 include/connectivity/sdbcx/VTable.hxx:77
     connectivity::sdbcx::OTable m_xColumns std::unique_ptr<OCollection>
@@ -316,6 +320,8 @@ include/filter/msfilter/svdfppt.hxx:891
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/oox/core/contexthandler2.hxx:231
     oox::core::ContextHandler2Helper mnRootStackSize size_t
+include/oox/helper/containerhelper.hxx:130
+    oox::Matrix maData container_type
 include/oox/ole/axbinarywriter.hxx:153
     oox::ole::AxBinaryPropertyWriter maStreamProps ComplexPropVector
 include/sfx2/lokhelper.hxx:35
@@ -351,45 +357,49 @@ include/svx/svdmark.hxx:142
 include/svx/svdoedge.hxx:160
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
 include/unoidl/unoidl.hxx:445
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:445:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5)
 include/unoidl/unoidl.hxx:446
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) booleanValue _Bool
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) booleanValue _Bool
 include/unoidl/unoidl.hxx:447
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) byteValue sal_Int8
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) byteValue sal_Int8
 include/unoidl/unoidl.hxx:448
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) shortValue sal_Int16
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) shortValue sal_Int16
 include/unoidl/unoidl.hxx:449
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) unsignedShortValue sal_uInt16
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) unsignedShortValue sal_uInt16
 include/unoidl/unoidl.hxx:450
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) longValue sal_Int32
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) longValue sal_Int32
 include/unoidl/unoidl.hxx:451
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) unsignedLongValue sal_uInt32
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) unsignedLongValue sal_uInt32
 include/unoidl/unoidl.hxx:452
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) hyperValue sal_Int64
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) hyperValue sal_Int64
 include/unoidl/unoidl.hxx:453
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) unsignedHyperValue sal_uInt64
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) unsignedHyperValue sal_uInt64
 include/unoidl/unoidl.hxx:454
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) floatValue float
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) floatValue float
 include/unoidl/unoidl.hxx:455
-    unoidl::ConstantValue::(anonymous union at /home/noel/libo/include/unoidl/unoidl.hxx:445:5) doubleValue double
+    unoidl::ConstantValue::(anonymous union at /home/noel/libo2/include/unoidl/unoidl.hxx:445:5) doubleValue double
 include/unotest/bootstrapfixturebase.hxx:52
     test::BootstrapFixtureBase m_directories Directories
+include/vcl/bitmap.hxx:101
+    BitmapSystemData mnWidth int
+include/vcl/bitmap.hxx:102
+    BitmapSystemData mnHeight int
 include/vcl/formatter.hxx:127
     Formatter m_aStaticFormatter StaticFormatter
 include/vcl/toolkit/field.hxx:399
     DateFormatter maStaticFormatter class Formatter::StaticFormatter
 io/source/stm/odata.cxx:235
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:235:5) f float
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:235:5) f float
 io/source/stm/odata.cxx:242
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:242:5) d double
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:242:5) d double
 io/source/stm/odata.cxx:551
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:551:5) n sal_uInt32
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:551:5) n sal_uInt32
 io/source/stm/odata.cxx:558
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:558:5) ad struct (unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:558:23)
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:558:5) ad struct (unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:558:23)
 io/source/stm/odata.cxx:558
-    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:558:23) n1 sal_uInt32
+    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:558:23) n1 sal_uInt32
 io/source/stm/odata.cxx:558
-    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:558:23) n2 sal_uInt32
+    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:558:23) n2 sal_uInt32
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:48
     (anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
 libreofficekit/source/gtk/lokdocview.cxx:86
@@ -435,23 +445,23 @@ sal/rtl/uuid.cxx:59
 sc/inc/attarray.hxx:69
     ScMergePatternState pItemSet std::optional<SfxItemSet>
 sc/inc/cellvalue.hxx:113
-    ScRefCellValue::(anonymous union at /home/noel/libo/sc/inc/cellvalue.hxx:111:5) mpString const svl::SharedString *
+    ScRefCellValue::(anonymous union at /home/noel/libo2/sc/inc/cellvalue.hxx:111:5) mpString const svl::SharedString *
 sc/inc/cellvalue.hxx:114
-    ScRefCellValue::(anonymous union at /home/noel/libo/sc/inc/cellvalue.hxx:111:5) mpEditText const EditTextObject *
+    ScRefCellValue::(anonymous union at /home/noel/libo2/sc/inc/cellvalue.hxx:111:5) mpEditText const EditTextObject *
 sc/inc/compiler.hxx:132
-    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo/sc/inc/compiler.hxx:131:9) nIndex sal_uInt16
+    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo2/sc/inc/compiler.hxx:131:9) nIndex sal_uInt16
 sc/inc/compiler.hxx:133
-    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo/sc/inc/compiler.hxx:131:9) eItem class ScTableRefToken::Item
+    ScRawToken::(anonymous union)::(unnamed struct at /home/noel/libo2/sc/inc/compiler.hxx:131:9) eItem class ScTableRefToken::Item
 sc/inc/compiler.hxx:134
-    ScRawToken::(anonymous union at /home/noel/libo/sc/inc/compiler.hxx:109:5) table struct (unnamed struct at /home/noel/libo/sc/inc/compiler.hxx:131:9)
+    ScRawToken::(anonymous union at /home/noel/libo2/sc/inc/compiler.hxx:109:5) table struct (unnamed struct at /home/noel/libo2/sc/inc/compiler.hxx:131:9)
 sc/inc/compiler.hxx:139
-    ScRawToken::(anonymous union at /home/noel/libo/sc/inc/compiler.hxx:109:5) pMat ScMatrix *
+    ScRawToken::(anonymous union at /home/noel/libo2/sc/inc/compiler.hxx:109:5) pMat ScMatrix *
 sc/inc/formulagroup.hxx:38
-    sc::FormulaGroupEntry::(anonymous union at /home/noel/libo/sc/inc/formulagroup.hxx:35:5) mpCells ScFormulaCell **
+    sc::FormulaGroupEntry::(anonymous union at /home/noel/libo2/sc/inc/formulagroup.hxx:35:5) mpCells ScFormulaCell **
 sc/inc/reordermap.hxx:20
     sc::ColRowReorderMapType maData DataType
 sc/source/core/inc/adiasync.hxx:41
-    ScAddInAsync::(anonymous union at /home/noel/libo/sc/source/core/inc/adiasync.hxx:38:5) pStr OUString *
+    ScAddInAsync::(anonymous union at /home/noel/libo2/sc/source/core/inc/adiasync.hxx:38:5) pStr OUString *
 sc/source/core/inc/interpre.hxx:99
     ScTokenStack pPointer const formula::FormulaToken *[512]
 sc/source/filter/excel/xltoolbar.cxx:31
@@ -520,9 +530,9 @@ sd/source/core/CustomAnimationCloner.cxx:70
     sd::(anonymous namespace)::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
 sd/source/core/CustomAnimationCloner.cxx:71
     sd::(anonymous namespace)::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> >
-sd/source/ui/inc/unopage.hxx:163
+sd/source/ui/inc/unopage.hxx:165
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/inc/unopage.hxx:223
+sd/source/ui/inc/unopage.hxx:227
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
 sd/source/ui/sidebar/MasterPageContainer.cxx:141
     sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated Image
@@ -544,7 +554,7 @@ sdext/source/pdfimport/tree/style.hxx:44
     pdfi::StyleContainer::Style Contents OUString
 sfx2/source/appl/lnkbase2.cxx:81
     sfx2::(anonymous namespace)::ImplDdeItem pLink SvBaseLink *
-slideshow/source/engine/slideshowimpl.cxx:140
+slideshow/source/engine/slideshowimpl.cxx:141
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:408
     UCBStorageStream_Impl m_aKey OString
@@ -586,15 +596,13 @@ svx/source/inc/datanavi.hxx:182
     svxform::XFormsPage m_aMethodString MethodString
 svx/source/inc/datanavi.hxx:183
     svxform::XFormsPage m_aReplaceString ReplaceString
-svx/source/inc/datanavi.hxx:367
-    svxform::AddDataItemDialog m_xDataTypeLB std::unique_ptr<weld::ComboBox>
 svx/source/inc/datanavi.hxx:487
     svxform::AddSubmissionDialog m_aMethodString MethodString
 svx/source/inc/datanavi.hxx:488
     svxform::AddSubmissionDialog m_aReplaceString ReplaceString
-svx/source/inc/gridcell.hxx:514
+svx/source/inc/gridcell.hxx:513
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/inc/gridcell.hxx:515
+svx/source/inc/gridcell.hxx:514
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/svdpdf.hxx:61
     ImpSdrPdfImport maDash XDash
@@ -604,14 +612,14 @@ sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
 sw/inc/breakit.hxx:38
     SwBreakIt m_xLanguageTag std::unique_ptr<LanguageTag>
-sw/inc/dpage.hxx:35
+sw/inc/dpage.hxx:38
     SwDPage m_pGridLst std::unique_ptr<SdrPageGridFrameList>
 sw/inc/hints.hxx:308
     SwAttrSetChg m_bDelSet _Bool
-sw/inc/shellio.hxx:145
+sw/inc/shellio.hxx:141
     SwReader mpStg tools::SvRef<SotStorage>
 sw/inc/swevent.hxx:71
-    SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat *
+    SwCallMouseEvent::(anonymous union)::(unnamed struct at /home/noel/libo2/sw/inc/swevent.hxx:69:9) pFormat const SwFrameFormat *
 sw/source/core/access/accfrmobjmap.hxx:100
     SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/access/acchypertextdata.hxx:40
@@ -639,11 +647,11 @@ sw/source/core/text/redlnitr.hxx:75
 sw/source/filter/html/htmltab.cxx:2834
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:33
-    RTFSurround::(unnamed union at /home/noel/libo/sw/source/filter/inc/rtf.hxx:26:5) nVal sal_uInt8
+    RTFSurround::(unnamed union at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:26:5) nVal sal_uInt8
 sw/source/ui/dbui/dbinsdlg.cxx:104
-    DB_Column::(anonymous union at /home/noel/libo/sw/source/ui/dbui/dbinsdlg.cxx:103:5) pText OUString *
+    DB_Column::(anonymous union at /home/noel/libo2/sw/source/ui/dbui/dbinsdlg.cxx:103:5) pText OUString *
 sw/source/ui/dbui/dbinsdlg.cxx:106
-    DB_Column::(anonymous union at /home/noel/libo/sw/source/ui/dbui/dbinsdlg.cxx:103:5) nFormat sal_uInt32
+    DB_Column::(anonymous union at /home/noel/libo2/sw/source/ui/dbui/dbinsdlg.cxx:103:5) nFormat sal_uInt32
 sw/source/uibase/dbui/mmconfigitem.cxx:113
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
 sw/source/uibase/dbui/mmconfigitem.cxx:115
@@ -652,7 +660,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:117
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
 sw/source/uibase/inc/fldmgr.hxx:80
     SwInsertField_Data m_aDBDataSource css::uno::Any
-toolkit/source/awt/vclxtoolkit.cxx:435
+toolkit/source/awt/vclxtoolkit.cxx:436
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 toolkit/source/controls/table/gridtablerenderer.cxx:71
     svt::table::(anonymous namespace)::CachedSortIndicator m_sortAscending BitmapEx
@@ -670,8 +678,8 @@ ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 ucb/source/ucp/package/pkgprovider.hxx:48
     package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages>
-ucb/source/ucp/webdav-curl/CurlSession.cxx:129
-    (anonymous namespace)::CurlOption::(anonymous union at /home/noel/libo/ucb/source/ucp/webdav-curl/CurlSession.cxx:128:5) pValue const void *const
+ucb/source/ucp/webdav-curl/CurlSession.cxx:130
+    (anonymous namespace)::CurlOption::(anonymous union at /home/noel/libo2/ucb/source/ucp/webdav-curl/CurlSession.cxx:129:5) pValue const void *const
 ucbhelper/source/client/proxydecider.cxx:132
     ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const InternetProxyServer
 ucbhelper/source/provider/propertyvalueset.cxx:79
@@ -715,19 +723,19 @@ unoidl/source/unoidl-read.cxx:152
 unoidl/source/unoidl-read.cxx:153
     (anonymous namespace)::Entity interfaceDependencies std::set<OUString>
 unoidl/source/unoidl-write.cxx:177
-    (unnamed union at /home/noel/libo/unoidl/source/unoidl-write.cxx:176:5) buf unsigned char[4]
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidl-write.cxx:176:5) buf unsigned char[4]
 unoidl/source/unoidl-write.cxx:190
-    (unnamed union at /home/noel/libo/unoidl/source/unoidl-write.cxx:189:5) buf unsigned char[8]
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidl-write.cxx:189:5) buf unsigned char[8]
 unoidl/source/unoidlprovider.cxx:89
     unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char[2]
 unoidl/source/unoidlprovider.cxx:99
     unoidl::detail::(anonymous namespace)::Memory32 byte unsigned char[4]
 unoidl/source/unoidlprovider.cxx:111
-    (unnamed union at /home/noel/libo/unoidl/source/unoidlprovider.cxx:109:9) f float
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidlprovider.cxx:109:9) f float
 unoidl/source/unoidlprovider.cxx:130
     unoidl::detail::(anonymous namespace)::Memory64 byte unsigned char[8]
 unoidl/source/unoidlprovider.cxx:146
-    (unnamed union at /home/noel/libo/unoidl/source/unoidlprovider.cxx:144:9) d double
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidlprovider.cxx:144:9) d double
 unoidl/source/unoidlprovider.cxx:458
     unoidl::detail::MapEntry name Memory32
 unoidl/source/unoidlprovider.cxx:459
@@ -746,13 +754,17 @@ vcl/inc/salwtype.hxx:171
     SalWheelMouseEvent mbDeltaIsPixel _Bool
 vcl/inc/salwtype.hxx:224
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:323
+vcl/inc/svdata.hxx:272
+    ImplSVWinData mbIsLiveResize _Bool
+vcl/inc/svdata.hxx:324
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:330
+vcl/inc/svdata.hxx:331
     ImplSVNWFData mbNoFrameJunctionForPopups _Bool
 vcl/inc/toolbox.h:109
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<ToolBoxItemId>
-vcl/inc/unx/saldisp.hxx:281
+vcl/inc/unx/saldisp.hxx:232
+    SalDisplay::RenderEntry m_aPixmap Pixmap
+vcl/inc/unx/saldisp.hxx:280
     SalDisplay m_aInvalidScreenData ScreenData
 vcl/inc/widgetdraw/WidgetDefinition.hxx:225
     vcl::WidgetDefinitionStyle maDefaultButtonTextColor Color
@@ -846,11 +858,11 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-writerfilter/source/ooxml/OOXMLFactory.hxx:57
+writerfilter/source/ooxml/OOXMLFactory.hxx:59
     writerfilter::ooxml::AttributeInfo m_nToken Token_t
-writerfilter/source/ooxml/OOXMLFactory.hxx:58
+writerfilter/source/ooxml/OOXMLFactory.hxx:60
     writerfilter::ooxml::AttributeInfo m_nResource ResourceType
-writerfilter/source/ooxml/OOXMLFactory.hxx:59
+writerfilter/source/ooxml/OOXMLFactory.hxx:61
     writerfilter::ooxml::AttributeInfo m_nRef Id
 xmloff/inc/MultiPropertySetHelper.hxx:85
     MultiPropertySetHelper aEmptyAny css::uno::Any
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 66cdde5c6b79..f3b73911aa8f 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -42,7 +42,7 @@ cui/source/inc/fileextcheckdlg.hxx:29
     FileExtCheckDialog m_pPerformCheck std::unique_ptr<weld::CheckButton>
 cui/source/inc/fileextcheckdlg.hxx:30
     FileExtCheckDialog m_pOk std::unique_ptr<weld::Button>
-dbaccess/source/core/inc/databasecontext.hxx:84
+dbaccess/source/core/inc/databasecontext.hxx:82
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
@@ -88,7 +88,7 @@ include/basegfx/DrawCommands.hxx:143
     gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo>
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard SolarMutexGuard
-include/editeng/unotext.hxx:610
+include/editeng/unotext.hxx:611
     SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
 include/LibreOfficeKit/LibreOfficeKitGtk.h:40
     _LOKDocView aDrawingArea GtkDrawingArea
@@ -224,6 +224,8 @@ include/sfx2/msg.hxx:147
     SfxType23 pType const std::type_info *
 include/sfx2/templdlg.hxx:41
     SfxTemplatePanelControl pImpl std::unique_ptr<SfxTemplateDialog_Impl>
+include/svtools/genericasyncunodialog.hxx:48
+    svt::OGenericUnoAsyncDialog::UnoAsyncDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/genericunodialog.hxx:154
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/unoevent.hxx:162
@@ -376,7 +378,7 @@ sc/inc/editutil.hxx:111
     ScEnginePoolHelper pEnginePool rtl::Reference<SfxItemPool>
 sc/inc/editutil.hxx:113
     ScEnginePoolHelper bDeleteEnginePool _Bool
-sc/inc/mtvelements.hxx:156
+sc/inc/mtvelements.hxx:171
     sc::ColumnBlockConstPosition miSparklinePos SparklineStoreType::const_iterator
 sc/source/core/data/document.cxx:1246
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
@@ -384,7 +386,7 @@ sc/source/core/data/document.cxx:1247
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
 sc/source/filter/inc/sheetdatacontext.hxx:50
     oox::xls::SheetDataContext aReleaser SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:457
+sc/source/ui/inc/docsh.hxx:459
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:47
     ScPivotLayoutTreeListBase maDropTargetHelper ScPivotLayoutTreeDropTarget
@@ -402,22 +404,16 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:63
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
 sd/source/ui/view/DocumentRenderer.cxx:1318
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1180
+sd/source/ui/view/viewshel.cxx:1185
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
-sd/source/ui/view/viewshel.cxx:1181
+sd/source/ui/view/viewshel.cxx:1186
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
-sd/source/ui/view/viewshel.cxx:1182
+sd/source/ui/view/viewshel.cxx:1187
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
-sd/source/ui/view/viewshel.cxx:1183
+sd/source/ui/view/viewshel.cxx:1188
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:188
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sdext/source/minimizer/optimizerdialog.hxx:191
-    OptimizerDialog mnCurrentStep sal_Int16
-sdext/source/minimizer/optimizerdialog.hxx:192
-    OptimizerDialog mnTabIndex sal_Int16
-sdext/source/minimizer/optimizerdialog.hxx:202
-    OptimizerDialog maControlPages std::vector<std::vector<OUString> >
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:267
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:267
@@ -426,6 +422,8 @@ sfx2/inc/autoredactdialog.hxx:99
     SfxAutoRedactDialog m_xDocShell SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:46
     SfxModelessDialog_Impl aMoveIdle Idle
+sfx2/source/doc/docmacromode.cxx:75
+    sfx2::DocumentMacroMode_Data m_bMacroDisabledMessageShown _Bool
 sfx2/source/doc/doctempl.cxx:106
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell SfxObjectShellLock
 sfx2/source/inc/sfxpicklist.hxx:33
@@ -452,7 +450,7 @@ starmath/inc/mathml/mathmlMo.hxx:69
     moOperatorData m_properties moOpDP
 starmath/inc/smmod.hxx:67
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
-starmath/inc/view.hxx:247
+starmath/inc/view.hxx:249
     SmViewShell maGraphicController SmGraphicController
 svl/source/crypto/cryptosign.cxx:110
     (anonymous namespace)::Extension extnID SECItem
@@ -476,6 +474,8 @@ svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx:41
     svx::sidebar::FontworkPropertyPanel m_xToolbar std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/tbxctrls/layctrl.cxx:432
     (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
+sw/qa/extras/uiwriter/uiwriter5.cxx:66
+    SwUiWriterTest5 m_aSavedSettings AllSettings
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:78
@@ -488,11 +488,9 @@ sw/source/core/layout/dbg_lay.cxx:181
     SwImplEnterLeave m_nAction DbgAction
 sw/source/ui/envelp/swuilabimp.hxx:32
     SwLabPage m_xAddressFrame std::unique_ptr<weld::Widget>
-sw/source/ui/vba/vbacontentcontrol.hxx:23
-    SwVbaContentControl mxTextDocument css::uno::Reference<css::text::XTextDocument>
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:307
+sw/source/uibase/inc/conttree.hxx:321
     SwGlobalTree m_aDropTargetHelper SwGlobalTreeDropTarget
 sw/source/uibase/inc/frmpage.hxx:94
     SwFramePage m_xAnchorFrame std::unique_ptr<weld::Widget>
@@ -500,19 +498,23 @@ sw/source/uibase/inc/insfnote.hxx:38
     SwInsFootNoteDlg m_xNumberFrame std::unique_ptr<weld::Widget>
 sw/source/uibase/inc/num.hxx:47
     SwNumPositionTabPage m_xPositionFrame std::unique_ptr<weld::Widget>
-sw/source/uibase/inc/swuicnttab.hxx:241
+sw/source/uibase/inc/pagenumberdlg.hxx:30
+    SwPageNumberDlg m_xCancel std::unique_ptr<weld::Button>
+sw/source/uibase/inc/swuicnttab.hxx:245
     SwTokenWindow m_aAdjustPositionsIdle Idle
-sw/source/uibase/inc/uivwimp.hxx:93
+sw/source/uibase/inc/uivwimp.hxx:95
     SwView_Impl m_xTmpSelDocShell SfxObjectShellLock
-sw/source/uibase/inc/unodispatch.hxx:45
+sw/source/uibase/inc/unodispatch.hxx:43
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard SolarMutexGuard
+sw/source/uibase/sidebar/ThemePanel.hxx:41
+    sw::sidebar::ThemePanel mxListBoxFonts std::unique_ptr<weld::TreeView>
 toolkit/source/awt/stylesettings.cxx:74
     toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard SolarMutexGuard
 unoidl/source/unoidlprovider.cxx:675
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider>
 unoidl/source/unoidlprovider.cxx:676
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
-vcl/inc/jsdialog/jsdialogbuilder.hxx:615
+vcl/inc/jsdialog/jsdialogbuilder.hxx:632
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
@@ -520,6 +522,14 @@ vcl/inc/pdf/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
 vcl/inc/pdf/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int[256]
+vcl/inc/pdf/pdfwriter_impl.hxx:607
+    vcl::pdf::PDFAddStream m_aMimeType OUString
+vcl/inc/pdf/pdfwriter_impl.hxx:608
+    vcl::pdf::PDFAddStream m_pStream PDFOutputStream *
+vcl/inc/pdf/pdfwriter_impl.hxx:609
+    vcl::pdf::PDFAddStream m_nStreamObject sal_Int32
+vcl/inc/pdf/pdfwriter_impl.hxx:610
+    vcl::pdf::PDFAddStream m_bCompress _Bool
 vcl/inc/salprn.hxx:45
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
 vcl/inc/sft.hxx:177
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 104de1f6b322..a8dc4ec698fc 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -12,7 +12,7 @@ basic/qa/cppunit/test_scanner.cxx:24
     (anonymous namespace)::Symbol line sal_uInt16
 basic/qa/cppunit/test_scanner.cxx:25
     (anonymous namespace)::Symbol col1 sal_uInt16
-basic/source/inc/runtime.hxx:255
+basic/source/inc/runtime.hxx:254
     SbiRuntime aRefSaved std::vector<SbxVariableRef>
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:56
     Data pMethod sal_uInt64
@@ -24,8 +24,8 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:59
     Data pGPR sal_uInt64 *
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:60
     Data pFPR double *
-bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx:448
-    bridges::cpp_uno::shared::VtableFactory::Slot fn void *
+bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx:449
+    bridges::cpp_uno::shared::VtableFactory::Slot fn const void *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:130
     __cxxabiv1::__cxa_exception unexpectedHandler void (*)(void)
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:131
@@ -72,13 +72,13 @@ canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex y float
 canvas/inc/rendering/irendermodule.hxx:38
     canvas::Vertex z float
-canvas/source/cairo/cairo_canvasbitmap.hxx:119
+canvas/source/cairo/cairo_canvasbitmap.hxx:118
     cairocanvas::CanvasBitmap mpBufferCairo ::cairo::CairoSharedPtr
 canvas/source/cairo/cairo_spritedevicehelper.hxx:73
     cairocanvas::SpriteDeviceHelper mbFullScreen _Bool
 canvas/source/cairo/cairo_spritehelper.hxx:98
     cairocanvas::SpriteHelper mbTextureDirty _Bool
-chart2/inc/ChartModel.hxx:150
+chart2/inc/ChartModel.hxx:151
     chart::ChartModel m_aGraphicObjectVector std::vector<GraphicObject>
 chart2/inc/ChartModel.hxx:481
     chart::ChartModel mnStart sal_Int32
@@ -86,7 +86,7 @@ chart2/inc/ChartModel.hxx:482
     chart::ChartModel mnEnd sal_Int32
 chart2/source/controller/dialogs/DialogModel.cxx:179
     (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt tContainerType *
-chart2/source/controller/inc/ChartController.hxx:420
+chart2/source/controller/inc/ChartController.hxx:421
     chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper>
 chart2/source/controller/inc/dlg_ChartType_UNO.hxx:62
     chart::ChartTypeUnoDlg m_xChartModel rtl::Reference< ::chart::ChartModel>
@@ -101,9 +101,9 @@ chart2/source/view/charttypes/PieChart.hxx:129
 codemaker/source/cppumaker/dependencies.hxx:108
     codemaker::cppumaker::Dependencies m_voidDependency _Bool
 codemaker/source/javamaker/classfile.cxx:508
-    (unnamed union at /home/noel/libo/codemaker/source/javamaker/classfile.cxx:508:5) floatBytes float
+    (unnamed union at /home/noel/libo2/codemaker/source/javamaker/classfile.cxx:508:5) floatBytes float
 codemaker/source/javamaker/classfile.cxx:540
-    (unnamed union at /home/noel/libo/codemaker/source/javamaker/classfile.cxx:540:5) doubleBytes double
+    (unnamed union at /home/noel/libo2/codemaker/source/javamaker/classfile.cxx:540:5) doubleBytes double
 comphelper/qa/container/comphelper_ifcontainer.cxx:44
     (anonymous namespace)::ContainerListener m_pStats ContainerStats *const
 comphelper/qa/unit/parallelsorttest.cxx:44
@@ -252,7 +252,7 @@ cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
 cppuhelper/source/typemanager.cxx:845
     (anonymous namespace)::BaseOffset set_ std::set<OUString>
-cui/source/inc/cfg.hxx:407
+cui/source/inc/cfg.hxx:408
     SvxConfigPage m_xDropTargetHelper std::unique_ptr<SvxConfigPageFunctionDropTarget>
 cui/source/inc/cuihyperdlg.hxx:46
     SvxHlinkCtrl aRdOnlyForwarder SfxStatusForwarder
@@ -303,13 +303,13 @@ desktop/source/deployment/manager/dp_managerfac.cxx:47
 desktop/source/deployment/manager/dp_managerfac.cxx:48
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
 desktop/unx/source/splashx.c:371
-    struct (unnamed at /home/noel/libo/desktop/unx/source/splashx.c:369:5) decorations unsigned long
+    struct (unnamed at /home/noel/libo2/desktop/unx/source/splashx.c:369:5) decorations unsigned long
 desktop/unx/source/splashx.c:371
-    struct (unnamed at /home/noel/libo/desktop/unx/source/splashx.c:369:5) flags unsigned long
+    struct (unnamed at /home/noel/libo2/desktop/unx/source/splashx.c:369:5) flags unsigned long
 desktop/unx/source/splashx.c:371
-    struct (unnamed at /home/noel/libo/desktop/unx/source/splashx.c:369:5) functions unsigned long
+    struct (unnamed at /home/noel/libo2/desktop/unx/source/splashx.c:369:5) functions unsigned long
 desktop/unx/source/splashx.c:372
-    struct (unnamed at /home/noel/libo/desktop/unx/source/splashx.c:369:5) input_mode long
+    struct (unnamed at /home/noel/libo2/desktop/unx/source/splashx.c:369:5) input_mode long
 drawinglayer/inc/texture/texture.hxx:58
     drawinglayer::texture::GeoTexSvxGradient maDefinitionRange basegfx::B2DRange
 drawinglayer/inc/texture/texture.hxx:61
@@ -371,7 +371,7 @@ include/basegfx/DrawCommands.hxx:82
 include/basic/basmgr.hxx:59
     BasicError nReason BasicErrorReason
 include/basic/sbxvar.hxx:75
-    SbxValues::(anonymous union at /home/noel/libo/include/basic/sbxvar.hxx:43:5) pData void *
+    SbxValues::(anonymous union at /home/noel/libo2/include/basic/sbxvar.hxx:43:5) pData void *
 include/basic/sbxvar.hxx:247
     SbxVariable m_xComListener css::uno::Reference<css::uno::XInterface>
 include/basic/sbxvar.hxx:248
@@ -384,15 +384,13 @@ include/drawinglayer/attribute/sdrallattribute3d.hxx:42
     drawinglayer::attribute::SdrLineFillShadowAttribute3D maLineStartEnd const SdrLineStartEndAttribute
 include/drawinglayer/primitive2d/mediaprimitive2d.hxx:48
     drawinglayer::primitive2d::MediaPrimitive2D maURL OUString
-include/editeng/adjustitem.hxx:37
-    SvxAdjustItem bLeft _Bool
 include/editeng/outlobj.hxx:44
     OutlinerParaObjData mbIsEditDoc _Bool
 include/editeng/splwrap.hxx:52
     SvxSpellWrapper xWait std::unique_ptr<weld::WaitObject>
-include/editeng/unotext.hxx:422
+include/editeng/unotext.hxx:423
     SvxUnoTextBase xParentText css::uno::Reference<css::text::XText>
-include/editeng/unotext.hxx:591
+include/editeng/unotext.hxx:592
     SvxUnoTextContentEnumeration mxParentText css::uno::Reference<css::text::XText>
 include/framework/addonsoptions.hxx:75
     framework::MergeNotebookBarInstruction aMergePoint OUString
@@ -424,8 +422,8 @@ include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
 include/sfx2/minfitem.hxx:38
     SfxMacroInfoItem aCommentText OUString
-include/svl/sigstruct.hxx:127
-    SignatureInformation hasInconsistentSigningTime _Bool
+include/sfx2/viewsh.hxx:181
+    SfxViewShell m_xHelper std::shared_ptr<SfxStoringHelper>
 include/svtools/brwbox.hxx:327
     BrowseBox::CursorMoveAttempt m_nCol sal_Int32
 include/svtools/brwbox.hxx:328
@@ -438,61 +436,61 @@ include/svtools/ctrltool.hxx:148
     FontList mpDev2 VclPtr<OutputDevice>
 include/svx/bmpmask.hxx:127
     SvxBmpMask aSelItem SvxBmpMaskSelectItem
-include/svx/diagram/datamodel.hxx:115
-    svx::diagram::Point msColorTransformCategoryId OUString
 include/svx/diagram/datamodel.hxx:116
-    svx::diagram::Point msColorTransformTypeId OUString
+    svx::diagram::Point msColorTransformCategoryId OUString
 include/svx/diagram/datamodel.hxx:117
-    svx::diagram::Point msLayoutCategoryId OUString
+    svx::diagram::Point msColorTransformTypeId OUString
 include/svx/diagram/datamodel.hxx:118
-    svx::diagram::Point msLayoutTypeId OUString
+    svx::diagram::Point msLayoutCategoryId OUString
 include/svx/diagram/datamodel.hxx:119
+    svx::diagram::Point msLayoutTypeId OUString
+include/svx/diagram/datamodel.hxx:120
     svx::diagram::Point msPlaceholderText OUString
-include/svx/diagram/datamodel.hxx:123
-    svx::diagram::Point msQuickStyleCategoryId OUString
 include/svx/diagram/datamodel.hxx:124
+    svx::diagram::Point msQuickStyleCategoryId OUString
+include/svx/diagram/datamodel.hxx:125
     svx::diagram::Point msQuickStyleTypeId OUString
-include/svx/diagram/datamodel.hxx:127
-    svx::diagram::Point mnMaxChildren sal_Int32
 include/svx/diagram/datamodel.hxx:128
+    svx::diagram::Point mnMaxChildren sal_Int32
+include/svx/diagram/datamodel.hxx:129
     svx::diagram::Point mnPreferredChildren sal_Int32
-include/svx/diagram/datamodel.hxx:131
-    svx::diagram::Point mnResizeHandles sal_Int32
 include/svx/diagram/datamodel.hxx:132
-    svx::diagram::Point mnCustomAngle sal_Int32
+    svx::diagram::Point mnResizeHandles sal_Int32
 include/svx/diagram/datamodel.hxx:133
-    svx::diagram::Point mnPercentageNeighbourWidth sal_Int32
+    svx::diagram::Point mnCustomAngle sal_Int32
 include/svx/diagram/datamodel.hxx:134
-    svx::diagram::Point mnPercentageNeighbourHeight sal_Int32
+    svx::diagram::Point mnPercentageNeighbourWidth sal_Int32
 include/svx/diagram/datamodel.hxx:135
-    svx::diagram::Point mnPercentageOwnWidth sal_Int32
+    svx::diagram::Point mnPercentageNeighbourHeight sal_Int32
 include/svx/diagram/datamodel.hxx:136
-    svx::diagram::Point mnPercentageOwnHeight sal_Int32
+    svx::diagram::Point mnPercentageOwnWidth sal_Int32
 include/svx/diagram/datamodel.hxx:137
-    svx::diagram::Point mnIncludeAngleScale sal_Int32
+    svx::diagram::Point mnPercentageOwnHeight sal_Int32
 include/svx/diagram/datamodel.hxx:138
-    svx::diagram::Point mnRadiusScale sal_Int32
+    svx::diagram::Point mnIncludeAngleScale sal_Int32
 include/svx/diagram/datamodel.hxx:139
-    svx::diagram::Point mnWidthScale sal_Int32
+    svx::diagram::Point mnRadiusScale sal_Int32
 include/svx/diagram/datamodel.hxx:140
-    svx::diagram::Point mnHeightScale sal_Int32
+    svx::diagram::Point mnWidthScale sal_Int32
 include/svx/diagram/datamodel.hxx:141
-    svx::diagram::Point mnWidthOverride sal_Int32
+    svx::diagram::Point mnHeightScale sal_Int32
 include/svx/diagram/datamodel.hxx:142
+    svx::diagram::Point mnWidthOverride sal_Int32
+include/svx/diagram/datamodel.hxx:143
     svx::diagram::Point mnHeightOverride sal_Int32
-include/svx/diagram/datamodel.hxx:146
-    svx::diagram::Point mbOrgChartEnabled _Bool
 include/svx/diagram/datamodel.hxx:147
-    svx::diagram::Point mbBulletEnabled _Bool
+    svx::diagram::Point mbOrgChartEnabled _Bool
 include/svx/diagram/datamodel.hxx:148
-    svx::diagram::Point mbCoherent3DOffset _Bool
+    svx::diagram::Point mbBulletEnabled _Bool
 include/svx/diagram/datamodel.hxx:149
-    svx::diagram::Point mbCustomHorizontalFlip _Bool
+    svx::diagram::Point mbCoherent3DOffset _Bool
 include/svx/diagram/datamodel.hxx:150
+    svx::diagram::Point mbCustomHorizontalFlip _Bool
+include/svx/diagram/datamodel.hxx:151
     svx::diagram::Point mbCustomVerticalFlip _Bool
-include/svx/diagram/datamodel.hxx:152
+include/svx/diagram/datamodel.hxx:153
     svx::diagram::Point mbIsPlaceholder _Bool
-include/svx/diagram/datamodel.hxx:263
+include/svx/diagram/datamodel.hxx:264
     svx::diagram::DiagramData maConnectionNameMap ConnectionNameMap
 include/svx/fillctrl.hxx:83
     FillControl mxColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
@@ -516,12 +514,6 @@ include/svx/srchdlg.hxx:167
     SvxSearchDialog pOptionsController std::unique_ptr<SvxSearchController>
 include/svx/svdmrkv.hxx:99
     SdrMarkView mpMarkingSubSelectionOverlay std::unique_ptr<MarkingSubSelectionOverlay>
-include/svx/viewpt3d.hxx:62
-    Viewport3D::(unnamed struct at /home/noel/libo/include/svx/viewpt3d.hxx:60:5) H double
-include/svx/viewpt3d.hxx:62
-    Viewport3D::(unnamed struct at /home/noel/libo/include/svx/viewpt3d.hxx:60:5) X double
-include/svx/viewpt3d.hxx:62
-    Viewport3D::(unnamed struct at /home/noel/libo/include/svx/viewpt3d.hxx:60:5) Y double
 include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:157
@@ -538,35 +530,25 @@ include/vcl/opengl/OpenGLContext.hxx:27
     GLWindow bMultiSampleSupported _Bool
 include/vcl/pdfextoutdevdata.hxx:83
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
-include/vcl/salnativewidgets.hxx:510
-    PushButtonValue mbSingleLine _Bool
-include/vcl/sysdata.hxx:68
+include/vcl/sysdata.hxx:69
     SystemEnvData pSalFrame SalFrame *
 include/vcl/textrectinfo.hxx:35
     TextRectInfo mnLineCount sal_uInt16
-include/vcl/vclenum.hxx:178
-    ItalicMatrix xx double
-include/vcl/vclenum.hxx:178
-    ItalicMatrix xy double
-include/vcl/vclenum.hxx:178
-    ItalicMatrix yx double
-include/vcl/vclenum.hxx:178
-    ItalicMatrix yy double
 include/xmloff/shapeimport.hxx:95
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 io/source/stm/odata.cxx:235
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:235:5) n sal_uInt32
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:235:5) n sal_uInt32
 io/source/stm/odata.cxx:242
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:242:5) ad struct (unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:242:23)
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:242:5) ad struct (unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:242:23)
 io/source/stm/odata.cxx:242
-    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:242:23) n1 sal_uInt32
+    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:242:23) n1 sal_uInt32
 io/source/stm/odata.cxx:242
-    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo/io/source/stm/odata.cxx:242:23) n2 sal_uInt32
+    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(unnamed struct at /home/noel/libo2/io/source/stm/odata.cxx:242:23) n2 sal_uInt32
 io/source/stm/odata.cxx:551
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:551:5) f float
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:551:5) f float
 io/source/stm/odata.cxx:558
-    (unnamed union at /home/noel/libo/io/source/stm/odata.cxx:558:5) d double
-jvmfwk/inc/vendorbase.hxx:181
+    (unnamed union at /home/noel/libo2/io/source/stm/odata.cxx:558:5) d double
+jvmfwk/inc/vendorbase.hxx:179
     jfw_plugin::VendorBase m_sArch OUString
 l10ntools/inc/common.hxx:32
     common::HandledArgs m_bUTF8BOM _Bool
@@ -581,13 +563,13 @@ package/inc/ByteChucker.hxx:33
 package/inc/ByteChucker.hxx:33
     ByteChucker p4Sequence sal_Int8 *const
 registry/source/reflread.cxx:435
-    (unnamed union at /home/noel/libo/registry/source/reflread.cxx:432:5) b sal_uInt32
+    (unnamed union at /home/noel/libo2/registry/source/reflread.cxx:432:5) b sal_uInt32
 registry/source/reflread.cxx:460
-    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo/registry/source/reflread.cxx:458:9) b1 sal_uInt32
+    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo2/registry/source/reflread.cxx:458:9) b1 sal_uInt32
 registry/source/reflread.cxx:461
-    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo/registry/source/reflread.cxx:458:9) b2 sal_uInt32
+    (anonymous namespace)::ConstantPool::readDoubleConstant(sal_uInt16)::(anonymous union)::(unnamed struct at /home/noel/libo2/registry/source/reflread.cxx:458:9) b2 sal_uInt32
 registry/source/reflread.cxx:462
-    (unnamed union at /home/noel/libo/registry/source/reflread.cxx:455:5) b struct (unnamed struct at /home/noel/libo/registry/source/reflread.cxx:458:9)
+    (unnamed union at /home/noel/libo2/registry/source/reflread.cxx:455:5) b struct (unnamed struct at /home/noel/libo2/registry/source/reflread.cxx:458:9)
 reportdesign/inc/RptObject.hxx:69
     rptui::OObjectBase m_xKeepShapeAlive css::uno::Reference<css::uno::XInterface>
 sal/rtl/alloc_arena.hxx:35
@@ -610,11 +592,11 @@ sal/textenc/tcvtutf7.cxx:422
     (anonymous namespace)::ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
 sal/textenc/tcvtutf7.cxx:423
     (anonymous namespace)::ImplUTF7FromUCContextData mnBufferBits sal_uInt32
-sc/inc/compiler.hxx:268
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:269
+sc/inc/compiler.hxx:268
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:271
+sc/inc/compiler.hxx:270
     ScCompiler::AddInMap pUpper const char *
 sc/inc/compressedarray.hxx:68
     ScCompressedArray::RangeData mnRow2 A
@@ -632,7 +614,7 @@ sc/inc/scmod.hxx:100
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
 sc/inc/tabopparams.hxx:37
     ScInterpreterTableOpParams bValid _Bool
-sc/source/core/data/column4.cxx:1436
+sc/source/core/data/column4.cxx:1447
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
 sc/source/core/data/column.cxx:1312
     (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
@@ -653,7 +635,7 @@ sc/source/filter/excel/xltoolbar.hxx:28
 sc/source/filter/excel/xltoolbar.hxx:53
     ScCTB rVisualData std::vector<TBVisualData>
 sc/source/filter/excel/xltools.cxx:103
-    (anonymous union at /home/noel/libo/sc/source/filter/excel/xltools.cxx:100:5) smD sal_math_Double
+    (anonymous union at /home/noel/libo2/sc/source/filter/excel/xltools.cxx:100:5) smD sal_math_Double
 sc/source/filter/inc/exp_op.hxx:47
     ExportBiff5 pExcRoot RootData *
 sc/source/filter/inc/imp_op.hxx:83
@@ -662,12 +644,14 @@ sc/source/filter/inc/namebuff.hxx:37
     StringHashEntry aString OUString
 sc/source/filter/inc/namebuff.hxx:38
     StringHashEntry nHash sal_uInt32
-sc/source/filter/inc/orcusinterface.hxx:377
-    ScOrcusStyles::fill maBgColor std::optional<Color>
-sc/source/filter/inc/orcusinterface.hxx:432
-    ScOrcusStyles::xf mnStyleXf size_t
-sc/source/filter/inc/orcusinterface.hxx:452
-    ScOrcusStyles::cell_style mnBuiltInId size_t
+sc/source/filter/inc/orcusinterface.hxx:385
+    ScOrcusFill maBgColor std::optional<Color>
+sc/source/filter/inc/orcusinterface.hxx:428
+    ScOrcusXf mnStyleXf std::size_t
+sc/source/filter/inc/orcusinterface.hxx:445
+    ScOrcusCellStyle maDisplayName OUString
+sc/source/filter/inc/orcusinterface.hxx:448
+    ScOrcusCellStyle mnBuiltInId std::size_t
 sc/source/filter/inc/tokstack.hxx:142
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
 sc/source/filter/lotus/lotfilter.hxx:53
@@ -708,7 +692,7 @@ sc/source/ui/inc/preview.hxx:46
     ScPreview nTabPage tools::Long
 sc/source/ui/inc/tabvwsh.hxx:125
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
-sc/source/ui/inc/transobj.hxx:46
+sc/source/ui/inc/transobj.hxx:48
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
 sc/source/ui/inc/uiitems.hxx:46
     ScInputStatusItem aStartPos ScAddress
@@ -742,9 +726,11 @@ sd/qa/unit/tiledrendering/tiledrendering.cxx:207
     SdTiledRenderingTest m_nSelectionBeforeSearchResult int
 sd/qa/unit/tiledrendering/tiledrendering.cxx:208
     SdTiledRenderingTest m_nSelectionAfterSearchResult int
+sd/source/console/PresenterTimer.cxx:105
+    sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
 sd/source/ui/dlg/RemoteDialogClientBox.hxx:66
     sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
-sd/source/ui/framework/module/ToolBarModule.hxx:72
+sd/source/ui/framework/module/ToolBarModule.hxx:74
     sd::framework::ToolBarModule mpToolBarManagerLock std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
 sd/source/ui/inc/animobjs.hxx:122
     sd::AnimationWindow pControllerItem std::unique_ptr<AnimationControllerItem>
@@ -758,7 +744,7 @@ sd/source/ui/inc/navigatr.hxx:144
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:72
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
-sd/source/ui/inc/unopage.hxx:276
+sd/source/ui/inc/unopage.hxx:282
     SdPageLinkTargets mxPage css::uno::Reference<css::drawing::XDrawPage>
 sd/source/ui/inc/ViewShellImplementation.hxx:78
     sd::ViewShell::Implementation::ToolBarManagerLock mpLock ::std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
@@ -778,8 +764,6 @@ sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:114
     sd::slidesorter::controller::Clipboard mxUndoContext std::unique_ptr<UndoContext>
 sd/source/ui/view/ToolBarManager.cxx:317
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
-sdext/source/presenter/PresenterTimer.cxx:105
-    sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
 sfx2/inc/commandpopup/CommandPopup.hxx:108
     CommandPopupHandler mpListBox std::unique_ptr<CommandListBox>
 sfx2/inc/notebookbar/NotebookbarTabControl.hxx:42
@@ -816,7 +800,7 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:298
     Vertex texcoord glm::vec2
-slideshow/source/engine/slideshowimpl.cxx:1048
+slideshow/source/engine/slideshowimpl.cxx:1049
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl SlideShowImpl *const
 slideshow/test/testview.cxx:50
     (anonymous namespace)::ImplTestView maCreatedSprites std::vector<std::pair<basegfx::B2DVector, double> >
@@ -824,9 +808,9 @@ slideshow/test/testview.cxx:53
     (anonymous namespace)::ImplTestView maPriority basegfx::B1DRange
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
-starmath/inc/mathml/mathmlimport.hxx:46
+starmath/inc/mathml/mathmlimport.hxx:47
     SmXMLImportWrapper m_bUseHTMLMLEntities _Bool
-starmath/inc/view.hxx:187
+starmath/inc/view.hxx:189
     SmCmdBoxWindow aController SmEditController
 stoc/source/servicemanager/servicemanager.cxx:389
     (anonymous namespace)::OServiceManager m_SetLoadedFactories HashSet_Ref
@@ -978,7 +962,7 @@ svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:40
     svx::sidebar::TextColumnsPropertyPanel maColumnsNumberController sfx2::sidebar::ControllerItem
 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx:41
     svx::sidebar::TextColumnsPropertyPanel maColumnsSpacingController sfx2::sidebar::ControllerItem
-svx/source/tbxctrls/tbcontrl.cxx:340
+svx/source/tbxctrls/tbcontrl.cxx:334
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -992,7 +976,7 @@ sw/inc/swwait.hxx:45
     SwWait mpLockedDispatchers o3tl::sorted_vector<SfxDispatcher *>
 sw/inc/textboxhelper.hxx:211
     SwTextBoxNode m_bIsCloningInProgress _Bool
-sw/inc/unoframe.hxx:314
+sw/inc/unoframe.hxx:305
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
 sw/inc/view.hxx:195
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
@@ -1014,7 +998,7 @@ sw/source/core/inc/swfont.hxx:988
     SvStatistics nDrawStretchText sal_uInt16
 sw/source/core/inc/swfont.hxx:989
     SvStatistics nChangeFont sal_uInt16
-sw/source/core/inc/unoflatpara.hxx:135
+sw/source/core/inc/unoflatpara.hxx:128
     SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> >
 sw/source/core/layout/dbg_lay.cxx:135
     SwImplProtocol m_aVars std::vector<tools::Long>
@@ -1022,16 +1006,16 @@ sw/source/core/table/swtable.cxx:2820
     SwTableCellInfo::Impl m_HandledTableBoxes TableBoxes_t
 sw/source/core/text/porfld.hxx:66
     SwFieldPortion m_nAttrFieldType sal_uInt16
-sw/source/filter/html/swhtml.hxx:385
+sw/source/filter/html/swhtml.hxx:388
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> >
 sw/source/filter/inc/rtf.hxx:29
-    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) nGoldCut sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9) nGoldCut sal_uInt8
 sw/source/filter/inc/rtf.hxx:30
-    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) nOrder sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9) nOrder sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9) nJunk sal_uInt8
+    RTFSurround::(anonymous union)::(unnamed struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:32
-    RTFSurround::(unnamed union at /home/noel/libo/sw/source/filter/inc/rtf.hxx:26:5) Flags struct (unnamed struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(unnamed union at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:26:5) Flags struct (unnamed struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/glossary.hxx:65
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
 sw/source/uibase/inc/glossary.hxx:81
@@ -1062,7 +1046,7 @@ sw/source/uibase/sidebar/TableEditPanel.hxx:60
     sw::sidebar::TableEditPanel m_xMiscDispatch std::unique_ptr<ToolbarUnoDispatcher>
 sw/source/uibase/sidebar/WrapPropertyPanel.hxx:73
     sw::sidebar::WrapPropertyPanel mxWrapOptionsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-testtools/source/bridgetest/cppobj.cxx:153
+testtools/source/bridgetest/cppobj.cxx:154
     bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<TestElement>
 ucb/source/ucp/gio/gio_mount.hxx:73
     OOoMountOperationClass parent_class GMountOperationClass
@@ -1075,15 +1059,15 @@ ucb/source/ucp/gio/gio_mount.hxx:78
 ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 unoidl/source/unoidl-write.cxx:178
-    (unnamed union at /home/noel/libo/unoidl/source/unoidl-write.cxx:176:5) f float
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidl-write.cxx:176:5) f float
 unoidl/source/unoidl-write.cxx:191
-    (unnamed union at /home/noel/libo/unoidl/source/unoidl-write.cxx:189:5) d float
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidl-write.cxx:189:5) d float
 unoidl/source/unoidl.cxx:84
     unoidl::(anonymous namespace)::AggregatingCursor seen_ std::set<OUString>
 unoidl/source/unoidlprovider.cxx:110
-    (unnamed union at /home/noel/libo/unoidl/source/unoidlprovider.cxx:109:9) buf unsigned char[4]
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidlprovider.cxx:109:9) buf unsigned char[4]
 unoidl/source/unoidlprovider.cxx:145
-    (unnamed union at /home/noel/libo/unoidl/source/unoidlprovider.cxx:144:9) buf unsigned char[8]
+    (unnamed union at /home/noel/libo2/unoidl/source/unoidlprovider.cxx:144:9) buf unsigned char[8]
 unoxml/source/rdf/librdf_repository.cxx:470
     (anonymous namespace)::librdf_GraphResult m_pQuery const std::shared_ptr<librdf_query>
 unoxml/source/rdf/librdf_repository.cxx:623
@@ -1136,7 +1120,7 @@ vcl/inc/salwtype.hxx:250
     SalGestureSwipeEvent mnVelocityY double
 vcl/inc/scanlinewriter.hxx:35
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/inc/svdata.hxx:464
+vcl/inc/svdata.hxx:465
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/toolbarvalue.hxx:47
     ToolbarValue mbIsTopDockingArea _Bool
@@ -1148,6 +1132,10 @@ vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
 vcl/inc/unx/gtk/gtkframe.hxx:83
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
+vcl/inc/unx/salgdi.h:152
+    X11SalGraphics bWindow_ _Bool
+vcl/inc/unx/salgdi.h:153
+    X11SalGraphics bVirDev_ _Bool
 vcl/source/components/dtranscomp.cxx:207
     vcl::(anonymous namespace)::GenericDragSource m_xTrans css::uno::Reference<css::datatransfer::XTransferable>
 vcl/source/fontsubset/sft.cxx:109
@@ -1174,13 +1162,13 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:82
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/glomenu.cxx:16
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtkinst.cxx:20631
+vcl/unx/gtk3/gtkinst.cxx:20811
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection gpointer
 vcl/unx/gtk3/hudawareness.cxx:21
     (anonymous namespace)::HudAwarenessHandle notify GDestroyNotify
-vcl/workben/vcldemo.cxx:1740
+vcl/workben/vcldemo.cxx:1741
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
 writerfilter/source/dmapper/DocumentProtection.hxx:50
     writerfilter::dmapper::DocumentProtection m_sRedlineProtectionKey OUString