compilerplugins/clang/unusedfields.only-used-in-constructor.results |  146 
+++---
 compilerplugins/clang/unusedfields.readonly.results                 |   74 +--
 compilerplugins/clang/unusedfields.untouched.results                |   62 +-
 compilerplugins/clang/unusedfields.writeonly.results                |  218 
+++++-----
 editeng/source/editeng/impedit5.cxx                                 |    2 
 include/svl/ondemand.hxx                                            |    5 
 include/xmloff/xmlnumfi.hxx                                         |    7 
 sd/source/console/PresenterAccessibility.cxx                        |    2 
 sd/source/console/PresenterAccessibility.hxx                        |    2 
 sd/source/console/PresenterController.cxx                           |    1 
 sd/source/console/PresenterTheme.cxx                                |   11 
 svl/source/numbers/zforlist.cxx                                     |    4 
 xmloff/source/core/xmlimp.cxx                                       |    4 
 xmloff/source/draw/ximpstyl.cxx                                     |    2 
 xmloff/source/style/xmlnumfi.cxx                                    |   28 -
 15 files changed, 283 insertions(+), 285 deletions(-)

New commits:
commit 8cfc3e8b50e96ecddc25831cf6aa1b7aec5fa548
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Apr 14 15:16:28 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Apr 15 08:10:37 2025 +0200

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

diff --git a/editeng/source/editeng/impedit5.cxx 
b/editeng/source/editeng/impedit5.cxx
index 9abcc1350c06..cbbd830d23e4 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -1232,7 +1232,7 @@ bool ImpEditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView
                                 LanguageTag aLanguageTag( eLang);
 
                                 if (!mxLocaleDataWrapper.isInitialized())
