[Libreoffice-commits] core.git: compilerplugins/clang include/xmloff xmloff/source

Noel (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 6 12:18:28 UTC 2020


 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  122 ++++------
 compilerplugins/clang/unusedfields.py                               |   16 -
 compilerplugins/clang/unusedfields.readonly.results                 |    4 
 compilerplugins/clang/unusedfields.untouched.results                |   98 +++-----
 compilerplugins/clang/unusedfields.writeonly.results                |   56 +---
 include/xmloff/xmlictxt.hxx                                         |    3 
 xmloff/source/core/xmlimp.cxx                                       |    6 
 7 files changed, 140 insertions(+), 165 deletions(-)

New commits:
commit 875944d0cfffb3540234affe2d0b2eba1fcddf90
Author:     Noel <noelgrandin at gmail.com>
AuthorDate: Fri Nov 6 08:42:38 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 6 13:17:49 2020 +0100

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

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 09cc4676e06b..2a815f823f29 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -26,10 +26,10 @@ connectivity/source/commontools/RowFunctionParser.cxx:372
     connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:373
     connectivity::(anonymous namespace)::ExpressionGrammar::definition assignment ::boost::spirit::classic::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:374
-    connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:374
     connectivity::(anonymous namespace)::ExpressionGrammar::definition argument ::boost::spirit::classic::rule<ScannerT>
+connectivity/source/commontools/RowFunctionParser.cxx:374
+    connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:375
     connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::classic::rule<ScannerT>
 connectivity/source/commontools/RowFunctionParser.cxx:375
@@ -154,8 +154,6 @@ dbaccess/source/core/dataaccess/connection.hxx:101
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2831
-      class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:57
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 drawinglayer/inc/texture/texture3d.hxx:59
@@ -202,38 +200,38 @@ include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs sal_uInt16
+include/sfx2/msg.hxx:132
+    SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
-    SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:132
     SfxType1 pType const std::type_info *
-include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:133
     SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
-include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
+include/sfx2/msg.hxx:133
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
 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 pType const std::type_info *
 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:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
+include/sfx2/msg.hxx:135
+    SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:136
     SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
@@ -242,70 +240,70 @@ include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
     SfxType5 pType const std::type_info *
-include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:137
     SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
     SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
-include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
+include/sfx2/msg.hxx:137
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
 include/sfx2/msg.hxx:138
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
-include/sfx2/msg.hxx:139
-    SfxType8 pType const std::type_info *
+include/sfx2/msg.hxx:138
+    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:139
     SfxType8 aAttrib struct SfxTypeAttrib [8]
+include/sfx2/msg.hxx:139
+    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:139
     SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
-    SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType8 pType const std::type_info *
+include/sfx2/msg.hxx:140
+    SfxType10 aAttrib struct SfxTypeAttrib [10]
 include/sfx2/msg.hxx:140
     SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:140
     SfxType10 nAttribs sal_uInt16
 include/sfx2/msg.hxx:140
     SfxType10 pType const std::type_info *
-include/sfx2/msg.hxx:140
-    SfxType10 aAttrib struct SfxTypeAttrib [10]
 include/sfx2/msg.hxx:141
-    SfxType11 nAttribs sal_uInt16
+    SfxType11 aAttrib struct SfxTypeAttrib [11]
 include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
+    SfxType11 nAttribs sal_uInt16
 include/sfx2/msg.hxx:141
     SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:143
-    SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
     SfxType13 aAttrib struct SfxTypeAttrib [13]
 include/sfx2/msg.hxx:143
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:143
+    SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
     SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:144
     SfxType14 aAttrib struct SfxTypeAttrib [14]
-include/sfx2/msg.hxx:144
-    SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:144
+    SfxType14 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
     SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:145
     SfxType16 aAttrib struct SfxTypeAttrib [16]
+include/sfx2/msg.hxx:145
+    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:145
     SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
     SfxType16 pType const std::type_info *
-include/sfx2/msg.hxx:145
-    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:146
     SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:146
@@ -315,13 +313,13 @@ include/sfx2/msg.hxx:146
 include/sfx2/msg.hxx:146
     SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:147
-    SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType23 aAttrib struct SfxTypeAttrib [23]
 include/sfx2/msg.hxx:147
-    SfxType23 pType const std::type_info *
+    SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
-    SfxType23 aAttrib struct SfxTypeAttrib [23]
+    SfxType23 pType const std::type_info *
 include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svx/ClassificationDialog.hxx:29
@@ -424,10 +422,10 @@ sal/qa/osl/file/osl_File.cxx:1588
     osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
-sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
+sal/qa/osl/file/osl_File.cxx:1589
+    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
@@ -442,22 +440,22 @@ sal/qa/osl/module/osl_Module.cxx:342
     osl_Module::getFunctionSymbol bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:358
     osl_Pipe::clear bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:523
-    osl_Pipe::getError bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:523
     osl_Pipe::getError bRes _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:523
+    osl_Pipe::getError bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:561
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
-    osl_StreamPipe::recv bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:848
+    osl_StreamPipe::recv bRes1 _Bool
 sal/qa/osl/process/osl_process.cxx:151
     Test_osl_executeProcess env_param_ const class rtl::OUString
-sal/qa/osl/security/osl_Security.cxx:59
-    osl_Security::ctors bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes _Bool
+sal/qa/osl/security/osl_Security.cxx:59
+    osl_Security::ctors bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:154
@@ -476,6 +474,8 @@ sc/inc/compiler.hxx:266
     ScCompiler::AddInMap pUpper const char *
 sc/inc/token.hxx:403
     SingleDoubleRefModifier aDub struct ScComplexRefData
+sc/qa/unit/ucalc_formula.cxx:3134
+      class Test *
 sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1243
@@ -542,7 +542,7 @@ sccomp/source/solver/DifferentialEvolution.hxx:35
     DifferentialEvolutionAlgorithm maRandomDevice std::random_device
 sccomp/source/solver/ParticelSwarmOptimization.hxx:56
     ParticleSwarmOptimizationAlgorithm maRandomDevice std::random_device
-scripting/source/stringresource/stringresource.cxx:1279
+scripting/source/stringresource/stringresource.cxx:1278
     stringresource::(anonymous namespace)::BinaryInput m_aData Sequence<sal_Int8>
 sd/inc/anminfo.hxx:52
     SdAnimationInfo maSecondSoundFile class rtl::OUString
@@ -571,33 +571,31 @@ sd/source/ui/view/viewshel.cxx:1168
 sd/source/ui/view/viewshel.cxx:1169
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition simple_type rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition comment rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition name rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition boolean rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition null_object rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
-    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition simple_type rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition stream rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
+    (anonymous namespace)::PDFGrammar::definition stringtype rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition dict_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition dict_element rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition dict_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition objectref rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
-    (anonymous namespace)::PDFGrammar::definition object_end rule<ScannerT>
+    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
@@ -606,14 +604,14 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
-    (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
+    (anonymous namespace)::PDFGrammar::definition object_end rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
     (anonymous namespace)::PDFGrammar::definition trailer rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:266
+    (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/inc/templatedefaultview.hxx:29
-    TemplateDefaultView mnItemMaxSize tools::Long
 sfx2/source/dialog/basedlgs.cxx:47
     SfxModelessDialog_Impl aMoveIdle class Idle
 sfx2/source/doc/doctempl.cxx:104
@@ -622,10 +620,10 @@ slideshow/source/engine/animationnodes/animationbasenode.hxx:88
     slideshow::internal::AnimationBaseNode mpSubsetManager slideshow::internal::SubsettableShapeManagerSharedPtr
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
     (anonymous namespace)::ThreeFloats x GLfloat
-slideshow/source/engine/opengl/TransitionImpl.cxx:1992
-    (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1992
     (anonymous namespace)::ThreeFloats y GLfloat
+slideshow/source/engine/opengl/TransitionImpl.cxx:1992
+    (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.hxx:301
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:302
@@ -716,7 +714,7 @@ sw/inc/unosett.hxx:145
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
 sw/qa/core/test_ToxTextGenerator.cxx:140
     (anonymous namespace)::ToxTextGeneratorWithMockedChapterField mChapterFieldType class SwChapterFieldType
-sw/qa/extras/uiwriter/uiwriter.cxx:4485
+sw/qa/extras/uiwriter/uiwriter.cxx:4582
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
@@ -772,8 +770,6 @@ vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
 vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone class OpenGLZone
-vcl/inc/qt5/Qt5Graphics.hxx:58
-    Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salmenu.hxx:42
     SalMenuButtonItem mnId sal_uInt16
 vcl/inc/salmenu.hxx:43
@@ -840,11 +836,9 @@ vcl/unx/gtk3/gtk3gtkinst.cxx:5347
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
 vcl/unx/gtk3/gtk3gtkinst.cxx:7638
     (anonymous namespace)::GtkInstanceMenuToggleButton m_pContainer GtkContainer *
-vcl/unx/gtk3/gtk3gtkinst.cxx:7640
-    (anonymous namespace)::GtkInstanceMenuToggleButton m_pBox GtkBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13955
+vcl/unx/gtk3/gtk3gtkinst.cxx:13954
     (anonymous namespace)::GtkInstanceComboBox m_pOverlay GtkOverlay *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13961
+vcl/unx/gtk3/gtk3gtkinst.cxx:13960
     (anonymous namespace)::GtkInstanceComboBox m_pMenuTextRenderer GtkCellRenderer *
 writerfilter/source/dmapper/PropertyMap.hxx:220
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index 9b313c89c9eb..6503b63fb626 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -246,14 +246,18 @@ for d in (potentialClasses - excludedClasses):
 def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
     return [int(text) if text.isdigit() else text.lower()
             for text in re.split(_nsre, s)]
+# sort by both the source-line and the datatype, so the output file ordering is stable
+# when we have multiple items on the same source line
+def v_sort_key(v):
+    return natural_sort_key(v[1]) + [v[0]]
 
 # sort results by name and line number
-tmp1list = sorted(untouchedSet, key=lambda v: natural_sort_key(v[1]))
-tmp2list = sorted(writeonlySet, key=lambda v: natural_sort_key(v[1]))
-tmp3list = sorted(canBePrivateSet, key=lambda v: natural_sort_key(v[1]))
-tmp4list = sorted(readonlySet, key=lambda v: natural_sort_key(v[1]))
-tmp5list = sorted(onlyUsedInConstructorSet, key=lambda v: natural_sort_key(v[1]))
-tmp6list = sorted(allFieldsCanBePrivateSet, key=lambda v: natural_sort_key(v[1]))
+tmp1list = sorted(untouchedSet, key=lambda v: v_sort_key(v))
+tmp2list = sorted(writeonlySet, key=lambda v: v_sort_key(v))
+tmp3list = sorted(canBePrivateSet, key=lambda v: v_sort_key(v))
+tmp4list = sorted(readonlySet, key=lambda v: v_sort_key(v))
+tmp5list = sorted(onlyUsedInConstructorSet, key=lambda v: v_sort_key(v))
+tmp6list = sorted(allFieldsCanBePrivateSet, key=lambda v: v_sort_key(v))
 
 # print out the results
 with open("compilerplugins/clang/unusedfields.untouched.results", "wt") as f:
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 3a161fc77a93..c782d5516581 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -344,10 +344,10 @@ include/vcl/opengl/OpenGLContext.hxx:48
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
 include/vcl/opengl/OpenGLContext.hxx:167
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
-io/source/stm/odata.cxx:559
-    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
 io/source/stm/odata.cxx:559
     io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n1 sal_uInt32
+io/source/stm/odata.cxx:559
+    io_stm::(anonymous namespace)::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:47
     (anonymous namespace)::GtvLokDialogPrivate m_nChildKeyModifier guint32
 libreofficekit/source/gtk/lokdocview.cxx:86
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index ecdf50f9605d..9f7c78e0c16e 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -24,8 +24,6 @@ dbaccess/source/core/inc/databasecontext.hxx:84
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2831
-      class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:49
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:43
@@ -50,38 +48,38 @@ include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
-    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
     SfxType1 aAttrib struct SfxTypeAttrib [1]
 include/sfx2/msg.hxx:132
     SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:133
-    SfxType2 pType const std::type_info *
+include/sfx2/msg.hxx:132
+    SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
+include/sfx2/msg.hxx:133
+    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
 include/sfx2/msg.hxx:133
-    SfxType2 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType2 pType const std::type_info *
 include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
-include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
 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 pType const std::type_info *
-include/sfx2/msg.hxx:135
-    SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:135
     SfxType4 aAttrib struct SfxTypeAttrib [4]
 include/sfx2/msg.hxx:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
     SfxType4 nAttribs sal_uInt16
+include/sfx2/msg.hxx:135
+    SfxType4 pType const std::type_info *
 include/sfx2/msg.hxx:136
     SfxType5 aAttrib struct SfxTypeAttrib [5]
 include/sfx2/msg.hxx:136
@@ -91,85 +89,85 @@ include/sfx2/msg.hxx:136
 include/sfx2/msg.hxx:136
     SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
+    SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
     SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:137
-    SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
+include/sfx2/msg.hxx:137
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
 include/sfx2/msg.hxx:138
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
+include/sfx2/msg.hxx:138
+    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:139
-    SfxType8 nAttribs sal_uInt16
+    SfxType8 aAttrib struct SfxTypeAttrib [8]
 include/sfx2/msg.hxx:139
     SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:139
-    SfxType8 pType const std::type_info *
+    SfxType8 nAttribs sal_uInt16
 include/sfx2/msg.hxx:139
-    SfxType8 aAttrib struct SfxTypeAttrib [8]
-include/sfx2/msg.hxx:140
-    SfxType10 nAttribs sal_uInt16
-include/sfx2/msg.hxx:140
-    SfxType10 pType const std::type_info *
+    SfxType8 pType const std::type_info *
 include/sfx2/msg.hxx:140
     SfxType10 aAttrib struct SfxTypeAttrib [10]
 include/sfx2/msg.hxx:140
     SfxType10 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:140
+    SfxType10 nAttribs sal_uInt16
+include/sfx2/msg.hxx:140
+    SfxType10 pType const std::type_info *
 include/sfx2/msg.hxx:141
-    SfxType11 nAttribs sal_uInt16
+    SfxType11 aAttrib struct SfxTypeAttrib [11]
 include/sfx2/msg.hxx:141
     SfxType11 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:141
-    SfxType11 aAttrib struct SfxTypeAttrib [11]
+    SfxType11 nAttribs sal_uInt16
 include/sfx2/msg.hxx:141
     SfxType11 pType const std::type_info *
-include/sfx2/msg.hxx:143
-    SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
     SfxType13 aAttrib struct SfxTypeAttrib [13]
 include/sfx2/msg.hxx:143
     SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:143
+    SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:143
     SfxType13 pType const std::type_info *
 include/sfx2/msg.hxx:144
     SfxType14 aAttrib struct SfxTypeAttrib [14]
-include/sfx2/msg.hxx:144
-    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
     SfxType14 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:144
     SfxType14 nAttribs sal_uInt16
+include/sfx2/msg.hxx:144
+    SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:145
-    SfxType16 pType const std::type_info *
+    SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:145
     SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:145
-    SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:145
     SfxType16 nAttribs sal_uInt16
+include/sfx2/msg.hxx:145
+    SfxType16 pType const std::type_info *
 include/sfx2/msg.hxx:146
-    SfxType17 nAttribs sal_uInt16
-include/sfx2/msg.hxx:146
-    SfxType17 pType const std::type_info *
+    SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:146
     SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:146
-    SfxType17 aAttrib struct SfxTypeAttrib [17]
+    SfxType17 nAttribs sal_uInt16
+include/sfx2/msg.hxx:146
+    SfxType17 pType const std::type_info *
 include/sfx2/msg.hxx:147
-    SfxType23 pType const std::type_info *
+    SfxType23 aAttrib struct SfxTypeAttrib [23]
 include/sfx2/msg.hxx:147
     SfxType23 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:147
     SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
-    SfxType23 aAttrib struct SfxTypeAttrib [23]
+    SfxType23 pType const std::type_info *
 include/svtools/genericunodialog.hxx:155
     svt::UnoDialogEntryGuard m_aGuard ::osl::MutexGuard
 include/svtools/unoevent.hxx:163
@@ -247,11 +245,11 @@ sal/qa/osl/file/osl_File.cxx:1588
 sal/qa/osl/file/osl_File.cxx:1588
     osl_FileStatus::getFileType m_aVolumeItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
+    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
     osl_FileStatus::getFileType m_aSocketItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:1589
-    osl_FileStatus::getFileType m_aLinkItem class osl::DirectoryItem
+    osl_FileStatus::getFileType m_aSpecialItem class osl::DirectoryItem
 sal/qa/osl/file/osl_File.cxx:3417
     osl_File::setAttributes rItem_hidden class osl::DirectoryItem
 sal/qa/osl/module/osl_Module.cxx:70
@@ -272,20 +270,22 @@ sal/qa/osl/pipe/osl_Pipe.cxx:523
     osl_Pipe::getError bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:561
     osl_Pipe::getHandle bRes1 _Bool
-sal/qa/osl/pipe/osl_Pipe.cxx:848
-    osl_StreamPipe::recv bRes1 _Bool
 sal/qa/osl/pipe/osl_Pipe.cxx:848
     osl_StreamPipe::recv bRes _Bool
-sal/qa/osl/security/osl_Security.cxx:59
-    osl_Security::ctors bRes1 _Bool
+sal/qa/osl/pipe/osl_Pipe.cxx:848
+    osl_StreamPipe::recv bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:59
     osl_Security::ctors bRes _Bool
+sal/qa/osl/security/osl_Security.cxx:59
+    osl_Security::ctors bRes1 _Bool
 sal/qa/osl/security/osl_Security.cxx:124
     osl_Security::getUserIdent bRes1 _Bool
 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/qa/unit/ucalc_formula.cxx:3134
+      class Test *
 sc/source/core/data/document.cxx:1242
     (anonymous namespace)::BroadcastRecalcOnRefMoveGuard aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1243
@@ -320,10 +320,10 @@ sd/source/ui/view/viewshel.cxx:1169
     sd::(anonymous namespace)::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
 sd/source/ui/view/ViewShellBase.cxx:188
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition array rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+    (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:94
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
 sfx2/source/dialog/basedlgs.cxx:47
@@ -394,12 +394,6 @@ vcl/inc/opengl/zone.hxx:33
     OpenGLVCLContextZone aZone class OpenGLZone
 vcl/inc/qt5/Qt5AccessibleEventListener.hxx:34
     Qt5AccessibleEventListener m_xAccessible css::uno::Reference<css::accessibility::XAccessible>
-vcl/inc/qt5/Qt5Graphics.hxx:56
-    Qt5Graphics m_focusedButton std::unique_ptr<QPushButton>
-vcl/inc/qt5/Qt5Graphics.hxx:57
-    Qt5Graphics m_image std::unique_ptr<QImage>
-vcl/inc/qt5/Qt5Graphics.hxx:58
-    Qt5Graphics m_lastPopupRect class QRect
 vcl/inc/salprn.hxx:45
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
 vcl/inc/WidgetThemeLibrary.hxx:100
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index e3e880caf9fe..9a409a723c75 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -62,16 +62,16 @@ canvas/inc/rendering/irendermodule.hxx:35
     canvas::Vertex g float
 canvas/inc/rendering/irendermodule.hxx:35
     canvas::Vertex r float
-canvas/inc/rendering/irendermodule.hxx:36
-    canvas::Vertex v float
 canvas/inc/rendering/irendermodule.hxx:36
     canvas::Vertex u float
+canvas/inc/rendering/irendermodule.hxx:36
+    canvas::Vertex v float
 canvas/inc/rendering/irendermodule.hxx:37
     canvas::Vertex x float
-canvas/inc/rendering/irendermodule.hxx:37
-    canvas::Vertex z float
 canvas/inc/rendering/irendermodule.hxx:37
     canvas::Vertex y float
+canvas/inc/rendering/irendermodule.hxx:37
+    canvas::Vertex z float
 canvas/source/cairo/cairo_canvasbitmap.hxx:119
     cairocanvas::CanvasBitmap mpBufferCairo ::cairo::CairoSharedPtr
 canvas/source/cairo/cairo_spritedevicehelper.hxx:73
@@ -104,8 +104,6 @@ codemaker/source/javamaker/classfile.cxx:508
      floatBytes float
 codemaker/source/javamaker/classfile.cxx:540
      doubleBytes double
-comphelper/qa/container/comphelper_ifcontainer.cxx:44
-    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const
 comphelper/qa/unit/parallelsorttest.cxx:44
     ParallelSortTest mnThreads size_t
 comphelper/source/misc/asyncnotification.cxx:86
@@ -180,6 +178,8 @@ cppu/source/uno/copy.hxx:38
     cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32
 cppu/source/uno/copy.hxx:39
     cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32
+cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:45
+    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *
 cppuhelper/source/access_control.cxx:79
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:80
@@ -210,8 +210,6 @@ dbaccess/source/ui/app/AppDetailView.hxx:107
     dbaui::OApplicationDetailView m_aExternalMnemonics class MnemonicGenerator
 dbaccess/source/ui/browser/dbloader.cxx:62
     (anonymous namespace)::DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener>
-desktop/qa/desktop_lib/test_desktop_lib.cxx:237
-    DesktopLOKTest m_bModified _Bool
 desktop/source/app/app.cxx:1209
     desktop::(anonymous namespace)::ExecuteGlobals pLanguageOptions std::unique_ptr<SvtLanguageOptions>
 desktop/source/app/app.cxx:1210
@@ -232,10 +230,10 @@ 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:47
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
-desktop/unx/source/splashx.c:371
-     flags unsigned long
 desktop/unx/source/splashx.c:371
      decorations unsigned long
+desktop/unx/source/splashx.c:371
+     flags unsigned long
 desktop/unx/source/splashx.c:371
      functions unsigned long
 desktop/unx/source/splashx.c:372
@@ -380,10 +378,10 @@ include/svx/svdograf.hxx:95
     SdrGrafObj aReferer class rtl::OUString
 include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) H double
-include/svx/viewpt3d.hxx:62
-    Viewport3D::(anonymous) Y double
 include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) X double
+include/svx/viewpt3d.hxx:62
+    Viewport3D::(anonymous) Y double
 include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:159
@@ -414,22 +412,24 @@ include/vcl/textrectinfo.hxx:35
     TextRectInfo mnLineCount sal_uInt16
 include/vcl/vclenum.hxx:202
     ItalicMatrix xx double
-include/vcl/vclenum.hxx:202
-    ItalicMatrix yy double
 include/vcl/vclenum.hxx:202
     ItalicMatrix xy double
 include/vcl/vclenum.hxx:202
     ItalicMatrix yx double
+include/vcl/vclenum.hxx:202
+    ItalicMatrix yy double
 include/xmloff/shapeimport.hxx:180
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 include/xmloff/shapeimport.hxx:181
     SdXML3DSceneAttributesHelper mbVPNUsed _Bool
 include/xmloff/shapeimport.hxx:182
     SdXML3DSceneAttributesHelper mbVUPUsed _Bool
-io/source/stm/odata.cxx:243
-    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
+include/xmloff/xmlictxt.hxx:53
+    SvXMLImportContext m_pRewindMap std::unique_ptr<SvXMLNamespaceMap>
 io/source/stm/odata.cxx:243
     io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n1 sal_uInt32
+io/source/stm/odata.cxx:243
+    io_stm::(anonymous namespace)::ODataInputStream::readDouble()::(anonymous union)::(anonymous) n2 sal_uInt32
 jvmfwk/inc/vendorbase.hxx:175
     jfw_plugin::VendorBase m_sArch class rtl::OUString
 l10ntools/inc/common.hxx:31
@@ -562,8 +562,6 @@ sc/source/ui/inc/drwtrans.hxx:45
     ScDrawTransferObj m_aDrawPersistRef SfxObjectShellRef
 sc/source/ui/inc/filtdlg.hxx:186
     ScSpecialFilterDlg pOptionsMgr std::unique_ptr<ScFilterOptionsMgr>
-sc/source/ui/inc/inputwin.hxx:145
-    ScTextWnd xAcc css::uno::WeakReference<css::accessibility::XAccessible>
 sc/source/ui/inc/instbdlg.hxx:57
     ScInsertTableDlg aDocShTablesRef SfxObjectShellRef
 sc/source/ui/inc/linkarea.hxx:38
@@ -656,8 +654,6 @@ sfx2/inc/notebookbar/NotebookbarTabControl.hxx:41
     NotebookbarTabControl m_pListener css::uno::Reference<css::ui::XUIConfigurationListener>
 sfx2/source/appl/fileobj.hxx:40
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/control/thumbnailviewacc.hxx:126
-    ThumbnailViewAcc mbIsFocused _Bool
 sfx2/source/doc/sfxbasemodel.cxx:448
     (anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
 sfx2/source/inc/appdata.hxx:71
@@ -994,10 +990,6 @@ vcl/inc/pdf/BitmapID.hxx:23
     vcl::pdf::BitmapID m_nChecksum BitmapChecksum
 vcl/inc/pdf/BitmapID.hxx:24
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/inc/qt5/Qt5Frame.hxx:97
-    Qt5Frame m_pSalMenu class Qt5Menu *
-vcl/inc/qt5/Qt5Graphics.hxx:53
-    Qt5Graphics m_pFontCollection class PhysicalFontCollection *
 vcl/inc/qt5/Qt5Instance.hxx:62
     Qt5Instance m_pQApplication std::unique_ptr<QApplication>
 vcl/inc/qt5/Qt5Instance.hxx:63
@@ -1046,10 +1038,6 @@ vcl/inc/unx/gtk/gtkframe.hxx:81
     GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8
 vcl/inc/unx/gtk/gtkframe.hxx:82
     GtkSalFrame::IMHandler::PreviousKeyPress time guint32
-vcl/inc/unx/gtk/gtkframe.hxx:185
-    GtkSalFrame m_pCurrentCursor GdkCursor *
-vcl/inc/unx/salgdi.h:316
-    X11SalGraphics nTextPixel_ Pixel
 vcl/inc/WidgetThemeLibrary.hxx:20
     vcl::WidgetDrawStyle nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:104
@@ -1073,11 +1061,11 @@ vcl/source/fontsubset/sft.cxx:92
 vcl/source/fontsubset/ttcr.cxx:350
     vcl::(anonymous namespace)::tdata_post ptr void *
 vcl/unx/generic/app/wmadaptor.cxx:1270
-    _mwmhints func unsigned long
+    _mwmhints deco unsigned long
 vcl/unx/generic/app/wmadaptor.cxx:1270
     _mwmhints flags unsigned long
 vcl/unx/generic/app/wmadaptor.cxx:1270
-    _mwmhints deco unsigned long
+    _mwmhints func unsigned long
 vcl/unx/generic/app/wmadaptor.cxx:1271
     _mwmhints input_mode tools::Long
 vcl/unx/generic/app/wmadaptor.cxx:1272
@@ -1098,9 +1086,7 @@ vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
 vcl/unx/gtk3/gtk3gtkinst.cxx:1613
      in char *
-vcl/unx/gtk3/gtk3gtkinst.cxx:7640
-    (anonymous namespace)::GtkInstanceMenuToggleButton m_pBox GtkBox *
-vcl/unx/gtk3/gtk3gtkinst.cxx:13965
+vcl/unx/gtk3/gtk3gtkinst.cxx:13964
     (anonymous namespace)::GtkInstanceComboBox m_xCustomMenuButtonHelper std::unique_ptr<CustomRenderMenuButtonHelper>
 vcl/unx/gtk3/gtk3hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
@@ -1140,3 +1126,7 @@ xmlsecurity/inc/certificateviewer.hxx:51
     CertificateViewer mxGeneralPage std::unique_ptr<CertificateViewerGeneralTP>
 xmlsecurity/inc/certificateviewer.hxx:52
     CertificateViewer mxDetailsPage std::unique_ptr<CertificateViewerDetailsTP>
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:236
+    (anonymous namespace)::PageChecksum m_nPageContent BitmapChecksum
+xmlsecurity/source/helper/pdfsignaturehelper.cxx:237
+    (anonymous namespace)::PageChecksum m_aAnnotations std::vector<basegfx::B2DRectangle>
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 95b631e1c2af..69fa648b64f8 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -50,13 +50,10 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public css::xml::sax::XFastContextHa
 
     SvXMLImport&                       mrImport;
     OUString                           maLocalName;
-    std::unique_ptr<SvXMLNamespaceMap> m_pRewindMap;
     oslInterlockedCount                m_nRefCount;
     sal_uInt16                         mnPrefix;
     bool                               mbPrefixAndLocalNameFilledIn;
 
-    SAL_DLLPRIVATE void PutRewindMap(std::unique_ptr<SvXMLNamespaceMap> p) { m_pRewindMap = std::move(p); }
-
 protected:
 
     SvXMLImport& GetImport() { return mrImport; }
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2f1a1dee4f10..71060b42f648 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -765,8 +765,7 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element,
     maNamespaceAttrList->Clear();
 
     maNamespaceHandler->addNSDeclAttributes( maNamespaceAttrList );
-    std::unique_ptr<SvXMLNamespaceMap> pRewindMap(
-            processNSAttributes( maNamespaceAttrList.get() ));
+    processNSAttributes( maNamespaceAttrList.get() );
 
     SvXMLImportContextRef xContext;
     const bool bRootContext = maContexts.empty();
@@ -832,9 +831,6 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element,
     // Call a startElement at the new context.
     xContext->startFastElement( Element, Attribs );
 
-    if (pRewindMap)
-        xContext->PutRewindMap(std::move(pRewindMap));
-
     // Push context on stack.
     maContexts.push(xContext);
 }


More information about the Libreoffice-commits mailing list