[Libreoffice-commits] core.git: basctl/source compilerplugins/clang cui/source drawinglayer/source sd/source sfx2/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 20 09:29:32 UTC 2021


 basctl/source/basicide/baside3.cxx                                  |    2 
 basctl/source/inc/baside3.hxx                                       |    1 
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  128 +++----
 compilerplugins/clang/unusedfields.readonly.results                 |   80 ++--
 compilerplugins/clang/unusedfields.untouched.results                |   96 ++---
 compilerplugins/clang/unusedfields.writeonly.results                |  172 +++-------
 cui/source/dialogs/tipofthedaydlg.cxx                               |    6 
 cui/source/inc/tipofthedaydlg.hxx                                   |    1 
 drawinglayer/source/geometry/viewinformation2d.cxx                  |    7 
 sd/source/ui/dlg/custsdlg.cxx                                       |   11 
 sd/source/ui/inc/custsdlg.hxx                                       |    1 
 sfx2/source/dialog/StyleList.cxx                                    |   11 
 sfx2/source/dialog/templdlg.cxx                                     |   12 
 sfx2/source/inc/StyleList.hxx                                       |    3 
 sfx2/source/inc/templdgi.hxx                                        |   10 
 15 files changed, 227 insertions(+), 314 deletions(-)

New commits:
commit e367e59e37499d0efca381f0b41df52c7cfc2026
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 20 10:13:13 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 20 11:28:46 2021 +0200

    loplugin:unusedfields
    
    Change-Id: Ie27afe4c2438c44baece4b926572584c6695dc39
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120774
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 12aa15589739..085228971eae 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -682,7 +682,7 @@ void DialogWindow::SaveDialog()
 
         if( bResource )
         {
-            INetURLObject aURLObj( m_sCurPath );
+            INetURLObject aURLObj("");
             aURLObj.removeExtension();
             OUString aDialogName( aURLObj.getName() );
             aURLObj.removeSegment();
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 86c37ea20a44..f5d367182d0a 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -51,7 +51,6 @@ private:
     DialogWindowLayout& m_rLayout;
     std::unique_ptr<DlgEditor> m_pEditor;
     std::unique_ptr<SfxUndoManager> m_pUndoMgr; // never nullptr
-    OUString            m_sCurPath;
     sal_uInt16          m_nControlSlotId;
 
 protected:
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 10564c4dece5..62a919d09124 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -72,7 +72,7 @@ cppcanvas/source/mtfrenderer/textaction.cxx:808
     cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo
 cppcanvas/source/mtfrenderer/textaction.cxx:1643
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo
-cppu/source/threadpool/threadpool.cxx:365
+cppu/source/threadpool/threadpool.cxx:352
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:59
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
@@ -116,15 +116,15 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:258
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cui/source/dialogs/colorpicker.cxx:736
+cui/source/dialogs/colorpicker.cxx:738
     cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1408
+cui/source/factory/dlgfact.cxx:1407
     (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/AdditionsDialog.hxx:47
     AdditionInfo sReleaseVersion class rtl::OUString
 cui/source/inc/AdditionsDialog.hxx:84
     AdditionsDialog m_sTag class rtl::OUString
-cui/source/inc/cfgutil.hxx:236
+cui/source/inc/cfgutil.hxx:241
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
 cui/source/inc/cuitabarea.hxx:223
     SvxAreaTabPage maFixed_ChangeType enum ChangeType
@@ -138,6 +138,8 @@ cui/source/inc/tabstpge.hxx:86
     SvxTabulatorTabPage m_aCenterWin class TabWin_Impl
 cui/source/inc/tabstpge.hxx:87
     SvxTabulatorTabPage m_aDezWin class TabWin_Impl
+cui/source/inc/tipofthedaydlg.hxx:39
+    TipOfTheDayDialog m_nDay sal_Int32
 cui/source/options/optcolor.cxx:237
     (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor class Color
 dbaccess/source/core/api/RowSet.hxx:107
@@ -162,7 +164,7 @@ dbaccess/source/core/dataaccess/connection.hxx:101
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2898
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2902
       class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:54
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmapEx class BitmapEx
@@ -170,6 +172,10 @@ drawinglayer/inc/texture/texture3d.hxx:55
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 drawinglayer/inc/texture/texture3d.hxx:57
     drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap
+drawinglayer/source/geometry/viewinformation2d.cxx:81
+    drawinglayer::geometry::ImpViewInformation2D mxViewInformation uno::Sequence<beans::PropertyValue>
+drawinglayer/source/geometry/viewinformation2d.cxx:85
+    drawinglayer::geometry::ImpViewInformation2D mxExtendedInformation uno::Sequence<beans::PropertyValue>
 drawinglayer/source/tools/emfphelperdata.hxx:197
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:198
@@ -177,7 +183,7 @@ drawinglayer/source/tools/emfphelperdata.hxx:198
 editeng/source/editeng/impedit.hxx:521
     ImpEditEngine aSelFuncSet class EditSelFunctionSet
 embeddedobj/source/msole/olecomponent.hxx:51
-    OleComponent m_pInterfaceContainer ::cppu::OMultiTypeInterfaceContainerHelper *
+    OleComponent m_pInterfaceContainer comphelper::OMultiTypeInterfaceContainerHelper2 *
 embeddedobj/source/msole/olecomponent.hxx:53
     OleComponent m_bDisposed _Bool
 embeddedobj/source/msole/olecomponent.hxx:54
@@ -200,7 +206,7 @@ embeddedobj/source/msole/olecomponent.hxx:65
     OleComponent m_aDataFlavors css::uno::Sequence<css::datatransfer::DataFlavor>
 embeddedobj/source/msole/olecomponent.hxx:69
     OleComponent m_bOleInitialized _Bool
-extensions/source/bibliography/datman.cxx:407
+extensions/source/bibliography/datman.cxx:410
     (anonymous namespace)::DBChangeDialog_Impl aConfig class DBChangeDialogConfig_Impl
 filter/source/graphicfilter/icgm/chart.hxx:48
     DataNode nBoxX1 sal_Int16
@@ -368,7 +374,7 @@ include/vcl/commandevent.hxx:311
     CommandGestureData mfY const double
 include/vcl/commandevent.hxx:315
     CommandGestureData meOrientation const enum PanningOrientation
-include/vcl/font/Feature.hxx:100
+include/vcl/font/Feature.hxx:101
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/pdf/PDFAnnotationMarker.hxx:67
     vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
@@ -436,7 +442,7 @@ pyuno/source/module/pyuno_impl.hxx:138
     pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:238
     pyuno::stRuntimeImpl ob_base PyObject
-reportdesign/source/core/api/ReportDefinition.cxx:239
+reportdesign/source/core/api/ReportDefinition.cxx:240
     reportdesign::(anonymous namespace)::OStyle m_aSize awt::Size
 sal/qa/osl/condition/osl_Condition.cxx:72
     osl_Condition::ctors bRes1 _Bool
@@ -492,29 +498,29 @@ sal/qa/osl/security/osl_Security.cxx:154
     osl_Security::getUserName bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:188
     osl_Security::getConfigDir bRes1 _Bool
-sal/textenc/textenc.cxx:406
+sal/textenc/textenc.cxx:405
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
-sc/inc/column.hxx:125
+sc/inc/column.hxx:126
     ScColumn maCellsEvent sc::CellStoreEvent
-sc/inc/compiler.hxx:262
+sc/inc/compiler.hxx:266
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:265
+sc/inc/compiler.hxx:269
     ScCompiler::AddInMap pUpper const char *
 sc/inc/editutil.hxx:113
     ScEnginePoolHelper bDeleteEnginePool _Bool
 sc/inc/token.hxx:402
     SingleDoubleRefModifier aDub struct ScComplexRefData
-sc/source/core/data/document.cxx:1234
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1235
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1236
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
 sc/source/core/data/table2.cxx:804
     (anonymous namespace)::TransClipHandler mnEndRow size_t
-sc/source/filter/html/htmlpars.cxx:3015
+sc/source/filter/html/htmlpars.cxx:3021
     (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3016
+sc/source/filter/html/htmlpars.cxx:3022
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/htmlpars.hxx:622
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
@@ -544,8 +550,6 @@ sc/source/filter/xml/xmltransformationi.hxx:154
     ScXMLDateTimeContext aType class rtl::OUString
 sc/source/ui/inc/acredlin.hxx:51
     ScAcceptChgDlg aReOpenIdle class Idle
-sc/source/ui/inc/checklistmenu.hxx:43
-    ScCheckListMember mbDuplicated _Bool
 sc/source/ui/inc/msgpool.hxx:34
     ScMessagePool aGlobalStringItem class SfxStringItem
 sc/source/ui/inc/msgpool.hxx:35
@@ -596,13 +600,13 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:32
     sd::ZeroconfService port uint
 sd/source/ui/view/DocumentRenderer.cxx:1340
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1165
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1166
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1167
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1168
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+sd/source/ui/view/viewshel.cxx:1169
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
@@ -650,6 +654,12 @@ sfx2/source/dialog/basedlgs.cxx:46
     SfxModelessDialog_Impl aMoveIdle class Idle
 sfx2/source/doc/doctempl.cxx:104
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
+sfx2/source/inc/templdgi.hxx:77
+    SfxCommonTemplateDialog_Impl pModule class SfxModule *
+sfx2/source/inc/templdgi.hxx:79
+    SfxCommonTemplateDialog_Impl mxStyleFamilies std::optional<SfxStyleFamilies>
+sfx2/source/inc/templdgi.hxx:106
+    SfxCommonTemplateDialog_Impl m_aStyleListUpdateFamily Link<void *, void>
 slideshow/source/engine/animationnodes/animationbasenode.hxx:88
     slideshow::internal::AnimationBaseNode mpSubsetManager slideshow::internal::SubsettableShapeManagerSharedPtr
 slideshow/source/engine/opengl/TransitionImpl.cxx:1987
@@ -676,10 +686,6 @@ slideshow/source/engine/smilfunctionparser.cxx:495
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::classic::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:496
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::classic::rule<ScannerT>
-starmath/inc/mathml/def.hxx:258
-    SmMlMathbackground m_aCol class Color
-starmath/inc/mathml/def.hxx:264
-    SmMlMathcolor m_aCol class Color
 starmath/inc/mathml/mathmlMo.hxx:63
     moOperatorData m_motxt class rtl::OUString
 starmath/inc/mathml/mathmlMo.hxx:64
@@ -736,25 +742,25 @@ svx/source/dialog/framelinkarray.cxx:385
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow size_t
 svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/dialog/weldeditview.cxx:460
+svx/source/dialog/weldeditview.cxx:459
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/inc/datanavi.hxx:190
     svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
 svx/source/svdraw/svdcrtv.cxx:48
     ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
-svx/source/svdraw/svdmrkv.cxx:136
+svx/source/svdraw/svdmrkv.cxx:137
     MarkingSubSelectionOverlay maObjects sdr::overlay::OverlayObjectList
 svx/source/tbxctrls/extrusioncontrols.hxx:66
     svx::ExtrusionDirectionWindow maImgDirection class Image [9]
-svx/source/xml/xmleohlp.cxx:69
+svx/source/xml/xmleohlp.cxx:70
     OutputStorageWrapper_Impl aTempFile class utl::TempFile
-svx/source/xml/xmlgrhlp.cxx:88
+svx/source/xml/xmlgrhlp.cxx:92
     (anonymous namespace)::GraphicInputStream maTempFile utl::TempFile
 sw/inc/unosett.hxx:149
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4131
+sw/qa/extras/uiwriter/uiwriter.cxx:4133
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
@@ -818,47 +824,45 @@ vcl/inc/qt5/Qt5Clipboard.hxx:43
     Qt5Clipboard m_bOwnClipboardChange _Bool
 vcl/inc/qt5/Qt5Clipboard.hxx:45
     Qt5Clipboard m_bDoClear _Bool
-vcl/inc/qt5/Qt5FilePicker.hxx:67
-    Qt5FilePicker m_aNamedFilterList class QStringList
 vcl/inc/qt5/Qt5FilePicker.hxx:68
+    Qt5FilePicker m_aNamedFilterList class QStringList
+vcl/inc/qt5/Qt5FilePicker.hxx:69
     Qt5FilePicker m_aTitleToFilterMap QHash<class QString, class QString>
-vcl/inc/qt5/Qt5FilePicker.hxx:70
-    Qt5FilePicker m_aNamedFilterToExtensionMap QHash<class QString, class QString>
 vcl/inc/qt5/Qt5FilePicker.hxx:71
+    Qt5FilePicker m_aNamedFilterToExtensionMap QHash<class QString, class QString>
+vcl/inc/qt5/Qt5FilePicker.hxx:72
     Qt5FilePicker m_aCurrentFilter class QString
-vcl/inc/qt5/Qt5FilePicker.hxx:74
+vcl/inc/qt5/Qt5FilePicker.hxx:75
     Qt5FilePicker m_aCustomWidgetsMap QHash<sal_Int16, class QWidget *>
-vcl/inc/qt5/Qt5FilePicker.hxx:76
+vcl/inc/qt5/Qt5FilePicker.hxx:77
     Qt5FilePicker m_bIsFolderPicker const _Bool
-vcl/inc/qt5/Qt5FilePicker.hxx:78
+vcl/inc/qt5/Qt5FilePicker.hxx:79
     Qt5FilePicker m_pParentWidget class QWidget *
 vcl/inc/qt5/Qt5Frame.hxx:85
     Qt5Frame m_bGraphicsInUse _Bool
-vcl/inc/qt5/Qt5Frame.hxx:86
-    Qt5Frame m_bGraphicsInvalid _Bool
-vcl/inc/qt5/Qt5Frame.hxx:88
+vcl/inc/qt5/Qt5Frame.hxx:87
     Qt5Frame m_pParent class Qt5Frame *
-vcl/inc/qt5/Qt5Frame.hxx:89
+vcl/inc/qt5/Qt5Frame.hxx:88
     Qt5Frame m_ePointerStyle enum PointerStyle
-vcl/inc/qt5/Qt5Frame.hxx:93
+vcl/inc/qt5/Qt5Frame.hxx:92
     Qt5Frame m_pDragSource class Qt5DragSource *
-vcl/inc/qt5/Qt5Frame.hxx:94
+vcl/inc/qt5/Qt5Frame.hxx:93
     Qt5Frame m_pDropTarget class Qt5DropTarget *
-vcl/inc/qt5/Qt5Frame.hxx:95
+vcl/inc/qt5/Qt5Frame.hxx:94
     Qt5Frame m_bInDrag _Bool
-vcl/inc/qt5/Qt5Frame.hxx:97
+vcl/inc/qt5/Qt5Frame.hxx:96
     Qt5Frame m_bDefaultSize _Bool
-vcl/inc/qt5/Qt5Frame.hxx:98
+vcl/inc/qt5/Qt5Frame.hxx:97
     Qt5Frame m_bDefaultPos _Bool
-vcl/inc/qt5/Qt5Frame.hxx:99
+vcl/inc/qt5/Qt5Frame.hxx:98
     Qt5Frame m_bFullScreen _Bool
-vcl/inc/qt5/Qt5Frame.hxx:100
+vcl/inc/qt5/Qt5Frame.hxx:99
     Qt5Frame m_bFullScreenSpanAll _Bool
-vcl/inc/qt5/Qt5Frame.hxx:101
+vcl/inc/qt5/Qt5Frame.hxx:100
     Qt5Frame m_nRestoreScreen sal_uInt32
-vcl/inc/qt5/Qt5Frame.hxx:102
+vcl/inc/qt5/Qt5Frame.hxx:101
     Qt5Frame m_aRestoreGeometry class QRect
-vcl/inc/qt5/Qt5Frame.hxx:105
+vcl/inc/qt5/Qt5Frame.hxx:104
     Qt5Frame m_ScreenSaverInhibitor class ScreenSaverInhibitor
 vcl/inc/qt5/Qt5Frame.hxx:108
     Qt5Frame m_nInputLanguage LanguageType
@@ -944,9 +948,9 @@ vcl/inc/WidgetThemeLibrary.hxx:103
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:119
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/gdi/jobset.cxx:37
+vcl/source/gdi/jobset.cxx:36
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:38
+vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cPortName char [32]
 vcl/source/gdi/pdfbuildin_fonts.hxx:32
     vcl::pdf::BuildinFont m_nAscent const int
@@ -970,13 +974,15 @@ vcl/unx/gtk3/gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 vcl/unx/gtk3/glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtkinst.cxx:6922
+vcl/unx/gtk3/gtkinst.cxx:6932
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtkinst.cxx:10025
-    (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkContainer *
-vcl/unx/gtk3/gtkinst.cxx:19072
+vcl/unx/gtk3/gtkinst.cxx:10048
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkBox *
+vcl/unx/gtk3/gtkinst.cxx:10050
+    (anonymous namespace)::GtkInstanceMenuToggleButton m_pMenuButton GtkMenuButton *
+vcl/unx/gtk3/gtkinst.cxx:19154
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtkinst.cxx:19078
+vcl/unx/gtk3/gtkinst.cxx:19160
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
 writerfilter/source/dmapper/PropertyMap.hxx:219
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index c0234103d79d..db9b36f9c7a5 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1,3 +1,5 @@
+basctl/source/inc/baside3.hxx:54
+    basctl::DialogWindow m_sCurPath class rtl::OUString
 basegfx/source/polygon/b2dtrapezoid.cxx:205
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
 basic/source/inc/expr.hxx:92
@@ -160,8 +162,6 @@ cppu/source/uno/check.cxx:258
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
 cui/source/options/optcolor.cxx:255
     (anonymous namespace)::ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions
-cui/source/options/optpath.cxx:65
-    OptPath_Impl m_aDefOpt class SvtDefaultOptions
 dbaccess/source/core/api/RowSetBase.hxx:84
     dbaccess::ORowSetBase m_aEmptyValue connectivity::ORowSetValue
 dbaccess/source/core/api/RowSetBase.hxx:95
@@ -180,33 +180,29 @@ dbaccess/source/ui/inc/sqledit.hxx:40
     dbaui::SQLEditView m_aColorConfig const svtools::ColorConfig
 dbaccess/source/ui/inc/WCopyTable.hxx:258
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
-drawinglayer/inc/processor3d/defaultprocessor3d.hxx:87
-    drawinglayer::processor3d::DefaultProcessor3D maDrawinglayerOpt const class SvtOptionsDrawinglayer
-drawinglayer/source/processor2d/vclprocessor2d.hxx:77
-    drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
 editeng/source/editeng/impedit.hxx:510
     ImpEditEngine maColorConfig svtools::ColorConfig
-embeddedobj/source/inc/commonembobj.hxx:105
+embeddedobj/source/inc/commonembobj.hxx:108
     OCommonEmbeddedObject m_aClassName class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:123
+embeddedobj/source/inc/oleembobj.hxx:125
     OleEmbeddedObject m_pOleComponent rtl::Reference<OleComponent>
-embeddedobj/source/inc/oleembobj.hxx:143
+embeddedobj/source/inc/oleembobj.hxx:145
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:165
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:182
+embeddedobj/source/inc/oleembobj.hxx:184
     OleEmbeddedObject m_aLinkURL class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:188
+embeddedobj/source/inc/oleembobj.hxx:190
     OleEmbeddedObject m_bFromClipboard _Bool
 embeddedobj/source/msole/olecomponent.hxx:73
     OleComponent m_bWorkaroundActive _Bool
@@ -214,6 +210,8 @@ extensions/source/propctrlr/eformshelper.hxx:60
     pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
 extensions/source/propctrlr/eformshelper.hxx:62
     pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet
+extensions/source/update/check/updatehdl.hxx:90
+    UpdateHandler mbStringsLoaded _Bool
 filter/source/graphicfilter/icgm/chart.hxx:48
     DataNode nBoxX1 sal_Int16
 filter/source/graphicfilter/icgm/chart.hxx:49
@@ -226,7 +224,7 @@ filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:85
     XMLFilterSettingsDialog maModuleOpt class SvtModuleOptions
 framework/inc/dispatch/dispatchprovider.hxx:76
     framework::DispatchProvider m_aProtocolHandlerCache class framework::HandlerCache
-framework/inc/helper/uiconfigelementwrapperbase.hxx:127
+framework/inc/helper/uiconfigelementwrapperbase.hxx:128
     framework::UIConfigElementWrapperBase m_bConfigListening _Bool
 framework/inc/xml/menudocumenthandler.hxx:186
     framework::OReadMenuPopupHandler m_bMenuMode _Bool
@@ -244,7 +242,7 @@ include/basic/sbstar.hxx:50
     StarBASIC aErrorHdl Link<class StarBASIC *, _Bool>
 include/basic/sbstar.hxx:51
     StarBASIC aBreakHdl Link<class StarBASIC *, enum BasicDebugFlags>
-include/comphelper/interfacecontainer3.hxx:222
+include/comphelper/interfacecontainer3.hxx:227
     comphelper::OInterfaceContainerHelper3::NotifySingleListener m_pMethod const comphelper::OInterfaceContainerHelper3::NotifySingleListener::NotificationMethod
 include/comphelper/parallelsort.hxx:163
     comphelper::(anonymous namespace)::Binner maLabels uint8_t [mnMaxStaticSize]
@@ -264,8 +262,6 @@ include/connectivity/sdbcx/VTable.hxx:78
     connectivity::sdbcx::OTable m_xIndexes rtl::Reference<OCollection>
 include/connectivity/sqlparse.hxx:104
     connectivity::OSQLParser_Data aErrors ::connectivity::SQLError
-include/editeng/brushitem.hxx:51
-    SvxBrushItem maSecOptions class SvtSecurityOptions
 include/filter/msfilter/svdfppt.hxx:706
     PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [10]
 include/filter/msfilter/svdfppt.hxx:877
@@ -308,16 +304,12 @@ include/svx/graphctl.hxx:52
     GraphCtrl xVD ScopedVclPtrInstance<class VirtualDevice>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49
     sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
-include/svx/sdr/overlay/overlaymanager.hxx:70
-    sdr::overlay::OverlayManager maDrawinglayerOpt class SvtOptionsDrawinglayer
 include/svx/svdmark.hxx:141
     SdrMarkList maPointName class rtl::OUString
 include/svx/svdmark.hxx:142
     SdrMarkList maGluePointName class rtl::OUString
 include/svx/svdoedge.hxx:158
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
-include/svx/svdpntv.hxx:154
-    SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
 include/unoidl/unoidl.hxx:443
     unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
@@ -396,11 +388,11 @@ sal/rtl/uuid.cxx:67
     (anonymous namespace)::UUID node sal_uInt8 [6]
 sc/inc/attarray.hxx:68
     ScMergePatternState pItemSet std::optional<SfxItemSet>
-sc/inc/compiler.hxx:128
+sc/inc/compiler.hxx:132
     ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
-sc/inc/compiler.hxx:129
-    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:126:9)
-sc/inc/compiler.hxx:134
+sc/inc/compiler.hxx:133
+    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:130:9)
+sc/inc/compiler.hxx:138
     ScRawToken::(anonymous) pMat class ScMatrix *
 sc/inc/formulagroup.hxx:38
     sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
@@ -500,9 +492,13 @@ sdext/source/pdfimport/tree/style.hxx:44
     pdfi::StyleContainer::Style Contents class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:99
     sfx2::(anonymous namespace)::ImplDdeItem pLink class sfx2::SvBaseLink *
+sfx2/source/inc/templdgi.hxx:77
+    SfxCommonTemplateDialog_Impl pModule class SfxModule *
+sfx2/source/inc/templdgi.hxx:79
+    SfxCommonTemplateDialog_Impl mxStyleFamilies std::optional<SfxStyleFamilies>
 slideshow/source/engine/slideshowimpl.cxx:137
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
-sot/source/sdstor/ucbstorage.cxx:404
+sot/source/sdstor/ucbstorage.cxx:405
     UCBStorageStream_Impl m_aKey class rtl::OString
 store/source/storbios.cxx:59
     (anonymous namespace)::OStoreSuperBlock m_aMarked (anonymous namespace)::OStoreSuperBlock::L
@@ -548,9 +544,9 @@ svx/source/inc/datanavi.hxx:488
     svxform::AddSubmissionDialog m_aMethodString class svxform::MethodString
 svx/source/inc/datanavi.hxx:489
     svxform::AddSubmissionDialog m_aReplaceString class svxform::ReplaceString
-svx/source/inc/gridcell.hxx:524
+svx/source/inc/gridcell.hxx:523
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/inc/gridcell.hxx:525
+svx/source/inc/gridcell.hxx:524
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/svdpdf.hxx:61
     ImpSdrPdfImport maDash class XDash
@@ -590,13 +586,13 @@ sw/source/core/text/inftxt.cxx:565
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
 sw/source/core/text/redlnitr.hxx:75
     SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
-sw/source/filter/html/htmltab.cxx:2818
+sw/source/filter/html/htmltab.cxx:2819
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:33
     RTFSurround::(anonymous) nVal sal_uInt8
-sw/source/ui/dbui/dbinsdlg.cxx:102
+sw/source/ui/dbui/dbinsdlg.cxx:103
     DB_Column::(anonymous) pText class rtl::OUString *
-sw/source/ui/dbui/dbinsdlg.cxx:104
+sw/source/ui/dbui/dbinsdlg.cxx:105
     DB_Column::(anonymous) nFormat sal_uInt32
 sw/source/uibase/dbui/mmconfigitem.cxx:112
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
@@ -604,7 +600,7 @@ sw/source/uibase/dbui/mmconfigitem.cxx:114
     SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString>
 sw/source/uibase/dbui/mmconfigitem.cxx:116
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
-sw/source/uibase/inc/fldmgr.hxx:79
+sw/source/uibase/inc/fldmgr.hxx:78
     SwInsertField_Data m_aDBDataSource css::uno::Any
 toolkit/source/awt/vclxtoolkit.cxx:442
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
@@ -618,8 +614,6 @@ ucb/source/ucp/gio/gio_mount.hxx:78
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
 ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:76
-    hierarchy_ucp::DataSupplier_Impl m_aIterator class HierarchyEntry::iterator
 ucb/source/ucp/package/pkgprovider.hxx:50
     package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages>
 ucbhelper/source/client/proxydecider.cxx:131
@@ -684,8 +678,6 @@ unoidl/source/unoidlprovider.cxx:457
     unoidl::detail::MapEntry data struct unoidl::detail::(anonymous namespace)::Memory32
 unotools/source/config/pathoptions.cxx:85
     SvtPathOptions_Impl m_aEmptyString class rtl::OUString
-unotools/source/config/saveopt.cxx:83
-    (anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave _Bool
 vcl/inc/bitmap/BitmapFastScaleFilter.hxx:31
     BitmapFastScaleFilter maSize class Size
 vcl/inc/ppdparser.hxx:131
@@ -702,7 +694,7 @@ vcl/inc/qt5/Qt5Frame.hxx:80
     Qt5Frame m_pSvpGraphics std::unique_ptr<Qt5SvpGraphics>
 vcl/inc/qt5/Qt5Frame.hxx:82
     Qt5Frame m_aRegion class QRegion
-vcl/inc/qt5/Qt5Frame.hxx:87
+vcl/inc/qt5/Qt5Frame.hxx:86
     Qt5Frame m_nStyle enum SalFrameStyleFlags
 vcl/inc/qt5/Qt5Menu.hxx:42
     Qt5Menu maItems std::vector<Qt5MenuItem *>
@@ -716,7 +708,7 @@ vcl/inc/salwtype.hxx:164
     SalWheelMouseEvent mbDeltaIsPixel _Bool
 vcl/inc/salwtype.hxx:218
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:316
+vcl/inc/svdata.hxx:318
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
 vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<ToolBoxItemId>
@@ -956,7 +948,7 @@ vcl/source/bitmap/dibtools.cxx:119
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
 vcl/source/control/roadmapwizard.cxx:63
     vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
-vcl/source/control/tabctrl.cxx:82
+vcl/source/control/tabctrl.cxx:80
     ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
 vcl/source/filter/eps/eps.cxx:115
     (anonymous namespace)::PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
@@ -1022,5 +1014,3 @@ xmloff/source/chart/SchXMLChartContext.hxx:55
     SeriesDefaultsAndStyles maPercentageErrorDefault css::uno::Any
 xmloff/source/chart/SchXMLChartContext.hxx:56
     SeriesDefaultsAndStyles maErrorMarginDefault css::uno::Any
-xmloff/source/core/xmlexp.cxx:264
-    SvXMLExport_Impl maSaveOptions class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index e88b3f4f010d..53587a1ae69b 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -10,9 +10,9 @@ canvas/source/vcl/impltools.hxx:114
     vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
 chart2/source/controller/inc/RangeSelectionListener.hxx:61
     chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
-chart2/source/inc/ModifyListenerCallBack.hxx:53
+chart2/source/inc/ModifyListenerCallBack.hxx:52
     chart::ModifyListenerCallBack m_xModifyListener css::uno::Reference<css::util::XModifyListener>
-comphelper/source/container/enumerablemap.cxx:297
+comphelper/source/container/enumerablemap.cxx:298
     comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface>
 connectivity/source/drivers/evoab2/EApi.h:121
     (anonymous) address_format char *
@@ -20,7 +20,7 @@ connectivity/source/drivers/evoab2/EApi.h:125
     (anonymous) ext char *
 connectivity/source/drivers/evoab2/NStatement.hxx:54
     connectivity::evoab::FieldSort bAscending _Bool
-cppu/source/threadpool/threadpool.cxx:365
+cppu/source/threadpool/threadpool.cxx:352
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:59
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
@@ -30,12 +30,16 @@ dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2898
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2902
       class AllSettings &
+drawinglayer/source/geometry/viewinformation2d.cxx:81
+    drawinglayer::geometry::ImpViewInformation2D mxViewInformation uno::Sequence<beans::PropertyValue>
+drawinglayer/source/geometry/viewinformation2d.cxx:85
+    drawinglayer::geometry::ImpViewInformation2D mxExtendedInformation uno::Sequence<beans::PropertyValue>
 embeddedobj/source/msole/olecomponent.hxx:50
     OleComponent m_aMutex ::osl::Mutex
 embeddedobj/source/msole/olecomponent.hxx:51
-    OleComponent m_pInterfaceContainer ::cppu::OMultiTypeInterfaceContainerHelper *
+    OleComponent m_pInterfaceContainer comphelper::OMultiTypeInterfaceContainerHelper2 *
 embeddedobj/source/msole/olecomponent.hxx:53
     OleComponent m_bDisposed _Bool
 embeddedobj/source/msole/olecomponent.hxx:54
@@ -220,9 +224,9 @@ include/vcl/commandevent.hxx:311
     CommandGestureData mfY const double
 include/vcl/commandevent.hxx:315
     CommandGestureData meOrientation const enum PanningOrientation
-include/vcl/filter/PngImageReader.hxx:31
+include/vcl/filter/PngImageReader.hxx:35
     vcl::PngImageReader mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
-include/vcl/font/Feature.hxx:100
+include/vcl/font/Feature.hxx:101
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/pdf/PDFAnnotationMarker.hxx:67
     vcl::pdf::PDFAnnotationMarkerHighlight meTextMarkerType enum vcl::pdf::PDFTextMarkerType
@@ -326,19 +330,17 @@ sc/inc/editutil.hxx:111
     ScEnginePoolHelper pEnginePool rtl::Reference<SfxItemPool>
 sc/inc/editutil.hxx:113
     ScEnginePoolHelper bDeleteEnginePool _Bool
-sc/source/core/data/document.cxx:1234
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1235
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1236
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
-sc/source/filter/html/htmlpars.cxx:3015
+sc/source/filter/html/htmlpars.cxx:3021
     (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3016
+sc/source/filter/html/htmlpars.cxx:3022
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:50
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
-sc/source/ui/inc/checklistmenu.hxx:43
-    ScCheckListMember mbDuplicated _Bool
-sc/source/ui/inc/docsh.hxx:454
+sc/source/ui/inc/docsh.hxx:455
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:47
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
@@ -354,13 +356,13 @@ sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
     sd::slidesorter::view::Layouter::Implementation mpTheme std::shared_ptr<view::Theme>
 sd/source/ui/view/DocumentRenderer.cxx:1340
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1165
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1166
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1167
-    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1168
+    sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+sd/source/ui/view/viewshel.cxx:1169
     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>
@@ -376,16 +378,14 @@ sfx2/source/doc/doctempl.cxx:104
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
+sfx2/source/inc/templdgi.hxx:106
+    SfxCommonTemplateDialog_Impl m_aStyleListUpdateFamily Link<void *, void>
 slideshow/source/engine/opengl/TransitionImpl.cxx:1987
     (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1987
     (anonymous namespace)::ThreeFloats y GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1987
     (anonymous namespace)::ThreeFloats z GLfloat
-starmath/inc/mathml/def.hxx:258
-    SmMlMathbackground m_aCol class Color
-starmath/inc/mathml/def.hxx:264
-    SmMlMathcolor m_aCol class Color
 starmath/inc/mathml/mathmlMo.hxx:63
     moOperatorData m_motxt class rtl::OUString
 starmath/inc/mathml/mathmlMo.hxx:64
@@ -414,7 +414,7 @@ svl/source/crypto/cryptosign.cxx:269
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/weldeditview.cxx:460
+svx/source/dialog/weldeditview.cxx:459
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/inc/datanavi.hxx:190
     svxform::XFormsPage m_aDropHelper class svxform::DataTreeDropTarget
@@ -466,53 +466,51 @@ vcl/inc/qt5/Qt5Clipboard.hxx:50
     Qt5Clipboard m_aOwner css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>
 vcl/inc/qt5/Qt5Clipboard.hxx:51
     Qt5Clipboard m_aListeners std::vector<css::uno::Reference<css::datatransfer::clipboard::XClipboardListener> >
-vcl/inc/qt5/Qt5FilePicker.hxx:61
+vcl/inc/qt5/Qt5FilePicker.hxx:62
     Qt5FilePicker m_context css::uno::Reference<css::uno::XComponentContext>
-vcl/inc/qt5/Qt5FilePicker.hxx:63
+vcl/inc/qt5/Qt5FilePicker.hxx:64
     Qt5FilePicker m_xListener css::uno::Reference<css::ui::dialogs::XFilePickerListener>
-vcl/inc/qt5/Qt5FilePicker.hxx:65
+vcl/inc/qt5/Qt5FilePicker.hxx:66
     Qt5FilePicker m_aHelperMutex osl::Mutex
-vcl/inc/qt5/Qt5FilePicker.hxx:67
-    Qt5FilePicker m_aNamedFilterList class QStringList
 vcl/inc/qt5/Qt5FilePicker.hxx:68
+    Qt5FilePicker m_aNamedFilterList class QStringList
+vcl/inc/qt5/Qt5FilePicker.hxx:69
     Qt5FilePicker m_aTitleToFilterMap QHash<class QString, class QString>
-vcl/inc/qt5/Qt5FilePicker.hxx:70
-    Qt5FilePicker m_aNamedFilterToExtensionMap QHash<class QString, class QString>
 vcl/inc/qt5/Qt5FilePicker.hxx:71
+    Qt5FilePicker m_aNamedFilterToExtensionMap QHash<class QString, class QString>
+vcl/inc/qt5/Qt5FilePicker.hxx:72
     Qt5FilePicker m_aCurrentFilter class QString
-vcl/inc/qt5/Qt5FilePicker.hxx:74
+vcl/inc/qt5/Qt5FilePicker.hxx:75
     Qt5FilePicker m_aCustomWidgetsMap QHash<sal_Int16, class QWidget *>
-vcl/inc/qt5/Qt5FilePicker.hxx:76
+vcl/inc/qt5/Qt5FilePicker.hxx:77
     Qt5FilePicker m_bIsFolderPicker const _Bool
-vcl/inc/qt5/Qt5FilePicker.hxx:78
+vcl/inc/qt5/Qt5FilePicker.hxx:79
     Qt5FilePicker m_pParentWidget class QWidget *
 vcl/inc/qt5/Qt5Frame.hxx:85
     Qt5Frame m_bGraphicsInUse _Bool
-vcl/inc/qt5/Qt5Frame.hxx:86
-    Qt5Frame m_bGraphicsInvalid _Bool
-vcl/inc/qt5/Qt5Frame.hxx:88
+vcl/inc/qt5/Qt5Frame.hxx:87
     Qt5Frame m_pParent class Qt5Frame *
-vcl/inc/qt5/Qt5Frame.hxx:89
+vcl/inc/qt5/Qt5Frame.hxx:88
     Qt5Frame m_ePointerStyle enum PointerStyle
-vcl/inc/qt5/Qt5Frame.hxx:93
+vcl/inc/qt5/Qt5Frame.hxx:92
     Qt5Frame m_pDragSource class Qt5DragSource *
-vcl/inc/qt5/Qt5Frame.hxx:94
+vcl/inc/qt5/Qt5Frame.hxx:93
     Qt5Frame m_pDropTarget class Qt5DropTarget *
-vcl/inc/qt5/Qt5Frame.hxx:95
+vcl/inc/qt5/Qt5Frame.hxx:94
     Qt5Frame m_bInDrag _Bool
-vcl/inc/qt5/Qt5Frame.hxx:97
+vcl/inc/qt5/Qt5Frame.hxx:96
     Qt5Frame m_bDefaultSize _Bool
-vcl/inc/qt5/Qt5Frame.hxx:98
+vcl/inc/qt5/Qt5Frame.hxx:97
     Qt5Frame m_bDefaultPos _Bool
-vcl/inc/qt5/Qt5Frame.hxx:99
+vcl/inc/qt5/Qt5Frame.hxx:98
     Qt5Frame m_bFullScreen _Bool
-vcl/inc/qt5/Qt5Frame.hxx:100
+vcl/inc/qt5/Qt5Frame.hxx:99
     Qt5Frame m_bFullScreenSpanAll _Bool
-vcl/inc/qt5/Qt5Frame.hxx:101
+vcl/inc/qt5/Qt5Frame.hxx:100
     Qt5Frame m_nRestoreScreen sal_uInt32
-vcl/inc/qt5/Qt5Frame.hxx:102
+vcl/inc/qt5/Qt5Frame.hxx:101
     Qt5Frame m_aRestoreGeometry class QRect
-vcl/inc/qt5/Qt5Frame.hxx:105
+vcl/inc/qt5/Qt5Frame.hxx:104
     Qt5Frame m_ScreenSaverInhibitor class ScreenSaverInhibitor
 vcl/inc/qt5/Qt5Frame.hxx:108
     Qt5Frame m_nInputLanguage LanguageType
@@ -596,9 +594,9 @@ vcl/inc/WidgetThemeLibrary.hxx:103
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:119
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/gdi/jobset.cxx:37
+vcl/source/gdi/jobset.cxx:36
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
-vcl/source/gdi/jobset.cxx:38
+vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cPortName char [32]
 vcl/source/gdi/pdfbuildin_fonts.hxx:32
     vcl::pdf::BuildinFont m_nAscent const int
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 61ac4c995d14..0742eb191a91 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -24,7 +24,7 @@ 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:438
+bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx:454
     bridges::cpp_uno::shared::VtableFactory::Slot fn void *
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:130
     __cxxabiv1::__cxa_exception unexpectedHandler void (*)(void)
@@ -108,7 +108,7 @@ comphelper/qa/container/comphelper_ifcontainer.cxx:44
     (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const
 comphelper/qa/unit/parallelsorttest.cxx:44
     ParallelSortTest mnThreads size_t
-comphelper/source/misc/asyncnotification.cxx:86
+comphelper/source/misc/asyncnotification.cxx:69
     comphelper::EventNotifierImpl pKeepThisAlive std::shared_ptr<AsyncEventNotifierAutoJoin>
 configmgr/source/components.cxx:162
     configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> *
@@ -216,7 +216,7 @@ cppuhelper/source/access_control.cxx:79
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str2 rtl_uString *
-cppuhelper/source/typemanager.cxx:826
+cppuhelper/source/typemanager.cxx:827
     (anonymous namespace)::BaseOffset set_ std::set<OUString>
 cui/source/inc/cfg.hxx:406
     SvxConfigPage m_xDropTargetHelper std::unique_ptr<SvxConfigPageFunctionDropTarget>
@@ -224,7 +224,7 @@ cui/source/inc/cuihyperdlg.hxx:46
     SvxHlinkCtrl aRdOnlyForwarder class SfxStatusForwarder
 cui/source/inc/cuihyperdlg.hxx:77
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
-cui/source/inc/GraphicsTestsDialog.hxx:45
+cui/source/inc/GraphicsTestsDialog.hxx:46
     GraphicsTestsDialog m_xGraphicTestEntries std::vector<std::unique_ptr<GraphicTestEntry> >
 cui/source/inc/screenshotannotationdlg.hxx:29
     ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
@@ -244,15 +244,15 @@ dbaccess/source/ui/app/AppDetailView.hxx:107
     dbaui::OApplicationDetailView m_aExternalMnemonics class MnemonicGenerator
 dbaccess/source/ui/browser/dbloader.cxx:59
     (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:289
+desktop/qa/desktop_lib/test_desktop_lib.cxx:293
     DesktopLOKTest m_bModified _Bool
 desktop/source/app/app.cxx:1223
-    desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
+    desktop::(anonymous namespace)::ExecuteGlobals pCTLLanguageOptions std::unique_ptr<SvtCTLOptions>
 desktop/source/app/app.cxx:1224
     desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx:137
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
-desktop/source/deployment/gui/dp_gui_updatedialog.hxx:150
+desktop/source/deployment/gui/dp_gui_updatedialog.hxx:149
     dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager>
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:101
     dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
@@ -284,23 +284,23 @@ drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:45
     drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool
 drawinglayer/source/attribute/sdrsceneattribute3d.cxx:30
     drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double
-embeddedobj/source/inc/oleembobj.hxx:131
+embeddedobj/source/inc/oleembobj.hxx:133
     OleEmbeddedObject m_nTargetState sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:143
+embeddedobj/source/inc/oleembobj.hxx:145
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:165
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:168
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:169
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:172
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:175
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:176
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:188
+embeddedobj/source/inc/oleembobj.hxx:190
     OleEmbeddedObject m_bFromClipboard _Bool
 emfio/inc/mtftools.hxx:558
     emfio::MtfTools mrclBounds tools::Rectangle
@@ -326,7 +326,7 @@ framework/source/layoutmanager/toolbarlayoutmanager.hxx:271
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:275
     framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-i18nutil/source/utility/paper.cxx:311
+i18nutil/source/utility/paper.cxx:315
     paperword string char *
 include/basegfx/DrawCommands.hxx:81
     gfx::LinearGradientInfo maMatrix basegfx::B2DHomMatrix
@@ -364,7 +364,7 @@ include/framework/addonsoptions.hxx:78
     framework::MergeNotebookBarInstruction aMergeFallback class rtl::OUString
 include/framework/addonsoptions.hxx:79
     framework::MergeNotebookBarInstruction aMergeContext class rtl::OUString
-include/framework/dispatchhelper.hxx:74
+include/framework/dispatchhelper.hxx:73
     framework::DispatchHelper m_xBroadcaster css::uno::Reference<css::uno::XInterface>
 include/framework/framelistanalyzer.hxx:122
     framework::FrameListAnalyzer m_xHelp css::uno::Reference<css::frame::XFrame>
@@ -382,7 +382,7 @@ include/opencl/platforminfo.hxx:30
     OpenCLDeviceInfo mnComputeUnits size_t
 include/opencl/platforminfo.hxx:31
     OpenCLDeviceInfo mnFrequency size_t
-include/sfx2/minfitem.hxx:35
+include/sfx2/minfitem.hxx:38
     SfxMacroInfoItem aCommentText class rtl::OUString
 include/svl/sigstruct.hxx:127
     SignatureInformation hasInconsistentSigningTime _Bool
@@ -398,11 +398,11 @@ include/svx/AccessibilityCheckDialog.hxx:44
     svx::AccessibilityCheckDialog m_aAccessibilityCheckEntries std::vector<std::unique_ptr<AccessibilityCheckEntry> >
 include/svx/bmpmask.hxx:127
     SvxBmpMask aSelItem class SvxBmpMaskSelectItem
-include/svx/fillctrl.hxx:83
+include/svx/fillctrl.hxx:84
     FillControl mxColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
 include/svx/float3d.hxx:202
     Svx3DWin pControllerItem std::unique_ptr<Svx3DCtrlItem>
-include/svx/fmtools.hxx:134
+include/svx/fmtools.hxx:135
     FmXDisposeListener m_pAdapter rtl::Reference<FmXDisposeMultiplexer>
 include/svx/galctrl.hxx:38
     GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
@@ -436,7 +436,7 @@ include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:45
     AddonNotebookBarItem sControlType class rtl::OUString
 include/vcl/notebookbar/NotebookBarAddonsMerger.hxx:46
     AddonNotebookBarItem nWidth sal_uInt16
-include/vcl/opengl/OpenGLContext.hxx:22
+include/vcl/opengl/OpenGLContext.hxx:27
     GLWindow bMultiSampleSupported _Bool
 include/vcl/pdfextoutdevdata.hxx:83
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
@@ -504,11 +504,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:262
+sc/inc/compiler.hxx:266
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:263
+sc/inc/compiler.hxx:267
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:265
+sc/inc/compiler.hxx:269
     ScCompiler::AddInMap pUpper const char *
 sc/inc/compressedarray.hxx:69
     ScCompressedArray::RangeData mnRow2 A
@@ -526,11 +526,11 @@ sc/inc/tabopparams.hxx:37
     ScInterpreterTableOpParams bValid _Bool
 sc/source/core/data/column4.cxx:1342
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
-sc/source/core/data/column.cxx:1410
-    (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
 sc/source/core/data/column.cxx:1411
+    (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
+sc/source/core/data/column.cxx:1412
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags enum ScCloneFlags
-sc/source/core/data/table2.cxx:3874
+sc/source/core/data/table2.cxx:3875
     (anonymous namespace)::OutlineArrayFinder mpArray class ScOutlineArray *
 sc/source/filter/excel/xltoolbar.hxx:24
     TBCCmd A _Bool
@@ -546,9 +546,9 @@ sc/source/filter/excel/xltoolbar.hxx:53
     ScCTB rVisualData std::vector<TBVisualData>
 sc/source/filter/excel/xltools.cxx:103
      smD union sal_math_Double
-sc/source/filter/html/htmlpars.cxx:3023
+sc/source/filter/html/htmlpars.cxx:3029
     (anonymous namespace)::CSSHandler maPropName struct (anonymous namespace)::CSSHandler::MemStr
-sc/source/filter/html/htmlpars.cxx:3024
+sc/source/filter/html/htmlpars.cxx:3030
     (anonymous namespace)::CSSHandler maPropValue struct (anonymous namespace)::CSSHandler::MemStr
 sc/source/filter/inc/exp_op.hxx:47
     ExportBiff5 pExcRoot struct RootData *
@@ -628,15 +628,15 @@ sc/source/ui/vba/vbachartobject.hxx:43
     ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
 sd/inc/sdmod.hxx:133
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:205
+sd/qa/unit/tiledrendering/tiledrendering.cxx:211
     SdTiledRenderingTest m_bFound _Bool
-sd/qa/unit/tiledrendering/tiledrendering.cxx:206
+sd/qa/unit/tiledrendering/tiledrendering.cxx:212
     SdTiledRenderingTest m_nPart sal_Int32
-sd/qa/unit/tiledrendering/tiledrendering.cxx:208
+sd/qa/unit/tiledrendering/tiledrendering.cxx:214
     SdTiledRenderingTest m_aSearchResultPart std::vector<int>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:209
+sd/qa/unit/tiledrendering/tiledrendering.cxx:215
     SdTiledRenderingTest m_nSelectionBeforeSearchResult int
-sd/qa/unit/tiledrendering/tiledrendering.cxx:210
+sd/qa/unit/tiledrendering/tiledrendering.cxx:216
     SdTiledRenderingTest m_nSelectionAfterSearchResult int
 sd/source/ui/dlg/RemoteDialogClientBox.hxx:66
     sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
@@ -644,6 +644,8 @@ 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>
+sd/source/ui/inc/custsdlg.hxx:33
+    SdCustomShowDlg bModified _Bool
 sd/source/ui/inc/fudspord.hxx:50
     sd::FuDisplayOrder mpOverlay std::unique_ptr<SdrDropMarkerOverlay>
 sd/source/ui/inc/navigatr.hxx:143
@@ -674,35 +676,41 @@ sd/source/ui/view/ToolBarManager.cxx:317
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
 sdext/source/presenter/PresenterTimer.cxx:104
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
-sfx2/inc/commandpopup/CommandPopup.hxx:104
+sfx2/inc/commandpopup/CommandPopup.hxx:113
     CommandPopupHandler mpListBox std::unique_ptr<CommandListBox>
 sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
     NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/doc/sfxbasemodel.cxx:449
+sfx2/source/doc/sfxbasemodel.cxx:450
     (anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
-sfx2/source/inc/appdata.hxx:71
+sfx2/source/inc/appdata.hxx:69
     SfxAppData_Impl pDocTopics std::unique_ptr<SfxDdeDocTopics_Impl>
-sfx2/source/inc/appdata.hxx:72
+sfx2/source/inc/appdata.hxx:70
     SfxAppData_Impl pTriggerTopic std::unique_ptr<SfxDdeTriggerTopic_Impl>
-sfx2/source/inc/appdata.hxx:73
+sfx2/source/inc/appdata.hxx:71
     SfxAppData_Impl pDdeService2 std::unique_ptr<DdeService>
-sfx2/source/inc/appdata.hxx:82
+sfx2/source/inc/appdata.hxx:80
     SfxAppData_Impl m_pToolsErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:83
+sfx2/source/inc/appdata.hxx:81
     SfxAppData_Impl m_pSoErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:85
+sfx2/source/inc/appdata.hxx:83
     SfxAppData_Impl m_pSbxErrorHdl std::unique_ptr<SfxErrorHandler>
-sfx2/source/inc/appdata.hxx:88
+sfx2/source/inc/appdata.hxx:86
     SfxAppData_Impl mxAppPickList std::unique_ptr<SfxPickList>
 sfx2/source/inc/splitwin.hxx:52
     SfxSplitWindow pActive VclPtr<class SfxDockingWindow>
-sfx2/source/inc/templdgi.hxx:105
-    SfxCommonTemplateDialog_Impl m_xTreeView1DropTargetHelper std::unique_ptr<TreeViewDropTarget>
-sfx2/source/inc/templdgi.hxx:106
-    SfxCommonTemplateDialog_Impl m_xTreeView2DropTargetHelper std::unique_ptr<TreeViewDropTarget>
-sfx2/source/inc/templdgi.hxx:267
+sfx2/source/inc/StyleList.hxx:221
+    StyleList m_xTreeView1DropTargetHelper std::unique_ptr<TreeViewDropTarget>
+sfx2/source/inc/StyleList.hxx:222
+    StyleList m_xTreeView2DropTargetHelper std::unique_ptr<TreeViewDropTarget>
+sfx2/source/inc/templdgi.hxx:92
+    SfxCommonTemplateDialog_Impl bUpdateFamily _Bool
+sfx2/source/inc/templdgi.hxx:96
+    SfxCommonTemplateDialog_Impl bTreeDrag _Bool
+sfx2/source/inc/templdgi.hxx:107
+    SfxCommonTemplateDialog_Impl m_aStyleListNotify Link<enum SfxHintId, void>
+sfx2/source/inc/templdgi.hxx:226
     SfxTemplateDialog_Impl m_xToolbarDropTargetHelper std::unique_ptr<ToolbarDropTarget>
 sfx2/source/view/classificationcontroller.cxx:73
     sfx2::(anonymous namespace)::ClassificationCategoriesController m_aPropertyListener class sfx2::(anonymous namespace)::ClassificationPropertyListener
@@ -722,7 +730,7 @@ starmath/inc/mathml/mathmlimport.hxx:45
     SmXMLImportWrapper m_bUseHTMLMLEntities _Bool
 starmath/inc/view.hxx:187
     SmCmdBoxWindow aController class SmEditController
-stoc/source/servicemanager/servicemanager.cxx:392
+stoc/source/servicemanager/servicemanager.cxx:393
     (anonymous namespace)::OServiceManager m_SetLoadedFactories (anonymous namespace)::HashSet_Ref
 store/source/storbios.cxx:58
     (anonymous namespace)::OStoreSuperBlock m_nMarked sal_uInt32
@@ -766,7 +774,7 @@ svl/source/crypto/cryptosign.cxx:181
     (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
 svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
-svl/source/undo/undo.cxx:313
+svl/source/undo/undo.cxx:312
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
 svx/inc/galbrws2.hxx:82
     GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
@@ -870,7 +878,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:311
+svx/source/tbxctrls/tbcontrl.cxx:312
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -898,7 +906,7 @@ sw/source/core/inc/unoflatpara.hxx:135
     SwXFlatParagraphIterator m_aFlatParaList std::set<css::uno::Reference<css::text::XFlatParagraph> >
 sw/source/core/layout/dbg_lay.cxx:133
     SwImplProtocol m_aVars std::vector<tools::Long>
-sw/source/core/table/swtable.cxx:2543
+sw/source/core/table/swtable.cxx:2562
     SwTableCellInfo::Impl m_HandledTableBoxes SwTableCellInfo::Impl::TableBoxes_t
 sw/source/core/text/porfld.hxx:65
     SwFieldPortion m_nAttrFieldType sal_uInt16
@@ -962,59 +970,15 @@ unoidl/source/unoidl.cxx:83
     unoidl::(anonymous namespace)::AggregatingCursor seen_ std::set<OUString>
 unoidl/source/unoidlprovider.hxx:32
     unoidl::detail::NestedMap trace std::set<Map>
-unotools/source/config/defaultoptions.cxx:70
-    SvtDefaultOptions_Impl m_aAddinPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:71
-    SvtDefaultOptions_Impl m_aAutoCorrectPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:72
-    SvtDefaultOptions_Impl m_aAutoTextPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:73
-    SvtDefaultOptions_Impl m_aBackupPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:74
-    SvtDefaultOptions_Impl m_aBasicPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:75
-    SvtDefaultOptions_Impl m_aBitmapPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:76
-    SvtDefaultOptions_Impl m_aConfigPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:77
-    SvtDefaultOptions_Impl m_aDictionaryPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:78
-    SvtDefaultOptions_Impl m_aFavoritesPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:79
-    SvtDefaultOptions_Impl m_aFilterPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:80
-    SvtDefaultOptions_Impl m_aGalleryPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:81
-    SvtDefaultOptions_Impl m_aGraphicPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:82
-    SvtDefaultOptions_Impl m_aHelpPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:83
-    SvtDefaultOptions_Impl m_aLinguisticPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:84
-    SvtDefaultOptions_Impl m_aModulePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:85
-    SvtDefaultOptions_Impl m_aPalettePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:86
-    SvtDefaultOptions_Impl m_aPluginPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:87
-    SvtDefaultOptions_Impl m_aTempPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:88
-    SvtDefaultOptions_Impl m_aTemplatePath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:89
-    SvtDefaultOptions_Impl m_aUserConfigPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:90
-    SvtDefaultOptions_Impl m_aWorkPath class rtl::OUString
-unotools/source/config/defaultoptions.cxx:91
-    SvtDefaultOptions_Impl m_aClassificationPath class rtl::OUString
-unoxml/source/rdf/librdf_repository.cxx:469
+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:622
+unoxml/source/rdf/librdf_repository.cxx:623
     (anonymous namespace)::librdf_QuerySelectResult m_pQuery const std::shared_ptr<librdf_query>
 unoxml/source/xpath/nodelist.hxx:51
     XPath::CNodeList m_pXPathObj std::shared_ptr<xmlXPathObject>
 vbahelper/source/vbahelper/vbafillformat.hxx:36
     ScVbaFillFormat m_nForeColor sal_Int32
-vcl/inc/accel.h:33
+vcl/inc/accel.hxx:41
     ImplAccelEntry mpAutoAccel class Accelerator *
 vcl/inc/driverblocklist.hxx:114
     DriverBlocklist::DriverInfo maMsg class rtl::OUString
@@ -1024,7 +988,7 @@ vcl/inc/pdf/BitmapID.hxx:23
     vcl::pdf::BitmapID m_nChecksum BitmapChecksum
 vcl/inc/pdf/BitmapID.hxx:24
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/inc/qt5/Qt5FilePicker.hxx:73
+vcl/inc/qt5/Qt5FilePicker.hxx:74
     Qt5FilePicker m_pLayout class QGridLayout *
 vcl/inc/salmenu.hxx:33
     SalItemParams pMenu VclPtr<class Menu>
@@ -1052,7 +1016,7 @@ vcl/inc/salwtype.hxx:257
     SalSwipeEvent mnVelocityY double
 vcl/inc/scanlinewriter.hxx:35
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/inc/svdata.hxx:454
+vcl/inc/svdata.hxx:457
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/unx/gtk/gtkdata.hxx:217
     DocumentFocusListener m_aRefList o3tl::sorted_vector<css::uno::Reference<css::uno::XInterface> >
@@ -1100,7 +1064,7 @@ vcl/unx/gtk3/glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
 vcl/unx/gtk3/gtkinst.cxx:2087
      in char *
-vcl/unx/gtk3/gtkinst.cxx:19082
+vcl/unx/gtk3/gtkinst.cxx:19164
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection gpointer
@@ -1134,7 +1098,7 @@ xmloff/source/forms/officeforms.hxx:68
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/text/txtimp.cxx:105
     XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper>
-xmlsecurity/inc/certificatechooser.hxx:52
+xmlsecurity/inc/certificatechooser.hxx:53
     CertificateChooser mvUserData std::vector<std::shared_ptr<UserData> >
 xmlsecurity/inc/certificateviewer.hxx:50
     CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP>
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx
index c4d1f876f935..ed528d3042de 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -73,17 +73,17 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
     }
 
     const auto t0 = std::chrono::system_clock::now().time_since_epoch();
-    m_nDay = std::chrono::duration_cast<std::chrono::hours>(t0).count() / 24;
+    sal_Int32 nDay = std::chrono::duration_cast<std::chrono::hours>(t0).count() / 24;
 
     // save this time to the config now instead of in the dtor otherwise we
     // end up with multiple copies of this dialog every time we open a new
     // document if the first one isn't closed
     std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
         comphelper::ConfigurationChanges::create());
-    officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(m_nDay, xChanges);
+    officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(nDay, xChanges);
     xChanges->commit();
 
-    if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
+    if (nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
         m_nCurrentTip++;
 
     UpdateTip();
diff --git a/cui/source/inc/tipofthedaydlg.hxx b/cui/source/inc/tipofthedaydlg.hxx
index f5f0ef999420..69af1996e454 100644
--- a/cui/source/inc/tipofthedaydlg.hxx
+++ b/cui/source/inc/tipofthedaydlg.hxx
@@ -36,7 +36,6 @@ private:
     std::unique_ptr<weld::CustomWeld> m_pPreview;
 
     sal_Int32 m_nCurrentTip;
-    sal_Int32 m_nDay;
     void UpdateTip();
     DECL_LINK(OnNextClick, weld::Button&, void);
     DECL_LINK(OnLinkClick, weld::LinkButton&, bool);
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 94def8eda93c..115d8cd0b039 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -77,13 +77,6 @@ protected:
 
     bool mbReducedDisplayQuality : 1;
 
-    // the complete PropertyValue representation (if already created)
-    uno::Sequence<beans::PropertyValue> mxViewInformation;
-
-    // the extra PropertyValues; not represented by ViewTransformation,
-    // Viewport, VisualizedPage or ViewTime
-    uno::Sequence<beans::PropertyValue> mxExtendedInformation;
-
 public:
     ImpViewInformation2D(const basegfx::B2DHomMatrix& rObjectTransformation,
                          const basegfx::B2DHomMatrix& rViewTransformation,
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index db2414a51fa2..f776a6a7e2ba 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -36,7 +36,6 @@ SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc
     : GenericDialogController(pWindow, "modules/simpress/ui/customslideshows.ui", "CustomSlideShows")
     , rDoc(rDrawDoc)
     , pCustomShowList(nullptr)
-    , bModified(false)
     , m_xLbCustomShows(m_xBuilder->weld_tree_view("customshowlist"))
     , m_xBtnNew(m_xBuilder->weld_button("new"))
     , m_xBtnEdit(m_xBuilder->weld_button("edit"))
@@ -125,9 +124,6 @@ void SdCustomShowDlg::SelectHdl(void const *p)
                 m_xLbCustomShows->append_text( pCustomShowTmp->GetName() );
                 m_xLbCustomShows->select_text( pCustomShowTmp->GetName() );
             }
-
-            if (aDlg.IsModified())
-                bModified = true;
         }
     }
     // edit CustomShow
@@ -146,8 +142,6 @@ void SdCustomShowDlg::SelectHdl(void const *p)
                 m_xLbCustomShows->remove(nPos);
                 m_xLbCustomShows->insert_text(nPos, pCustomShow->GetName());
                 m_xLbCustomShows->select(nPos);
-                if (aDlg.IsModified())
-                    bModified = true;
             }
         }
     }
@@ -160,7 +154,6 @@ void SdCustomShowDlg::SelectHdl(void const *p)
             pCustomShowList->erase( pCustomShowList->begin() + nPos );
             m_xLbCustomShows->remove(nPos);
             m_xLbCustomShows->select(nPos == 0 ? nPos : nPos - 1);
-            bModified = true;
         }
     }
     // copy CustomShow
@@ -219,8 +212,6 @@ void SdCustomShowDlg::SelectHdl(void const *p)
             pCustomShowList->Last();
             m_xLbCustomShows->append_text(pShowTmp->GetName());
             m_xLbCustomShows->select_text(pShowTmp->GetName());
-
-            bModified = true;
         }
     }
     else if( p == m_xLbCustomShows.get() )
@@ -228,8 +219,6 @@ void SdCustomShowDlg::SelectHdl(void const *p)
         int nPos = m_xLbCustomShows->get_selected_index();
         if (nPos != -1)
             pCustomShowList->Seek(nPos);
-
-        bModified = true;
     }
 
     CheckState();
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index aa5f423396de..2de2eb30f509 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -30,7 +30,6 @@ class SdCustomShowDlg : public weld::GenericDialogController
 private:
     SdDrawDocument& rDoc;
     SdCustomShowList* pCustomShowList;
-    bool            bModified;
 
     std::unique_ptr<weld::TreeView> m_xLbCustomShows;
     std::unique_ptr<weld::Button> m_xBtnNew;
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index 259113f62e96..b9d943cf519d 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -77,10 +77,9 @@ using namespace css::uno;
 
 // Constructor
 
-StyleList::StyleList(weld::Builder* pBuilder, std::optional<SfxStyleFamilies> xFamilies,
-                     SfxBindings* pBindings, SfxCommonTemplateDialog_Impl* Parent,
-                     SfxModule* Module, weld::Container* pC, OString treeviewname,
-                     OString flatviewname)
+StyleList::StyleList(weld::Builder* pBuilder, SfxBindings* pBindings,
+                     SfxCommonTemplateDialog_Impl* Parent, weld::Container* pC,
+                     OString treeviewname, OString flatviewname)
     : m_bHierarchical(false)
     , m_bAllowReParentDrop(false)
     , m_bNewByExampleDisabled(false)
@@ -97,13 +96,12 @@ StyleList::StyleList(weld::Builder* pBuilder, std::optional<SfxStyleFamilies> xF
     , m_nActFilter(0)
     , m_xFmtLb(pBuilder->weld_tree_view(flatviewname))
     , m_xTreeBox(pBuilder->weld_tree_view(treeviewname))
-    , m_xStyleFamilies(xFamilies)
     , m_pCurObjShell(nullptr)
     , m_nActFamily(0xffff)
     , m_nAppFilter(SfxStyleSearchBits::Auto)
     , m_pParentDialog(Parent)
     , m_pBindings(pBindings)
-    , m_Module(Module)
+    , m_Module(nullptr)
     , m_nModifier(0)
     , m_pContainer(pC)
 {
@@ -925,7 +923,6 @@ IMPL_LINK(StyleList, EnableTreeDrag, bool, m_bEnable, void)
         m_bAllowReParentDrop = pStyle && pStyle->HasParentSupport() && m_bEnable;
     }
     m_bTreeDrag = m_bEnable;
-    m_pParentDialog->SetEnableDrag(m_bTreeDrag);
 }
 
 // Fill the treeview
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0d17a7cbd4e4..bb27c5e51fb3 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -188,21 +188,18 @@ void SfxCommonTemplateDialog_Impl::connect_stylelist_set_water_can_state(
 SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(SfxBindings* pB, weld::Container* pC, weld::Builder* pBuilder)
     : pBindings(pB)
     , mpContainer(pC)
-    , pModule(nullptr)
     , xModuleManager(frame::ModuleManager::create(::comphelper::getProcessComponentContext()))
     , m_pDeletionWatcher(nullptr)
-    , m_aStyleList(pBuilder, mxStyleFamilies, pB, this, pModule, pC, "treeview", "flatview")
+    , m_aStyleList(pBuilder, pB, this, pC, "treeview", "flatview")
     , mxPreviewCheckbox(pBuilder->weld_check_button("showpreview"))
     , mxFilterLb(pBuilder->weld_combo_box("filter"))
     , nActFamily(0xffff)
     , nActFilter(0)
     , bIsWater(false)
     , bUpdate(false)
-    , bUpdateFamily(false)
     , bWaterDisabled(false)
     , bNewByExampleDisabled(false)
     , bUpdateByExampleDisabled(false)
-    , bTreeDrag(true)
     , m_bWantHierarchical(false)
 {
     mxFilterLb->set_help_id(HID_TEMPLATE_FILTER);
@@ -454,9 +451,6 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx
 {
     m_aStyleList.SetFamilyState(nSlotId, pItem);
     bUpdate = true;
-
-    // If used templates (how the hell you find this out??)
-    bUpdateFamily = true;
 }
 
 // Internal: Perform functions through the Dispatcher
@@ -905,16 +899,12 @@ void SfxCommonTemplateDialog_Impl::SetFamily(SfxStyleFamily const nFamily)
     {
         m_aStyleListSetFamily.Call(nId);
         nActFamily = nId;
-        if ( nId != 0xFFFF )
-            bUpdateFamily = true;
     }
 }
 
 IMPL_LINK(SfxCommonTemplateDialog_Impl, UpdateFamily_Hdl, StyleList&, rStyleList, void)
 {
-    bUpdateFamily = false;
     bWaterDisabled = false;
-    bTreeDrag = true;
     bUpdateByExampleDisabled = false;
 
     if (IsCheckedItem("watercan") &&
diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx
index 99889b15534b..ed228f869c1e 100644
--- a/sfx2/source/inc/StyleList.hxx
+++ b/sfx2/source/inc/StyleList.hxx
@@ -52,8 +52,7 @@ class StyleList : public SfxListener
 
 public:
     // Constructor
-    StyleList(weld::Builder* pBuilder, std::optional<SfxStyleFamilies> xFamilies,
-              SfxBindings* pBindings, SfxCommonTemplateDialog_Impl* Parent, SfxModule* Module,
+    StyleList(weld::Builder* pBuilder, SfxBindings* pBindings, SfxCommonTemplateDialog_Impl* Parent,
               weld::Container* pC, OString treeviewname, OString flatviewname);
 
     // Destructor
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 83192cbd6356..0b9753cccce1 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -74,9 +74,7 @@ protected:
     SfxBindings* pBindings;
 
     weld::Container* mpContainer;
-    SfxModule* pModule;
 
-    std::optional<SfxStyleFamilies> mxStyleFamilies;
     css::uno::Reference<css::frame::XModuleManager2> xModuleManager;
     DeletionWatcher* m_pDeletionWatcher;
 
@@ -89,11 +87,9 @@ protected:
 
     bool bIsWater :1;
     bool bUpdate :1;
-    bool bUpdateFamily :1;
     bool bWaterDisabled :1;
     bool bNewByExampleDisabled :1;
     bool bUpdateByExampleDisabled :1;
-    bool bTreeDrag :1;
     bool m_bWantHierarchical :1;
 
     Link<void*, size_t> m_aStyleListReadResource;
@@ -104,7 +100,6 @@ protected:
     Link<void*, bool> m_aStyleListWaterCan;
     Link<void*, bool> m_aStyleListHasSelectedStyle;
     Link<void*, void> m_aStyleListUpdateFamily;
-    Link<SfxHintId, void> m_aStyleListNotify;
     Link<void*, void> m_aStyleListUpdateStyleDependents;
     Link<bool, void> m_aStyleListEnableTreeDrag;
     Link<void*, void> m_aStyleListEnableDelete;
@@ -172,10 +167,6 @@ public:
 
     // Used in TreeDrag
     void EnableTreeDrag(bool b);
-    // Dialog and StyleList have their own copies of variable bTreeDrag.
-    // When TreeDrag is enabled in StyleList, the value of m_bTreeDrag is updated in StyleList
-    // This function updates the value of bTreeDrag here too.
-    void SetEnableDrag(bool treedrag) { bTreeDrag = treedrag; }
     // It comes into action when a style is created or updated or newmenu is created
     void EnableExample_Impl(sal_uInt16 nId, bool bEnable);
 
@@ -208,7 +199,6 @@ public:
     void connect_stylelist_has_selected_style(const Link<void*, bool>& rLink);
     void connect_stylelist_update_style_dependents(const Link<void*, void>& rLink);
     void connect_stylelist_enable_tree_drag(const Link<bool, void> rLink);
-    void connect_stylelist_notify(const Link<SfxHintId, void> rLink) { m_aStyleListNotify = rLink; }
     void connect_stylelist_enable_delete(const Link<void*, void> rLink);
     void connect_stylelist_set_water_can_state(const Link<const SfxBoolItem*, void> rLink);
     void connect_set_family(const Link<sal_uInt16, void> rLink) { m_aStyleListSetFamily = rLink; }


More information about the Libreoffice-commits mailing list