loplugin:unusedfields improve checking for fields guarded by existence check

which resulted in only a couple of real finds, mostly false+

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

12 files changed, 231 insertions, 162 deletions

diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx
index 2ec4ab815414..6efb17334e21 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -15,6 +15,8 @@
 #include <ostream>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
+#include <rtl/ref.hxx>
 
 struct Foo
 // expected-error@-1 {{read m_foo1 [loplugin:unusedfields]}}
@@ -258,6 +260,41 @@ namespace WriteOnlyAnalysis3
     };
 };
 
+// Check that writes to fields that are wrapped by conditional checks are ignored,
+// where those conditional checks use an 'operator bool'
+namespace ReadOnlyAnalysis5
+{
+    struct RefTarget
+    {
+        void acquire();
+        void release();
+    };
+    struct Foo1
+    // expected-error@-1 {{read m_field1 [loplugin:unusedfields]}}
+    // expected-error@-2 {{read m_field2 [loplugin:unusedfields]}}
+    // expected-error@-3 {{read m_field3xx [loplugin:unusedfields]}}
+    {
+        std::unique_ptr<int> m_field1;
+        rtl::Reference<RefTarget> m_field2;
+        css::uno::Reference<css::uno::XInterface> m_field3xx;
+        void f1(css::uno::Reference<css::uno::XInterface> a)
+        {
+            if (m_field1)
+                m_field1.reset(new int);
+            if (m_field1.get())
+                m_field1.reset(new int);
+            if (m_field2)
+                m_field2 = new RefTarget;
+            if (m_field2.get())
+                m_field2 = new RefTarget;
+            if (m_field3xx)
+                m_field3xx = a;
+            if (m_field3xx.get())
+                m_field3xx = a;
+        }
+    };
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index 471ecee97410..fb1a16a0c13f 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -447,11 +447,30 @@ bool UnusedFields::TraverseIfStmt(IfStmt* ifStmt)
 {
     FieldDecl const * memberFieldDecl = nullptr;
     Expr const * cond = ifStmt->getCond()->IgnoreParenImpCasts();
-    if (auto memberExpr = dyn_cast<MemberExpr>(cond))
+
+    if (auto memberCallExpr = dyn_cast<CXXMemberCallExpr>(cond))
+    {
+        if (auto cxxConvert = dyn_cast_or_null<CXXConversionDecl>(memberCallExpr->getMethodDecl()))
+        {
+            if (cxxConvert->getConversionType()->isBooleanType())
+                if (auto memberExpr = dyn_cast<MemberExpr>(memberCallExpr->getImplicitObjectArgument()->IgnoreParenImpCasts()))
+                    if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
+                        insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
+        }
+        else if (auto cxxMethod = memberCallExpr->getMethodDecl())
+        {
+            if (cxxMethod->getIdentifier() && cxxMethod->getName() == "get" && memberCallExpr->getNumArgs()==0)
+                if (auto memberExpr = dyn_cast<MemberExpr>(memberCallExpr->getImplicitObjectArgument()->IgnoreParenImpCasts()))
+                    if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
+                        insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
+        }
+    }
+    else if (auto memberExpr = dyn_cast<MemberExpr>(cond))
     {
         if ((memberFieldDecl = dyn_cast<FieldDecl>(memberExpr->getMemberDecl())))
             insideConditionalCheckOfMemberSet.push_back(memberFieldDecl);
     }
+
     bool ret = RecursiveASTVisitor::TraverseIfStmt(ifStmt);
     if (memberFieldDecl)
         insideConditionalCheckOfMemberSet.pop_back();
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 9d804914389c..72335ea1c78a 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basegfx/source/polygon/b2dtrapezoid.cxx:207
@@ -128,9 +128,9 @@ cui/source/factory/dlgfact.cxx:1394
     (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/cfgutil.hxx:239
     SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
-cui/source/inc/cuitabarea.hxx:225
+cui/source/inc/cuitabarea.hxx:224
     SvxAreaTabPage maFixed_ChangeType enum ChangeType
-cui/source/inc/cuitabarea.hxx:233
+cui/source/inc/cuitabarea.hxx:232
     SvxAreaTabPage m_aXFillAttr class XFillAttrSetItem
 cui/source/inc/tabstpge.hxx:85
     SvxTabulatorTabPage m_aLeftWin class TabWin_Impl
@@ -164,6 +164,8 @@ dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2771
+      class AllSettings &
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
@@ -204,7 +206,7 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:38
     _LOKDocViewClass parent_class GtkDrawingAreaClass
 include/oox/export/shapes.hxx:101
     oox::drawingml::ShapeExport maShapeMap oox::drawingml::ShapeExport::ShapeHashMap
-include/registry/registry.hxx:35
+include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
 include/sfx2/classificationhelper.hxx:123
     sfx::ClassificationKeyCreator m_ePolicyType const enum SfxClassificationPolicyType
@@ -229,13 +231,13 @@ include/sfx2/msg.hxx:133
 include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
 include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
-include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
 include/sfx2/msg.hxx:134
     SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:134
+    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
@@ -338,8 +340,6 @@ include/svx/ClassificationDialog.hxx:31
     svx::ClassificationDialog m_bPerParagraph const _Bool
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/svx/itemwin.hxx:33
-    SvxLineBox aDelayTimer class Timer
 include/vcl/commandevent.hxx:310
     CommandGestureData mfX const double
 include/vcl/commandevent.hxx:311
@@ -482,17 +482,17 @@ sal/textenc/textenc.cxx:406
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
 sc/inc/column.hxx:126
     ScColumn maCellsEvent const sc::CellStoreEvent
-sc/inc/compiler.hxx:261
-    ScCompiler::AddInMap pODFF const char *
 sc/inc/compiler.hxx:262
+    ScCompiler::AddInMap pODFF const char *
+sc/inc/compiler.hxx:263
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:265
     ScCompiler::AddInMap pUpper const char *
 sc/inc/token.hxx:403
     SingleDoubleRefModifier aDub struct ScComplexRefData
-sc/source/core/data/document.cxx:1240
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch const sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1241
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch const sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3009
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -568,7 +568,7 @@ sd/source/ui/remotecontrol/Receiver.hxx:35
     sd::Receiver pTransmitter class sd::Transmitter *
 sd/source/ui/remotecontrol/ZeroconfService.hxx:32
     sd::ZeroconfService port const uint
-sd/source/ui/view/DocumentRenderer.cxx:1340
+sd/source/ui/view/DocumentRenderer.cxx:1339
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1161
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -578,46 +578,46 @@ sd/source/ui/view/viewshel.cxx:1163
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
 sd/source/ui/view/viewshel.cxx:1164
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
-    (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
-    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
-    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
-    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition simple_type rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition name rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:262
-    (anonymous namespace)::PDFGrammar::definition stream rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition dict_begin rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition stream rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition array_end rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition dict_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition object_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
-    (anonymous namespace)::PDFGrammar::definition trailer rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+    (anonymous namespace)::PDFGrammar::definition array_end rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
+    (anonymous namespace)::PDFGrammar::definition trailer rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:101
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:45
@@ -632,21 +632,21 @@ slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats y GLfloat
-slideshow/source/engine/opengl/TransitionImpl.hxx:299
-    Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:300
+    Vertex normal glm::vec3
+slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex texcoord glm::vec2
-slideshow/source/engine/smilfunctionparser.cxx:491
+slideshow/source/engine/smilfunctionparser.cxx:493
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:492
+slideshow/source/engine/smilfunctionparser.cxx:494
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:493
+slideshow/source/engine/smilfunctionparser.cxx:495
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:494
+slideshow/source/engine/smilfunctionparser.cxx:496
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:495
+slideshow/source/engine/smilfunctionparser.cxx:497
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:496
+slideshow/source/engine/smilfunctionparser.cxx:498
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 starmath/inc/view.hxx:216
     SmViewShell maGraphicController const class SmGraphicController
@@ -664,8 +664,6 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
-svx/inc/galbrws2.hxx:79
-    GalleryBrowser2 maMiscOptions class SvtMiscOptions
 svx/inc/GalleryControl.hxx:42
     svx::sidebar::GalleryControl mpGallery class Gallery *
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
@@ -706,14 +704,14 @@ svx/source/stbctrls/zoomctrl.cxx:62
     (anonymous namespace)::ZoomPopup_Impl m_aBuilder class VclBuilder
 svx/source/svdraw/svdcrtv.cxx:53
     ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
+svx/source/tbxctrls/extrusioncontrols.hxx:66
+    svx::ExtrusionDirectionWindow maImgDirection class Image [9]
 svx/source/xml/xmleohlp.cxx:72
     OutputStorageWrapper_Impl aTempFile class utl::TempFile
 sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:145
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter2.cxx:70
-      class SwUiWriterTest2 *
 sw/qa/extras/uiwriter/uiwriter.cxx:4137
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
@@ -752,7 +750,7 @@ ucb/source/ucp/gio/gio_mount.hxx:79
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
 ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-vcl/headless/svpgdi.cxx:329
+vcl/headless/svpgdi.cxx:317
     (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
 vcl/inc/canvasbitmap.hxx:42
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
@@ -802,9 +800,9 @@ vcl/inc/WidgetThemeLibrary.hxx:93
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:109
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:3356
+vcl/source/app/salvtables.cxx:3357
     (anonymous namespace)::SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:6194
+vcl/source/app/salvtables.cxx:6195
     (anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -828,8 +826,6 @@ vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
 vcl/unx/gtk3/gtk3gtkinst.cxx:5071
     (anonymous namespace)::CrippledViewport viewport GtkViewport
-vcl/unx/kf5/KF5FilePicker.hxx:32
-    KF5FilePicker _layout class QGridLayout *
 writerfilter/source/dmapper/PropertyMap.hxx:204
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 xmloff/source/chart/transporttypes.hxx:149
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 794b307e9bfb..f124f1da711b 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -238,9 +238,9 @@ framework/inc/xml/menudocumenthandler.hxx:158
     framework::OReadMenuHandler m_bMenuPopupMode _Bool
 framework/inc/xml/menudocumenthandler.hxx:188
     framework::OReadMenuPopupHandler m_bMenuMode _Bool
-framework/source/fwe/classes/addonsoptions.cxx:343
-    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
 framework/source/fwe/classes/addonsoptions.cxx:344
+    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
+framework/source/fwe/classes/addonsoptions.cxx:345
     framework::AddonsOptions_Impl m_aEmptyAddonNotebookBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
 i18npool/inc/textconversion.hxx:79
     i18npool::(anonymous) code sal_Unicode
@@ -260,12 +260,20 @@ include/comphelper/parallelsort.hxx:164
     comphelper::(anonymous namespace)::Binner maLabels uint8_t [mnMaxStaticSize]
 include/connectivity/DriversConfig.hxx:75
     connectivity::DriversConfig m_aNode connectivity::DriversConfig::OSharedConfigNode
+include/connectivity/sdbcx/VCatalog.hxx:68
+    connectivity::sdbcx::OCatalog m_pViews std::unique_ptr<OCollection>
 include/connectivity/sdbcx/VCatalog.hxx:69
     connectivity::sdbcx::OCatalog m_pGroups std::unique_ptr<OCollection>
 include/connectivity/sdbcx/VDescriptor.hxx:53
     connectivity::sdbcx::ODescriptor m_aCase comphelper::UStringMixEqual
 include/connectivity/sdbcx/VGroup.hxx:55
     connectivity::sdbcx::OGroup m_pUsers std::unique_ptr<OUsers>
+include/connectivity/sdbcx/VKey.hxx:72
+    connectivity::sdbcx::OKey m_pColumns std::unique_ptr<OCollection>
+include/connectivity/sdbcx/VTable.hxx:78
+    connectivity::sdbcx::OTable m_xColumns rtl::Reference<OCollection>
+include/connectivity/sdbcx/VTable.hxx:79
+    connectivity::sdbcx::OTable m_xIndexes rtl::Reference<OCollection>
 include/connectivity/sdbcx/VUser.hxx:55
     connectivity::sdbcx::OUser m_pGroups std::unique_ptr<OGroups>
 include/connectivity/sqlparse.hxx:109
@@ -316,6 +324,8 @@ include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:32
     MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
+include/svtools/valueset.hxx:223
+    ValueSet maHighlightHdl Link<class ValueSet *, void>
 include/svx/colorwindow.hxx:67
     SvxColorWindow maSelectedLink Link<const NamedColor &, void>
 include/svx/graphctl.hxx:52
@@ -333,7 +343,7 @@ include/svx/svdoedge.hxx:160
 include/svx/svdpntv.hxx:160
     SdrPaintView maDrawinglayerOpt const class SvtOptionsDrawinglayer
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo2/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/disk2/libo7/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -360,7 +370,7 @@ include/vcl/opengl/OpenGLContext.hxx:48
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
 include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
-include/vcl/ppdparser.hxx:127
+include/vcl/ppdparser.hxx:130
     psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
 io/source/stm/odata.cxx:578
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
@@ -408,11 +418,13 @@ sal/rtl/uuid.cxx:66
     (anonymous namespace)::UUID clock_seq_low sal_uInt8
 sal/rtl/uuid.cxx:67
     (anonymous namespace)::UUID node sal_uInt8 [6]
-sc/inc/compiler.hxx:128
-    ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
+sc/inc/attarray.hxx:68
+    ScMergePatternState pItemSet std::unique_ptr<SfxItemSet>
 sc/inc/compiler.hxx:129
-    ScRawToken::(anonymous) table const struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:126:9)
-sc/inc/compiler.hxx:134
+    ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
+sc/inc/compiler.hxx:130
+    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo7/sc/inc/compiler.hxx:127:9)
+sc/inc/compiler.hxx:135
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
     sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **const
@@ -430,10 +442,10 @@ sc/source/filter/excel/xltoolbar.cxx:28
     (anonymous namespace)::MSOExcelCommandConvertor msoToOOcmd IdToString
 sc/source/filter/excel/xltoolbar.cxx:29
     (anonymous namespace)::MSOExcelCommandConvertor tcidToOOcmd IdToString
-sc/source/filter/inc/autofilterbuffer.hxx:181
-    oox::xls::FilterColumn mxSettings std::shared_ptr<FilterSettingsBase>
 sc/source/filter/inc/commentsbuffer.hxx:42
     oox::xls::CommentModel maAnchor const css::awt::Rectangle
+sc/source/filter/inc/htmlexp.hxx:118
+    ScHTMLExport pFileNameMap ScHTMLExport::FileNameMapPtr
 sc/source/filter/inc/htmlpars.hxx:56
     ScHTMLStyles maEmpty const class rtl::OUString
 sc/source/filter/inc/namebuff.hxx:81
@@ -448,6 +460,8 @@ sc/source/filter/inc/stylesbuffer.hxx:767
     oox::xls::CellStyleBuffer maBuiltinStyles oox::xls::CellStyleBuffer::CellStyleVector
 sc/source/filter/inc/stylesbuffer.hxx:768
     oox::xls::CellStyleBuffer maUserStyles oox::xls::CellStyleBuffer::CellStyleVector
+sc/source/filter/inc/XclExpChangeTrack.hxx:348
+    XclExpChTrAction pAddAction std::unique_ptr<XclExpChTrAction>
 sc/source/filter/inc/xepage.hxx:122
     XclExpChartPageSettings maData struct XclPageData
 sc/source/filter/inc/xistyle.hxx:518
@@ -462,6 +476,12 @@ sc/source/ui/inc/csvruler.hxx:39
     ScCsvRuler maBackgrDev ScopedVclPtrInstance<class VirtualDevice>
 sc/source/ui/inc/csvruler.hxx:40
     ScCsvRuler maRulerDev ScopedVclPtrInstance<class VirtualDevice>
+sc/source/ui/inc/inputhdl.hxx:67
+    ScInputHandler pColumnData std::unique_ptr<ScTypedCaseStrSet>
+sc/source/ui/inc/inputhdl.hxx:68
+    ScInputHandler pFormulaData std::unique_ptr<ScTypedCaseStrSet>
+sc/source/ui/inc/inputhdl.hxx:69
+    ScInputHandler pFormulaDataPara std::unique_ptr<ScTypedCaseStrSet>
 sc/source/ui/inc/tabcont.hxx:38
     ScTabControl bErrorShown _Bool
 sc/source/ui/vba/vbaformatconditions.hxx:37
@@ -488,13 +508,13 @@ sd/source/ui/inc/unopage.hxx:165
     SdDrawPage maTypeSequence css::uno::Sequence<css::uno::Type>
 sd/source/ui/inc/unopage.hxx:226
     SdMasterPage maTypeSequence css::uno::Sequence<css::uno::Type>
-sd/source/ui/sidebar/MasterPageContainer.cxx:141
-    sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
 sd/source/ui/sidebar/MasterPageContainer.cxx:142
+    sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
+sd/source/ui/sidebar/MasterPageContainer.cxx:143
     sd::sidebar::MasterPageContainer::Implementation maSmallPreviewBeingCreated class Image
-sd/source/ui/sidebar/MasterPageContainer.cxx:147
-    sd::sidebar::MasterPageContainer::Implementation maLargePreviewNotAvailable class Image
 sd/source/ui/sidebar/MasterPageContainer.cxx:148
+    sd::sidebar::MasterPageContainer::Implementation maLargePreviewNotAvailable class Image
+sd/source/ui/sidebar/MasterPageContainer.cxx:149
     sd::sidebar::MasterPageContainer::Implementation maSmallPreviewNotAvailable class Image
 sd/source/ui/slideshow/showwindow.hxx:99
     sd::ShowWindow mbMouseCursorHidden _Bool
@@ -508,8 +528,12 @@ sdext/source/pdfimport/tree/style.hxx:43
     pdfi::StyleContainer::Style Contents const class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:99
     sfx2::(anonymous namespace)::ImplDdeItem pLink class sfx2::SvBaseLink *
+slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx:58
+    slideshow::internal::SequentialTimeContainer mpCurrentRewindEvent slideshow::internal::EventSharedPtr
 slideshow/source/engine/slideshowimpl.cxx:132
     (anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime
+slideshow/source/inc/usereventqueue.hxx:260
+    slideshow::internal::UserEventQueue mpDoubleClickEventHandler ::std::shared_ptr<ClickEventHandler>
 sot/source/sdstor/ucbstorage.cxx:403
     UCBStorageStream_Impl m_aKey const class rtl::OString
 starmath/source/view.cxx:862
@@ -566,8 +590,12 @@ svx/source/svdraw/svdpdf.hxx:171
     ImpSdrPdfImport maDash const class XDash
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree const editeng::Trie
+sw/inc/breakit.hxx:38
+    SwBreakIt m_xLanguageTag std::unique_ptr<LanguageTag>
 sw/inc/calc.hxx:197
     SwCalc m_aSysLocale const class SvtSysLocale
+sw/inc/dpage.hxx:35
+    SwDPage pGridLst std::unique_ptr<SdrPageGridFrameList>
 sw/inc/hints.hxx:230
     SwAttrSetChg m_bDelSet const _Bool
 sw/inc/shellio.hxx:153
@@ -592,13 +620,21 @@ sw/source/core/doc/swstylemanager.cxx:61
     (anonymous namespace)::SwStyleManager aAutoParaPool class StylePool
 sw/source/core/inc/swblocks.hxx:69
     SwImpBlocks m_bInPutMuchBlocks _Bool
+sw/source/core/text/atrhndl.hxx:50
+    SwAttrHandler m_pFnt std::unique_ptr<SwFont>
 sw/source/core/text/inftxt.cxx:567
     (anonymous namespace)::SwTransparentTextGuard m_aContentVDev ScopedVclPtrInstance<class VirtualDevice>
+sw/source/core/text/redlnitr.hxx:76
+    SwRedlineItr m_pSet std::unique_ptr<SfxItemSet>
+sw/source/filter/html/htmltab.cxx:2834
+    CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:32
     RTFSurround::(anonymous) nVal sal_uInt8
-sw/source/ui/dbui/dbinsdlg.cxx:120
+sw/source/filter/writer/writer.cxx:68
+    Writer_Impl pFileNameMap std::unique_ptr<std::map<OUString, OUString> >
+sw/source/ui/dbui/dbinsdlg.cxx:99
     DB_Column::(anonymous) pText class rtl::OUString *const
-sw/source/ui/dbui/dbinsdlg.cxx:122
+sw/source/ui/dbui/dbinsdlg.cxx:101
     DB_Column::(anonymous) nFormat const sal_uInt32
 sw/source/uibase/dbui/mmconfigitem.cxx:111
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
@@ -622,6 +658,8 @@ ucb/source/ucp/gio/gio_mount.hxx:80
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx:76
     hierarchy_ucp::DataSupplier_Impl m_aIterator const class HierarchyEntry::iterator
+ucb/source/ucp/package/pkgprovider.hxx:51
+    package_ucp::ContentProvider m_pPackages std::unique_ptr<Packages>
 ucbhelper/source/client/proxydecider.cxx:130
     ucbhelper::proxydecider_impl::InternetProxyDecider_Impl m_aEmptyProxy const struct ucbhelper::InternetProxyServer
 ucbhelper/source/provider/propertyvalueset.cxx:88
@@ -892,41 +930,41 @@ vcl/source/fontsubset/sft.cxx:1050
     vcl::(anonymous namespace)::subHeader2 entryCount const sal_uInt16
 vcl/source/fontsubset/sft.cxx:1051
     vcl::(anonymous namespace)::subHeader2 idDelta const sal_uInt16
-vcl/source/gdi/dibtools.cxx:52
-    (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
 vcl/source/gdi/dibtools.cxx:53
-    (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30
+    (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
 vcl/source/gdi/dibtools.cxx:54
+    (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30
+vcl/source/gdi/dibtools.cxx:55
     (anonymous namespace)::CIEXYZ aXyzZ FXPT2DOT30
-vcl/source/gdi/dibtools.cxx:65
-    (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ
 vcl/source/gdi/dibtools.cxx:66
-    (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ
+    (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ
 vcl/source/gdi/dibtools.cxx:67
+    (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ
+vcl/source/gdi/dibtools.cxx:68
     (anonymous namespace)::CIEXYZTriple aXyzBlue struct (anonymous namespace)::CIEXYZ
-vcl/source/gdi/dibtools.cxx:107
-    (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:108
-    (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:109
-    (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:110
+    (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32
+vcl/source/gdi/dibtools.cxx:111
     (anonymous namespace)::DIBV5Header nV5AlphaMask sal_uInt32
-vcl/source/gdi/dibtools.cxx:112
-    (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple
 vcl/source/gdi/dibtools.cxx:113
-    (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32
+    (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple
 vcl/source/gdi/dibtools.cxx:114
-    (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32
 vcl/source/gdi/dibtools.cxx:115
+    (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32
+vcl/source/gdi/dibtools.cxx:116
     (anonymous namespace)::DIBV5Header nV5GammaBlue sal_uInt32
-vcl/source/gdi/dibtools.cxx:117
-    (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32
 vcl/source/gdi/dibtools.cxx:118
-    (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32
 vcl/source/gdi/dibtools.cxx:119
+    (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
+vcl/source/gdi/dibtools.cxx:120
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
-vcl/source/gdi/pdfwriter_impl.hxx:257
+vcl/source/gdi/pdfwriter_impl.hxx:258
     vcl::pdf::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
 vcl/source/treelist/headbar.cxx:40
     ImplHeadItem maHelpId const class rtl::OString
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 81cb54e4b339..900d39f4e5b1 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -5,9 +5,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
     libvlc_track_description_t psz_name char *
 basctl/source/inc/dlged.hxx:122
@@ -38,9 +38,11 @@ cppu/source/typelib/typelib.cxx:59
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
+dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-emfio/source/emfuno/xemfparser.cxx:50
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2771
+      class AllSettings &
+emfio/source/emfuno/xemfparser.cxx:52
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:45
     ScannerManager maProtector osl::Mutex
@@ -58,17 +60,17 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:38
     _LOKDocViewClass parent_class GtkDrawingAreaClass
 include/oox/vml/vmlshapecontext.hxx:116
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
-include/registry/registry.hxx:35
+include/registry/registry.hxx:34
     Registry_Api acquire void (*)(RegHandle)
 include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc const std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs const sal_uInt16
 include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
-include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
+    SfxType1 pType const std::type_info *
+include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
 include/sfx2/msg.hxx:132
     SfxType1 aAttrib struct SfxTypeAttrib [1]
@@ -304,9 +306,9 @@ 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:1240
-    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch const sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1241
+    (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch const sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aBulk const class ScBulkBroadcast
 sc/source/filter/html/htmlpars.cxx:3009
     (anonymous namespace)::CSSHandler::MemStr mp const char *
@@ -322,7 +324,7 @@ sd/source/ui/remotecontrol/ZeroconfService.hxx:32
     sd::ZeroconfService port const uint
 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/source/ui/view/DocumentRenderer.cxx:1339
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1161
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
@@ -334,9 +336,9 @@ sd/source/ui/view/viewshel.cxx:1164
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:188
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:101
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
@@ -368,16 +370,12 @@ svl/source/crypto/cryptosign.cxx:284
     (anonymous namespace)::PKIStatusInfo statusString SECItem
 svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
-svx/inc/galbrws2.hxx:79
-    GalleryBrowser2 maMiscOptions class SvtMiscOptions
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
 svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
 svx/source/tbxctrls/layctrl.cxx:432
     (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
-sw/qa/extras/uiwriter/uiwriter2.cxx:70
-      class SwUiWriterTest2 *
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:75
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index cae053e3fc00..3d7e367ed58f 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -134,7 +134,7 @@ connectivity/source/drivers/postgresql/pq_statics.hxx:191
     pq_sdbc_driver::Statics KEY_COLUMN class rtl::OUString
 connectivity/source/drivers/postgresql/pq_statics.hxx:215
     pq_sdbc_driver::Statics HELP_TEXT class rtl::OUString
-connectivity/source/inc/calc/CConnection.hxx:53
+connectivity/source/inc/calc/CConnection.hxx:52
     connectivity::calc::OCalcConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
 connectivity/source/inc/odbc/OConnection.hxx:55
     connectivity::odbc::OConnection m_sUser class rtl::OUString
@@ -228,27 +228,27 @@ dbaccess/source/filter/xml/dbloader2.cxx:233
     dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader>
 dbaccess/source/ui/browser/dbloader.cxx:71
     (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:255
+desktop/qa/desktop_lib/test_desktop_lib.cxx:250
     DesktopLOKTest m_bModified _Bool
-desktop/source/app/app.cxx:1210
+desktop/source/app/app.cxx:1202
     desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
-desktop/source/app/app.cxx:1211
+desktop/source/app/app.cxx:1203
     desktop::(anonymous namespace)::ExecuteGlobals pPathOptions std::unique_ptr<SvtPathOptions>
-desktop/source/deployment/gui/dp_gui_extlistbox.hxx:136
+desktop/source/deployment/gui/dp_gui_extlistbox.hxx:138
     dp_gui::ExtensionBox_Impl m_vRemovedEntries std::vector<TEntry_Impl>
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx:152
     dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager>
-desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:114
+desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:101
     dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
-desktop/source/deployment/manager/dp_managerfac.cxx:44
+desktop/source/deployment/manager/dp_managerfac.cxx:43
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xUserMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:45
+desktop/source/deployment/manager/dp_managerfac.cxx:44
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xSharedMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:46
+desktop/source/deployment/manager/dp_managerfac.cxx:45
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBundledMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:47
+desktop/source/deployment/manager/dp_managerfac.cxx:46
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xTmpMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:48
+desktop/source/deployment/manager/dp_managerfac.cxx:47
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
 desktop/unx/source/splashx.c:371
      decorations unsigned long
@@ -284,10 +284,6 @@ emfio/inc/mtftools.hxx:511
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:63
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
-extensions/source/propctrlr/propertyeditor.hxx:62
-    pcr::OPropertyEditor m_nMinHelpLines sal_Int32
-extensions/source/propctrlr/propertyeditor.hxx:63
-    pcr::OPropertyEditor m_nMaxHelpLines sal_Int32
 extensions/source/scanner/scanner.hxx:47
     ScannerManager mpData void *
 framework/inc/services/layoutmanager.hxx:248
@@ -396,9 +392,9 @@ include/svtools/ctrltool.hxx:150
     FontList mpDev2 VclPtr<class OutputDevice>
 include/svx/AccessibilityCheckDialog.hxx:46
     svx::AccessibilityCheckDialog m_aAccessibilityCheckEntries std::vector<std::unique_ptr<AccessibilityCheckEntry> >
-include/svx/bmpmask.hxx:125
+include/svx/bmpmask.hxx:128
     SvxBmpMask aSelItem class SvxBmpMaskSelectItem
-include/svx/float3d.hxx:171
+include/svx/float3d.hxx:204
     Svx3DWin pControllerItem std::unique_ptr<Svx3DCtrlItem>
 include/svx/fmtools.hxx:134
     FmXDisposeListener m_pAdapter rtl::Reference<FmXDisposeMultiplexer>
@@ -410,8 +406,6 @@ include/svx/gridctrl.hxx:254
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaRefItem mxRef rtl::Reference<reference_type>
-include/svx/sidebar/LinePropertyPanelBase.hxx:110
-    svx::sidebar::LinePropertyPanelBase mxArrowsDispatch std::unique_ptr<ToolbarUnoDispatcher>
 include/svx/srchdlg.hxx:165
     SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
 include/svx/srchdlg.hxx:166
@@ -516,11 +510,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:261
-    ScCompiler::AddInMap pODFF const char *
 sc/inc/compiler.hxx:262
+    ScCompiler::AddInMap pODFF const char *
+sc/inc/compiler.hxx:263
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:265
     ScCompiler::AddInMap pUpper const char *
 sc/inc/document.hxx:2604
     ScMutationDisable mpDocument class ScDocument *
@@ -536,13 +530,13 @@ sc/inc/scmod.hxx:103
     ScModule m_pErrorHdl std::unique_ptr<SfxErrorHandler>
 sc/inc/tabopparams.hxx:38
     ScInterpreterTableOpParams bValid _Bool
-sc/source/core/data/column4.cxx:1310
+sc/source/core/data/column4.cxx:1311
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
-sc/source/core/data/column.cxx:1398
-    (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
 sc/source/core/data/column.cxx:1399
+    (anonymous namespace)::CopyByCloneHandler meListenType sc::StartListeningType
+sc/source/core/data/column.cxx:1400
     (anonymous namespace)::CopyByCloneHandler mnFormulaCellCloneFlags const enum ScCloneFlags
-sc/source/core/data/table2.cxx:3687
+sc/source/core/data/table2.cxx:3688
     (anonymous namespace)::OutlineArrayFinder mpArray class ScOutlineArray *
 sc/source/filter/excel/xltoolbar.hxx:25
     TBCCmd A _Bool
@@ -646,7 +640,7 @@ sd/source/ui/framework/module/ToolBarModule.hxx:75
     sd::framework::ToolBarModule mpToolBarManagerLock std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock> >
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx:245
     accessibility::AccessibleDocumentViewBase mpWindow VclPtr< ::sd::Window>
-sd/source/ui/inc/animobjs.hxx:124
+sd/source/ui/inc/animobjs.hxx:120
     sd::AnimationWindow pControllerItem std::unique_ptr<AnimationControllerItem>
 sd/source/ui/inc/fudspord.hxx:51
     sd::FuDisplayOrder mpOverlay std::unique_ptr<SdrDropMarkerOverlay>
@@ -696,9 +690,9 @@ sfx2/source/inc/splitwin.hxx:52
     SfxSplitWindow pActive VclPtr<class SfxDockingWindow>
 sfx2/source/view/classificationcontroller.cxx:72
     sfx2::(anonymous namespace)::ClassificationCategoriesController m_aPropertyListener class sfx2::(anonymous namespace)::ClassificationPropertyListener
-slideshow/source/engine/opengl/TransitionImpl.hxx:299
-    Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:300
+    Vertex normal glm::vec3
+slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex texcoord glm::vec2
 slideshow/source/engine/slideshowimpl.cxx:1018
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
@@ -756,7 +750,7 @@ svl/source/misc/inethist.cxx:45
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
 svl/source/undo/undo.cxx:316
     svl::undo::impl::UndoManagerGuard m_aUndoActionsCleanup ::std::vector<std::unique_ptr<SfxUndoAction> >
-svx/inc/galbrws2.hxx:85
+svx/inc/galbrws2.hxx:82
     GalleryBrowser2 mxDragDropTargetHelper std::unique_ptr<GalleryDragDrop>
 svx/inc/sdr/overlay/overlaytools.hxx:41
     drawinglayer::primitive2d::OverlayStaticRectanglePrimitive mfRotation const double
@@ -764,7 +758,7 @@ svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx:46
     drawinglayer::primitive2d::SdrOleContentPrimitive2D mnGraphicVersion const sal_uInt32
 svx/source/form/dataaccessdescriptor.cxx:42
     svx::ODADescriptorImpl m_bSetOutOfDate _Bool
-svx/source/form/formcontroller.cxx:216
+svx/source/form/formcontroller.cxx:217
     svxform::(anonymous namespace)::ColumnInfo nNullable sal_Int32
 svx/source/inc/docrecovery.hxx:131
     svx::DocRecovery::TURLInfo Module class rtl::OUString
@@ -774,17 +768,15 @@ svx/source/sdr/attribute/sdrtextattribute.cxx:51
     drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32
 svx/source/sdr/attribute/sdrtextattribute.cxx:65
     drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell const _Bool
-svx/source/sidebar/line/LinePropertyPanel.hxx:85
+svx/source/sidebar/line/LinePropertyPanel.hxx:81
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:86
+svx/source/sidebar/line/LinePropertyPanel.hxx:82
     svx::sidebar::LinePropertyPanel maDashControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:88
-    svx::sidebar::LinePropertyPanel maLineStyleListControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:89
+svx/source/sidebar/line/LinePropertyPanel.hxx:84
     svx::sidebar::LinePropertyPanel maTransControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:90
+svx/source/sidebar/line/LinePropertyPanel.hxx:85
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:91
+svx/source/sidebar/line/LinePropertyPanel.hxx:86
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
 svx/source/sidebar/lists/ListsPropertyPanel.hxx:44
     svx::sidebar::ListsPropertyPanel mxNumBulletDispatcher std::unique_ptr<ToolbarUnoDispatcher>
@@ -853,14 +845,14 @@ sw/source/filter/inc/rtf.hxx:29
 sw/source/filter/inc/rtf.hxx:30
     RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo2/sw/source/filter/inc/rtf.hxx:27:9)
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/disk2/libo7/sw/source/filter/inc/rtf.hxx:27:9)
 sw/source/uibase/inc/glossary.hxx:63
     SwGlossaryDlg m_xGroupData std::vector<std::unique_ptr<GroupUserData> >
 sw/source/uibase/inc/maildispatcher.hxx:146
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
 sw/source/uibase/inc/maildispatcher.hxx:152
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
-sw/source/uibase/inc/navipi.hxx:69
+sw/source/uibase/inc/navipi.hxx:70
     SwNavigationPI m_xNaviListener std::unique_ptr<NaviStateListener>
 sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
@@ -878,6 +870,10 @@ sw/source/uibase/sidebar/TableEditPanel.hxx:61
     sw::sidebar::TableEditPanel m_xSplitMergeDispatch std::unique_ptr<ToolbarUnoDispatcher>
 sw/source/uibase/sidebar/TableEditPanel.hxx:63
     sw::sidebar::TableEditPanel m_xMiscDispatch std::unique_ptr<ToolbarUnoDispatcher>
+sw/source/uibase/sidebar/WrapPropertyPanel.hxx:70
+    sw::sidebar::WrapPropertyPanel mxWrapOptions1Dispatch std::unique_ptr<ToolbarUnoDispatcher>
+sw/source/uibase/sidebar/WrapPropertyPanel.hxx:73
+    sw::sidebar::WrapPropertyPanel mxWrapOptions2Dispatch std::unique_ptr<ToolbarUnoDispatcher>
 testtools/source/bridgetest/cppobj.cxx:149
     bridge_object::(anonymous namespace)::Test_Impl _arStruct Sequence<struct test::testtools::bridgetest::TestElement>
 ucb/source/ucp/gio/gio_mount.hxx:74
@@ -896,7 +892,7 @@ unoidl/source/legacyprovider.cxx:86
     unoidl::detail::(anonymous namespace)::Cursor manager_ rtl::Reference<Manager>
 unoidl/source/unoidl.cxx:83
     unoidl::(anonymous namespace)::AggregatingCursor seen_ std::set<OUString>
-unoidl/source/unoidlprovider.hxx:33
+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
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 221798c2aa4d..86036fe7130a 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -220,7 +220,6 @@ private:
     DrawFrameStyle  mnFrameStyle;
     Color           maColor;
     Link<ValueSet*,void>  maSelectHdl;
-    Link<ValueSet*,void>  maHighlightHdl;
 
     bool            mbFormat : 1;
     bool            mbHighlight : 1;
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 9a4737dd9784..3f928593c846 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -57,10 +57,6 @@ void SequentialTimeContainer::dispose()
         mpCurrentSkipEvent->dispose();
         mpCurrentSkipEvent.reset();
     }
-    if (mpCurrentRewindEvent) {
-        mpCurrentRewindEvent->dispose();
-        mpCurrentRewindEvent.reset();
-    }
 }
 
 void SequentialTimeContainer::skipEffect(
@@ -85,8 +81,6 @@ bool SequentialTimeContainer::resolveChild(
         // discharge events:
         if (mpCurrentSkipEvent)
             mpCurrentSkipEvent->dispose();
-        if (mpCurrentRewindEvent)
-            mpCurrentRewindEvent->dispose();
 
         // event that will deactivate the resolved/running child:
         mpCurrentSkipEvent = makeEvent(
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 0ee4e42ef94b..ad9dbb40132e 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -55,7 +55,6 @@ private:
     bool resolveChild( AnimationNodeSharedPtr const& pChildNode );
 
     EventSharedPtr mpCurrentSkipEvent;
-    EventSharedPtr mpCurrentRewindEvent;
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 2dfeba8221ff..bd3e1820ea14 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -535,7 +535,6 @@ UserEventQueue::UserEventQueue( EventMultiplexer&   rMultiplexer,
       mpAudioStoppedEventHandler(),
       mpClickEventHandler(),
       mpSkipEffectEventHandler(),
-      mpDoubleClickEventHandler(),
       mpMouseEnterHandler(),
       mpMouseLeaveHandler(),
       mbAdvanceOnClick( true )
@@ -591,10 +590,6 @@ void UserEventQueue::clear()
         mrMultiplexer.removeMouseMoveHandler( mpShapeDoubleClickEventHandler );
         mpShapeDoubleClickEventHandler.reset();
     }
-    if( mpDoubleClickEventHandler ) {
-        mrMultiplexer.removeDoubleClickHandler( mpDoubleClickEventHandler );
-        mpDoubleClickEventHandler.reset();
-    }
     if( mpMouseEnterHandler ) {
         mrMultiplexer.removeMouseMoveHandler( mpMouseEnterHandler );
         mpMouseEnterHandler.reset();
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index a60a931b473b..13b4d3adf385 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -257,7 +257,6 @@ private:
     ::std::shared_ptr<ClickEventHandler>          mpClickEventHandler;
     ::std::shared_ptr<SkipEffectEventHandler>     mpSkipEffectEventHandler;
     ::std::shared_ptr<ShapeClickEventHandler>     mpShapeDoubleClickEventHandler;
-    ::std::shared_ptr<ClickEventHandler>          mpDoubleClickEventHandler;
     ::std::shared_ptr<MouseEnterHandler>          mpMouseEnterHandler;
     ::std::shared_ptr<MouseLeaveHandler>          mpMouseLeaveHandler;
 
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 791a10ca1d4f..d30025e1d51e 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1740,7 +1740,6 @@ void ValueSet::SelectItem( sal_uInt16 nItemId )
         Any aNewAny;
         ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny);
     }
-    maHighlightHdl.Call(this);
 }
 
 void ValueSet::SetNoSelection()