loplugin:unusedfields

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

9 files changed, 206 insertions, 214 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index ed6a78ccae1c..4886b9fb3f2c 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -16,11 +16,11 @@ canvas/source/vcl/impltools.hxx:114
     vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
 chart2/source/controller/accessibility/AccessibleChartShape.hxx:78
     chart::AccessibleChartShape m_aShapeTreeInfo ::accessibility::AccessibleShapeTreeInfo
-chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:68
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:70
     chart::ThreeD_SceneIllumination_TabPage m_aModelChangeListener class chart::ModifyListenerCallBack
-chart2/source/controller/inc/dlg_View3D.hxx:43
+chart2/source/controller/inc/dlg_View3D.hxx:46
     chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper
-chart2/source/controller/inc/RangeSelectionListener.hxx:62
+chart2/source/controller/inc/RangeSelectionListener.hxx:61
     chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
 connectivity/source/commontools/RowFunctionParser.cxx:372
     connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
@@ -154,7 +154,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:2832
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2902
       class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:55
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
@@ -180,7 +180,7 @@ helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basic/basmgr.hxx:56
     BasicError nReason enum BasicErrorReason
-include/drawinglayer/primitive2d/textlayoutdevice.hxx:55
+include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
 include/filter/msfilter/svdfppt.hxx:877
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
@@ -196,7 +196,7 @@ include/oox/export/shapes.hxx:102
     oox::drawingml::ShapeExport maShapeMap oox::drawingml::ShapeExport::ShapeHashMap
 include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
-include/sfx2/classificationhelper.hxx:123
+include/sfx2/classificationhelper.hxx:132
     sfx::ClassificationKeyCreator m_ePolicyType const enum SfxClassificationPolicyType
 include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
@@ -324,9 +324,9 @@ include/sfx2/msg.hxx:147
     SfxType23 pType const std::type_info *
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
-include/svx/ClassificationDialog.hxx:29
+include/svx/ClassificationDialog.hxx:35
     svx::ClassificationDialog maInternationalHelper class SfxClassificationHelper
-include/svx/ClassificationDialog.hxx:31
+include/svx/ClassificationDialog.hxx:37
     svx::ClassificationDialog m_bPerParagraph const _Bool
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
@@ -476,13 +476,13 @@ sc/inc/compiler.hxx:266
     ScCompiler::AddInMap pUpper const char *
 sc/inc/token.hxx:403
     SingleDoubleRefModifier aDub struct ScComplexRefData