-                                    mxLocaleDataWrapper.init( 
SvtSysLocale().GetLocaleData().getComponentContext(), aLanguageTag);
+                                    mxLocaleDataWrapper.init( aLanguageTag);
                                 else
                                     mxLocaleDataWrapper.changeLocale( 
aLanguageTag);
 
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index 200958b2d99c..a4d4a5337736 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -51,7 +51,6 @@
 
 class OnDemandLocaleDataWrapper
 {
-    css::uno::Reference<css::uno::XComponentContext> m_xContext;
     SvtSysLocale aSysLocale;
     LanguageType eCurrentLanguage;
     LanguageType eLastAnyLanguage;
@@ -71,10 +70,8 @@ public:
 
     bool isInitialized() const { return bInitialized; }
 
-    void init(const css::uno::Reference<css::uno::XComponentContext>& 
rxContext,
-              const LanguageTag& rLanguageTag)
+    void init(const LanguageTag& rLanguageTag)
     {
-        m_xContext = rxContext;
         changeLocale(rLanguageTag);
         bInitialized = true;
     }
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index da7537717e94..7fe1e337d5f3 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -293,7 +293,7 @@ SvNFLanguageData::SvNFLanguageData(const 
Reference<XComponentContext>& rxContext
     , eEvalDateFormat(NF_EVALDATEFORMAT_INTL)
 {
     xCharClass.changeLocale(xContext, aLanguageTag);
-    xLocaleData.init(xContext, aLanguageTag);
+    xLocaleData.init(aLanguageTag);
     xCalendar.init(xContext, aLanguageTag.getLocale());
     xTransliteration.init(xContext, ActLnge);
 
@@ -320,7 +320,7 @@ SvNFLanguageData::SvNFLanguageData(const SvNFLanguageData& 
rOther)
     , eEvalDateFormat(rOther.eEvalDateFormat)
 {
     xCharClass.changeLocale(xContext, aLanguageTag);
-    xLocaleData.init(xContext, aLanguageTag);
+    xLocaleData.init(aLanguageTag);
     xCalendar.init(xContext, aLanguageTag.getLocale());
     xTransliteration.init(xContext, ActLnge);
 
commit 1fc3b3198c2362f2fc0ae2233d23c163478c1a0d
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Apr 14 15:00:46 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Apr 15 08:10:29 2025 +0200

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

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 35d589b93fcd..af2e6981d79b 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -16,9 +16,9 @@ binaryurp/source/writer.hxx:135
     binaryurp::Writer state_ WriterState
 canvas/source/tools/surfaceproxy.hxx:104
     canvas::SurfaceProxy mpPageManager PageManagerSharedPtr
-canvas/source/vcl/impltools.hxx:119
+canvas/source/vcl/impltools.hxx:95
     vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
-chart2/source/controller/accessibility/AccessibleChartShape.hxx:77
+chart2/source/controller/accessibility/AccessibleChartShape.hxx:65
     chart::AccessibleChartShape m_aShapeTreeInfo 
::accessibility::AccessibleShapeTreeInfo
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:70
     chart::ThreeD_SceneIllumination_TabPage m_aModelChangeListener 
ModifyListenerCallBack
@@ -62,9 +62,9 @@ connectivity/source/drivers/evoab2/EApi.h:121
     EContactAddress address_format char *
 connectivity/source/drivers/evoab2/EApi.h:125
     EContactAddress ext char *
-connectivity/source/drivers/firebird/Driver.hxx:48
-    connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory 
::utl::TempFileNamed
 connectivity/source/drivers/firebird/Driver.hxx:49
+    connectivity::firebird::FirebirdDriver m_firebirdTMPDirectory 
::utl::TempFileNamed
+connectivity/source/drivers/firebird/Driver.hxx:50
     connectivity::firebird::FirebirdDriver m_firebirdLockDirectory 
::utl::TempFileNamed
 connectivity/source/drivers/postgresql/pq_statics.hxx:105
     pq_sdbc_driver::ImplementationStatics types 
css::uno::Sequence<css::uno::Type>
@@ -93,7 +93,7 @@ connectivity/source/inc/file/FStatement.hxx:93
 connectivity/source/inc/flat/EResultSet.hxx:39
     connectivity::flat::OFlatResultSet m_bBookmarkable _Bool
 connectivity/source/inc/java/lang/Object.hxx:37
-    connectivity::SDBThreadAttach m_aGuard jvmaccess::class 
VirtualMachine::AttachGuard
+    connectivity::SDBThreadAttach m_aGuard 
jvmaccess::VirtualMachine::AttachGuard
 cppcanvas/source/mtfrenderer/textaction.cxx:812
     cppcanvas::internal::(anonymous namespace)::EffectTextAction 
maTextLineInfo const tools::TextLineInfo
 cppcanvas/source/mtfrenderer/textaction.cxx:1650
@@ -146,45 +146,45 @@ cui/source/dialogs/colorpicker.cxx:748
     cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious 
ColorPreviewControl
 cui/source/factory/dlgfact.cxx:1176
     (anonymous namespace)::SvxMacroAssignDialog_Impl m_aItems SfxItemSet
-cui/source/inc/AdditionsDialog.hxx:47
+cui/source/inc/AdditionsDialog.hxx:46
     AdditionInfo sReleaseVersion OUString
-cui/source/inc/AdditionsDialog.hxx:83
+cui/source/inc/AdditionsDialog.hxx:82
     AdditionsDialog m_sTag OUString
-cui/source/inc/cfgutil.hxx:246
+cui/source/inc/cfgutil.hxx:244
     SvxScriptSelectorDialog m_aStylesInfo SfxStylesInfo_Impl
 cui/source/inc/cuitabarea.hxx:232
     SvxAreaTabPage maFixed_ChangeType ChangeType
 cui/source/inc/cuitabarea.hxx:236
     SvxAreaTabPage m_aXFillAttr XFillAttrSetItem
-cui/source/inc/tabstpge.hxx:84
+cui/source/inc/tabstpge.hxx:82
     SvxTabulatorTabPage m_aLeftWin TabWin_Impl
-cui/source/inc/tabstpge.hxx:85
+cui/source/inc/tabstpge.hxx:83
     SvxTabulatorTabPage m_aRightWin TabWin_Impl
-cui/source/inc/tabstpge.hxx:86
+cui/source/inc/tabstpge.hxx:84
     SvxTabulatorTabPage m_aCenterWin TabWin_Impl
-cui/source/inc/tabstpge.hxx:87
+cui/source/inc/tabstpge.hxx:85
     SvxTabulatorTabPage m_aDezWin TabWin_Impl
-dbaccess/source/core/api/RowSet.hxx:109
+dbaccess/source/core/api/RowSet.hxx:111
     dbaccess::ORowSet m_aURL OUString
-dbaccess/source/core/api/RowSet.hxx:124
-    dbaccess::ORowSet m_nMaxFieldSize sal_Int32
 dbaccess/source/core/api/RowSet.hxx:126
-    dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+    dbaccess::ORowSet m_nMaxFieldSize sal_Int32
 dbaccess/source/core/api/RowSet.hxx:128
+    dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+dbaccess/source/core/api/RowSet.hxx:130
     dbaccess::ORowSet m_nTransactionIsolation sal_Int32
-dbaccess/source/core/api/RowSet.hxx:140
-    dbaccess::ORowSet m_bIsBookmarkable _Bool
 dbaccess/source/core/api/RowSet.hxx:142
+    dbaccess::ORowSet m_bIsBookmarkable _Bool
+dbaccess/source/core/api/RowSet.hxx:144
     dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:454
+dbaccess/source/core/api/RowSet.hxx:456
     dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:455
+dbaccess/source/core/api/RowSet.hxx:457
     dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:456
+dbaccess/source/core/api/RowSet.hxx:458
     dbaccess::ORowSetClone m_bIsBookmarkable _Bool
-dbaccess/source/core/inc/connection.hxx:99
+dbaccess/source/core/inc/connection.hxx:103
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
-dbaccess/source/core/inc/databasecontext.hxx:82
+dbaccess/source/core/inc/databasecontext.hxx:73
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:79
     dbaccess::OSingleSelectQueryComposer m_aNeutralContext 
::svxform::ONeutralParseContext
@@ -198,7 +198,7 @@ drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
     emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
-editeng/source/editeng/impedit.hxx:566
+editeng/source/editeng/impedit.hxx:568
     ImpEditEngine maSelFuncSet EditSelFunctionSet
 embeddedobj/source/msole/olecomponent.hxx:51
     OleComponent m_pInterfaceContainer 
comphelper::OMultiTypeInterfaceContainerHelper2 *
@@ -250,8 +250,6 @@ include/filter/msfilter/svdfppt.hxx:886
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/formula/formulahelper.hxx:39
     formula::FormulaHelper m_aSysLocale SvtSysLocale
-include/formula/IFunctionDescription.hxx:77
-    formula::IFunctionManager changeFavouriteList _Bool
 include/LibreOfficeKit/LibreOfficeKitGtk.h:41
     _LOKDocView aDrawingArea GtkDrawingArea
 include/LibreOfficeKit/LibreOfficeKitGtk.h:46
@@ -336,8 +334,6 @@ include/vcl/GestureEventZoom.hxx:32
     GestureEventZoom mfScaleDelta double
 include/vcl/idletask.hxx:31
     IdleTask maIdle Idle
-include/vcl/notebookbar/notebookbar.hxx:63
-    NotebookBar PersonaSettings AllSettings
 include/vcl/pdf/PDFAnnotationMarker.hxx:79
     vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType PDFTextMarkerType
 include/xmloff/shapeimport.hxx:55
@@ -376,9 +372,9 @@ lotuswordpro/source/filter/bento.hxx:349
     OpenStormBento::CBenNamedObject cNameListElmt CBenNamedObjectListElmt
 lotuswordpro/source/filter/clone.hxx:23
     detail::has_clone::no a char[2]
-oox/source/drawingml/diagram/layoutnodecontext.cxx:92
+oox/source/drawingml/diagram/layoutnodecontext.cxx:93
     oox::drawingml::(anonymous namespace)::AlgorithmContext mnRevision 
sal_Int32
-oox/source/drawingml/diagram/layoutnodecontext.cxx:134
+oox/source/drawingml/diagram/layoutnodecontext.cxx:135
     oox::drawingml::(anonymous namespace)::ChooseContext msName OUString
 oox/source/drawingml/scene3dhelper.cxx:476
     oox::(anonymous namespace)::MSOLight fScale double
@@ -386,23 +382,23 @@ oox/source/drawingml/scene3dhelper.cxx:477
     oox::(anonymous namespace)::MSOLight fOffset double
 oox/source/drawingml/scene3dhelper.cxx:479
     oox::(anonymous namespace)::MSOLight bDiffuse _Bool
-oox/source/ppt/timenodelistcontext.cxx:206
+oox/source/ppt/timenodelistcontext.cxx:207
     oox::ppt::(anonymous namespace)::MediaNodeContext mbFullScrn _Bool
-oox/source/ppt/timenodelistcontext.cxx:401
-    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
 oox/source/ppt/timenodelistcontext.cxx:402
+    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnNextAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:402
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnPrevAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:638
+oox/source/ppt/timenodelistcontext.cxx:639
     oox::ppt::(anonymous namespace)::AnimContext mnValueType sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:720
+oox/source/ppt/timenodelistcontext.cxx:721
     oox::ppt::(anonymous namespace)::AnimScaleContext mbZoomContents _Bool
-oox/source/ppt/timenodelistcontext.cxx:860
-    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes OUString
 oox/source/ppt/timenodelistcontext.cxx:861
-    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes OUString
 oox/source/ppt/timenodelistcontext.cxx:862
+    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+oox/source/ppt/timenodelistcontext.cxx:863
     oox::ppt::(anonymous namespace)::AnimMotionContext mnAngle sal_Int32
 pyuno/source/module/pyuno_callable.cxx:45
     pyuno::(anonymous namespace)::PyUNO_callable ob_base PyObject
@@ -482,7 +478,7 @@ sc/inc/editutil.hxx:113
     ScEnginePoolHelper m_bDeleteEnginePool _Bool
 sc/inc/mtvelements.hxx:172
     sc::ColumnBlockConstPosition miSparklinePos 
SparklineStoreType::const_iterator
-sc/inc/patattr.hxx:141
+sc/inc/patattr.hxx:142
     ScPatternAttr m_nSerialNumber sal_uInt32
 sc/inc/pivot/PivotTableFormats.hxx:44
     sc::PivotTableFormat bSelected _Bool
@@ -496,7 +492,7 @@ sc/inc/SolverSettings.hxx:240
     sc::SolverSettings SolverCodesToLOEngines std::map<OUString, OUString>
 sc/inc/token.hxx:402
     SingleDoubleRefModifier aDub ScComplexRefData
-sc/qa/unit/tiledrendering/tiledrenderingmodeltestbase.cxx:273
+sc/qa/unit/tiledrendering/tiledrenderingmodeltestbase.cxx:275
     ViewCallback m_callbackWrapper TestLokCallbackWrapper
 sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch 
sc::AutoCalcSwitch
@@ -504,9 +500,9 @@ sc/source/core/data/document.cxx:1241
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
 sc/source/core/data/table2.cxx:835
     (anonymous namespace)::TransClipHandler mnEndRow size_t
-sc/source/core/inc/interpre.hxx:84
+sc/source/core/inc/interpre.hxx:85
     VectorSearchArguments nTab2 SCTAB
-sc/source/core/inc/interpre.hxx:251
+sc/source/core/inc/interpre.hxx:252
     ScInterpreter maResultTokenMap ScResultTokenMap
 sc/source/filter/inc/htmlpars.hxx:634
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
@@ -554,32 +550,38 @@ scripting/source/stringresource/stringresource.cxx:1246
     stringresource::(anonymous namespace)::BinaryInput m_aData 
Sequence<sal_Int8>
 sd/inc/anminfo.hxx:51
     SdAnimationInfo maSecondSoundFile OUString
+sd/qa/inc/sdtiledrenderingtest.hxx:79
+    SdTestViewCallback m_callbackWrapper TestLokCallbackWrapper
+sd/qa/unit/tiledrendering/tiledrendering.cxx:2835
+    (anonymous namespace)::SlideRendererChecker mnSlideNumber sal_Int32
 sd/source/filter/eppt/epptbase.hxx:348
     PPTWriterBase maFraction Fraction
 sd/source/filter/ppt/pptin.hxx:81
     SdPPTImport maParam PowerPointImportParam
-sd/source/ui/inc/AccessibleDocumentViewBase.hxx:258
+sd/source/ui/inc/AccessibleDocumentViewBase.hxx:246
     accessibility::AccessibleDocumentViewBase maViewForwarder 
AccessibleViewForwarder
 sd/source/ui/inc/CustomAnimationList.hxx:127
     sd::CustomAnimationList maDropTargetHelper CustomAnimationListDropTarget
 sd/source/ui/inc/OutlineBulletDlg.hxx:43
     sd::OutlineBulletDlg m_aInputSet SfxItemSet
+sd/source/ui/inc/SlideshowLayerRenderer.hxx:120
+    sd::RenderState mpCurrentTarget SdrObject *
+sd/source/ui/inc/SlideshowLayerRenderer.hxx:121
+    sd::RenderState mnCurrentTargetParagraph sal_Int32
 sd/source/ui/remotecontrol/Receiver.hxx:34
     sd::Receiver pTransmitter Transmitter *
 sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
-sd/source/ui/tools/SlideshowLayerRenderer.cxx:52
-    sd::RenderContext maScale Fraction
-sd/source/ui/view/DocumentRenderer.cxx:1635
+sd/source/ui/view/DocumentRenderer.cxx:1650
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1321
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1322
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::class 
SlideSorterController::ModelChangeLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1323
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1324
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::class SelectionObserver::Context
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:249
     (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:249
@@ -710,11 +712,11 @@ svx/source/dialog/contimp.hxx:74
     SvxSuperContourDlg aContourItem SvxContourDlgItem
 svx/source/dialog/framelinkarray.cxx:570
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow sal_Int32
-svx/source/dialog/weldeditview.cxx:454
+svx/source/dialog/weldeditview.cxx:465
     (anonymous namespace)::WeldEditSource m_rEditAcc WeldEditAccessible &
 svx/source/inc/datanavi.hxx:194
     svxform::XFormsPage m_aDropHelper DataTreeDropTarget
-svx/source/svdraw/svdcrtv.cxx:48
+svx/source/svdraw/svdcrtv.cxx:49
     ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
 svx/source/svdraw/svdmrkv.cxx:143
     MarkingSelectionOverlay maObjects sdr::overlay::OverlayObjectList
@@ -730,9 +732,9 @@ sw/inc/unosett.hxx:144
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:145
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField 
mChapterFieldType SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter5.cxx:67
+sw/qa/extras/uiwriter/uiwriter10.cxx:47
     SwUiWriterTest5 m_aSavedSettings AllSettings
-sw/qa/inc/swtestviewcallback.hxx:55
+sw/qa/inc/swtestviewcallback.hxx:56
     SwTestViewCallback m_callbackWrapper TestLokCallbackWrapper
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
@@ -776,15 +778,15 @@ sw/source/writerfilter/dmapper/PropertyMap.hxx:251
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 toolkit/source/awt/stylesettings.cxx:74
     toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard SolarMutexGuard
-ucb/source/ucp/gio/gio_mount.hxx:73
-    OOoMountOperationClass parent_class GMountOperationClass
 ucb/source/ucp/gio/gio_mount.hxx:76
+    OOoMountOperationClass parent_class GMountOperationClass
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:81
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:82
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 vcl/inc/graphic/Manager.hxx:36
     vcl::graphic::MemoryManager maSwapOutTimer Timer
@@ -792,7 +794,7 @@ vcl/inc/graphic/Manager.hxx:37
     vcl::graphic::MemoryManager mnTimeout sal_Int32
 vcl/inc/headless/BitmapHelper.hxx:32
     BitmapHelper aTmpBmp SvpSalBitmap
-vcl/inc/jsdialog/jsdialogbuilder.hxx:641
+vcl/inc/jsdialog/jsdialogbuilder.hxx:642
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/COSWriter.hxx:27
     vcl::pdf::COSWriter maLine OStringBuffer
@@ -804,21 +806,19 @@ vcl/inc/pdf/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int[256]
 vcl/inc/pdf/pdfwriter_impl.hxx:1082
     vcl::PDFWriterImpl m_bIsPDF_A4 _Bool
-vcl/inc/qt5/QtInstanceIconView.hxx:21
-    QtInstanceIconView m_pListView QListView *
 vcl/inc/qt5/QtInstanceToolbar.hxx:20
     QtInstanceToolbar m_pToolBar QToolBar *
-vcl/inc/salprn.hxx:48
+vcl/inc/salprn.hxx:47
     SalPrinterQueueInfo moPortName std::optional<OUString>
 vcl/inc/salvtables.hxx:613
     SalInstanceEntry m_aTextFilter WeldTextFilter
-vcl/inc/salvtables.hxx:1008
+vcl/inc/salvtables.hxx:1004
     SalInstanceComboBoxWithEdit m_aTextFilter WeldTextFilter
-vcl/inc/sft.hxx:179
+vcl/inc/sft.hxx:178
     vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
-vcl/inc/skia/zone.hxx:29
+vcl/inc/skia/zone.hxx:28
     SkiaZone g SolarMutexGuard
-vcl/inc/svimpbox.hxx:113
+vcl/inc/svimpbox.hxx:112
     SvImpLBox m_aFctSet ImpLBSelEng
 vcl/inc/unx/genpspgraphics.h:52
     GenPspGraphics m_aCairoCommon CairoCommon
@@ -866,15 +866,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:7449
+vcl/unx/gtk3/gtkinst.cxx:7446
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtkinst.cxx:11155
+vcl/unx/gtk3/gtkinst.cxx:11152
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox *
-vcl/unx/gtk3/gtkinst.cxx:11157
+vcl/unx/gtk3/gtkinst.cxx:11154
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton 
GtkMenuButton *
-vcl/unx/gtk3/gtkinst.cxx:21302
+vcl/unx/gtk3/gtkinst.cxx:21297
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtkinst.cxx:21308
+vcl/unx/gtk3/gtkinst.cxx:21303
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer 
GtkCellRenderer *
 xmloff/inc/XMLThemeContext.hxx:45
     XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color>
diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index 17d76937365a..f7abc1cc7dd7 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -4,8 +4,8 @@ basegfx/source/polygon/b2dtrapezoid.cxx:208
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator 
maFirstStackBlock B2DPoint[32]
 basegfx/test/B2DPolyPolygonTest.cxx:66
     basegfx::b2dpolypolygon rng std::mt19937
-basic/source/inc/expr.hxx:111
-    SbiExprNode::(anonymous union at 
/home/noel/libo-plugin/basic/source/inc/expr.hxx:110:5) nTypeStrId sal_uInt16
+basic/source/inc/expr.hxx:110
+    SbiExprNode::(anonymous union at 
/home/noel/libo-plugin/basic/source/inc/expr.hxx:109:5) nTypeStrId sal_uInt16
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:73
     Data rdx sal_uInt64
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:75
@@ -96,7 +96,7 @@ connectivity/source/inc/OColumn.hxx:48
     connectivity::OColumn m_DefinitelyWritable _Bool
 connectivity/source/inc/TConnection.hxx:54
     connectivity::OMetaConnection m_aResources SharedResources
-connectivity/source/inc/writer/WTable.hxx:43
+connectivity/source/inc/writer/WTable.hxx:39
     connectivity::writer::OWriterTable m_nStartCol sal_Int32
 cppcanvas/source/mtfrenderer/textaction.cxx:1658
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextFillColor 
const ::Color
@@ -182,9 +182,9 @@ cppuhelper/inc/interfacecontainer4.hxx:266
     cppuhelper::OInterfaceContainerHelper4::NotifySingleListener m_pMethod 
const NotificationMethod
 cui/source/inc/paragrph.hxx:47
     SvxStdParagraphTabPage nMinFixDist tools::Long
-dbaccess/source/core/api/RowSetBase.hxx:82
+dbaccess/source/core/api/RowSetBase.hxx:76
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
-dbaccess/source/core/api/RowSetBase.hxx:93
+dbaccess/source/core/api/RowSetBase.hxx:87
     dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
 dbaccess/source/core/dataaccess/documentcontainer.cxx:67
     dbaccess::(anonymous namespace)::LocalNameApproval m_aErrors 
::connectivity::SQLError
@@ -232,7 +232,7 @@ dbaccess/source/ui/inc/sqledit.hxx:42
     dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig
 dbaccess/source/ui/inc/WCopyTable.hxx:258
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
-editeng/source/editeng/impedit.hxx:556
+editeng/source/editeng/impedit.hxx:558
     ImpEditEngine maColorConfig svtools::ColorConfig
 embeddedobj/source/inc/commonembobj.hxx:114
     OCommonEmbeddedObject m_aClassName OUString
@@ -374,6 +374,8 @@ include/svx/svdmark.hxx:139
     SdrMarkList maPointName OUString
 include/svx/svdmark.hxx:140
     SdrMarkList maGluePointName OUString
+include/svx/svdobj.hxx:955
+    SdrObject maUniqueID class UniqueID
 include/svx/svdoedge.hxx:166
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
 include/svx/svdpage.hxx:434
@@ -406,10 +408,10 @@ include/vcl/bitmap.hxx:102
     BitmapSystemData mnWidth int
 include/vcl/bitmap.hxx:103
     BitmapSystemData mnHeight int
-include/vcl/formatter.hxx:128
+include/vcl/formatter.hxx:150
     Formatter m_aStaticFormatter StaticFormatter
 include/vcl/toolkit/field.hxx:399
-    DateFormatter maStaticFormatter class Formatter::StaticFormatter
+    DateFormatter maStaticFormatter Formatter::StaticFormatter
 include/xmloff/xmlstyle.hxx:128
     SvXMLStylesContext mxParaStyles 
css::uno::Reference<css::container::XNameContainer>
 include/xmloff/xmlstyle.hxx:130
@@ -479,7 +481,7 @@ sc/inc/cellvalue.hxx:115
 sc/inc/compiler.hxx:132
     ScRawToken::(anonymous union)::(unnamed struct at 
/home/noel/libo-plugin/sc/inc/compiler.hxx:131:9) nIndex sal_uInt16
 sc/inc/compiler.hxx:133
-    ScRawToken::(anonymous union)::(unnamed struct at 
/home/noel/libo-plugin/sc/inc/compiler.hxx:131:9) eItem class 
ScTableRefToken::Item
+    ScRawToken::(anonymous union)::(unnamed struct at 
/home/noel/libo-plugin/sc/inc/compiler.hxx:131:9) eItem ScTableRefToken::Item
 sc/inc/compiler.hxx:134
     ScRawToken::(anonymous union at 
/home/noel/libo-plugin/sc/inc/compiler.hxx:109:5) table struct (unnamed struct 
at /home/noel/libo-plugin/sc/inc/compiler.hxx:131:9)
 sc/inc/compiler.hxx:139
@@ -494,7 +496,7 @@ sc/inc/userlist.hxx:64
     ScUserList maData DataType
 sc/source/core/inc/adiasync.hxx:41
     ScAddInAsync::(anonymous union at 
/home/noel/libo-plugin/sc/source/core/inc/adiasync.hxx:38:5) pStr OUString *
-sc/source/core/inc/interpre.hxx:153
+sc/source/core/inc/interpre.hxx:154
     ScTokenStack pPointer const formula::FormulaToken *[512]
 sc/source/filter/excel/xltoolbar.cxx:31
     (anonymous namespace)::MSOExcelCommandConvertor msoToOOcmd IdToString
@@ -510,11 +512,11 @@ sc/source/filter/inc/namebuff.hxx:80
     RangeNameBufferWK3::Entry nAbsInd sal_uInt16
 sc/source/filter/inc/qproform.hxx:54
     QProToSc mnAddToken TokenId
-sc/source/filter/inc/stylesbuffer.hxx:694
+sc/source/filter/inc/stylesbuffer.hxx:717
     oox::xls::Dxf mxAlignment std::shared_ptr<Alignment>
-sc/source/filter/inc/stylesbuffer.hxx:785
+sc/source/filter/inc/stylesbuffer.hxx:808
     oox::xls::CellStyleBuffer maBuiltinStyles CellStyleVector
-sc/source/filter/inc/stylesbuffer.hxx:786
+sc/source/filter/inc/stylesbuffer.hxx:809
     oox::xls::CellStyleBuffer maUserStyles CellStyleVector
 sc/source/filter/inc/XclExpChangeTrack.hxx:354
     XclExpChTrAction pAddAction std::unique_ptr<XclExpChTrAction>
@@ -544,13 +546,13 @@ sc/source/ui/inc/inputhdl.hxx:68
     ScInputHandler pFormulaDataPara std::unique_ptr<ScTypedCaseStrSet>
 sc/source/ui/inc/tabcont.hxx:37
     ScTabControl bErrorShown _Bool
-sc/source/ui/vba/vbaformatconditions.hxx:38
-    ScVbaFormatConditions mxSheetConditionalEntries 
css::uno::Reference<css::sheet::XSheetConditionalEntries>
 sc/source/ui/vba/vbaformatconditions.hxx:39
-    ScVbaFormatConditions mxStyles rtl::Reference<ScVbaStyles>
+    ScVbaFormatConditions mxSheetConditionalEntries 
css::uno::Reference<css::sheet::XSheetConditionalEntries>
 sc/source/ui/vba/vbaformatconditions.hxx:40
-    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+    ScVbaFormatConditions mxStyles rtl::Reference<ScVbaStyles>
 sc/source/ui/vba/vbaformatconditions.hxx:41
+    ScVbaFormatConditions mxRangeParent css::uno::Reference<ov::excel::XRange>
+sc/source/ui/vba/vbaformatconditions.hxx:42
     ScVbaFormatConditions mxParentRangePropertySet 
css::uno::Reference<css::beans::XPropertySet>
 sc/source/ui/vba/vbaworksheet.hxx:50
     ScVbaWorksheet mxButtons ::rtl::Reference<ScVbaSheetObjectsBase>[2]
@@ -570,13 +572,13 @@ sd/source/ui/inc/unopage.hxx:165
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
 sd/source/ui/inc/unopage.hxx:227
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/sidebar/MasterPageContainer.cxx:140
+sd/source/ui/sidebar/MasterPageContainer.cxx:142
     sd::sidebar::MasterPageContainer::Implementation 
maLargePreviewBeingCreated Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:141
+sd/source/ui/sidebar/MasterPageContainer.cxx:143
     sd::sidebar::MasterPageContainer::Implementation 
maSmallPreviewBeingCreated Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:146
+sd/source/ui/sidebar/MasterPageContainer.cxx:148
     sd::sidebar::MasterPageContainer::Implementation 
maLargePreviewNotAvailable Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:147
+sd/source/ui/sidebar/MasterPageContainer.cxx:149
     sd::sidebar::MasterPageContainer::Implementation 
maSmallPreviewNotAvailable Image
 sd/source/ui/slideshow/showwindow.hxx:98
     sd::ShowWindow mbMouseCursorHidden _Bool
@@ -588,8 +590,10 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:103
     pdfi::GraphicsContext BlendMode sal_Int8
 sfx2/source/appl/lnkbase2.cxx:82
     sfx2::(anonymous namespace)::ImplDdeItem pLink SvBaseLink *
-sfx2/source/inc/appdata.hxx:68
+sfx2/source/inc/appdata.hxx:67
     SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *>
+slideshow/source/engine/shapes/drawshape.hxx:58
+    slideshow::internal::DelayedGraphicLoader mpVDev 
ScopedVclPtrInstance<VirtualDevice>
 slideshow/source/engine/slideshowimpl.cxx:147
     (anonymous namespace)::FrameSynchronization maTimer 
canvas::tools::ElapsedTime
 sot/source/sdstor/ucbstorage.cxx:427
@@ -716,20 +720,20 @@ tools/qa/cppunit/UniqueIdTest.cxx:25
     (anonymous namespace)::ObjectExample1 maID UniqueID
 tools/qa/cppunit/UniqueIdTest.cxx:30
     (anonymous namespace)::ObjectExample2 maID UniqueID
-ucb/source/ucp/gio/gio_mount.hxx:73
-    OOoMountOperationClass parent_class GMountOperationClass
 ucb/source/ucp/gio/gio_mount.hxx:76
+    OOoMountOperationClass parent_class GMountOperationClass
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:81
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:82
     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:198
-    (anonymous namespace)::CurlOption::(anonymous union at 
/home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:197:5) pValue 
const void *const
+ucb/source/ucp/webdav-curl/CurlSession.cxx:203
+    (anonymous namespace)::CurlOption::(anonymous union at 
/home/noel/libo-plugin/ucb/source/ucp/webdav-curl/CurlSession.cxx:202:5) pValue 
const void *const
 ucbhelper/source/client/proxydecider.cxx:130
     ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy 
const InternetProxyServer
 ucbhelper/source/provider/propertyvalueset.cxx:79
@@ -792,17 +796,17 @@ unoidl/source/unoidlprovider.cxx:459
     unoidl::detail::MapEntry data Memory32
 unotools/source/config/pathoptions.cxx:77
     SvtPathOptions_Impl m_aEmptyString OUString
-vcl/inc/headless/svpdummies.hxx:31
+vcl/inc/headless/svpdummies.hxx:30
     SvpSalObject m_aSystemChildData SystemEnvData
 vcl/inc/ppdparser.hxx:133
     psp::PPDParser::PPDConstraint m_pKey1 const PPDKey *
-vcl/inc/printerinfomanager.hxx:75
+vcl/inc/printerinfomanager.hxx:74
     psp::PrinterInfoManager::SystemPrintQueue m_aComment OUString
-vcl/inc/salinst.hxx:83
+vcl/inc/salinst.hxx:82
     SalInstance m_bSupportsBitmap32 _Bool
-vcl/inc/salwtype.hxx:171
+vcl/inc/salwtype.hxx:170
     SalWheelMouseEvent mbDeltaIsPixel _Bool
-vcl/inc/salwtype.hxx:224
+vcl/inc/salwtype.hxx:223
     SalQueryCharPositionEvent mnCharPos sal_uLong
 vcl/inc/svdata.hxx:277
     ImplSVWinData mbIsLiveResize _Bool
@@ -812,7 +816,7 @@ vcl/inc/svdata.hxx:330
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
 vcl/inc/svdata.hxx:337
     ImplSVNWFData mbNoFrameJunctionForPopups _Bool
-vcl/inc/toolbox.h:111
+vcl/inc/toolbox.h:110
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<ToolBoxItemId>
 vcl/inc/unx/saldisp.hxx:244
     SalDisplay m_aInvalidScreenData ScreenData
diff --git a/compilerplugins/clang/unusedfields.untouched.results 
b/compilerplugins/clang/unusedfields.untouched.results
index b7457a33c8db..c4efea4a6320 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -8,11 +8,11 @@ basic/qa/cppunit/test_global_as_new.cxx:25
     (anonymous namespace)::GlobalAsNewTest lib BasicDLL
 canvas/source/vcl/canvasbitmap.hxx:113
     vclcanvas::CanvasBitmap mxDevice 
css::uno::Reference<css::rendering::XGraphicDevice>
-canvas/source/vcl/impltools.hxx:119
+canvas/source/vcl/impltools.hxx:95
     vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
 chart2/source/controller/inc/dlg_DataEditor.hxx:48
     chart::DataEditor m_xContext 
css::uno::Reference<css::uno::XComponentContext>
-chart2/source/inc/ModifyListenerCallBack.hxx:51
+chart2/source/inc/ModifyListenerCallBack.hxx:50
     chart::ModifyListenerCallBack m_xModifyListener 
css::uno::Reference<css::util::XModifyListener>
 chart2/source/inc/RangeSelectionListener.hxx:70
     chart::RangeSelectionListener m_aControllerLockGuard ControllerLockGuardUNO
@@ -30,9 +30,9 @@ cppu/source/threadpool/threadpool.cxx:352
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:57
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
-cui/source/inc/AdditionsDialog.hxx:47
+cui/source/inc/AdditionsDialog.hxx:46
     AdditionInfo sReleaseVersion OUString
-cui/source/inc/AdditionsDialog.hxx:74
+cui/source/inc/AdditionsDialog.hxx:73
     AdditionsDialog m_xContentWindow std::unique_ptr<weld::ScrolledWindow>
 cui/source/inc/fileextcheckdlg.hxx:28
     FileExtCheckDialog m_pText std::unique_ptr<weld::Label>
@@ -40,19 +40,15 @@ 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>
-cui/source/inc/MacroManagerDialog.hxx:181
-    MacroManagerDialog m_xDialogDescription std::unique_ptr<weld::Label>
-cui/source/inc/MacroManagerDialog.hxx:184
-    MacroManagerDialog m_xScriptContainersListBoxLabel 
std::unique_ptr<weld::Label>
 cui/source/inc/paragrph.hxx:73
     SvxStdParagraphTabPage m_xAbsDist std::unique_ptr<weld::Label>
 cui/source/options/optinet2.hxx:108
     SvxSecurityTabPage m_xCertPathImg std::unique_ptr<weld::Widget>
 cui/source/options/optinet2.hxx:109
     SvxSecurityTabPage m_xCertPathLabel std::unique_ptr<weld::Label>
-dbaccess/source/core/inc/databasecontext.hxx:82
+dbaccess/source/core/inc/databasecontext.hxx:73
     dbaccess::ODatabaseContext m_aBasicDLL BasicDLL
-dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
+dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard 
::osl::MutexGuard
 embeddedobj/source/msole/olecomponent.hxx:50
     OleComponent m_aMutex ::osl::Mutex
@@ -104,8 +100,6 @@ include/editeng/unotext.hxx:621
     SvxUnoTextRangeEnumeration mxParentText 
css::uno::Reference<css::text::XText>
 include/filter/msfilter/svdfppt.hxx:541
     ProcessData aBackgroundColoredObjects 
::std::vector<rtl::Reference<SdrObject> >
-include/formula/IFunctionDescription.hxx:77
-    formula::IFunctionManager changeFavouriteList _Bool
 include/LibreOfficeKit/LibreOfficeKitGtk.h:41
     _LOKDocView aDrawingArea GtkDrawingArea
 include/LibreOfficeKit/LibreOfficeKitGtk.h:46
@@ -190,8 +184,6 @@ include/vcl/GestureEventZoom.hxx:28
     GestureEventZoom meEventType GestureEventZoomType
 include/vcl/GestureEventZoom.hxx:32
     GestureEventZoom mfScaleDelta double
-include/vcl/notebookbar/notebookbar.hxx:63
-    NotebookBar PersonaSettings AllSettings
 include/vcl/pdf/PDFAnnotationMarker.hxx:79
     vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType PDFTextMarkerType
 include/vcl/uitest/uiobject.hxx:316
@@ -306,7 +298,7 @@ sc/inc/editutil.hxx:113
     ScEnginePoolHelper m_bDeleteEnginePool _Bool
 sc/inc/mtvelements.hxx:172
     sc::ColumnBlockConstPosition miSparklinePos 
SparklineStoreType::const_iterator
-sc/inc/patattr.hxx:141
+sc/inc/patattr.hxx:142
     ScPatternAttr m_nSerialNumber sal_uInt32
 sc/inc/pivot/PivotTableFormats.hxx:44
     sc::PivotTableFormat bSelected _Bool
@@ -316,9 +308,9 @@ sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch 
sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1241
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk ScBulkBroadcast
-sc/source/core/inc/interpre.hxx:84
+sc/source/core/inc/interpre.hxx:85
     VectorSearchArguments nTab2 SCTAB
-sc/source/core/inc/interpre.hxx:251
+sc/source/core/inc/interpre.hxx:252
     ScInterpreter maResultTokenMap ScResultTokenMap
 sc/source/filter/inc/sheetdatacontext.hxx:50
     oox::xls::SheetDataContext aReleaser SolarMutexReleaser
@@ -340,26 +332,34 @@ sc/source/ui/inc/PivotLayoutTreeListBase.hxx:47
     ScPivotLayoutTreeListBase maDropTargetHelper ScPivotLayoutTreeDropTarget
 sc/source/ui/inc/pvfundlg.hxx:85
     ScDPFunctionDlg mxExpander std::unique_ptr<weld::Expander>
+sd/source/console/PresenterAccessibility.hxx:86
+    sdext::presenter::PresenterAccessible mxComponentContext const 
css::uno::Reference<css::uno::XComponentContext>
+sd/source/console/PresenterTheme.cxx:85
+    sdext::presenter::(anonymous namespace)::ReadContext mxComponentContext 
Reference<XComponentContext>
 sd/source/ui/inc/CustomAnimationList.hxx:127
     sd::CustomAnimationList maDropTargetHelper CustomAnimationListDropTarget
 sd/source/ui/inc/custsdlg.hxx:68
     SdDefineCustomShowDlg m_xDropTargetHelper 
std::unique_ptr<weld::ReorderingDropTarget>
+sd/source/ui/inc/SlideshowLayerRenderer.hxx:120
+    sd::RenderState mpCurrentTarget SdrObject *
+sd/source/ui/inc/SlideshowLayerRenderer.hxx:121
+    sd::RenderState mnCurrentTargetParagraph sal_Int32
 sd/source/ui/inc/TableDesignPane.hxx:117
     sd::TableDesignPane m_xImpl std::unique_ptr<TableDesignWidget>
 sd/source/ui/remotecontrol/ZeroconfService.hxx:33
     sd::ZeroconfService port uint
 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:1635
+sd/source/ui/view/DocumentRenderer.cxx:1650
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1321
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aDrawLock sd::slidesorter::view::SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1322
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::class 
SlideSorterController::ModelChangeLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aModelLock sd::slidesorter::controller::SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1323
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges 
m_aUpdateLock sd::slidesorter::controller::PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1324
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::class SelectionObserver::Context
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext 
sd::slidesorter::controller::SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:197
     sd::ViewShellBase::Implementation mpPageCacheManager 
std::shared_ptr<slidesorter::cache::PageCacheManager>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:250
@@ -372,8 +372,10 @@ sfx2/source/dialog/basedlgs.cxx:46
     SfxModelessDialog_Impl aMoveIdle Idle
 sfx2/source/doc/doctempl.cxx:103
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell 
SfxObjectShellLock
-sfx2/source/inc/sfxpicklist.hxx:33
+sfx2/source/inc/sfxpicklist.hxx:31
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
+sfx2/source/inc/templdgi.hxx:92
+    SfxCommonTemplateDialog_Impl m_aStyleListUpdateFamily Link<void *, void>
 slideshow/source/engine/opengl/TransitionImpl.cxx:1991
     (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1991
@@ -408,7 +410,7 @@ svtools/source/filter/exportdialog.hxx:124
     ExportDialog mxEncoding std::unique_ptr<weld::Widget>
 svx/source/dialog/contimp.hxx:74
     SvxSuperContourDlg aContourItem SvxContourDlgItem
-svx/source/dialog/weldeditview.cxx:454
+svx/source/dialog/weldeditview.cxx:465
     (anonymous namespace)::WeldEditSource m_rEditAcc WeldEditAccessible &
 svx/source/inc/datanavi.hxx:194
     svxform::XFormsPage m_aDropHelper DataTreeDropTarget
@@ -418,7 +420,7 @@ svx/source/svdraw/svdmodel.cxx:93
     SdrModelImpl mpThemeColorChanger std::shared_ptr<svx::IThemeColorChanger>
 svx/source/tbxctrls/layctrl.cxx:431
     (anonymous namespace)::ColumnsWindow mxControl 
rtl::Reference<SvxColumnsToolBoxControl>
-sw/qa/extras/uiwriter/uiwriter5.cxx:67
+sw/qa/extras/uiwriter/uiwriter10.cxx:47
     SwUiWriterTest5 m_aSavedSettings AllSettings
 sw/source/core/crsr/crbm.cxx:62
     (anonymous namespace)::CursorStateHelper m_aSaveState SwCursorSaveState
@@ -468,7 +470,7 @@ unoidl/source/unoidlprovider.cxx:669
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ 
rtl::Reference<UnoidlModuleEntity>
 uui/source/openlocked.hxx:36
     vcl::OpenLockedQueryBox mxQuestionMarkImage std::unique_ptr<weld::Image>
-vcl/inc/jsdialog/jsdialogbuilder.hxx:641
+vcl/inc/jsdialog/jsdialogbuilder.hxx:642
     JSToolbar m_pPopovers std::map<sal_uInt16, weld::Widget *>
 vcl/inc/pdf/pdfbuildin_fonts.hxx:34
     vcl::pdf::BuildinFont m_nAscent const int
@@ -476,11 +478,11 @@ 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/salprn.hxx:48
+vcl/inc/salprn.hxx:47
     SalPrinterQueueInfo moPortName std::optional<OUString>
-vcl/inc/sft.hxx:179
+vcl/inc/sft.hxx:178
     vcl::TTGlobalFontInfo_ fsSelection sal_uInt16
-vcl/inc/skia/zone.hxx:29
+vcl/inc/skia/zone.hxx:28
     SkiaZone g SolarMutexGuard
 vcl/source/app/salvtables.cxx:245
     SalFlashAttention m_aOrigBackground Wallpaper
@@ -510,5 +512,7 @@ vcl/unx/gtk3/gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 xmloff/inc/XMLThemeContext.hxx:45
     XMLThemeColorsContext m_aColorScheme std::vector<css::util::Color>
+xmloff/source/style/xmlnumfi.cxx:71
+    SvXMLNumImpData m_xContext uno::Reference<uno::XComponentContext>
 xmlscript/source/xmldlg_imexp/imp_share.hxx:537
     xmlscript::BulletinBoardElement mxDialogImport rtl::Reference<DialogImport>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results 
b/compilerplugins/clang/unusedfields.writeonly.results
index 81fcc234f97e..1879456be908 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1,6 +1,6 @@
 basctl/source/basicide/moduldlg.hxx:140
     basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget>
-basctl/source/inc/basidesh.hxx:99
+basctl/source/inc/basidesh.hxx:95
     basctl::Shell m_aNotifier DocumentEventNotifier
 basctl/source/inc/bastype2.hxx:181
     basctl::SbTreeListBox m_aNotifier DocumentEventNotifier
@@ -16,7 +16,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:330
+basic/source/inc/runtime.hxx:329
     SbiRuntime aRefSaved std::vector<SbxVariableRef>
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:66
     Data pMethod sal_uInt64
@@ -82,11 +82,11 @@ 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:153
+chart2/inc/ChartModel.hxx:156
     chart::ChartModel m_aGraphicObjectVector std::vector<GraphicObject>
-chart2/inc/ChartModel.hxx:485
+chart2/inc/ChartModel.hxx:502
     chart::ChartModel mnStart sal_Int32
-chart2/inc/ChartModel.hxx:486
+chart2/inc/ChartModel.hxx:503
     chart::ChartModel mnEnd sal_Int32
 chart2/source/controller/dialogs/DialogModel.cxx:178
     (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt tContainerType *
@@ -98,9 +98,9 @@ chart2/source/controller/inc/dlg_View3D.hxx:48
     chart::View3DDialog m_xIllumination 
std::unique_ptr<ThreeD_SceneIllumination_TabPage>
 chart2/source/controller/main/ElementSelector.hxx:37
     chart::ListBoxEntryData nHierarchyDepth sal_Int32
-chart2/source/inc/MediaDescriptorHelper.hxx:72
+chart2/source/inc/MediaDescriptorHelper.hxx:71
     apphelper::MediaDescriptorHelper ReadOnly _Bool
-chart2/source/view/charttypes/PieChart.hxx:292
+chart2/source/view/charttypes/PieChart.hxx:291
     chart::PieChart::PieLabelInfo fValue double
 codemaker/source/cppumaker/dependencies.hxx:108
     codemaker::cppumaker::Dependencies m_voidDependency _Bool
@@ -162,12 +162,10 @@ connectivity/source/drivers/postgresql/pq_statics.hxx:200
     pq_sdbc_driver::Statics RESULT_SET_TYPE OUString
 connectivity/source/drivers/postgresql/pq_statics.hxx:212
     pq_sdbc_driver::Statics HELP_TEXT OUString
-connectivity/source/inc/calc/CConnection.hxx:51
+connectivity/source/inc/calc/CConnection.hxx:49
     connectivity::calc::OCalcConnection::CloseVetoButTerminateListener 
m_pCloseListener std::unique_ptr<utl::CloseVeto>
 connectivity/source/inc/odbc/OConnection.hxx:54
     connectivity::odbc::OConnection m_sUser OUString
-connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx:71
-    connectivity::odbc::ODatabaseMetaDataResultSet m_aStatement 
css::uno::WeakReferenceHelper
 connectivity/source/inc/odbc/OResultSet.hxx:117
     connectivity::odbc::OResultSet m_aBindVector 
std::vector<std::unique_ptr<BindData> >
 connectivity/source/inc/OTypeInfo.hxx:30
@@ -180,7 +178,7 @@ connectivity/source/inc/OTypeInfo.hxx:35
     connectivity::OTypeInfo nMaximumScale sal_Int16
 connectivity/source/inc/OTypeInfo.hxx:37
     connectivity::OTypeInfo nType sal_Int16
-connectivity/source/inc/writer/WConnection.hxx:54
+connectivity/source/inc/writer/WConnection.hxx:50
     connectivity::writer::OWriterConnection::CloseVetoButTerminateListener 
m_pCloseListener std::unique_ptr<utl::CloseVeto>
 cppcanvas/source/inc/implrenderer.hxx:210
     cppcanvas::internal::ImplRenderer aBaseTransform XForm
@@ -280,19 +278,21 @@ dbaccess/source/core/inc/TableDeco.hxx:64
     dbaccess::ODBTableDecorator m_xColumnMediator 
rtl::Reference<OContainerMediator>
 dbaccess/source/filter/xml/dbloader2.cxx:200
     dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf 
rtl::Reference<DBContentLoader>
-dbaccess/source/ui/app/AppDetailView.hxx:107
+dbaccess/source/ui/app/AppDetailView.hxx:106
     dbaui::OApplicationDetailView m_aExternalMnemonics MnemonicGenerator
 dbaccess/source/ui/browser/dbloader.cxx:60
     (anonymous namespace)::DBContentLoader m_xListener 
Reference<XLoadEventListener>
 dbaccess/source/ui/inc/RelationController.hxx:36
     dbaui::ORelationController m_xWaitObject std::unique_ptr<weld::WaitObject>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:314
+desktop/qa/desktop_lib/test_desktop_lib.cxx:316
     DesktopLOKTest m_bModified _Bool
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2141
+desktop/qa/desktop_lib/test_desktop_lib.cxx:317
+    DesktopLOKTest m_nTrackChanges int
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2216
     (anonymous namespace)::ViewCallback m_bTilesInvalidated _Bool
-desktop/source/app/app.cxx:1284
-    desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions 
std::unique_ptr<SvtCTLOptions>
 desktop/source/app/app.cxx:1285
+    desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions 
std::unique_ptr<SvtCTLOptions>
+desktop/source/app/app.cxx:1286
     desktop::(anonymous namespace)::ExecuteGlobals pPathOptions 
std::unique_ptr<SvtPathOptions>
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx:138
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
@@ -652,21 +652,23 @@ include/opencl/platforminfo.hxx:30
     OpenCLDeviceInfo mnComputeUnits size_t
 include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
-include/sfx2/AccessibilityIssue.hxx:92
+include/sfx2/AccessibilityIssue.hxx:93
     sfx::AccessibilityIssue m_pParent weld::Window *
 include/sfx2/minfitem.hxx:38
     SfxMacroInfoItem aCommentText OUString
 include/sfx2/viewsh.hxx:186
     SfxViewShell m_xHelper std::shared_ptr<SfxStoringHelper>
-include/svl/poolitem.hxx:618
+include/svl/ondemand.hxx:54
+    OnDemandLocaleDataWrapper m_xContext 
css::uno::Reference<css::uno::XComponentContext>
+include/svl/poolitem.hxx:621
     SfxPoolItem m_bDeleted _Bool
 include/svl/sigstruct.hxx:125
     SignatureInformation hasInconsistentSigningTime _Bool
-include/svtools/brwbox.hxx:319
+include/svtools/brwbox.hxx:322
     BrowseBox::CursorMoveAttempt m_nCol sal_Int32
-include/svtools/brwbox.hxx:320
+include/svtools/brwbox.hxx:323
     BrowseBox::CursorMoveAttempt m_nRow sal_Int32
-include/svtools/brwbox.hxx:321
+include/svtools/brwbox.hxx:324
     BrowseBox::CursorMoveAttempt m_bScrolledToReachCell _Bool
 include/svtools/ctrltool.hxx:147
     FontList mpDev VclPtr<OutputDevice>
@@ -750,6 +752,12 @@ include/svx/ofaitem.hxx:45
     OfaXColorListItem mxRef rtl::Reference<XColorList>
 include/svx/sdasitm.hxx:55
     SdrCustomShapeGeometryItem m_aHash size_t
+include/svx/sidebar/InspectorTextPanel.hxx:70
+    svx::sidebar::InspectorTextPanel mParaController 
sfx2::sidebar::ControllerItem
+include/svx/sidebar/InspectorTextPanel.hxx:71
+    svx::sidebar::InspectorTextPanel mCharController 
sfx2::sidebar::ControllerItem
+include/svx/sidebar/InspectorTextPanel.hxx:72
+    svx::sidebar::InspectorTextPanel mDFController 
sfx2::sidebar::ControllerItem
 include/svx/sidebar/LinePropertyPanelBase.hxx:94
     svx::sidebar::LinePropertyPanelBase mxArrowHeadStyleDispatch 
std::unique_ptr<ToolbarUnoDispatcher>
 include/svx/srchdlg.hxx:174
@@ -918,9 +926,9 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:78
     oox::drawingml::Constraint mnRefPointType sal_Int32
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx:345
     oox::drawingml::LayoutNode msMoveWith OUString
-oox/source/drawingml/diagram/layoutnodecontext.cxx:92
+oox/source/drawingml/diagram/layoutnodecontext.cxx:93
     oox::drawingml::(anonymous namespace)::AlgorithmContext mnRevision 
sal_Int32
-oox/source/drawingml/diagram/layoutnodecontext.cxx:134
+oox/source/drawingml/diagram/layoutnodecontext.cxx:135
     oox::drawingml::(anonymous namespace)::ChooseContext msName OUString
 oox/source/drawingml/scene3dhelper.cxx:470
     oox::(anonymous namespace)::MSOLight fMSOColorG double
@@ -930,23 +938,23 @@ oox/source/ppt/buildlistcontext.hxx:41
     oox::ppt::BuildListContext mbBuildAsOne _Bool
 oox/source/ppt/commonbehaviorcontext.hxx:34
     oox::ppt::Attribute type AnimationAttributeEnum
-oox/source/ppt/timenodelistcontext.cxx:206
+oox/source/ppt/timenodelistcontext.cxx:207
     oox::ppt::(anonymous namespace)::MediaNodeContext mbFullScrn _Bool
-oox/source/ppt/timenodelistcontext.cxx:401
-    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
 oox/source/ppt/timenodelistcontext.cxx:402
+    oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mbConcurrent _Bool
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnNextAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:402
+oox/source/ppt/timenodelistcontext.cxx:403
     oox::ppt::(anonymous namespace)::SequenceTimeNodeContext mnPrevAc sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:638
+oox/source/ppt/timenodelistcontext.cxx:639
     oox::ppt::(anonymous namespace)::AnimContext mnValueType sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:720
+oox/source/ppt/timenodelistcontext.cxx:721
     oox::ppt::(anonymous namespace)::AnimScaleContext mbZoomContents _Bool
-oox/source/ppt/timenodelistcontext.cxx:860
-    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes OUString
 oox/source/ppt/timenodelistcontext.cxx:861
-    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+    oox::ppt::(anonymous namespace)::AnimMotionContext msPtsTypes OUString
 oox/source/ppt/timenodelistcontext.cxx:862
+    oox::ppt::(anonymous namespace)::AnimMotionContext mnPathEditMode sal_Int32
+oox/source/ppt/timenodelistcontext.cxx:863
     oox::ppt::(anonymous namespace)::AnimMotionContext mnAngle sal_Int32
 package/inc/ByteChucker.hxx:33
     ByteChucker p2Sequence sal_Int8 *const
@@ -1020,11 +1028,13 @@ sc/inc/compiler.hxx:271
     ScCompiler::AddInMap pUpper const char *
 sc/inc/compressedarray.hxx:68
     ScCompressedArray::RangeData mnRow2 A
-sc/inc/fillinfo.hxx:287
-    ScTableInfo mDataBarInfos std::vector<std::unique_ptr<const ScDataBarInfo> 
>
+sc/inc/fillinfo.hxx:95
+    ScIconSetInfo eConditionMode ScConditionMode
 sc/inc/fillinfo.hxx:288
+    ScTableInfo mDataBarInfos std::vector<std::unique_ptr<const ScDataBarInfo> 
>
+sc/inc/fillinfo.hxx:289
     ScTableInfo mIconSetInfos std::vector<std::unique_ptr<const ScIconSetInfo> 
>
-sc/inc/patattr.hxx:142
+sc/inc/patattr.hxx:143
     ScPatternAttr m_bDeleted _Bool
 sc/inc/pivot.hxx:75
     ScDPLabelData mnFlags sal_Int32
@@ -1044,9 +1054,9 @@ sc/qa/unit/subsequent_export_test.cxx:2177
     (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2174:18) mnStyle 
SvxBorderLineStyle
 sc/qa/unit/subsequent_export_test.cxx:2178
     (unnamed struct at 
/home/noel/libo-plugin/sc/qa/unit/subsequent_export_test.cxx:2174:18) mnWidth 
tools::Long
-sc/qa/unit/tiledrendering/tiledrenderingmodeltestbase.cxx:261
-    ViewCallback m_aInvalidationsParts std::vector<int>
 sc/qa/unit/tiledrendering/tiledrenderingmodeltestbase.cxx:262
+    ViewCallback m_aInvalidationsParts std::vector<int>
+sc/qa/unit/tiledrendering/tiledrenderingmodeltestbase.cxx:263
     ViewCallback m_aInvalidationsMode std::vector<int>
 sc/source/core/data/column4.cxx:1450
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
@@ -1054,7 +1064,7 @@ sc/source/core/data/column.cxx:1242
     (anonymous namespace)::CopyByCloneHandler meListenType 
sc::StartListeningType
 sc/source/core/data/column.cxx:1243
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags 
ScCloneFlags
-sc/source/core/data/table2.cxx:4054
+sc/source/core/data/table2.cxx:4083
     (anonymous namespace)::OutlineArrayFinder mpArray ScOutlineArray *
 sc/source/filter/excel/xltoolbar.hxx:24
     TBCCmd A _Bool
@@ -1076,14 +1086,22 @@ 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:393
+sc/source/filter/inc/orcusinterface.hxx:85
+    ScOrcusStrikethrough meStyle 
std::optional<orcus::spreadsheet::strikethrough_style_t>
+sc/source/filter/inc/orcusinterface.hxx:98
+    ScOrcusUnderline meSpacing 
std::optional<orcus::spreadsheet::underline_spacing_t>
+sc/source/filter/inc/orcusinterface.hxx:449
     ScOrcusFill maBgColor std::optional<Color>
-sc/source/filter/inc/orcusinterface.hxx:436
+sc/source/filter/inc/orcusinterface.hxx:492
     ScOrcusXf mnStyleXf std::size_t
-sc/source/filter/inc/orcusinterface.hxx:453
+sc/source/filter/inc/orcusinterface.hxx:509
     ScOrcusCellStyle maDisplayName OUString
-sc/source/filter/inc/orcusinterface.hxx:456
+sc/source/filter/inc/orcusinterface.hxx:512
     ScOrcusCellStyle mnBuiltInId std::size_t
+sc/source/filter/inc/orcusinterface.hxx:521
+    ScOrcusImportFontUnderlineStyle mpDestFont ScOrcusFont *
+sc/source/filter/inc/orcusinterface.hxx:542
+    ScOrcusImportFontStrikethroughStyle mpDestFont ScOrcusFont *
 sc/source/filter/inc/tokstack.hxx:142
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
 sc/source/filter/lotus/lotfilter.hxx:53
@@ -1116,13 +1134,13 @@ sc/source/ui/inc/PivotLayoutTreeListData.hxx:37
     ScPivotLayoutTreeListData maDataItemValues 
std::vector<std::unique_ptr<ScItemValue> >
 sc/source/ui/inc/preview.hxx:46
     ScPreview nTabPage tools::Long
-sc/source/ui/inc/tabvwsh.hxx:152
+sc/source/ui/inc/tabvwsh.hxx:153
     ScTabViewShell xDisProvInterceptor 
rtl::Reference<ScDispatchProviderInterceptor>
 sc/source/ui/inc/transobj.hxx:48
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
-sc/source/ui/inc/uiitems.hxx:46
+sc/source/ui/inc/uiitems.hxx:43
     ScInputStatusItem aStartPos ScAddress
-sc/source/ui/inc/uiitems.hxx:47
+sc/source/ui/inc/uiitems.hxx:44
     ScInputStatusItem aEndPos ScAddress
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:76
     sc::sidebar::AlignmentPropertyPanel mxHorizontalAlignDispatch 
std::unique_ptr<ToolbarUnoDispatcher>
@@ -1140,6 +1158,14 @@ sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:65
     sc::sidebar::NumberFormatPropertyPanel mxCategoryDispatch 
std::unique_ptr<ToolbarUnoDispatcher>
 sc/source/ui/vba/vbachartobject.hxx:43
     ScVbaChartObject oShapeHelper std::optional<ov::ShapeHelper>
+sd/inc/drawdoc.hxx:199
+    InsertBookmarkOptions bIsClipboardOperation _Bool
+sd/inc/drawdoc.hxx:200
+    InsertBookmarkOptions bIsDragAndDropOperation _Bool
+sd/inc/drawdoc.hxx:201
+    InsertBookmarkOptions bIsSameDocumentOperation _Bool
+sd/inc/drawdoc.hxx:202
+    InsertBookmarkOptions bIsFileDocument _Bool
 sd/inc/sdmod.hxx:139
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
 sd/source/console/PresenterTimer.cxx:110
@@ -1158,8 +1184,8 @@ sd/source/ui/inc/navigatr.hxx:147
     SdNavigatorWin mpNavigatorCtrlItem 
std::unique_ptr<SdNavigatorControllerItem>
 sd/source/ui/inc/navigatr.hxx:148
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
-sd/source/ui/inc/SlideshowLayerRenderer.hxx:82
-    sd::RenderState mnCurrentPass sal_Int32
+sd/source/ui/inc/SlideshowLayerRenderer.hxx:95
+    sd::RenderPass mbAnimation _Bool
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:72
     sd::tools::TimerBasedTaskExecution mpSelf 
std::shared_ptr<TimerBasedTaskExecution>
 sd/source/ui/inc/ViewShellImplementation.hxx:78
@@ -1174,9 +1200,9 @@ sd/source/ui/slideshow/slideshowimpl.hxx:359
     sd::SlideshowImpl mpPaneHider ::std::unique_ptr<PaneHider>
 sd/source/ui/slideshow/SlideShowRestarter.hxx:72
     sd::SlideShowRestarter mpSelf ::std::shared_ptr<SlideShowRestarter>
-sd/source/ui/slidesorter/controller/SlsListener.hxx:140
+sd/source/ui/slidesorter/controller/SlsListener.hxx:133
     sd::slidesorter::controller::Listener mpModelChangeLock 
std::shared_ptr<SlideSorterController::ModelChangeLock>
-sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:114
+sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:115
     sd::slidesorter::controller::Clipboard mxUndoContext 
std::unique_ptr<UndoContext>
 sd/source/ui/view/ToolBarManager.cxx:320
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock 
::std::unique_ptr<LayouterLock>
@@ -1188,19 +1214,19 @@ sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
 sfx2/source/doc/sfxbasemodel.cxx:480
     (anonymous namespace)::SfxSaveGuard m_pFramesLock 
std::unique_ptr<SfxOwnFramesLocker>
-sfx2/source/inc/appdata.hxx:68
+sfx2/source/inc/appdata.hxx:67
     SfxAppData_Impl maDocTopics std::vector<SfxDdeDocTopic_Impl *>
-sfx2/source/inc/appdata.hxx:69
+sfx2/source/inc/appdata.hxx:68
     SfxAppData_Impl pTriggerTopic std::unique_ptr<SfxDdeTriggerTopic_Impl>
-sfx2/source/inc/appdata.hxx:70
+sfx2/source/inc/appdata.hxx:69
     SfxAppData_Impl pDdeService2 std::unique_ptr<DdeService>
-sfx2/source/inc/appdata.hxx:78
+sfx2/source/inc/appdata.hxx:77
     SfxAppData_Impl m_pToolsErrorHdl std::optional<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:79
+sfx2/source/inc/appdata.hxx:78
     SfxAppData_Impl m_pSoErrorHdl std::optional<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:81
+sfx2/source/inc/appdata.hxx:80
     SfxAppData_Impl m_pSbxErrorHdl std::optional<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:84
+sfx2/source/inc/appdata.hxx:83
     SfxAppData_Impl mxAppPickList std::optional<SfxPickList>
 sfx2/source/inc/splitwin.hxx:52
     SfxSplitWindow pActive VclPtr<SfxDockingWindow>
@@ -1422,12 +1448,6 @@ sw/inc/unoframe.hxx:310
     SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel>
 sw/inc/view.hxx:198
     SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell>
-sw/inc/viewopt.hxx:47
-    ViewOptFlags1 bPagebreak _Bool
-sw/inc/viewopt.hxx:48
-    ViewOptFlags1 bColumnbreak _Bool
-sw/inc/viewopt.hxx:51
-    ViewOptFlags1 bRef _Bool
 sw/qa/core/doc/doc.cxx:397
     (anonymous namespace)::SelectionChangeListener m_aAnchors 
std::vector<uno::Reference<text::XTextRange> >
 sw/source/core/inc/swfont.hxx:997
@@ -1442,15 +1462,15 @@ sw/source/core/inc/swfont.hxx:1001
     SvStatistics nChangeFont sal_uInt16
 sw/source/core/layout/dbg_lay.cxx:135
     SwImplProtocol m_aVars std::vector<tools::Long>
-sw/source/core/layout/tabfrm.cxx:2126
+sw/source/core/layout/tabfrm.cxx:2128
     (anonymous namespace)::PosSizeOscillationControl::FrameData frameArea 
SwRect
-sw/source/core/layout/tabfrm.cxx:2127
+sw/source/core/layout/tabfrm.cxx:2129
     (anonymous namespace)::PosSizeOscillationControl::FrameData framePrintArea 
SwRect
-sw/source/core/layout/tabfrm.cxx:2128
+sw/source/core/layout/tabfrm.cxx:2130
     (anonymous namespace)::PosSizeOscillationControl::FrameData 
frameAreaPositionValid _Bool
-sw/source/core/layout/tabfrm.cxx:2129
+sw/source/core/layout/tabfrm.cxx:2131
     (anonymous namespace)::PosSizeOscillationControl::FrameData 
frameAreaSizeValid _Bool
-sw/source/core/layout/tabfrm.cxx:2130
+sw/source/core/layout/tabfrm.cxx:2132
     (anonymous namespace)::PosSizeOscillationControl::FrameData 
framePrintAreaValid _Bool
 sw/source/core/table/swtable.cxx:3100
     SwTableCellInfo::Impl m_HandledTableBoxes TableBoxes_t
@@ -1466,6 +1486,8 @@ sw/source/filter/inc/rtf.hxx:32
     RTFSurround::(unnamed union at 
/home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:26:5) Flags struct (unnamed 
struct at /home/noel/libo-plugin/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/filter/writer/writer.cxx:48
     Writer_Impl aFontRemoveLst std::vector<SfxPoolItemHolder>
+sw/source/uibase/app/swdllimpl.hxx:39
+    SwDLL m_pFilters std::unique_ptr<sw::Filters>
 sw/source/uibase/inc/glossary.hxx:65
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
 sw/source/uibase/inc/glossary.hxx:81
@@ -1502,25 +1524,25 @@ 
sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx:247
     writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
 sw/source/writerfilter/dmapper/PropertyMap.hxx:251
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
-sw/source/writerfilter/dmapper/PropertyMap.hxx:304
+sw/source/writerfilter/dmapper/PropertyMap.hxx:305
     writerfilter::dmapper::SectionPropertyMap m_nPaperSourceOther sal_Int32
-sw/source/writerfilter/dmapper/PropertyMap.hxx:434
-    writerfilter::dmapper::SectionPropertyMap m_bRightHeader _Bool
 sw/source/writerfilter/dmapper/PropertyMap.hxx:435
+    writerfilter::dmapper::SectionPropertyMap m_bRightHeader _Bool
+sw/source/writerfilter/dmapper/PropertyMap.hxx:436
     writerfilter::dmapper::SectionPropertyMap m_bRightFooter _Bool
 sw/source/writerfilter/dmapper/WriteProtection.hxx:36
     writerfilter::dmapper::WriteProtection m_nCryptProviderType sal_Int32
 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
 ucb/source/ucp/gio/gio_mount.hxx:76
+    OOoMountOperationClass parent_class GMountOperationClass
+ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved1 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:77
+ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved2 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:78
+ucb/source/ucp/gio/gio_mount.hxx:81
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
-ucb/source/ucp/gio/gio_mount.hxx:79
+ucb/source/ucp/gio/gio_mount.hxx:82
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 unoidl/source/unoidl-write.cxx:178
     (unnamed union at 
/home/noel/libo-plugin/unoidl/source/unoidl-write.cxx:176:5) f float
@@ -1542,7 +1564,7 @@ vbahelper/source/vbahelper/vbafillformat.hxx:36
     ScVbaFillFormat m_nForeColor sal_Int32
 vcl/inc/accel.hxx:37
     ImplAccelEntry mpAutoAccel Accelerator *
-vcl/inc/driverblocklist.hxx:110
+vcl/inc/driverblocklist.hxx:109
     DriverBlocklist::DriverInfo maMsg OUString
 vcl/inc/font/FontSelectPattern.hxx:65
     vcl::font::FontSelectPattern mfExactHeight float
@@ -1552,41 +1574,41 @@ vcl/inc/pdf/BitmapID.hxx:23
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
 vcl/inc/pdf/pdfwriter_impl.hxx:1082
     vcl::PDFWriterImpl m_bIsPDF_A4 _Bool
-vcl/inc/qt5/QtInstance.hxx:64
+vcl/inc/qt5/QtInstance.hxx:76
     QtInstance m_pQApplication std::unique_ptr<QApplication>
-vcl/inc/qt5/QtInstance.hxx:65
+vcl/inc/qt5/QtInstance.hxx:77
     QtInstance m_pFakeArgvFreeable std::vector<FreeableCStr>
-vcl/inc/qt5/QtInstance.hxx:66
+vcl/inc/qt5/QtInstance.hxx:78
     QtInstance m_pFakeArgv std::unique_ptr<char *[]>
-vcl/inc/qt5/QtInstance.hxx:67
+vcl/inc/qt5/QtInstance.hxx:79
     QtInstance m_pFakeArgc std::unique_ptr<int>
-vcl/inc/salmenu.hxx:34
+vcl/inc/salmenu.hxx:33
     SalItemParams pMenu VclPtr<Menu>
-vcl/inc/salmenu.hxx:35
+vcl/inc/salmenu.hxx:34
     SalItemParams aText OUString
-vcl/inc/salmenu.hxx:38
+vcl/inc/salmenu.hxx:37
     SalItemParams nBits MenuItemBits
-vcl/inc/salwtype.hxx:213
+vcl/inc/salwtype.hxx:212
     SalSurroundingTextRequestEvent mnEnd sal_uLong
-vcl/inc/salwtype.hxx:225
+vcl/inc/salwtype.hxx:224
     SalQueryCharPositionEvent maCursorBound AbsoluteScreenPixelRectangle
-vcl/inc/salwtype.hxx:226
+vcl/inc/salwtype.hxx:225
     SalQueryCharPositionEvent mbValid _Bool
-vcl/inc/salwtype.hxx:227
+vcl/inc/salwtype.hxx:226
     SalQueryCharPositionEvent mbVertical _Bool
-vcl/inc/salwtype.hxx:240
+vcl/inc/salwtype.hxx:239
     SalInputContext mpFont rtl::Reference<LogicalFontInstance>
-vcl/inc/salwtype.hxx:247
+vcl/inc/salwtype.hxx:246
     SalGestureSwipeEvent mnVelocityY double
-vcl/inc/scanlinewriter.hxx:35
+vcl/inc/scanlinewriter.hxx:34
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/inc/sft.hxx:169
+vcl/inc/sft.hxx:168
     vcl::TTGlobalFontInfo_ linegap int
-vcl/inc/sft.hxx:173
+vcl/inc/sft.hxx:172
     vcl::TTGlobalFontInfo_ typoLineGap int
 vcl/inc/svdata.hxx:451
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
-vcl/inc/toolbarvalue.hxx:47
+vcl/inc/toolbarvalue.hxx:46
     ToolbarValue mbIsTopDockingArea _Bool
 vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
@@ -1594,8 +1616,6 @@ vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
 vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
-vcl/inc/window.h:386
-    WindowImpl mbToolbarFloatingWindow _Bool
 vcl/source/components/dtranscomp.cxx:212
     vcl::(anonymous namespace)::GenericDragSource m_xTrans 
css::uno::Reference<css::datatransfer::XTransferable>
 vcl/source/filter/eps/eps.cxx:119
@@ -1910,13 +1930,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:21313
+vcl/unx/gtk3/gtkinst.cxx:21308
     (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:1738
+vcl/workben/vcldemo.cxx:1723
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
 xmlhelp/source/cxxhelp/provider/databases.hxx:258
     chelp::Databases m_aDatabases DatabasesTable
@@ -1934,7 +1954,7 @@ xmloff/qa/unit/uxmloff.cxx:108
     (unnamed struct at 
/home/noel/libo-plugin/xmloff/qa/unit/uxmloff.cxx:106:12) buildId const char 
*const
 xmloff/qa/unit/uxmloff.cxx:109
     (unnamed struct at 
/home/noel/libo-plugin/xmloff/qa/unit/uxmloff.cxx:106:12) result const 
sal_uInt16
-xmloff/source/draw/ximpstyl.hxx:220
+xmloff/source/draw/ximpstyl.hxx:219
     SdXMLMasterStylesContext maMasterPageList 
std::vector<rtl::Reference<SdXMLMasterPageContext> >
 xmloff/source/forms/elementexport.hxx:45
     xmloff::OElementExport m_pXMLElement std::unique_ptr<SvXMLElementExport>
@@ -1943,7 +1963,7 @@ xmloff/source/forms/elementexport.hxx:102
 xmloff/source/forms/officeforms.hxx:68
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/text/txtimp.cxx:102
-    XMLTextImportHelper::Impl m_xFrameImpPrMap 
rtl::Reference<SvXMLImportPropertyMapper>
+    XMLTextImportHelper::Impl m_xFrameImpPrMap 
std::unique_ptr<SvXMLImportPropertyMapper>
 xmlsecurity/inc/certificatechooser.hxx:56
     CertificateChooser mvUserData 
std::vector<std::shared_ptr<CertificateChooserUserData> >
 xmlsecurity/inc/certificateviewer.hxx:51
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index f55b4ba8ff80..c8de09bfd106 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -72,12 +72,9 @@ class SvXMLNumFmtHelper
 
 public:
     SvXMLNumFmtHelper(
-        const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp,
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+        const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp 
);
 
-    SvXMLNumFmtHelper(
-        SvNumberFormatter* pNumberFormatter,
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+    SvXMLNumFmtHelper( SvNumberFormatter* pNumberFormatter );
 
     ~SvXMLNumFmtHelper();
 
diff --git a/sd/source/console/PresenterAccessibility.cxx 
b/sd/source/console/PresenterAccessibility.cxx
index 4461cb9253c5..a1257738cb98 100644
--- a/sd/source/console/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
@@ -127,11 +127,9 @@ private:
 //===== PresenterAccessible ===================================================
 
 PresenterAccessible::PresenterAccessible (
-    css::uno::Reference<css::uno::XComponentContext> xContext,
     ::rtl::Reference<PresenterController> xPresenterController,
     const Reference<drawing::framework::XPane>& rxMainPane)
     : PresenterAccessibleInterfaceBase(m_aMutex),
-      mxComponentContext(std::move(xContext)),
       mpPresenterController(std::move(xPresenterController)),
       mxMainPane(rxMainPane, UNO_QUERY)
 {
diff --git a/sd/source/console/PresenterAccessibility.hxx 
b/sd/source/console/PresenterAccessibility.hxx
index 6cadfaeba96f..6a8b1cb030fa 100644
--- a/sd/source/console/PresenterAccessibility.hxx
+++ b/sd/source/console/PresenterAccessibility.hxx
@@ -52,7 +52,6 @@ class PresenterAccessible
 {
 public:
     PresenterAccessible (
-        css::uno::Reference<css::uno::XComponentContext> xContext,
         ::rtl::Reference<PresenterController> xPresenterController,
         const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane);
     virtual ~PresenterAccessible() override;
@@ -83,7 +82,6 @@ public:
     virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& 
rArguments) override;
 
 private:
-    const css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
     ::rtl::Reference<PresenterController> mpPresenterController;
     css::uno::Reference<css::drawing::framework::XPane2> mxMainPane;
     css::uno::Reference<css::awt::XWindow> mxMainWindow;
diff --git a/sd/source/console/PresenterController.cxx 
b/sd/source/console/PresenterController.cxx
index c246ab8c34d7..561f6015828d 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -1039,7 +1039,6 @@ void PresenterController::InitializeMainPane (const 
Reference<XPane>& rxPane)
         return;
 
     mpAccessibleObject = new PresenterAccessible(
-        mxComponentContext,
         this,
         rxPane);
 
diff --git a/sd/source/console/PresenterTheme.cxx 
b/sd/source/console/PresenterTheme.cxx
index f0c319b6bfd5..60c7aa2af429 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -82,11 +82,9 @@ public:
 class ReadContext
 {
 public:
-    Reference<XComponentContext> mxComponentContext;
     Reference<rendering::XCanvas> mxCanvas;
 
     ReadContext (
-        const Reference<XComponentContext>& rxContext,
         const Reference<rendering::XCanvas>& rxCanvas);
 
     /** Read data describing a font from the node that can be reached from
@@ -255,7 +253,7 @@ PresenterTheme::~PresenterTheme()
 
 std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme()
 {
-    ReadContext aReadContext(mxContext, mxCanvas);
+    ReadContext aReadContext(mxCanvas);
 
     PresenterConfigurationAccess aConfiguration (
         mxContext,
@@ -644,11 +642,8 @@ namespace {
 
 //===== ReadContext ===========================================================
 
-ReadContext::ReadContext (
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext,
-    const Reference<rendering::XCanvas>& rxCanvas)
-    : mxComponentContext(rxContext),
-      mxCanvas(rxCanvas)
+ReadContext::ReadContext(const Reference<rendering::XCanvas>& rxCanvas)
+    : mxCanvas(rxCanvas)
 {
 }
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 94bf7e41b7a7..a487b992a142 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -427,7 +427,7 @@ void SvXMLImport::InitCtor_()
     }
 
     if (mxNumberFormatsSupplier.is())
-        mpNumImport = 
std::make_unique<SvXMLNumFmtHelper>(mxNumberFormatsSupplier, 
GetComponentContext());
+        mpNumImport = 
std::make_unique<SvXMLNumFmtHelper>(mxNumberFormatsSupplier);
 
     if (mxModel.is() && !mxEventListener.is())
     {
@@ -1739,7 +1739,7 @@ void SvXMLImport::CreateDataStylesImport_()
     uno::Reference<util::XNumberFormatsSupplier> xNum =
         GetNumberFormatsSupplier();
     if ( xNum.is() )
-        mpNumImport = std::make_unique<SvXMLNumFmtHelper>(xNum, 
GetComponentContext() );
+        mpNumImport = std::make_unique<SvXMLNumFmtHelper>(xNum);
 }
 
 sal_Unicode SvXMLImport::ConvStarBatsCharToStarSymbol( sal_Unicode c )
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index d44b5ed1d7f9..b4e62de87ca5 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -943,7 +943,7 @@ SdXMLStylesContext::SdXMLStylesContext(
 {
     Reference< uno::XComponentContext > xContext = 
rImport.GetComponentContext();
     mpNumFormatter = std::make_unique<SvNumberFormatter>( xContext, 
LANGUAGE_SYSTEM );
-    mpNumFmtHelper = std::make_unique<SvXMLNumFmtHelper>( 
mpNumFormatter.get(), xContext );
+    mpNumFmtHelper = std::make_unique<SvXMLNumFmtHelper>( mpNumFormatter.get() 
);
 }
 
 SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 386e48381017..2a51c7c66701 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -68,12 +68,8 @@ class SvXMLNumImpData
     const LocaleDataWrapper*  pLocaleData { nullptr };
     std::vector<SvXMLNumFmtEntry> m_NameEntries;
 
-    uno::Reference< uno::XComponentContext > m_xContext;
-
 public:
-    SvXMLNumImpData(
-        SvNumberFormatter* pFmt,
-        const uno::Reference<uno::XComponentContext>& rxContext );
+    SvXMLNumImpData(SvNumberFormatter* pFmt);
 
     SvNumberFormatter*      GetNumberFormatter() const  { return pFormatter; }
     const LocaleDataWrapper&    GetLocaleData( LanguageType nLang );
@@ -289,12 +285,9 @@ const SvXMLDefaultDateFormat aDefaultDateFormats[] =
 
 
 SvXMLNumImpData::SvXMLNumImpData(
-    SvNumberFormatter* pFmt,
-    const uno::Reference<uno::XComponentContext>& rxContext )
-:   pFormatter(pFmt),
-    m_xContext(rxContext)
+    SvNumberFormatter* pFmt )
+:   pFormatter(pFmt)
 {
-    SAL_WARN_IF( !rxContext.is(), "xmloff", "got no service manager" );
 }
 
 sal_uInt32 SvXMLNumImpData::GetKeyForName( std::u16string_view rName )
@@ -2282,27 +2275,20 @@ bool SvXMLNumFormatContext::IsSystemLanguage() const
 
 
 SvXMLNumFmtHelper::SvXMLNumFmtHelper(
-    const uno::Reference<util::XNumberFormatsSupplier>& rSupp,
-    const uno::Reference<uno::XComponentContext>& rxContext )
+    const uno::Reference<util::XNumberFormatsSupplier>& rSupp )
 {
-    SAL_WARN_IF( !rxContext.is(), "xmloff", "got no service manager" );
-
     SvNumberFormatter* pFormatter = nullptr;
     SvNumberFormatsSupplierObj* pObj =
                     comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( 
rSupp );
     if (pObj)
         pFormatter = pObj->GetNumberFormatter();
 
-    m_pData = std::make_unique<SvXMLNumImpData>( pFormatter, rxContext );
+    m_pData = std::make_unique<SvXMLNumImpData>( pFormatter );
 }
 
-SvXMLNumFmtHelper::SvXMLNumFmtHelper(
-    SvNumberFormatter* pNumberFormatter,
-    const uno::Reference<uno::XComponentContext>& rxContext )
+SvXMLNumFmtHelper::SvXMLNumFmtHelper( SvNumberFormatter* pNumberFormatter )
 {
-    SAL_WARN_IF( !rxContext.is(), "xmloff", "got no service manager" );
-
-    m_pData = std::make_unique<SvXMLNumImpData>( pNumberFormatter, rxContext );
+    m_pData = std::make_unique<SvXMLNumImpData>( pNumberFormatter );
 }
 
 SvXMLNumFmtHelper::~SvXMLNumFmtHelper()

Reply via email to