improve loplugin:unusedfields

noticed something that wasn't being picked up, wrote some tests,
and found an unhandled case in Plugin::getParentFunctionDecl

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

7 files changed, 373 insertions, 103 deletions

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index c6591d6b4fd5..d2555eb034c2 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -217,9 +217,31 @@ static const Decl* getDeclContext(ASTContext& context, const Stmt* stmt)
     return nullptr;
 }
 
+static const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt)
+{
+    auto it = context.getParents(*stmt).begin();
+
+    if (it == context.getParents(*stmt).end())
+          return nullptr;
+
+    const Decl *decl = it->get<Decl>();
+    if (decl)
+    {
+        if (isa<VarDecl>(decl))
+            return dyn_cast<FunctionDecl>(decl->getDeclContext());
+        return decl;
+    }
+
+    stmt = it->get<Stmt>();
+    if (stmt)
+        return getFunctionDeclContext(context, stmt);
+
+    return nullptr;
+}
+
 const FunctionDecl* Plugin::getParentFunctionDecl( const Stmt* stmt )
 {
-    const Decl *decl = getDeclContext(compiler.getASTContext(), stmt);
+    const Decl *decl = getFunctionDeclContext(compiler.getASTContext(), stmt);
     if (decl)
         return static_cast<const FunctionDecl*>(decl->getNonClosureContext());
 
diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx
index 6efb17334e21..6b54b4f7acf1 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -6,8 +6,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+#include "config_clang.h"
 
-#if defined _WIN32 //TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
+// CLANG_VERSION = older versions of clang need something different in getParentFunctionDecl
+// WIN32 = TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx
+#if CLANG_VERSION < 110000 || defined _WIN32
 // expected-no-diagnostics
 #else
 
@@ -20,6 +23,7 @@
 
 struct Foo
 // expected-error@-1 {{read m_foo1 [loplugin:unusedfields]}}
+// expected-error@-2 {{outside m_foo1 [loplugin:unusedfields]}}
 {
     int m_foo1;
 };
@@ -41,6 +45,20 @@ struct Bar
 // expected-error@-14 {{write m_bar7 [loplugin:unusedfields]}}
 // expected-error@-15 {{write m_bar9 [loplugin:unusedfields]}}
 // expected-error@-16 {{write m_bar12 [loplugin:unusedfields]}}
+// expected-error@-17 {{outside-constructor m_bar2 [loplugin:unusedfields]}}
+// expected-error@-18 {{outside-constructor m_bar3 [loplugin:unusedfields]}}
+// expected-error@-19 {{outside-constructor m_bar3b [loplugin:unusedfields]}}
+// expected-error@-20 {{outside-constructor m_bar4 [loplugin:unusedfields]}}
+// expected-error@-21 {{outside-constructor m_bar5 [loplugin:unusedfields]}}
+// expected-error@-22 {{outside-constructor m_bar6 [loplugin:unusedfields]}}
+// expected-error@-23 {{outside-constructor m_bar7 [loplugin:unusedfields]}}
+// expected-error@-24 {{outside-constructor m_bar8 [loplugin:unusedfields]}}
+// expected-error@-25 {{outside-constructor m_bar9 [loplugin:unusedfields]}}
+// expected-error@-26 {{outside-constructor m_bar10 [loplugin:unusedfields]}}
+// expected-error@-27 {{outside-constructor m_bar11 [loplugin:unusedfields]}}
+// expected-error@-28 {{outside-constructor m_bar12 [loplugin:unusedfields]}}
+// expected-error@-29 {{outside-constructor m_barfunctionpointer [loplugin:unusedfields]}}
+// expected-error@-30 {{outside m_barstream [loplugin:unusedfields]}}
 {
     int  m_bar1;
     int  m_bar2 = 1;
@@ -145,6 +163,11 @@ struct ReadOnlyAnalysis
 // expected-error@-7 {{write m_f4 [loplugin:unusedfields]}}
 // expected-error@-8 {{write m_f5 [loplugin:unusedfields]}}
 // expected-error@-9 {{write m_f6 [loplugin:unusedfields]}}
+// expected-error@-10 {{outside-constructor m_f2 [loplugin:unusedfields]}}
+// expected-error@-11 {{outside-constructor m_f3 [loplugin:unusedfields]}}
+// expected-error@-12 {{outside-constructor m_f4 [loplugin:unusedfields]}}
+// expected-error@-13 {{outside-constructor m_f5 [loplugin:unusedfields]}}
+// expected-error@-14 {{outside-constructor m_f6 [loplugin:unusedfields]}}
 {
     int m_f1;
     int m_f2;
@@ -186,6 +209,7 @@ ReadOnlyAnalysis2 global { 1 };
 
 struct ReadOnlyAnalysis3
 // expected-error@-1 {{read m_f1 [loplugin:unusedfields]}}
+// expected-error@-2 {{outside-constructor m_f1 [loplugin:unusedfields]}}
 {
     int m_f1;
 
@@ -202,6 +226,9 @@ struct ReadOnlyAnalysis4
 // expected-error@-1 {{read m_readonly [loplugin:unusedfields]}}
 // expected-error@-2 {{write m_writeonly [loplugin:unusedfields]}}
 // expected-error@-3 {{read m_readonlyCss [loplugin:unusedfields]}}
+// expected-error@-4 {{outside-constructor m_readonly [loplugin:unusedfields]}}
+// expected-error@-5 {{outside-constructor m_readonlyCss [loplugin:unusedfields]}}
+// expected-error@-6 {{outside-constructor m_writeonly [loplugin:unusedfields]}}
 {
     std::vector<int> m_readonly;
     std::vector<int> m_writeonly;
@@ -230,6 +257,7 @@ struct VclPtr
 // Check calls to operators
 struct WriteOnlyAnalysis2
 // expected-error@-1 {{write m_vclwriteonly [loplugin:unusedfields]}}
+// expected-error@-2 {{outside-constructor m_vclwriteonly [loplugin:unusedfields]}}
 {
     VclPtr<int> m_vclwriteonly;
 
@@ -250,6 +278,7 @@ namespace WriteOnlyAnalysis3
     struct Foo1
     // expected-error@-1 {{read m_field1 [loplugin:unusedfields]}}
     // expected-error@-2 {{write m_field1 [loplugin:unusedfields]}}
+    // expected-error@-3 {{outside-constructor m_field1 [loplugin:unusedfields]}}
     {
         int m_field1;
         Foo1() : m_field1(1) {}
@@ -273,6 +302,9 @@ namespace ReadOnlyAnalysis5
     // expected-error@-1 {{read m_field1 [loplugin:unusedfields]}}
     // expected-error@-2 {{read m_field2 [loplugin:unusedfields]}}
     // expected-error@-3 {{read m_field3xx [loplugin:unusedfields]}}
+    // expected-error@-4 {{outside-constructor m_field1 [loplugin:unusedfields]}}
+    // expected-error@-5 {{outside-constructor m_field2 [loplugin:unusedfields]}}
+    // expected-error@-6 {{outside-constructor m_field3xx [loplugin:unusedfields]}}
     {
         std::unique_ptr<int> m_field1;
         rtl::Reference<RefTarget> m_field2;
@@ -295,6 +327,57 @@ namespace ReadOnlyAnalysis5
     };
 };
 
+
+namespace TouchFromOutsideConstructorAnalysis1
+{
+    struct RenderContextGuard
+    // expected-error@-1 {{write m_pRef [loplugin:unusedfields]}}
+    // expected-error@-2 {{read m_pRef [loplugin:unusedfields]}}
+    // expected-error@-3 {{write m_pOriginalValue [loplugin:unusedfields]}}
+    {
+        int& m_pRef;
+        int m_pOriginalValue;
+
+        RenderContextGuard(int& pRef, int pValue)
+            : m_pRef(pRef),
+              m_pOriginalValue(m_pRef)
+        {
+            m_pRef = pValue;
+        }
+    };
+};
+
+namespace TouchFromOutsideAnalysis1
+{
+    struct SwViewShell
+    {
+        int* GetWin();
+        int* Imp();
+    };
+    struct RenderContextGuard
+    // expected-error@-1 {{write m_pShell [loplugin:unusedfields]}}
+    // expected-error@-2 {{read m_pShell [loplugin:unusedfields]}}
+    {
+        SwViewShell* m_pShell;
+
+        RenderContextGuard(SwViewShell* pShell)
+            : m_pShell(pShell)
+        {
+            if (m_pShell->GetWin())
+            {
+                int* pDrawView(m_pShell->Imp());
+
+                if (nullptr != pDrawView)
+                {
+                    FindPageWindow(*m_pShell->GetWin());
+                }
+            }
+        }
+
+        void FindPageWindow(int x);
+    };
+};
+
 #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 98c5a30d6a1d..5f5101e85af9 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -222,6 +222,18 @@ void UnusedFields::run()
                 "write %0",
                 compat::getBeginLoc(s.parentRecord))
                 << s.fieldName;
+        for (const MyFieldInfo & s : touchedFromOutsideConstructorSet)
+            report(
+                DiagnosticsEngine::Warning,
+                "outside-constructor %0",
+                compat::getBeginLoc(s.parentRecord))
+                << s.fieldName;
+        for (const MyFieldInfo & s : touchedFromOutsideSet)
+            report(
+                DiagnosticsEngine::Warning,
+                "outside %0",
+                compat::getBeginLoc(s.parentRecord))
+                << s.fieldName;
     }
 }
 
@@ -1132,6 +1144,28 @@ bool UnusedFields::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
     return true;
 }
 
+static const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt)
+{
+    auto it = context.getParents(*stmt).begin();
+
+    if (it == context.getParents(*stmt).end())
+          return nullptr;
+
+    const Decl *decl = it->get<Decl>();
+    if (decl)
+    {
+        if (isa<VarDecl>(decl))
+            return dyn_cast<FunctionDecl>(decl->getDeclContext());
+        return decl;
+    }
+
+    stmt = it->get<Stmt>();
+    if (stmt)
+        return getFunctionDeclContext(context, stmt);
+
+    return nullptr;
+}
+
 void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Expr* memberExpr) {
     const FunctionDecl* memberExprParentFunction = getParentFunctionDecl(memberExpr);
     const CXXMethodDecl* methodDecl = dyn_cast_or_null<CXXMethodDecl>(memberExprParentFunction);
@@ -1140,6 +1174,16 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
 
     // it's touched from somewhere outside a class
     if (!methodDecl) {
+        if (fieldDecl->getName() == "m_pShell")
+        {
+            if (memberExprParentFunction)
+                memberExprParentFunction->dump();
+            memberExpr->dump();
+            const Decl *decl = getFunctionDeclContext(compiler.getASTContext(), memberExpr);
+            if (decl)
+                decl->dump();
+            std::cout << "site1" << std::endl;
+        }
         touchedFromOutsideSet.insert(fieldInfo);
         return;
     }
@@ -1155,6 +1199,13 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
             if (!constructorDecl)
                 touchedFromOutsideConstructorSet.insert(fieldInfo);
         } else {
+            if (fieldDecl->getName() == "m_pShell")
+            {
+                if (memberExprParentFunction)
+                    memberExprParentFunction->dump();
+                memberExpr->dump();
+                std::cout << "site2" << std::endl;
+            }
             touchedFromOutsideSet.insert(fieldInfo);
         }
     }
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index b02a68e3ae25..20780329b2c4 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,19 +9,25 @@ 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 /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo2/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/b2dpolygontriangulator.cxx:112
+    basegfx::(anonymous namespace)::Triangulator maStartEntries basegfx::(anonymous namespace)::EdgeEntries
 basegfx/source/polygon/b2dtrapezoid.cxx:205
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
+basegfx/source/polygon/b2dtrapezoid.cxx:257
+    basegfx::trapezoidhelper::(anonymous namespace)::TrapezoidSubdivider maPoints std::vector<B2DPoint>
 basic/qa/cppunit/basictest.hxx:28
     MacroSnippet maDll class BasicDLL
 binaryurp/source/unmarshal.hxx:87
     binaryurp::Unmarshal buffer_ com::sun::star::uno::Sequence<sal_Int8>
 binaryurp/source/writer.hxx:148
     binaryurp::Writer state_ struct binaryurp::WriterState