-sc/source/core/data/document.cxx:1242
+sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1243
+sc/source/core/data/document.cxx:1241
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
-sc/source/filter/html/htmlpars.cxx:3019
+sc/source/filter/html/htmlpars.cxx:3018
     (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3020
+sc/source/filter/html/htmlpars.cxx:3019
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/htmlpars.hxx:613
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
@@ -490,9 +490,9 @@ sc/source/filter/inc/sheetdatacontext.hxx:51
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
 sc/source/filter/inc/XclImpChangeTrack.hxx:56
     XclImpChangeTrack xInStrm tools::SvRef<SotStorageStream>
-sc/source/filter/inc/xetable.hxx:1004
-    XclExpCellTable maArrayBfr class XclExpArrayBuffer
 sc/source/filter/inc/xetable.hxx:1005
+    XclExpCellTable maArrayBfr class XclExpArrayBuffer
+sc/source/filter/inc/xetable.hxx:1006
     XclExpCellTable maShrfmlaBfr class XclExpShrfmlaBuffer
 sc/source/filter/inc/xiescher.hxx:1206
     XclImpDffPropSet maDummyStrm class SvMemoryStream
@@ -510,7 +510,7 @@ sc/source/filter/xml/xmlexternaltabi.hxx:111
     ScXMLExternalRefCellContext mnCellType sal_Int16
 sc/source/filter/xml/xmltransformationi.hxx:155
     ScXMLDateTimeContext aType class rtl::OUString
-sc/source/ui/inc/acredlin.hxx:50
+sc/source/ui/inc/acredlin.hxx:52
     ScAcceptChgDlg aReOpenIdle class Idle
 sc/source/ui/inc/msgpool.hxx:35
     ScMessagePool aGlobalStringItem class SfxStringItem
@@ -536,13 +536,13 @@ sc/source/ui/inc/notemark.hxx:46
     ScNoteMarker m_aTimer class Timer
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
-sc/source/ui/inc/xmlsourcedlg.hxx:62
+sc/source/ui/inc/xmlsourcedlg.hxx:61
     ScXMLSourceDlg maCustomCompare struct CustomCompare
 sccomp/source/solver/DifferentialEvolution.hxx:35
     DifferentialEvolutionAlgorithm maRandomDevice std::random_device
 sccomp/source/solver/ParticelSwarmOptimization.hxx:56
     ParticleSwarmOptimizationAlgorithm maRandomDevice std::random_device
-scripting/source/stringresource/stringresource.cxx:1278
+scripting/source/stringresource/stringresource.cxx:1277
     stringresource::(anonymous namespace)::BinaryInput m_aData Sequence<sal_Int8>
 sd/inc/anminfo.hxx:52
     SdAnimationInfo maSecondSoundFile class rtl::OUString
@@ -612,7 +612,9 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/source/dialog/basedlgs.cxx:47
+sfx2/inc/sidebar/DeckTitleBar.hxx:54
+    sfx2::sidebar::DeckTitleBar maGrip class BitmapEx
+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
@@ -648,17 +650,17 @@ starmath/source/accessibility.hxx:270
     SmEditSource rEditAcc class SmEditAccessible &
 svgio/inc/svgcharacternode.hxx:85
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
-svl/source/crypto/cryptosign.cxx:124
+svl/source/crypto/cryptosign.cxx:122
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:125
+svl/source/crypto/cryptosign.cxx:123
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:126
+svl/source/crypto/cryptosign.cxx:124
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:284
+svl/source/crypto/cryptosign.cxx:282
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:285
+svl/source/crypto/cryptosign.cxx:283
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
-svx/inc/GalleryControl.hxx:43
+svx/inc/GalleryControl.hxx:42
     svx::sidebar::GalleryControl mpGallery class Gallery *
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
     (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
@@ -714,7 +716,7 @@ sw/inc/unosett.hxx:145
     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:4584
+sw/qa/extras/uiwriter/uiwriter.cxx:4587
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
@@ -724,10 +726,12 @@ sw/source/core/layout/dbg_lay.cxx:179
     SwImplEnterLeave m_nAction enum DbgAction
 sw/source/core/text/inftxt.cxx:565
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
-sw/source/core/text/inftxt.hxx:682
+sw/source/core/text/inftxt.hxx:675
     SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:142
     (anonymous namespace)::SwFieldSlot aText class rtl::OUString
+sw/source/core/text/redlnitr.hxx:78
+    SwRedlineItr m_nNdIdx const sal_uLong
 sw/source/uibase/docvw/romenu.hxx:34
     SwReadOnlyPopup m_aBuilder class VclBuilder
 sw/source/uibase/docvw/romenu.hxx:46
@@ -736,9 +740,9 @@ sw/source/uibase/docvw/romenu.hxx:50
     SwReadOnlyPopup m_nReadonlyBackgroundtogallery sal_uInt16
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:297
+sw/source/uibase/inc/conttree.hxx:300
     SwGlobalTree m_aDropTargetHelper class SwGlobalTreeDropTarget
-sw/source/uibase/inc/olmenu.hxx:78
+sw/source/uibase/inc/olmenu.hxx:77
     SwSpellPopup m_aBuilder class VclBuilder
 sw/source/uibase/inc/swuicnttab.hxx:240
     SwTokenWindow m_aAdjustPositionsIdle class Idle
@@ -768,17 +772,11 @@ vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
 vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
-vcl/inc/opengl/zone.hxx:33
+vcl/inc/opengl/zone.hxx:35
     OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/salmenu.hxx:42
-    SalMenuButtonItem mnId sal_uInt16
-vcl/inc/salmenu.hxx:43
-    SalMenuButtonItem maImage class Image
-vcl/inc/salmenu.hxx:44
-    SalMenuButtonItem maToolTipText class rtl::OUString
-vcl/inc/salvtables.hxx:532
+vcl/inc/salvtables.hxx:540
     SalInstanceEntry m_aTextFilter class WeldTextFilter
-vcl/inc/salvtables.hxx:914
+vcl/inc/salvtables.hxx:922
     SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
 vcl/inc/svimpbox.hxx:120
     SvImpLBox m_aFctSet class ImpLBSelEng
@@ -826,19 +824,19 @@ vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:4857
+vcl/unx/gtk3/gtk3gtkinst.cxx:4883
     (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:5230
+vcl/unx/gtk3/gtk3gtkinst.cxx:5256
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5374
+vcl/unx/gtk3/gtk3gtkinst.cxx:5400
     (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5382
+vcl/unx/gtk3/gtk3gtkinst.cxx:5408
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
-vcl/unx/gtk3/gtk3gtkinst.cxx:7673
+vcl/unx/gtk3/gtk3gtkinst.cxx:7743
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkContainer *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13987
+vcl/unx/gtk3/gtk3gtkinst.cxx:14109
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13993
+vcl/unx/gtk3/gtk3gtkinst.cxx:14115
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 39612deb7006..9bc5157fa857 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -176,25 +176,25 @@ editeng/source/editeng/impedit.hxx:508
     ImpEditEngine maColorConfig svtools::ColorConfig
 embeddedobj/source/inc/commonembobj.hxx:103
     OCommonEmbeddedObject m_aClassName class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:124
+embeddedobj/source/inc/oleembobj.hxx:123
     OleEmbeddedObject m_pOleComponent class OleComponent *
-embeddedobj/source/inc/oleembobj.hxx:144
+embeddedobj/source/inc/oleembobj.hxx:143
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:165
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:166
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:168
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:172
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:173
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:175
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:183
+embeddedobj/source/inc/oleembobj.hxx:182
     OleEmbeddedObject m_aLinkURL class rtl::OUString
-embeddedobj/source/inc/oleembobj.hxx:189
+embeddedobj/source/inc/oleembobj.hxx:188
     OleEmbeddedObject m_bFromClipboard _Bool
 extensions/source/propctrlr/eformshelper.hxx:61
     pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
@@ -317,7 +317,7 @@ include/svx/svdoedge.hxx:160
 include/svx/svdpntv.hxx:154
     SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -397,7 +397,7 @@ sc/inc/attarray.hxx:68
 sc/inc/compiler.hxx:129
     ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
 sc/inc/compiler.hxx:130
-    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:127:9)
+    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:127:9)
 sc/inc/compiler.hxx:135
     ScRawToken::(anonymous) pMat class ScMatrix *
 sc/inc/formulagroup.hxx:39
@@ -406,7 +406,7 @@ sc/inc/reordermap.hxx:21
     sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
 sc/source/core/inc/adiasync.hxx:42
     ScAddInAsync::(anonymous) pStr class rtl::OUString *
-sc/source/core/inc/interpre.hxx:102
+sc/source/core/inc/interpre.hxx:101
     ScTokenStack pPointer const formula::FormulaToken *[512]
 sc/source/filter/excel/xltoolbar.cxx:28
     (anonymous namespace)::MSOExcelCommandConvertor msoToOOcmd IdToString
@@ -442,9 +442,9 @@ sc/source/filter/inc/xltracer.hxx:82
     XclTracer mbEnabled _Bool
 sc/source/filter/xml/xmlcelli.hxx:96
     ScXMLTableRowCellContext mbEditEngineHasText _Bool
-sc/source/ui/inc/csvruler.hxx:39
+sc/source/ui/inc/csvruler.hxx:38
     ScCsvRuler maBackgrDev ScopedVclPtrInstance<class VirtualDevice>
-sc/source/ui/inc/csvruler.hxx:40
+sc/source/ui/inc/csvruler.hxx:39
     ScCsvRuler maRulerDev ScopedVclPtrInstance<class VirtualDevice>
 sc/source/ui/inc/inputhdl.hxx:67
     ScInputHandler pColumnData std::unique_ptr<ScTypedCaseStrSet>
@@ -506,11 +506,11 @@ sot/source/sdstor/ucbstorage.cxx:403
     UCBStorageStream_Impl m_aKey class rtl::OString
 store/source/storbios.cxx:59
     (anonymous namespace)::OStoreSuperBlock m_aMarked (anonymous namespace)::OStoreSuperBlock::L
-svl/source/crypto/cryptosign.cxx:283
+svl/source/crypto/cryptosign.cxx:281
     (anonymous namespace)::PKIStatusInfo status SECItem
-svl/source/crypto/cryptosign.cxx:303
+svl/source/crypto/cryptosign.cxx:301
     (anonymous namespace)::TimeStampResp status struct (anonymous namespace)::PKIStatusInfo
-svl/source/crypto/cryptosign.cxx:304
+svl/source/crypto/cryptosign.cxx:302
     (anonymous namespace)::TimeStampResp timeStampToken SECItem
 svl/source/misc/strmadpt.cxx:51
     SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1]
@@ -518,21 +518,21 @@ svl/source/uno/pathservice.cxx:37
     (anonymous namespace)::PathService m_aOptions class SvtPathOptions
 svtools/source/control/tabbar.cxx:200
     ImplTabBarItem maHelpId class rtl::OString
-svtools/source/dialogs/insdlg.cxx:46
+svtools/source/dialogs/insdlg.cxx:54
     (anonymous namespace)::OleObjectDescriptor cbSize sal_uInt32
-svtools/source/dialogs/insdlg.cxx:47
+svtools/source/dialogs/insdlg.cxx:55
     (anonymous namespace)::OleObjectDescriptor clsid ClsId
-svtools/source/dialogs/insdlg.cxx:48
+svtools/source/dialogs/insdlg.cxx:56
     (anonymous namespace)::OleObjectDescriptor dwDrawAspect sal_uInt32
-svtools/source/dialogs/insdlg.cxx:49
-    (anonymous namespace)::OleObjectDescriptor sizel class Size
-svtools/source/dialogs/insdlg.cxx:50
-    (anonymous namespace)::OleObjectDescriptor pointl class Point
-svtools/source/dialogs/insdlg.cxx:51
+svtools/source/dialogs/insdlg.cxx:57
+    (anonymous namespace)::OleObjectDescriptor sizel SIZEL
+svtools/source/dialogs/insdlg.cxx:58
+    (anonymous namespace)::OleObjectDescriptor pointl POINTL
+svtools/source/dialogs/insdlg.cxx:59
     (anonymous namespace)::OleObjectDescriptor dwStatus sal_uInt32
-svtools/source/dialogs/insdlg.cxx:52
+svtools/source/dialogs/insdlg.cxx:60
     (anonymous namespace)::OleObjectDescriptor dwFullUserTypeName sal_uInt32
-svtools/source/dialogs/insdlg.cxx:53
+svtools/source/dialogs/insdlg.cxx:61
     (anonymous namespace)::OleObjectDescriptor dwSrcOfCopy sal_uInt32
 svtools/source/table/gridtablerenderer.cxx:71
     svt::table::(anonymous namespace)::CachedSortIndicator m_sortAscending class BitmapEx
@@ -552,7 +552,7 @@ svx/source/inc/gridcell.hxx:527
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/gridcell.hxx:528
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/inc/svdpdf.hxx:71
+svx/source/inc/svdpdf.hxx:70
     ImpSdrPdfImport maDash class XDash
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
@@ -562,7 +562,7 @@ sw/inc/calc.hxx:204
     SwCalc m_aSysLocale class SvtSysLocale
 sw/inc/dpage.hxx:35
     SwDPage m_pGridLst std::unique_ptr<SdrPageGridFrameList>
-sw/inc/hints.hxx:241
+sw/inc/hints.hxx:268
     SwAttrSetChg m_bDelSet _Bool
 sw/inc/shellio.hxx:147
     SwReader mpStg tools::SvRef<SotStorage>
@@ -590,11 +590,11 @@ sw/source/core/text/atrhndl.hxx:48
     SwAttrHandler m_pFnt std::unique_ptr<SwFont>
 sw/source/core/text/inftxt.cxx:565
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
-sw/source/core/text/redlnitr.hxx:76
+sw/source/core/text/redlnitr.hxx:75
     SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
-sw/source/filter/html/htmltab.cxx:2830
+sw/source/filter/html/htmltab.cxx:2829
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
-sw/source/filter/inc/rtf.hxx:32
+sw/source/filter/inc/rtf.hxx:33
     RTFSurround::(anonymous) nVal sal_uInt8
 sw/source/filter/writer/writer.cxx:68
     Writer_Impl pFileNameMap std::unique_ptr<std::map<OUString, OUString> >
@@ -676,17 +676,17 @@ unoidl/source/unoidl-read.cxx:147
     (anonymous namespace)::Entity dependencies std::set<OUString>
 unoidl/source/unoidl-read.cxx:148
     (anonymous namespace)::Entity interfaceDependencies std::set<OUString>
-unoidl/source/unoidlprovider.cxx:86
+unoidl/source/unoidlprovider.cxx:87
     unoidl::detail::(anonymous namespace)::Memory16 byte unsigned char [2]
-unoidl/source/unoidlprovider.cxx:96
+unoidl/source/unoidlprovider.cxx:97
     unoidl::detail::(anonymous namespace)::Memory32 byte unsigned char [4]
-unoidl/source/unoidlprovider.cxx:127
+unoidl/source/unoidlprovider.cxx:128
     unoidl::detail::(anonymous namespace)::Memory64 byte unsigned char [8]
-unoidl/source/unoidlprovider.cxx:455
-    unoidl::detail::MapEntry name struct unoidl::detail::(anonymous namespace)::Memory32
 unoidl/source/unoidlprovider.cxx:456
+    unoidl::detail::MapEntry name struct unoidl::detail::(anonymous namespace)::Memory32
+unoidl/source/unoidlprovider.cxx:457
     unoidl::detail::MapEntry data struct unoidl::detail::(anonymous namespace)::Memory32
-unotools/source/config/pathoptions.cxx:84
+unotools/source/config/pathoptions.cxx:85
     SvtPathOptions_Impl m_aEmptyString class rtl::OUString
 unotools/source/config/saveopt.cxx:82
     (anonymous namespace)::SvtSaveOptions_Impl bROUserAutoSave _Bool
@@ -972,7 +972,7 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:75
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1637
+vcl/unx/gtk3/gtk3gtkinst.cxx:1650
      out gpointer *
 writerfilter/source/ooxml/OOXMLFactory.hxx:57
     writerfilter::ooxml::AttributeInfo m_nToken writerfilter::Token_t
@@ -980,9 +980,9 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:58
     writerfilter::ooxml::AttributeInfo m_nResource enum writerfilter::ooxml::ResourceType
 writerfilter/source/ooxml/OOXMLFactory.hxx:59
     writerfilter::ooxml::AttributeInfo m_nRef Id
-xmloff/inc/MultiPropertySetHelper.hxx:78
+xmloff/inc/MultiPropertySetHelper.hxx:86
     MultiPropertySetHelper aEmptyAny css::uno::Any
-xmloff/source/chart/SchXMLChartContext.cxx:444
+xmloff/source/chart/SchXMLChartContext.cxx:443
     (anonymous namespace)::NewDonutSeries msStyleName class rtl::OUString
 xmloff/source/chart/SchXMLChartContext.hxx:52
     SeriesDefaultsAndStyles maErrorIndicatorDefault css::uno::Any
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index e5e810fb8ce1..ff36b9e4d6b3 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -6,9 +6,9 @@ canvas/source/vcl/canvasbitmap.hxx:113
     vclcanvas::CanvasBitmap mxDevice css::uno::Reference<css::rendering::XGraphicDevice>
 canvas/source/vcl/impltools.hxx:114
     vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
-chart2/source/controller/inc/RangeSelectionListener.hxx:62
+chart2/source/controller/inc/RangeSelectionListener.hxx:61
     chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
-chart2/source/inc/ModifyListenerCallBack.hxx:51
+chart2/source/inc/ModifyListenerCallBack.hxx:53
     chart::ModifyListenerCallBack m_xModifyListener css::uno::Reference<css::util::XModifyListener>
 comphelper/source/container/enumerablemap.cxx:297
     comphelper::(anonymous namespace)::MapEnumeration m_xKeepMapAlive Reference<class com::sun::star::uno::XInterface>
@@ -24,7 +24,7 @@ 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:2832
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2902
       class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:49
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
@@ -34,7 +34,7 @@ helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basegfx/DrawCommands.hxx:142
     gfx::DrawPath mpFillGradient std::shared_ptr<GradientInfo>
-include/drawinglayer/primitive2d/textlayoutdevice.hxx:55
+include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
     drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class SolarMutexGuard
 include/editeng/unotext.hxx:605
     SvxUnoTextRangeEnumeration mxParentText css::uno::Reference<css::text::XText>
@@ -170,13 +170,13 @@ include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
     SfxType23 pType const std::type_info *
-include/svtools/genericunodialog.hxx:155
+include/svtools/genericunodialog.hxx:154
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
-include/svtools/unoevent.hxx:163
+include/svtools/unoevent.hxx:162
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/unotest/macros_test.hxx:84
+include/unotest/macros_test.hxx:86
     unotest::MacrosTest mpDll std::unique_ptr<BasicDLL>
 include/vcl/commandevent.hxx:310
     CommandGestureData mfX const double
@@ -286,13 +286,13 @@ 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
-sc/source/core/data/document.cxx:1242
+sc/source/core/data/document.cxx:1240
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
-sc/source/core/data/document.cxx:1243
+sc/source/core/data/document.cxx:1241
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk class ScBulkBroadcast
-sc/source/filter/html/htmlpars.cxx:3019
+sc/source/filter/html/htmlpars.cxx:3018
     (anonymous namespace)::CSSHandler::MemStr mp const char *
-sc/source/filter/html/htmlpars.cxx:3020
+sc/source/filter/html/htmlpars.cxx:3019
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:51
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
@@ -326,7 +326,11 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/source/dialog/basedlgs.cxx:47
+sfx2/inc/sidebar/DeckTitleBar.hxx:54
+    sfx2::sidebar::DeckTitleBar maGrip class BitmapEx
+sfx2/inc/sidebar/TitleBar.hxx:56
+    sfx2::sidebar::TitleBar mxToolBoxController std::unique_ptr<ToolbarUnoDispatcher>
+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
@@ -344,17 +348,15 @@ starmath/inc/view.hxx:216
     SmViewShell maGraphicController class SmGraphicController
 starmath/source/accessibility.hxx:270
     SmEditSource rEditAcc class SmEditAccessible &
-starmath/source/mathmlimport.hxx:69
-    SmXMLImport pColorTokenMap std::unique_ptr<SvXMLTokenMap>
-svl/source/crypto/cryptosign.cxx:124
+svl/source/crypto/cryptosign.cxx:122
     (anonymous namespace)::Extension extnID SECItem
-svl/source/crypto/cryptosign.cxx:125
+svl/source/crypto/cryptosign.cxx:123
     (anonymous namespace)::Extension critical SECItem
-svl/source/crypto/cryptosign.cxx:126
+svl/source/crypto/cryptosign.cxx:124
     (anonymous namespace)::Extension extnValue SECItem
-svl/source/crypto/cryptosign.cxx:284
+svl/source/crypto/cryptosign.cxx:282
     (anonymous namespace)::PKIStatusInfo statusString SECItem
-svl/source/crypto/cryptosign.cxx:285
+svl/source/crypto/cryptosign.cxx:283
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
@@ -374,7 +376,7 @@ sw/source/core/layout/dbg_lay.cxx:179
     SwImplEnterLeave m_nAction enum DbgAction
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
-sw/source/uibase/inc/conttree.hxx:297
+sw/source/uibase/inc/conttree.hxx:300
     SwGlobalTree m_aDropTargetHelper class SwGlobalTreeDropTarget
 sw/source/uibase/inc/swuicnttab.hxx:240
     SwTokenWindow m_aAdjustPositionsIdle class Idle
@@ -384,15 +386,15 @@ sw/source/uibase/inc/unodispatch.hxx:45
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard class SolarMutexGuard
 toolkit/source/awt/stylesettings.cxx:94
     toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard class SolarMutexGuard
-unoidl/source/unoidlprovider.cxx:672
-    unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider>
 unoidl/source/unoidlprovider.cxx:673
+    unoidl::detail::(anonymous namespace)::UnoidlCursor reference1_ rtl::Reference<UnoidlProvider>
+unoidl/source/unoidlprovider.cxx:674
     unoidl::detail::(anonymous namespace)::UnoidlCursor reference2_ rtl::Reference<UnoidlModuleEntity>
 vcl/inc/opengl/gdiimpl.hxx:52
     TextureCombo mpTexture std::unique_ptr<OpenGLTexture>
 vcl/inc/opengl/gdiimpl.hxx:53
     TextureCombo mpMask std::unique_ptr<OpenGLTexture>
-vcl/inc/opengl/zone.hxx:33
+vcl/inc/opengl/zone.hxx:35
     OpenGLVCLContextZone aZone class OpenGLZone
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
@@ -426,11 +428,11 @@ vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx:31
     (anonymous namespace)::HyperLink atk_hyper_link const AtkHyperlink
 vcl/unx/gtk3/gtk3gloactiongroup.cxx:27
     (anonymous namespace)::GLOAction parent_instance GObject
-vcl/unx/gtk3/gtk3gtkinst.cxx:5230
+vcl/unx/gtk3/gtk3gtkinst.cxx:5256
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/gtk3/gtk3gtkinst.cxx:5374
+vcl/unx/gtk3/gtk3gtkinst.cxx:5400
     (anonymous namespace)::CustomCellRendererSurface parent GtkCellRendererText
-vcl/unx/gtk3/gtk3gtkinst.cxx:5382
+vcl/unx/gtk3/gtk3gtkinst.cxx:5408
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index d84c91ef9d48..5d16d0717968 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -90,7 +90,7 @@ chart2/source/controller/dialogs/DialogModel.cxx:232
     (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt (anonymous namespace)::lcl_RolesWithRangeAppend::tContainerType *
 chart2/source/controller/inc/ChartController.hxx:412
     chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper>
-chart2/source/controller/inc/dlg_View3D.hxx:50
+chart2/source/controller/inc/dlg_View3D.hxx:53
     chart::View3DDialog m_xIllumination std::unique_ptr<ThreeD_SceneIllumination_TabPage>
 chart2/source/controller/main/ElementSelector.hxx:37
     chart::ListBoxEntryData nHierarchyDepth sal_Int32
@@ -104,8 +104,6 @@ codemaker/source/javamaker/classfile.cxx:508
      floatBytes float
 codemaker/source/javamaker/classfile.cxx:540
      doubleBytes double
-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
@@ -180,6 +178,8 @@ cppu/source/uno/copy.hxx:38
     cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32
 cppu/source/uno/copy.hxx:39
     cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32
+cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:45
+    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *
 cppuhelper/source/access_control.cxx:79
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:80
@@ -210,7 +210,7 @@ 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:237
+desktop/qa/desktop_lib/test_desktop_lib.cxx:280
     DesktopLOKTest m_bModified _Bool
 desktop/source/app/app.cxx:1209
     desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
@@ -250,23 +250,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:132
+embeddedobj/source/inc/oleembobj.hxx:131
     OleEmbeddedObject m_nTargetState sal_Int32
-embeddedobj/source/inc/oleembobj.hxx:144
+embeddedobj/source/inc/oleembobj.hxx:143
     OleEmbeddedObject m_xClosePreventer css::uno::Reference<css::util::XCloseListener>
-embeddedobj/source/inc/oleembobj.hxx:166
+embeddedobj/source/inc/oleembobj.hxx:165
     OleEmbeddedObject m_bHasSizeToSet _Bool
-embeddedobj/source/inc/oleembobj.hxx:167
+embeddedobj/source/inc/oleembobj.hxx:166
     OleEmbeddedObject m_aSizeToSet css::awt::Size
-embeddedobj/source/inc/oleembobj.hxx:168
+embeddedobj/source/inc/oleembobj.hxx:167
     OleEmbeddedObject m_nAspectToSet sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:173
+embeddedobj/source/inc/oleembobj.hxx:172
     OleEmbeddedObject m_bGotStatus _Bool
-embeddedobj/source/inc/oleembobj.hxx:174
+embeddedobj/source/inc/oleembobj.hxx:173
     OleEmbeddedObject m_nStatus sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:175
+embeddedobj/source/inc/oleembobj.hxx:174
     OleEmbeddedObject m_nStatusAspect sal_Int64
-embeddedobj/source/inc/oleembobj.hxx:189
+embeddedobj/source/inc/oleembobj.hxx:188
     OleEmbeddedObject m_bFromClipboard _Bool
 emfio/inc/mtftools.hxx:515
     emfio::MtfTools mrclBounds tools::Rectangle
@@ -278,11 +278,11 @@ framework/inc/services/layoutmanager.hxx:248
     framework::LayoutManager m_bGlobalSettings _Bool
 framework/inc/services/layoutmanager.hxx:262
     framework::LayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
-framework/inc/uielement/langselectionmenucontroller.hxx:71
+framework/inc/uielement/langselectionmenucontroller.hxx:70
     framework::LanguageSelectionMenuController m_xMenuDispatch_Lang css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/langselectionmenucontroller.hxx:73
+framework/inc/uielement/langselectionmenucontroller.hxx:72
     framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/langselectionmenucontroller.hxx:75
+framework/inc/uielement/langselectionmenucontroller.hxx:74
     framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
@@ -344,13 +344,13 @@ include/sfx2/minfitem.hxx:35
     SfxMacroInfoItem aCommentText class rtl::OUString
 include/sfx2/templdlg.hxx:42
     SfxTemplatePanelControl pImpl std::unique_ptr<SfxTemplateDialog_Impl>
-include/svtools/brwbox.hxx:327
+include/svtools/brwbox.hxx:326
     BrowseBox::CursorMoveAttempt m_nCol sal_Int32
-include/svtools/brwbox.hxx:328
+include/svtools/brwbox.hxx:327
     BrowseBox::CursorMoveAttempt m_nRow sal_Int32
-include/svtools/brwbox.hxx:329
+include/svtools/brwbox.hxx:328
     BrowseBox::CursorMoveAttempt m_bScrolledToReachCell _Bool
-include/svtools/ctrltool.hxx:150
+include/svtools/ctrltool.hxx:149
     FontList mpDev2 VclPtr<class OutputDevice>
 include/svx/AccessibilityCheckDialog.hxx:44
     svx::AccessibilityCheckDialog m_aAccessibilityCheckEntries std::vector<std::unique_ptr<AccessibilityCheckEntry> >
@@ -366,7 +366,7 @@ include/svx/galctrl.hxx:38
     GalleryPreview mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 include/svx/galctrl.hxx:91
     GalleryIconView mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
-include/svx/gridctrl.hxx:265
+include/svx/gridctrl.hxx:258
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaRefItem mxRef rtl::Reference<reference_type>
@@ -376,8 +376,6 @@ include/svx/srchdlg.hxx:166
     SvxSearchDialog pOptionsController std::unique_ptr<SvxSearchController>
 include/svx/svdmrkv.hxx:100
     SdrMarkView mpMarkingSubSelectionOverlay std::unique_ptr<MarkingSubSelectionOverlay>
-include/svx/svdograf.hxx:95
-    SdrGrafObj aReferer class rtl::OUString
 include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) H double
 include/svx/viewpt3d.hxx:62
@@ -388,7 +386,7 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:159
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/menu.hxx:456
+include/vcl/menu.hxx:457
     MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonNotebookBarItem sTarget class rtl::OUString
@@ -420,17 +418,19 @@ include/vcl/vclenum.hxx:202
     ItalicMatrix yx double
 include/vcl/vclenum.hxx:202
     ItalicMatrix yy double
-include/xmloff/shapeimport.hxx:180
+include/xmloff/shapeimport.hxx:178
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
-include/xmloff/shapeimport.hxx:181
+include/xmloff/shapeimport.hxx:179
     SdXML3DSceneAttributesHelper mbVPNUsed _Bool
-include/xmloff/shapeimport.hxx:182
+include/xmloff/shapeimport.hxx:180
     SdXML3DSceneAttributesHelper mbVUPUsed _Bool
+include/xmloff/xmlimp.hxx:232
+    SvXMLImport maAttrList rtl::Reference<comphelper::AttributeList>
 io/source/stm/odata.cxx:243
     io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
 io/source/stm/odata.cxx:243
     io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
-jvmfwk/inc/vendorbase.hxx:175
+jvmfwk/inc/vendorbase.hxx:171
     jfw_plugin::VendorBase m_sArch class rtl::OUString
 l10ntools/inc/common.hxx:31
     common::HandledArgs m_bUTF8BOM _Bool
@@ -460,7 +460,7 @@ sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
 sal/rtl/alloc_arena.hxx:36
     rtl_arena_stat_type m_mem_alloc sal_Size
-sal/rtl/math.cxx:953
+sal/rtl/math.cxx:1031
      md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:98
     (anonymous namespace)::ImplUTF7ToUCContextData mbShifted _Bool
@@ -494,7 +494,7 @@ sc/inc/pivot.hxx:79
     ScDPLabelData mbIsValue _Bool
 sc/inc/scmatrix.hxx:118
     ScMatrix mbCloneIfConst _Bool
-sc/inc/scmod.hxx:102
+sc/inc/scmod.hxx:101
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
 sc/inc/tabopparams.hxx:38
     ScInterpreterTableOpParams bValid _Bool
@@ -520,11 +520,11 @@ sc/source/filter/excel/xltoolbar.hxx:54
     ScCTB rVisualData std::vector<TBVisualData>
 sc/source/filter/excel/xltools.cxx:102
      smD union sal_math_Double
-sc/source/filter/html/htmlpars.cxx:3027
+sc/source/filter/html/htmlpars.cxx:3026
     (anonymous namespace)::CSSHandler maPropName struct (anonymous namespace)::CSSHandler::MemStr
-sc/source/filter/html/htmlpars.cxx:3028
+sc/source/filter/html/htmlpars.cxx:3027
     (anonymous namespace)::CSSHandler maPropValue struct (anonymous namespace)::CSSHandler::MemStr
-sc/source/filter/inc/exp_op.hxx:47
+sc/source/filter/inc/exp_op.hxx:48
     ExportBiff5 pExcRoot struct RootData *
 sc/source/filter/inc/imp_op.hxx:84
     ImportExcel::LastFormula mpCell class ScFormulaCell *
@@ -562,19 +562,19 @@ sc/source/ui/inc/drwtrans.hxx:45
     ScDrawTransferObj m_aDrawPersistRef SfxObjectShellRef
 sc/source/ui/inc/filtdlg.hxx:186
     ScSpecialFilterDlg pOptionsMgr std::unique_ptr<ScFilterOptionsMgr>
-sc/source/ui/inc/instbdlg.hxx:57
+sc/source/ui/inc/instbdlg.hxx:58
     ScInsertTableDlg aDocShTablesRef SfxObjectShellRef
 sc/source/ui/inc/linkarea.hxx:38
     ScLinkedAreaDlg aSourceRef SfxObjectShellRef
 sc/source/ui/inc/pfuncache.hxx:49
     ScPrintSelectionStatus aRanges class ScRangeList
-sc/source/ui/inc/PivotLayoutTreeList.hxx:21
+sc/source/ui/inc/PivotLayoutTreeList.hxx:20
     ScPivotLayoutTreeList maItemValues std::vector<std::unique_ptr<ScItemValue> >
-sc/source/ui/inc/PivotLayoutTreeListData.hxx:38
+sc/source/ui/inc/PivotLayoutTreeListData.hxx:37
     ScPivotLayoutTreeListData maDataItemValues std::vector<std::unique_ptr<ScItemValue> >
 sc/source/ui/inc/preview.hxx:47
     ScPreview nTabPage tools::Long
-sc/source/ui/inc/tabvwsh.hxx:122
+sc/source/ui/inc/tabvwsh.hxx:121
     ScTabViewShell xDisProvInterceptor css::uno::Reference<css::frame::XDispatchProviderInterceptor>
 sc/source/ui/inc/transobj.hxx:47
     ScTransferObj m_aDrawPersistRef SfxObjectShellRef
@@ -600,15 +600,15 @@ sc/source/ui/vba/vbachartobject.hxx:44
     ScVbaChartObject oShapeHelper std::unique_ptr<ov::ShapeHelper>
 sd/inc/sdmod.hxx:133
     SdModule mpErrorHdl std::unique_ptr<SfxErrorHandler>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:195
+sd/qa/unit/tiledrendering/tiledrendering.cxx:197
     SdTiledRenderingTest m_bFound _Bool
-sd/qa/unit/tiledrendering/tiledrendering.cxx:196
-    SdTiledRenderingTest m_nPart sal_Int32
 sd/qa/unit/tiledrendering/tiledrendering.cxx:198
+    SdTiledRenderingTest m_nPart sal_Int32
+sd/qa/unit/tiledrendering/tiledrendering.cxx:200
     SdTiledRenderingTest m_aSearchResultPart std::vector<int>
-sd/qa/unit/tiledrendering/tiledrendering.cxx:199
+sd/qa/unit/tiledrendering/tiledrendering.cxx:201
     SdTiledRenderingTest m_nSelectionBeforeSearchResult int
-sd/qa/unit/tiledrendering/tiledrendering.cxx:200
+sd/qa/unit/tiledrendering/tiledrendering.cxx:202
     SdTiledRenderingTest m_nSelectionAfterSearchResult int
 sd/source/ui/dlg/RemoteDialogClientBox.hxx:67
     sd::ClientBox m_vEntries std::vector<TClientBoxEntry>
@@ -628,17 +628,17 @@ sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
 sd/source/ui/inc/unopage.hxx:279
     SdPageLinkTargets mxPage css::uno::Reference<css::drawing::XDrawPage>
-sd/source/ui/inc/ViewShellImplementation.hxx:76
+sd/source/ui/inc/ViewShellImplementation.hxx:79
     sd::ViewShell::Implementation::ToolBarManagerLock mpLock ::std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
-sd/source/ui/inc/ViewShellImplementation.hxx:87
+sd/source/ui/inc/ViewShellImplementation.hxx:90
     sd::ViewShell::Implementation::ToolBarManagerLock mpSelf std::shared_ptr<ToolBarManagerLock>
 sd/source/ui/remotecontrol/Receiver.hxx:35
     sd::Receiver pTransmitter class sd::Transmitter *
-sd/source/ui/sidebar/MasterPageContainerProviders.hxx:136
+sd/source/ui/sidebar/MasterPageContainerProviders.hxx:145
     sd::sidebar::TemplatePreviewProvider msURL class rtl::OUString
 sd/source/ui/slideshow/slideshowimpl.hxx:333
     sd::SlideshowImpl mpPaneHider ::std::unique_ptr<PaneHider>
-sd/source/ui/slideshow/SlideShowRestarter.hxx:70
+sd/source/ui/slideshow/SlideShowRestarter.hxx:74
     sd::SlideShowRestarter mpSelf ::std::shared_ptr<SlideShowRestarter>
 sd/source/ui/slidesorter/controller/SlsListener.hxx:142
     sd::slidesorter::controller::Listener mpModelChangeLock std::shared_ptr<SlideSorterController::ModelChangeLock>
@@ -648,10 +648,12 @@ sd/source/ui/table/TableDesignPane.hxx:101
     sd::TableDesignPane m_xImpl std::unique_ptr<TableDesignWidget>
 sd/source/ui/view/ToolBarManager.cxx:315
     sd::ToolBarManager::Implementation mpAsynchronousLayouterLock ::std::unique_ptr<LayouterLock>
-sdext/source/presenter/PresenterTimer.cxx:104
+sdext/source/presenter/PresenterTimer.cxx:103
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
 sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
     NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
+sfx2/inc/sidebar/PanelTitleBar.hxx:64
+    sfx2::sidebar::PanelTitleBar mxFrame css::uno::Reference<css::frame::XFrame>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
 sfx2/source/doc/sfxbasemodel.cxx:448
@@ -694,7 +696,7 @@ soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
 starmath/inc/view.hxx:157
     SmCmdBoxWindow aController class SmEditController
-stoc/source/servicemanager/servicemanager.cxx:392
+stoc/source/servicemanager/servicemanager.cxx:391
     (anonymous namespace)::OServiceManager m_SetLoadedFactories (anonymous namespace)::HashSet_Ref
 store/source/storbios.cxx:58
     (anonymous namespace)::OStoreSuperBlock m_nMarked sal_uInt32
@@ -710,35 +712,35 @@ svgio/inc/svgusenode.hxx:41
     svgio::svgreader::SvgUseNode maWidth class svgio::svgreader::SvgNumber
 svgio/inc/svgusenode.hxx:42
     svgio::svgreader::SvgUseNode maHeight class svgio::svgreader::SvgNumber
-svl/source/crypto/cryptosign.cxx:113
+svl/source/crypto/cryptosign.cxx:111
     (anonymous namespace)::MessageImprint hashedMessage SECItem
-svl/source/crypto/cryptosign.cxx:148
+svl/source/crypto/cryptosign.cxx:146
     (anonymous namespace)::TimeStampReq version SECItem
-svl/source/crypto/cryptosign.cxx:150
+svl/source/crypto/cryptosign.cxx:148
     (anonymous namespace)::TimeStampReq reqPolicy SECItem
-svl/source/crypto/cryptosign.cxx:151
+svl/source/crypto/cryptosign.cxx:149
     (anonymous namespace)::TimeStampReq nonce SECItem
-svl/source/crypto/cryptosign.cxx:152
+svl/source/crypto/cryptosign.cxx:150
     (anonymous namespace)::TimeStampReq certReq SECItem
-svl/source/crypto/cryptosign.cxx:153
+svl/source/crypto/cryptosign.cxx:151
     (anonymous namespace)::TimeStampReq extensions struct (anonymous namespace)::Extension *
-svl/source/crypto/cryptosign.cxx:161
+svl/source/crypto/cryptosign.cxx:159
     (anonymous namespace)::GeneralName name CERTName
-svl/source/crypto/cryptosign.cxx:169
+svl/source/crypto/cryptosign.cxx:167
     (anonymous namespace)::GeneralNames names struct (anonymous namespace)::GeneralName
-svl/source/crypto/cryptosign.cxx:177
+svl/source/crypto/cryptosign.cxx:175
     (anonymous namespace)::IssuerSerial issuer struct (anonymous namespace)::GeneralNames
-svl/source/crypto/cryptosign.cxx:178
+svl/source/crypto/cryptosign.cxx:176
     (anonymous namespace)::IssuerSerial serialNumber SECItem
-svl/source/crypto/cryptosign.cxx:188
+svl/source/crypto/cryptosign.cxx:186
     (anonymous namespace)::ESSCertIDv2 certHash SECItem
-svl/source/crypto/cryptosign.cxx:189
+svl/source/crypto/cryptosign.cxx:187
     (anonymous namespace)::ESSCertIDv2 issuerSerial struct (anonymous namespace)::IssuerSerial
-svl/source/crypto/cryptosign.cxx:197
+svl/source/crypto/cryptosign.cxx:195
     (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:315
+svl/source/undo/undo.cxx:313
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
 svx/inc/galbrws2.hxx:82
     GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
@@ -754,7 +756,7 @@ svx/source/inc/datanavi.hxx:318
     svxform::DataNavigator m_xDataWin std::unique_ptr<DataNavigatorWindow>
 svx/source/inc/docrecovery.hxx:131
     svx::DocRecovery::TURLInfo Module class rtl::OUString
-svx/source/inc/StylesPreviewToolBoxControl.hxx:34
+svx/source/inc/StylesPreviewToolBoxControl.hxx:33
     StylesPreviewToolBoxControl m_xWeldBox std::unique_ptr<StylesPreviewWindow_Base>
 svx/source/sdr/attribute/sdrformtextattribute.cxx:153
     drawinglayer::attribute::ImpSdrFormTextAttribute mnFormTextShdwTransp sal_uInt16
@@ -836,7 +838,7 @@ svx/source/sidebar/text/TextPropertyPanel.hxx:68
     svx::sidebar::TextPropertyPanel mxPositionBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/sidebar/text/TextPropertyPanel.hxx:70
     svx::sidebar::TextPropertyPanel mxSpacingBarDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/tbxctrls/tbcontrl.cxx:311
+svx/source/tbxctrls/tbcontrl.cxx:310
     (anonymous namespace)::SvxFontNameBox_Base m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -864,47 +866,49 @@ 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:2588
+sw/source/core/table/swtable.cxx:2590
     SwTableCellInfo::Impl m_HandledTableBoxes SwTableCellInfo::Impl::TableBoxes_t
 sw/source/core/text/porfld.hxx:61
     SwFieldPortion m_nAttrFieldType sal_uInt16
-sw/source/filter/html/swhtml.hxx:382
+sw/source/filter/html/swhtml.hxx:384
     SwHTMLParser m_aOrphanedTableBoxes std::vector<std::unique_ptr<SwTableBox> >
-sw/source/filter/inc/rtf.hxx:28
-    RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
 sw/source/filter/inc/rtf.hxx:29
-    RTFSurround::(anonymous union)::(anonymous) nOrder sal_uInt8
+    RTFSurround::(anonymous union)::(anonymous) nGoldCut sal_uInt8
 sw/source/filter/inc/rtf.hxx:30
-    RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
+    RTFSurround::(anonymous union)::(anonymous) nOrder sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
+sw/source/filter/inc/rtf.hxx:32
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/glossary.hxx:63
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
-sw/source/uibase/inc/maildispatcher.hxx:146
+sw/source/uibase/inc/maildispatcher.hxx:144
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
-sw/source/uibase/inc/maildispatcher.hxx:152
+sw/source/uibase/inc/maildispatcher.hxx:150
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
-sw/source/uibase/inc/navipi.hxx:61
-    SwNavigationPI m_xContent1Dispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/inc/redlndlg.hxx:61
+sw/source/uibase/inc/navipi.hxx:62
+    SwNavigationPI m_xContent2Dispatch std::unique_ptr<ToolbarUnoDispatcher>
+sw/source/uibase/inc/navipi.hxx:63
+    SwNavigationPI m_xContent3Dispatch std::unique_ptr<ToolbarUnoDispatcher>
+sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
-sw/source/uibase/sidebar/TableEditPanel.hxx:52
+sw/source/uibase/sidebar/TableEditPanel.hxx:51
     sw::sidebar::TableEditPanel m_xInsertDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:54
+sw/source/uibase/sidebar/TableEditPanel.hxx:53
     sw::sidebar::TableEditPanel m_xSelectDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:56
+sw/source/uibase/sidebar/TableEditPanel.hxx:55
     sw::sidebar::TableEditPanel m_xRowSizingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:58
+sw/source/uibase/sidebar/TableEditPanel.hxx:57
     sw::sidebar::TableEditPanel m_xColumnSizingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:60
+sw/source/uibase/sidebar/TableEditPanel.hxx:59
     sw::sidebar::TableEditPanel m_xDeleteDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:62
+sw/source/uibase/sidebar/TableEditPanel.hxx:61
     sw::sidebar::TableEditPanel m_xSplitMergeDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sw/source/uibase/sidebar/TableEditPanel.hxx:64
+sw/source/uibase/sidebar/TableEditPanel.hxx:63
     sw::sidebar::TableEditPanel m_xMiscDispatch std::unique_ptr<ToolbarUnoDispatcher>
 sw/source/uibase/sidebar/WrapPropertyPanel.hxx:74
     sw::sidebar::WrapPropertyPanel mxWrapOptionsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-testtools/source/bridgetest/cppobj.cxx:149
+testtools/source/bridgetest/cppobj.cxx:153
     bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
@@ -1004,12 +1008,6 @@ vcl/inc/salmenu.hxx:34
     SalItemParams aText class rtl::OUString
 vcl/inc/salmenu.hxx:37
     SalItemParams nBits enum MenuItemBits
-vcl/inc/salmenu.hxx:42
-    SalMenuButtonItem mnId sal_uInt16
-vcl/inc/salmenu.hxx:43
-    SalMenuButtonItem maImage class Image
-vcl/inc/salmenu.hxx:44
-    SalMenuButtonItem maToolTipText class rtl::OUString
 vcl/inc/salwtype.hxx:206
     SalSurroundingTextRequestEvent mnEnd sal_uLong
 vcl/inc/salwtype.hxx:217
@@ -1028,7 +1026,7 @@ vcl/inc/salwtype.hxx:250
     SalInputContext mpFont rtl::Reference<LogicalFontInstance>
 vcl/inc/salwtype.hxx:257
     SalSwipeEvent mnVelocityY double
-vcl/inc/scanlinewriter.hxx:36
+vcl/inc/scanlinewriter.hxx:35
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
 vcl/inc/svdata.hxx:452
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
@@ -1084,9 +1082,9 @@ vcl/unx/gtk3/a11y/gtk3atkutil.cxx:138
     DocumentFocusListener m_aRefList o3tl::sorted_vector<uno::Reference<uno::XInterface> >
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1637
+vcl/unx/gtk3/gtk3gtkinst.cxx:1650
      in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13997
+vcl/unx/gtk3/gtk3gtkinst.cxx:14119
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/gtk3hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
@@ -1118,7 +1116,7 @@ xmloff/source/forms/elementexport.hxx:104
     xmloff::OControlExport m_pOuterElement std::unique_ptr<SvXMLElementExport>
 xmloff/source/forms/officeforms.hxx:69
     xmloff::OFormsRootExport m_pImplElement std::unique_ptr<SvXMLElementExport>
-xmloff/source/text/txtimp.cxx:513
+xmloff/source/text/txtimp.cxx:437
     XMLTextImportHelper::Impl m_xFrameImpPrMap rtl::Reference<SvXMLImportPropertyMapper>
 xmlsecurity/inc/certificatechooser.hxx:52
     CertificateChooser mvUserData std::vector<std::shared_ptr<UserData> >
@@ -1126,7 +1124,7 @@ xmlsecurity/inc/certificateviewer.hxx:50
     CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP>
 xmlsecurity/inc/certificateviewer.hxx:51
     CertificateViewer mxDetailsPage std::unique_ptr<CertificateViewerDetailsTP>
-xmlsecurity/source/helper/pdfsignaturehelper.cxx:236
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:243
     (anonymous namespace)::PageChecksum m_nPageContent BitmapChecksum
-xmlsecurity/source/helper/pdfsignaturehelper.cxx:237
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:244
     (anonymous namespace)::PageChecksum m_aAnnotations std::vector<basegfx::B2DRectangle>
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index ae165a2201b8..2a18accc9ccc 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -229,7 +229,6 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
     std::set< OUString > embeddedFontUrlsKnown;
     css::uno::Reference< css::xml::sax::XFastParser > mxParser;
     rtl::Reference< SvXMLImportFastNamespaceHandler > maNamespaceHandler;
-    rtl::Reference < comphelper::AttributeList > maAttrList;
     rtl::Reference < comphelper::AttributeList > maNamespaceAttrList;
     css::uno::Reference< css::xml::sax::XFastDocumentHandler > mxFastDocumentHandler;
     static rtl::Reference< xmloff::token::FastTokenHandler > xTokenHandler;
diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx
index 5fcc7403f134..29dec2d47c3a 100644
--- a/sfx2/inc/sidebar/DeckTitleBar.hxx
+++ b/sfx2/inc/sidebar/DeckTitleBar.hxx
@@ -51,7 +51,6 @@ private:
     std::unique_ptr<weld::Label> mxLabel;
 
     const std::function<void()> maCloserAction;
-    BitmapEx maGrip;
     bool mbIsCloserVisible;
 };
 
diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 745fc8cd3030..ff00eb9f9294 100644
--- a/sfx2/inc/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -61,7 +61,6 @@ private:
     css::uno::Reference<css::frame::XToolbarController> mxController;
 
     VclPtr<Panel> mpPanel;
-    css::uno::Reference<css::frame::XFrame> mxFrame;
     OString msIdent;
     OUString msMoreOptionsCommand;
 };
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 79ac22826ea5..a9ddbc79fcb5 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -37,7 +37,6 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle,
                Theme::Color_PanelTitleBarBackground),
       mxExpander(m_xBuilder->weld_expander("expander")),
       mpPanel(pPanel),
-      mxFrame(),
       msIdent("button"),
       msMoreOptionsCommand()
 {
@@ -95,7 +94,6 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName,
         mxToolBox->set_item_visible(msIdent, false);
 
     msMoreOptionsCommand = rsCommandName;
-    mxFrame = rxFrame;
 
     if (msMoreOptionsCommand.isEmpty())
         return;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d2c346fbe5f6..a96836829318 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -422,7 +422,6 @@ SvXMLImport::SvXMLImport(
     }
     registerNamespaces();
     maNamespaceAttrList = new comphelper::AttributeList;
-    maAttrList = new comphelper::AttributeList;
 }
 
 void SvXMLImport::cleanup() throw ()