+canvas/source/tools/surfaceproxy.hxx:105
+    canvas::SurfaceProxy mpPageManager canvas::PageManagerSharedPtr
 canvas/source/vcl/impltools.hxx:115
     vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
 chart2/source/controller/accessibility/AccessibleChartShape.hxx:79
@@ -140,36 +146,54 @@ cui/source/inc/tabstpge.hxx:87
     SvxTabulatorTabPage m_aCenterWin class TabWin_Impl
 cui/source/inc/tabstpge.hxx:88
     SvxTabulatorTabPage m_aDezWin class TabWin_Impl
+cui/source/inc/textanim.hxx:40
+    SvxTextAnimationPage rOutAttrs const class SfxItemSet &
+cui/source/inc/transfrm.hxx:167
+    SvxAngleTabPage rOutAttrs const class SfxItemSet &
+cui/source/inc/transfrm.hxx:217
+    SvxSlantTabPage rOutAttrs const class SfxItemSet &
 cui/source/options/optcolor.cxx:237
     (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor class Color
-dbaccess/source/core/api/RowSet.hxx:111
+dbaccess/source/core/api/RowSet.hxx:108
     dbaccess::ORowSet m_aURL class rtl::OUString
-dbaccess/source/core/api/RowSet.hxx:125
+dbaccess/source/core/api/RowSet.hxx:122
     dbaccess::ORowSet m_nMaxFieldSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:127
+dbaccess/source/core/api/RowSet.hxx:124
     dbaccess::ORowSet m_nQueryTimeOut sal_Int32
-dbaccess/source/core/api/RowSet.hxx:129
+dbaccess/source/core/api/RowSet.hxx:126
     dbaccess::ORowSet m_nTransactionIsolation sal_Int32
-dbaccess/source/core/api/RowSet.hxx:141
+dbaccess/source/core/api/RowSet.hxx:138
     dbaccess::ORowSet m_bIsBookmarkable _Bool
-dbaccess/source/core/api/RowSet.hxx:143
+dbaccess/source/core/api/RowSet.hxx:140
     dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:459
+dbaccess/source/core/api/RowSet.hxx:456
     dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:460
+dbaccess/source/core/api/RowSet.hxx:457
     dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:461
+dbaccess/source/core/api/RowSet.hxx:458
     dbaccess::ORowSetClone m_bIsBookmarkable _Bool
 dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
-dbaccess/source/core/inc/databasecontext.hxx:95
+dbaccess/source/core/inc/databasecontext.hxx:85
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+dbaccess/source/filter/xml/xmlComponent.hxx:30
+    dbaxml::OXMLComponent m_sName class rtl::OUString
+dbaccess/source/filter/xml/xmlComponent.hxx:31
+    dbaxml::OXMLComponent m_sHREF class rtl::OUString
+dbaccess/source/filter/xml/xmlComponent.hxx:32
+    dbaxml::OXMLComponent m_bAsTemplate _Bool
+dbaccess/source/filter/xml/xmlHierarchyCollection.hxx:33
+    dbaxml::OXMLHierarchyCollection m_sName class rtl::OUString
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
     emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
 editeng/source/editeng/impedit.hxx:458
     ImpEditEngine aSelFuncSet class EditSelFunctionSet
+extensions/source/bibliography/datman.cxx:408
+    (anonymous namespace)::DBChangeDialog_Impl aConfig class DBChangeDialogConfig_Impl
+extensions/source/bibliography/datman.cxx:409
+    (anonymous namespace)::DBChangeDialog_Impl pDatMan class BibDataManager *
 filter/source/flash/swfwriter.hxx:391
     swf::Writer maMovieTempFile utl::TempFile
 filter/source/flash/swfwriter.hxx:392
@@ -192,6 +216,10 @@ include/drawinglayer/texture/texture3d.hxx:62
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 include/drawinglayer/texture/texture3d.hxx:64
     drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap
+include/editeng/unotext.hxx:589
+    SvxUnoTextContentEnumeration mrText const class SvxUnoTextBase &
+include/editeng/unotext.hxx:607
+    SvxUnoTextRangeEnumeration mnParagraph sal_Int32
 include/filter/msfilter/svdfppt.hxx:877
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
 include/filter/msfilter/svdfppt.hxx:878
@@ -334,6 +362,8 @@ include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
+include/svx/ClassificationDialog.hxx:29
+    svx::ClassificationDialog maInternationalHelper class SfxClassificationHelper
 include/svx/ClassificationDialog.hxx:31
     svx::ClassificationDialog m_bPerParagraph const _Bool
 include/svx/imapdlg.hxx:91
@@ -354,13 +384,17 @@ include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonsParams sControlType class rtl::OUString
 include/vcl/NotebookBarAddonsMerger.hxx:46
     AddonsParams nWidth sal_uInt16
+include/vcl/weld.hxx:2082
+    weld::Builder m_sHelpRoot class rtl::OString
 include/xmloff/shapeimport.hxx:140
     SdXML3DLightContext mbSpecular _Bool
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:52
+jvmfwk/inc/fwkbase.hxx:36
+    jfw::VendorSettings m_xmlDocVendorSettingsFileUrl class rtl::OUString
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
     GtvApplicationWindow parent_instance GtkApplicationWindow
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:56
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
     GtvApplicationWindow doctype LibreOfficeKitDocumentType
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:75
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:74
     GtvApplicationWindowClass parentClass GtkApplicationWindowClass
 libreofficekit/qa/gtktiledviewer/gtv-application.hxx:26
     GtvApplication parent GtkApplication
@@ -426,6 +460,8 @@ reportdesign/source/core/api/ReportDefinition.cxx:250
     reportdesign::(anonymous namespace)::OStyle m_aSize awt::Size
 reportdesign/source/filter/xml/xmlExport.cxx:1241
       sal_Int32
+reportdesign/source/ui/dlg/Navigator.cxx:801
+    rptui::ONavigatorImpl m_rController ::rptui::OReportController &
 sal/qa/osl/condition/osl_Condition.cxx:72
     osl_Condition::ctors bRes1 _Bool
 sal/qa/osl/condition/osl_Condition.cxx:202
@@ -457,9 +493,9 @@ sal/qa/osl/module/osl_Module.cxx:342
 sal/qa/osl/pipe/osl_Pipe.cxx:359
     osl_Pipe::clear bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:524
-    osl_Pipe::getError bRes _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:524
     osl_Pipe::getError bRes1 _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:524
+    osl_Pipe::getError bRes _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:562
     osl_Pipe::getHandle bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:850
@@ -480,6 +516,8 @@ sal/qa/osl/security/osl_Security.cxx:188
     osl_Security::getConfigDir bRes1 _Bool
 sal/textenc/textenc.cxx:406
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
+sc/inc/cellsuno.hxx:1173
+    ScUniqueCellFormatsObj aTotalRange const class ScRange
 sc/inc/column.hxx:126
     ScColumn maCellsEvent const sc::CellStoreEvent
 sc/inc/compiler.hxx:262
@@ -488,6 +526,10 @@ sc/inc/compiler.hxx:263
     ScCompiler::AddInMap pEnglish const char *
 sc/inc/compiler.hxx:265
     ScCompiler::AddInMap pUpper const char *
+sc/inc/editutil.hxx:90
+    ScEditAttrTester pEngine class ScEditEngineDefaulter *
+sc/inc/funcdesc.hxx:390
+    ScFunctionMgr pFuncList class ScFunctionList *
 sc/inc/token.hxx:403
     SingleDoubleRefModifier aDub struct ScComplexRefData
 sc/source/core/data/document.cxx:1241
@@ -502,6 +544,8 @@ sc/source/filter/inc/htmlpars.hxx:614
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
 sc/source/filter/inc/sheetdatacontext.hxx:52
     oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
+sc/source/filter/inc/XclImpChangeTrack.hxx:56
+    XclImpChangeTrack xInStrm tools::SvRef<SotStorageStream>
 sc/source/filter/inc/xetable.hxx:1006
     XclExpCellTable maArrayBfr class XclExpArrayBuffer
 sc/source/filter/inc/xetable.hxx:1007
@@ -520,6 +564,8 @@ sc/source/filter/xml/xmldrani.hxx:72
     ScXMLDatabaseRangeContext bIsSelection _Bool
 sc/source/filter/xml/xmlexternaltabi.hxx:111
     ScXMLExternalRefCellContext mnCellType sal_Int16
+sc/source/filter/xml/XMLTableHeaderFooterContext.hxx:38
+    XMLTableHeaderFooterContext sOn const class rtl::OUString
 sc/source/filter/xml/xmltransformationi.hxx:155
     ScXMLDateTimeContext aType class rtl::OUString
 sc/source/ui/inc/acredlin.hxx:50
@@ -548,6 +594,10 @@ 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/solveroptions.hxx:61
+    ScSolverOptionsDialog maDescriptions css::uno::Sequence<OUString>
+sc/source/ui/inc/tbzoomsliderctrl.hxx:70
+    ScZoomSliderWnd aLogicalSize const class Size
 sc/source/ui/inc/xmlsourcedlg.hxx:62
     ScXMLSourceDlg maCustomCompare struct CustomCompare
 sccomp/source/solver/DifferentialEvolution.hxx:35
@@ -564,10 +614,24 @@ sd/source/filter/ppt/pptin.hxx:81
     SdPPTImport maParam struct PowerPointImportParam
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx:263
     accessibility::AccessibleDocumentViewBase maViewForwarder class accessibility::AccessibleViewForwarder
+sd/source/ui/inc/dlgpage.hxx:35
+    SdPageDlg mpDocShell const class SfxObjectShell *
+sd/source/ui/inc/GraphicObjectBar.hxx:51
+    sd::GraphicObjectBar mpViewSh class sd::ViewShell *const
+sd/source/ui/inc/MediaObjectBar.hxx:53
+    sd::MediaObjectBar mpViewSh class sd::ViewShell *const
+sd/source/ui/inc/OutlineBulletDlg.hxx:44
+    sd::OutlineBulletDlg m_aInputSet class SfxItemSet
+sd/source/ui/inc/prltempl.hxx:55
+    SdPresLayoutTemplateDlg pOrgSet const class SfxItemSet *
+sd/source/ui/inc/tpaction.hxx:42
+    SdActionDlg rOutAttrs const class SfxItemSet &
 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/slideshow/PaneHider.hxx:50
+    sd::PaneHider mrViewShell const class sd::ViewShell &
 sd/source/ui/view/DocumentRenderer.cxx:1339
     sd::DocumentRenderer::Implementation mxObjectShell const SfxObjectShellRef
 sd/source/ui/view/viewshel.cxx:1161
@@ -666,6 +730,8 @@ svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/inc/GalleryControl.hxx:42
     svx::sidebar::GalleryControl mpGallery class Gallery *
+svx/source/customshapes/EnhancedCustomShape3d.hxx:48
+    EnhancedCustomShape3d::Transformation2D pMap const double *
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
     (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::classic::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
@@ -696,26 +762,30 @@ svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
 svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/stbctrls/pszctrl.cxx:101
+svx/source/stbctrls/pszctrl.cxx:95
     (anonymous namespace)::FunctionPopup_Impl m_aBuilder class VclBuilder
-svx/source/stbctrls/selctrl.cxx:44
+svx/source/stbctrls/selctrl.cxx:42
     (anonymous namespace)::SelectionTypePopup m_aBuilder class VclBuilder
-svx/source/stbctrls/zoomctrl.cxx:62
+svx/source/stbctrls/zoomctrl.cxx:59
     (anonymous namespace)::ZoomPopup_Impl m_aBuilder class VclBuilder
-svx/source/svdraw/svdcrtv.cxx:53
+svx/source/svdraw/svdcrtv.cxx:48
     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
+svx/source/xml/xmlgrhlp.cxx:89
+    (anonymous namespace)::GraphicInputStream maTempFile 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/uiwriter.cxx:4184
+sw/qa/extras/uiwriter/uiwriter.cxx:4210
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
+sw/source/core/edit/acorrect.cxx:43
+    (anonymous namespace)::PaMIntoCursorShellRing rSh class SwCursorShell &
 sw/source/core/inc/swfont.hxx:988
     SvStatistics nGetStretchTextSize sal_uInt16
 sw/source/core/layout/dbg_lay.cxx:170
@@ -726,20 +796,42 @@ sw/source/core/text/inftxt.hxx:682
     SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:143
     (anonymous namespace)::SwFieldSlot aText class rtl::OUString
+sw/source/ui/index/cnttab.cxx:137
+    (anonymous namespace)::SwEntryBrowseBox m_sSearch class rtl::OUString
+sw/source/ui/index/cnttab.cxx:138
+    (anonymous namespace)::SwEntryBrowseBox m_sAlternative class rtl::OUString
+sw/source/ui/index/cnttab.cxx:139
+    (anonymous namespace)::SwEntryBrowseBox m_sPrimKey class rtl::OUString
+sw/source/ui/index/cnttab.cxx:140
+    (anonymous namespace)::SwEntryBrowseBox m_sSecKey class rtl::OUString
+sw/source/ui/index/cnttab.cxx:141
+    (anonymous namespace)::SwEntryBrowseBox m_sComment class rtl::OUString
+sw/source/ui/index/cnttab.cxx:142
+    (anonymous namespace)::SwEntryBrowseBox m_sCaseSensitive class rtl::OUString
+sw/source/ui/index/cnttab.cxx:143
+    (anonymous namespace)::SwEntryBrowseBox m_sWordOnly class rtl::OUString
 sw/source/uibase/docvw/romenu.hxx:34
     SwReadOnlyPopup m_aBuilder class VclBuilder
+sw/source/uibase/docvw/romenu.hxx:46
+    SwReadOnlyPopup m_nReadonlyGraphictogallery const sal_uInt16
+sw/source/uibase/docvw/romenu.hxx:50
+    SwReadOnlyPopup m_nReadonlyBackgroundtogallery const sal_uInt16
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
 sw/source/uibase/inc/olmenu.hxx:78
     SwSpellPopup m_aBuilder class VclBuilder
 sw/source/uibase/inc/swuicnttab.hxx:239
     SwTokenWindow m_aAdjustPositionsIdle class Idle
+sw/source/uibase/inc/swuipardlg.hxx:29
+    SwParaDlg nHtmlMode sal_uInt16
 sw/source/uibase/inc/uivwimp.hxx:93
     SwView_Impl xTmpSelDocSh const class SfxObjectShellLock
 sw/source/uibase/inc/unodispatch.hxx:45
     SwXDispatchProviderInterceptor::DispatchMutexLock_Impl aGuard const class SolarMutexGuard
 toolkit/source/awt/stylesettings.cxx:94
     toolkit::(anonymous namespace)::StyleMethodGuard m_aGuard const class SolarMutexGuard
+ucb/source/ucp/ftp/ftpintreq.hxx:75
+    ftp::XInteractionRequestImpl p2 class ftp::XInteractionDisapproveImpl *const
 ucb/source/ucp/gio/gio_mount.hxx:74
     OOoMountOperationClass parent_class GMountOperationClass
 ucb/source/ucp/gio/gio_mount.hxx:77
@@ -750,8 +842,14 @@ 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:319
-    (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
+uui/source/masterpassworddlg.hxx:29
+    MasterPasswordDialog rResLocale const std::locale &
+uui/source/passworddlg.hxx:47
+    PasswordDialog rResLocale const std::locale &
+vcl/headless/svpgdi.cxx:398
+    (anonymous namespace)::BitmapHelper aTmpBmp class SvpSalBitmap
+vcl/inc/bitmap/Octree.hxx:55
+    Octree mpAccess const class BitmapReadAccess *
 vcl/inc/canvasbitmap.hxx:42
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
 vcl/inc/graphic/Manager.hxx:41
@@ -762,7 +860,7 @@ vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
 vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone const class OpenGLZone
-vcl/inc/qt5/Qt5Graphics.hxx:58
+vcl/inc/qt5/Qt5Graphics.hxx:56
     Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salmenu.hxx:42
     SalMenuButtonItem mnId sal_uInt16
@@ -792,6 +890,8 @@ vcl/inc/unx/i18n_ic.hxx:45
     SalI18N_InputContext maSwitchIMCallback XIMCallback
 vcl/inc/unx/i18n_ic.hxx:46
     SalI18N_InputContext maDestroyCallback XIMCallback
+vcl/inc/unx/saldisp.hxx:125
+    SalColormap m_nXScreen class SalX11Screen
 vcl/inc/WidgetThemeLibrary.hxx:90
     vcl::ControlDrawParameters nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:91
@@ -802,7 +902,7 @@ 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:5793
+vcl/source/app/salvtables.cxx:5852
     (anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class WeldTextFilter
 vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -814,6 +914,8 @@ vcl/source/gdi/pdfbuildin_fonts.hxx:35
     vcl::pdf::BuildinFont m_nDescent const int
 vcl/source/gdi/pdfbuildin_fonts.hxx:42
     vcl::pdf::BuildinFont m_aWidths const int [256]
+vcl/source/gdi/textlayout.cxx:93
+    vcl::ReferenceDeviceTextLayout m_aUnzoomedPointFont const class vcl::Font
 vcl/unx/gtk3/a11y/atkwrapper.hxx:47
     AtkObjectWrapper aParent const AtkObject
 vcl/unx/gtk3/a11y/atkwrapper.hxx:75
@@ -824,12 +926,26 @@ 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:5143
+vcl/unx/gtk3/gtk3gtkinst.cxx:4814
+    (anonymous namespace)::GtkInstanceAssistant m_pButtonBox GtkButtonBox *
+vcl/unx/gtk3/gtk3gtkinst.cxx:5165
     (anonymous namespace)::CrippledViewport viewport GtkViewport
+vcl/unx/gtk3/gtk3gtkinst.cxx:13349
+    (anonymous namespace)::GtkInstanceBuilder m_sHelpRoot class rtl::OUString
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
+xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx:47
+    chelp::ResultSetForQuery m_aURLParameter const class chelp::URLParameter
+xmloff/inc/txtvfldi.hxx:405
+    XMLVariableDeclImportContext aValueHelper class XMLValueImportHelper
+xmloff/inc/txtvfldi.hxx:406
+    XMLVariableDeclImportContext cSeparationChar sal_Unicode
 xmloff/source/chart/transporttypes.hxx:149
     CustomLabelField sRuns std::vector<OUString>
+xmloff/source/draw/ximpbody.hxx:31
+    SdXMLDrawPageContext maMasterPageName class rtl::OUString
+xmloff/source/draw/ximpbody.hxx:32
+    SdXMLDrawPageContext maHREF class rtl::OUString
 xmloff/source/text/XMLTextListBlockContext.hxx:35
     XMLTextListBlockContext msListStyleName class rtl::OUString
 xmloff/source/text/XMLTextListBlockContext.hxx:41
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 3071b96d5a38..25a153d86200 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -174,17 +174,17 @@ dbaccess/source/core/api/RowSetBase.hxx:96
     dbaccess::ORowSetBase m_aErrors ::connectivity::SQLError
 dbaccess/source/core/dataaccess/documentcontainer.cxx:67
     dbaccess::(anonymous namespace)::LocalNameApproval m_aErrors ::connectivity::SQLError
-dbaccess/source/core/inc/ContentHelper.hxx:109
+dbaccess/source/core/inc/ContentHelper.hxx:105
     dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
-dbaccess/source/filter/hsqldb/parseschema.hxx:36
+dbaccess/source/filter/hsqldb/parseschema.hxx:35
     dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
 dbaccess/source/ui/control/tabletree.cxx:233
     dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
 dbaccess/source/ui/inc/charsetlistbox.hxx:44
     dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
-dbaccess/source/ui/inc/directsql.hxx:65
+dbaccess/source/ui/inc/directsql.hxx:67
     dbaui::DirectSQLDialog m_aColorConfig const svtools::ColorConfig
-dbaccess/source/ui/inc/WCopyTable.hxx:261
+dbaccess/source/ui/inc/WCopyTable.hxx:259
     dbaui::OCopyTableWizard m_aLocale css::lang::Locale
 drawinglayer/source/processor2d/vclprocessor2d.hxx:82
     drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer
@@ -341,7 +341,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 /media/disk2/libo4/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
@@ -372,7 +372,7 @@ io/source/stm/odata.cxx:578
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
 io/source/stm/odata.cxx:578
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
-libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:53
+libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:46
     (anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
 libreofficekit/source/gtk/lokdocview.cxx:86
     (anonymous namespace)::LOKDocViewPrivateImpl m_bIsLoading _Bool
@@ -419,17 +419,13 @@ sc/inc/attarray.hxx:68
 sc/inc/compiler.hxx:129
     ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
 sc/inc/compiler.hxx:130
-    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo4/sc/inc/compiler.hxx:127:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /home/noel/libo2/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
 sc/inc/reordermap.hxx:21
     sc::ColRowReorderMapType maData sc::ColRowReorderMapType::DataType
-sc/qa/extras/anchor.cxx:61
-    sc_apitest::ScAnchorTest mxComponent uno::Reference<lang::XComponent>
-sc/qa/unit/scshapetest.cxx:43
-    sc_apitest::ScShapeTest mxComponent uno::Reference<lang::XComponent>
 sc/source/core/inc/adiasync.hxx:42
     ScAddInAsync::(anonymous) pStr class rtl::OUString *
 sc/source/core/inc/interpre.hxx:102
@@ -598,13 +594,13 @@ sw/source/core/access/accfrmobjmap.hxx:100
     SwAccessibleChildMap maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/access/acchypertextdata.hxx:40
     SwAccessibleHyperTextData maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:106
+sw/source/core/access/accmap.cxx:107
     SwAccessibleContextMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:291
+sw/source/core/access/accmap.cxx:290
     SwAccessibleShapeMap_Impl maMap std::map<key_type, mapped_type, SwShapeFunc>
-sw/source/core/access/accmap.cxx:648
+sw/source/core/access/accmap.cxx:647
     SwAccessibleEventMap_Impl maMap std::map<key_type, mapped_type, key_compare>
-sw/source/core/access/accmap.cxx:692
+sw/source/core/access/accmap.cxx:691
     SwAccessibleSelectedParas_Impl maMap std::map<key_type, mapped_type, key_compare>
 sw/source/core/doc/swstylemanager.cxx:60
     (anonymous namespace)::SwStyleManager aAutoCharPool class StylePool
@@ -618,7 +614,7 @@ 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
+sw/source/filter/html/htmltab.cxx:2835
     CellSaveStruct m_xCnts std::shared_ptr<HTMLTableCnts>
 sw/source/filter/inc/rtf.hxx:32
     RTFSurround::(anonymous) nVal sal_uInt8
@@ -730,7 +726,7 @@ vcl/inc/salwtype.hxx:205
     SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong
 vcl/inc/salwtype.hxx:211
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:278
+vcl/inc/svdata.hxx:316
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
 vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
@@ -898,15 +894,15 @@ vcl/source/control/roadmapwizard.cxx:62
     vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions
 vcl/source/control/tabctrl.cxx:78
     ImplTabCtrlData maLayoutPageIdToLine std::unordered_map<int, int>
-vcl/source/filter/jpeg/Exif.hxx:51
+vcl/source/filter/jpeg/Exif.hxx:53
     Exif::ExifIFD tag sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:52
+vcl/source/filter/jpeg/Exif.hxx:54
     Exif::ExifIFD type sal_uInt8 [2]
-vcl/source/filter/jpeg/Exif.hxx:53
+vcl/source/filter/jpeg/Exif.hxx:55
     Exif::ExifIFD count sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:54
+vcl/source/filter/jpeg/Exif.hxx:56
     Exif::ExifIFD offset sal_uInt8 [4]
-vcl/source/filter/jpeg/Exif.hxx:58
+vcl/source/filter/jpeg/Exif.hxx:60
     Exif::TiffHeader byteOrder const sal_uInt16
 vcl/source/filter/jpeg/transupp.h:132
     (anonymous) slow_hflip boolean
@@ -998,5 +994,5 @@ xmloff/source/chart/SchXMLChartContext.hxx:56
     SeriesDefaultsAndStyles maPercentageErrorDefault const css::uno::Any
 xmloff/source/chart/SchXMLChartContext.hxx:57
     SeriesDefaultsAndStyles maErrorMarginDefault const css::uno::Any
-xmloff/source/core/xmlexp.cxx:262
+xmloff/source/core/xmlexp.cxx:264
     SvXMLExport_Impl maSaveOptions const class SvtSaveOptions
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 2f94798d9bb1..568a83577f26 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 /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo2/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
@@ -36,13 +36,13 @@ cppu/source/threadpool/threadpool.cxx:361
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:59
     (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
-dbaccess/source/core/inc/databasecontext.hxx:95
+dbaccess/source/core/inc/databasecontext.hxx:85
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
 emfio/source/emfuno/xemfparser.cxx:50
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
-extensions/source/scanner/scanner.hxx:45
+extensions/source/scanner/scanner.hxx:43
     ScannerManager maProtector osl::Mutex
 helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
@@ -81,20 +81,20 @@ include/sfx2/msg.hxx:133
 include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 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:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
-include/sfx2/msg.hxx:134
-    SfxType3 pType const std::type_info *
-include/sfx2/msg.hxx:135
-    SfxType4 aAttrib struct SfxTypeAttrib [4]
 include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
+    SfxType4 aAttrib struct SfxTypeAttrib [4]
+include/sfx2/msg.hxx:135
     SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
@@ -214,11 +214,11 @@ include/vcl/uitest/uiobject.hxx:272
     TabPageUIObject mxTabPage VclPtr<class TabPage>
 include/xmloff/formlayerexport.hxx:172
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:52
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
     GtvApplicationWindow parent_instance GtkApplicationWindow
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:56
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
     GtvApplicationWindow doctype LibreOfficeKitDocumentType
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:75
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:74
     GtvApplicationWindowClass parentClass GtkApplicationWindowClass
 libreofficekit/qa/gtktiledviewer/gtv-application.hxx:26
     GtvApplication parent GtkApplication
@@ -316,10 +316,12 @@ sc/source/filter/html/htmlpars.cxx:3010
     (anonymous namespace)::CSSHandler::MemStr mn size_t
 sc/source/filter/inc/sheetdatacontext.hxx:52
     oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser
-sc/source/ui/inc/docsh.hxx:455
+sc/source/ui/inc/docsh.hxx:459
     ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector>
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48
     ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget
+sd/source/ui/inc/sdtreelb.hxx:72
+    SdPageObjsTLV m_xDropTargetHelper std::unique_ptr<SdPageObjsTLVDropTarget>
 sd/source/ui/remotecontrol/ZeroconfService.hxx:32
     sd::ZeroconfService port const uint
 sd/source/ui/slidesorter/view/SlsLayouter.cxx:62
@@ -404,11 +406,11 @@ vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone const class OpenGLZone
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
-vcl/inc/qt5/Qt5Graphics.hxx:56
+vcl/inc/qt5/Qt5Graphics.hxx:54
     Qt5Graphics m_focusedButton std::unique_ptr<QPushButton>
-vcl/inc/qt5/Qt5Graphics.hxx:57
+vcl/inc/qt5/Qt5Graphics.hxx:55
     Qt5Graphics m_image std::unique_ptr<QImage>
-vcl/inc/qt5/Qt5Graphics.hxx:58
+vcl/inc/qt5/Qt5Graphics.hxx:56
     Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salprn.hxx:45
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
@@ -442,9 +444,13 @@ 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:5143
+vcl/unx/gtk3/gtk3gtkinst.cxx:5165
     (anonymous namespace)::CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
 xmloff/source/chart/transporttypes.hxx:149
     CustomLabelField sRuns std::vector<OUString>
+xmloff/source/draw/sdxmlimp_impl.hxx:159
+    SdXMLImport mpDrawPageAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:160
+    SdXMLImport mpDrawPageElemTokenMap std::unique_ptr<SvXMLTokenMap>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 0da880763305..e4627fe73eda 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -90,7 +90,7 @@ chart2/source/controller/dialogs/DialogModel.cxx:173
     (anonymous namespace)::lcl_DataSeriesContainerAppend m_rDestCnt (anonymous namespace)::lcl_DataSeriesContainerAppend::tContainerType *
 chart2/source/controller/dialogs/DialogModel.cxx:232
     (anonymous namespace)::lcl_RolesWithRangeAppend m_rDestCnt (anonymous namespace)::lcl_RolesWithRangeAppend::tContainerType *
-chart2/source/controller/inc/ChartController.hxx:417
+chart2/source/controller/inc/ChartController.hxx:413
     chart::ChartController m_apDropTargetHelper std::unique_ptr<DropTargetHelper>
 chart2/source/controller/inc/dlg_View3D.hxx:51
     chart::View3DDialog m_xIllumination std::unique_ptr<ThreeD_SceneIllumination_TabPage>
@@ -170,7 +170,7 @@ connectivity/source/inc/writer/WConnection.hxx:66
     connectivity::writer::OWriterConnection::CloseVetoButTerminateListener m_pCloseListener std::unique_ptr<utl::CloseVeto>
 cppcanvas/source/inc/implrenderer.hxx:210
     cppcanvas::internal::ImplRenderer aBaseTransform struct cppcanvas::internal::XForm
-cppu/source/typelib/typelib.cxx:907
+cppu/source/typelib/typelib.cxx:903
     (anonymous namespace)::BaseList set (anonymous namespace)::BaseList::Set
 cppu/source/uno/check.cxx:38
     (anonymous namespace)::C1 n1 sal_Int16
@@ -230,7 +230,7 @@ cui/source/inc/cuihyperdlg.hxx:77
     SvxHpLinkDlg maCtrl class SvxHlinkCtrl
 cui/source/inc/screenshotannotationdlg.hxx:30
     ScreenshotAnnotationDlg m_pImpl std::unique_ptr<ScreenshotAnnotationDlg_Impl>
-dbaccess/source/core/dataaccess/databasedocument.hxx:176
+dbaccess/source/core/dataaccess/databasedocument.hxx:177
     dbaccess::ODatabaseDocument m_pEventExecutor ::rtl::Reference<DocumentEventExecutor>
 dbaccess/source/core/dataaccess/documentdefinition.cxx:299
     dbaccess::(anonymous namespace)::LifetimeCoupler m_xClient Reference<class com::sun::star::uno::XInterface>
@@ -238,7 +238,7 @@ dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:84
     dbaccess::OSingleSelectQueryComposer m_aColumnsCollection std::vector<std::unique_ptr<OPrivateColumns> >
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:86
     dbaccess::OSingleSelectQueryComposer m_aTablesCollection std::vector<std::unique_ptr<OPrivateTables> >
-dbaccess/source/core/inc/TableDeco.hxx:67
+dbaccess/source/core/inc/TableDeco.hxx:66
     dbaccess::ODBTableDecorator m_xColumnMediator css::uno::Reference<css::container::XContainerListener>
 dbaccess/source/filter/xml/dbloader2.cxx:233
     dbaxml::(anonymous namespace)::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader>
@@ -298,9 +298,9 @@ embeddedobj/source/inc/oleembobj.hxx:189
     OleEmbeddedObject m_bFromClipboard _Bool
 emfio/inc/mtftools.hxx:511
     emfio::MtfTools mrclBounds tools::Rectangle
-extensions/source/propctrlr/genericpropertyhandler.hxx:63
+extensions/source/propctrlr/genericpropertyhandler.hxx:65
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
-extensions/source/scanner/scanner.hxx:47
+extensions/source/scanner/scanner.hxx:45
     ScannerManager mpData void *
 framework/inc/services/layoutmanager.hxx:248
     framework::LayoutManager m_bGlobalSettings _Bool
@@ -418,8 +418,6 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:158
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/accel.hxx:42
-    Accelerator maCurKeyCode vcl::KeyCode
 include/vcl/menu.hxx:454
     MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:54
@@ -444,14 +442,14 @@ include/vcl/sysdata.hxx:69
     SystemEnvData pSalFrame void *
 include/vcl/textrectinfo.hxx:32
     TextRectInfo mnLineCount sal_uInt16
-include/vcl/vclenum.hxx:199
+include/vcl/vclenum.hxx:202
     ItalicMatrix yy double
-include/vcl/vclenum.hxx:199
-    ItalicMatrix yx double
-include/vcl/vclenum.hxx:199
-    ItalicMatrix xy double
-include/vcl/vclenum.hxx:199
+include/vcl/vclenum.hxx:202
     ItalicMatrix xx double
+include/vcl/vclenum.hxx:202
+    ItalicMatrix xy double
+include/vcl/vclenum.hxx:202
+    ItalicMatrix yx double
 include/xmloff/shapeimport.hxx:180
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 include/xmloff/shapeimport.hxx:181
@@ -466,11 +464,11 @@ jvmfwk/inc/vendorbase.hxx:174
     jfw_plugin::VendorBase m_sArch class rtl::OUString
 l10ntools/inc/common.hxx:31
     common::HandledArgs m_bUTF8BOM _Bool
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:29
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:28
     GtvRenderingArgs m_aBackgroundColor std::string
-libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:63
+libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:62
     GtvApplicationWindow statusbar GtkWidget *
-libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:39
+libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx:37
     (anonymous namespace)::GtvMainToolbarPrivateImpl m_pPartModeSelector GtkWidget *
 package/inc/ByteChucker.hxx:38
     ByteChucker p2Sequence sal_Int8 *const
@@ -492,7 +490,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:1025
+sal/rtl/math.cxx:952
      md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:98
     (anonymous namespace)::ImplUTF7ToUCContextData mbShifted _Bool
@@ -616,17 +614,17 @@ sc/source/ui/inc/uiitems.hxx:47
     ScInputStatusItem aStartPos const class ScAddress
 sc/source/ui/inc/uiitems.hxx:48
     ScInputStatusItem aEndPos const class ScAddress
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:76
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:78
     sc::sidebar::AlignmentPropertyPanel mxHorizontalAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:79
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:81
     sc::sidebar::AlignmentPropertyPanel mxVertAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:82
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:84
     sc::sidebar::AlignmentPropertyPanel mxWriteDirectionDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:85
+sc/source/ui/sidebar/AlignmentPropertyPanel.hxx:87
     sc::sidebar::AlignmentPropertyPanel mxIndentButtonsDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:77
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:75
     sc::sidebar::CellAppearancePropertyPanel mxBackColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:81
+sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx:79
     sc::sidebar::CellAppearancePropertyPanel mxLineColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx:67
     sc::sidebar::NumberFormatPropertyPanel mxCatagoryDispatch std::unique_ptr<ToolbarUnoDispatcher>
@@ -644,9 +642,9 @@ 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>
-sd/source/ui/inc/navigatr.hxx:124
-    SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
 sd/source/ui/inc/navigatr.hxx:125
+    SdNavigatorWin mpNavigatorCtrlItem std::unique_ptr<SdNavigatorControllerItem>
+sd/source/ui/inc/navigatr.hxx:126
     SdNavigatorWin mpPageNameCtrlItem std::unique_ptr<SdPageNameControllerItem>
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:73
     sd::tools::TimerBasedTaskExecution mpSelf std::shared_ptr<TimerBasedTaskExecution>
@@ -806,7 +804,7 @@ svx/source/sidebar/possize/PosSizePropertyPanel.hxx:105
     svx::sidebar::PosSizePropertyPanel mxArrangeDispatch std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/svdraw/svdpdf.hxx:193
     ImpSdrPdfImport mdPageWidthPts double
-svx/source/tbxctrls/tbcontrl.cxx:202
+svx/source/tbxctrls/tbcontrl.cxx:204
     (anonymous namespace)::SvxFontNameBox_Impl m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -847,7 +845,7 @@ 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 /media/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9)
+    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
@@ -871,9 +869,7 @@ sw/source/uibase/sidebar/TableEditPanel.hxx:61
 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>
+    sw::sidebar::WrapPropertyPanel mxWrapOptionsDispatch 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
@@ -962,7 +958,7 @@ vcl/inc/pdf/BitmapID.hxx:25
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
 vcl/inc/qt5/Qt5Frame.hxx:97
     Qt5Frame m_pSalMenu class Qt5Menu *
-vcl/inc/qt5/Qt5Graphics.hxx:53
+vcl/inc/qt5/Qt5Graphics.hxx:51
     Qt5Graphics m_pFontCollection class PhysicalFontCollection *
 vcl/inc/qt5/Qt5Instance.hxx:59
     Qt5Instance m_pQApplication std::unique_ptr<QApplication>
@@ -1008,7 +1004,7 @@ vcl/inc/scanlinewriter.hxx:36
     vcl::ScanlineWriter mpCurrentScanline sal_uInt8 *
 vcl/inc/sft.hxx:742
     vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
-vcl/inc/svdata.hxx:418
+vcl/inc/svdata.hxx:456
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
@@ -1030,7 +1026,7 @@ vcl/source/filter/graphicfilter.cxx:613
     (anonymous namespace)::ImpFilterLibCacheEntry maFiltername const class rtl::OUString
 vcl/source/filter/graphicfilter.cxx:716
     (anonymous namespace)::ImpFilterLibCache mpLast struct (anonymous namespace)::ImpFilterLibCacheEntry *
-vcl/source/filter/jpeg/Exif.hxx:51
+vcl/source/filter/jpeg/Exif.hxx:53
     Exif::ExifIFD tag sal_uInt8 [2]
 vcl/source/filter/wmf/wmfwr.hxx:95
     WMFWriter aDstClipRegion vcl::Region
@@ -1070,7 +1066,7 @@ vcl/unx/gtk3/gtk3hudawareness.cxx:21
     (anonymous namespace)::HudAwarenessHandle notify GDestroyNotify
 vcl/workben/vcldemo.cxx:1750
     (anonymous namespace)::DemoWin mxThread rtl::Reference<RenderThread>
-writerfilter/source/dmapper/DomainMapperTableHandler.cxx:232
+writerfilter/source/dmapper/DomainMapperTableHandler.cxx:233
     writerfilter::dmapper::TableInfo aTablePropertyIds std::vector<PropertyIds>
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32