[Libreoffice-commits] core.git: compilerplugins/clang extensions/source framework/inc include/vcl reportdesign/source svtools/source vcl/inc vcl/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 20 13:38:11 UTC 2020


 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  108 ++++-----
 compilerplugins/clang/unusedfields.readonly.results                 |   38 +--
 compilerplugins/clang/unusedfields.untouched.results                |   74 +++---
 compilerplugins/clang/unusedfields.writeonly.results                |  120 +++++-----
 extensions/source/propctrlr/browserlistbox.cxx                      |    5 
 extensions/source/propctrlr/browserlistbox.hxx                      |    1 
 extensions/source/propctrlr/inspectorhelpwindow.cxx                 |    8 
 extensions/source/propctrlr/inspectorhelpwindow.hxx                 |    5 
 extensions/source/propctrlr/propertyeditor.cxx                      |    7 
 extensions/source/propctrlr/propertyeditor.hxx                      |    1 
 framework/inc/dispatch/popupmenudispatcher.hxx                      |    1 
 include/vcl/field.hxx                                               |    1 
 reportdesign/source/filter/xml/xmlfilter.hxx                        |    1 
 svtools/source/control/ctrlbox.cxx                                  |    1 
 vcl/inc/toolbox.h                                                   |    1 
 vcl/source/control/field.cxx                                        |    4 
 vcl/source/window/toolbox.cxx                                       |    3 
 17 files changed, 181 insertions(+), 198 deletions(-)

New commits:
commit 73de019c0b1ac82229f7c5cff84deea39ad78a18
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 20 14:08:15 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 20 14:37:38 2020 +0100

    loplugin:unusedfields
    
    Change-Id: If130c8a4861998d7eafd2e9525592f3c811ec21c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87069
    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 3822fb535d35..12a7e0451255 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,12 +9,12 @@ 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/b2dtrapezoid.cxx:212
+basegfx/source/polygon/b2dtrapezoid.cxx:207
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
 basic/qa/cppunit/basictest.hxx:28
     MacroSnippet maDll class BasicDLL
@@ -30,17 +30,17 @@ chart2/source/controller/inc/dlg_View3D.hxx:44
     chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper
 chart2/source/controller/inc/RangeSelectionListener.hxx:63
     chart::RangeSelectionListener m_aControllerLockGuard class chart::ControllerLockGuardUNO
-connectivity/source/commontools/RowFunctionParser.cxx:374
+connectivity/source/commontools/RowFunctionParser.cxx:372
     connectivity::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:375
+connectivity/source/commontools/RowFunctionParser.cxx:373
     connectivity::(anonymous namespace)::ExpressionGrammar::definition assignment ::boost::spirit::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:376
+connectivity/source/commontools/RowFunctionParser.cxx:374
     connectivity::(anonymous namespace)::ExpressionGrammar::definition argument ::boost::spirit::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:376
+connectivity/source/commontools/RowFunctionParser.cxx:374
     connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:377
+connectivity/source/commontools/RowFunctionParser.cxx:375
     connectivity::(anonymous namespace)::ExpressionGrammar::definition orExpression ::boost::spirit::rule<ScannerT>
-connectivity/source/commontools/RowFunctionParser.cxx:377
+connectivity/source/commontools/RowFunctionParser.cxx:375
     connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::rule<ScannerT>
 connectivity/source/drivers/evoab2/EApi.h:122
     (anonymous) address_format char *
@@ -74,12 +74,14 @@ connectivity/source/inc/flat/EResultSet.hxx:42
     connectivity::flat::OFlatResultSet m_bBookmarkable _Bool
 connectivity/source/inc/java/lang/Object.hxx:38
     connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard
-cppcanvas/source/mtfrenderer/textaction.cxx:810
+cppcanvas/source/mtfrenderer/textaction.cxx:808
     cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo
-cppcanvas/source/mtfrenderer/textaction.cxx:1643
+cppcanvas/source/mtfrenderer/textaction.cxx:1641
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo
 cppu/source/threadpool/threadpool.cxx:361
     _uno_ThreadPool dummy sal_Int32
+cppu/source/typelib/typelib.cxx:59
+    (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:38
     (anonymous namespace)::C1 n1 sal_Int16
 cppu/source/uno/check.cxx:67
@@ -112,8 +114,6 @@ cppu/source/uno/check.cxx:107
     (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:120
-    (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
     (anonymous namespace)::Char1 c1 char
 cppu/source/uno/check.cxx:130
@@ -164,6 +164,8 @@ dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:95
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2776
+      class AllSettings &
 drawinglayer/source/tools/emfphelperdata.hxx:198
     emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
@@ -228,14 +230,14 @@ include/sfx2/msg.hxx:133
     SfxType2 aAttrib struct SfxTypeAttrib [2]
 include/sfx2/msg.hxx:133
     SfxType2 nAttribs sal_uInt16
+include/sfx2/msg.hxx:134
+    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:134
     SfxType3 aAttrib struct SfxTypeAttrib [3]
 include/sfx2/msg.hxx:134
     SfxType3 pType const std::type_info *
 include/sfx2/msg.hxx:134
     SfxType3 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:134
-    SfxType3 nAttribs sal_uInt16
 include/sfx2/msg.hxx:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:135
@@ -308,20 +310,20 @@ 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:145
-    SfxType16 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 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:146
     SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:146
-    SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
     SfxType17 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:146
+    SfxType17 nAttribs sal_uInt16
 include/sfx2/msg.hxx:146
     SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:147
@@ -514,7 +516,7 @@ sc/source/filter/inc/xistream.hxx:172
     XclImpBiff8StdDecrypter maCodec ::msfilter::MSCodec_Std97
 sc/source/filter/inc/xistream.hxx:194
     XclImpBiff8CryptoAPIDecrypter maCodec ::msfilter::MSCodec_CryptoAPI
-sc/source/filter/oox/worksheethelper.cxx:384
+sc/source/filter/oox/worksheethelper.cxx:383
     oox::xls::WorksheetGlobals mxProgressBar oox::ISegmentProgressBarRef
 sc/source/filter/xml/xmldrani.hxx:72
     ScXMLDatabaseRangeContext bIsSelection _Bool
@@ -606,10 +608,10 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition object rule<ScannerT>
-sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
-    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition array_end rule<ScannerT>
+sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
+    (anonymous namespace)::PDFGrammar::definition array_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
     (anonymous namespace)::PDFGrammar::definition object_begin rule<ScannerT>
 sdext/source/pdfimport/pdfparse/pdfparse.cxx:264
@@ -620,9 +622,9 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:265
     (anonymous namespace)::PDFGrammar::definition xref rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:101
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/source/dialog/basedlgs.cxx:55
+sfx2/source/dialog/basedlgs.cxx:45
     SfxModelessDialog_Impl aMoveIdle class Idle
-sfx2/source/doc/doctempl.cxx:123
+sfx2/source/doc/doctempl.cxx:102
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock
 slideshow/source/engine/animationnodes/animationbasenode.hxx:89
     slideshow::internal::AnimationBaseNode mpSubsetManager const slideshow::internal::SubsettableShapeManagerSharedPtr
@@ -636,17 +638,17 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:299
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:300
     Vertex texcoord glm::vec2
-slideshow/source/engine/smilfunctionparser.cxx:493
+slideshow/source/engine/smilfunctionparser.cxx:491
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:494
+slideshow/source/engine/smilfunctionparser.cxx:492
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:495
+slideshow/source/engine/smilfunctionparser.cxx:493
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:496
+slideshow/source/engine/smilfunctionparser.cxx:494
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:497
+slideshow/source/engine/smilfunctionparser.cxx:495
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
-slideshow/source/engine/smilfunctionparser.cxx:498
+slideshow/source/engine/smilfunctionparser.cxx:496
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 starmath/inc/view.hxx:216
     SmViewShell maGraphicController const class SmGraphicController
@@ -666,37 +668,37 @@ svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/inc/GalleryControl.hxx:45
     svx::sidebar::GalleryControl mpGallery class Gallery *
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
     (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1085
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
     (anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1086
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1085
     (anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1087
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1086
     (anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1088
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1087
     (anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1089
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1088
     (anonymous namespace)::ExpressionGrammar::definition ternaryFunction ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1090
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1089
     (anonymous namespace)::ExpressionGrammar::definition funcRef_decl ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1090
     (anonymous namespace)::ExpressionGrammar::definition functionReference ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
     (anonymous namespace)::ExpressionGrammar::definition modRef_decl ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
     (anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::rule<ScannerT>
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1094
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
     (anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/framelinkarray.cxx:387
+svx/source/dialog/framelinkarray.cxx:385
     svx::frame::(anonymous namespace)::MergedCellIterator mnFirstRow size_t
 svx/source/dialog/imapwnd.hxx:87
     IMapWindow maItemInfos struct SfxItemInfo [1]
-svx/source/dialog/weldeditview.cxx:313
+svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-svx/source/gallery2/galbrws2.cxx:114
+svx/source/gallery2/galbrws2.cxx:112
     (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
 svx/source/stbctrls/pszctrl.cxx:101
     (anonymous namespace)::FunctionPopup_Impl m_aBuilder class VclBuilder
@@ -712,9 +714,7 @@ 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/layout/layout.cxx:2702
-      class SvtSysLocaleOptions &
-sw/qa/extras/uiwriter/uiwriter.cxx:4139
+sw/qa/extras/uiwriter/uiwriter.cxx:4137
     (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
@@ -764,12 +764,18 @@ vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
 vcl/inc/opengl/zone.hxx:62
     OpenGLVCLContextZone aZone const 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
     SalMenuButtonItem maImage class Image
 vcl/inc/salmenu.hxx:44
     SalMenuButtonItem maToolTipText class rtl::OUString
+vcl/inc/skia/packedsurfaceatlas.hxx:37
+    SkiaPackedSurface mSurface sk_sp<class SkSurface>
+vcl/inc/skia/packedsurfaceatlas.hxx:38
+    SkiaPackedSurface mRect tools::Rectangle
 vcl/inc/svimpbox.hxx:127
     SvImpLBox m_aFctSet class ImpLBSelEng
 vcl/inc/unx/i18n_ic.hxx:40
@@ -796,9 +802,9 @@ vcl/inc/WidgetThemeLibrary.hxx:93
     vcl::ControlDrawParameters eState enum ControlState
 vcl/inc/WidgetThemeLibrary.hxx:109
     vcl::WidgetThemeLibrary_t nSize uint32_t
-vcl/source/app/salvtables.cxx:3330
+vcl/source/app/salvtables.cxx:3356
     (anonymous namespace)::SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter
-vcl/source/app/salvtables.cxx:6149
+vcl/source/app/salvtables.cxx:6175
     (anonymous namespace)::SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter
 vcl/source/gdi/jobset.cxx:37
     (anonymous namespace)::ImplOldJobSetupData cDeviceName char [32]
@@ -820,8 +826,10 @@ 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:4909
+vcl/unx/gtk3/gtk3gtkinst.cxx:4914
     (anonymous namespace)::CrippledViewport viewport GtkViewport
+vcl/unx/kf5/KF5FilePicker.hxx:32
+    KF5FilePicker _layout class QGridLayout *
 writerfilter/source/dmapper/PropertyMap.hxx:204
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
 xmloff/source/chart/transporttypes.hxx:149
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 6261b9de8653..8632cb80580e 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -4,7 +4,7 @@ avmedia/source/vlc/wrapper/Types.hxx:52
     libvlc_track_description_t i_id int
 avmedia/source/vlc/wrapper/Types.hxx:54
     libvlc_track_description_t p_next struct libvlc_track_description_t *
-basegfx/source/polygon/b2dtrapezoid.cxx:212
+basegfx/source/polygon/b2dtrapezoid.cxx:207
     basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
 basic/source/inc/expr.hxx:93
     SbiExprNode::(anonymous) nTypeStrId sal_uInt16
@@ -98,7 +98,7 @@ connectivity/source/inc/TConnection.hxx:55
     connectivity::OMetaConnection m_aResources class connectivity::SharedResources
 connectivity/source/inc/writer/WTable.hxx:65
     connectivity::writer::OWriterTable m_nStartCol sal_Int32
-cppcanvas/source/mtfrenderer/textaction.cxx:1651
+cppcanvas/source/mtfrenderer/textaction.cxx:1649
     cppcanvas::internal::(anonymous namespace)::OutlineAction maTextFillColor const ::Color
 cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx:36
     (anonymous namespace)::Mapping m_from uno::Environment
@@ -146,8 +146,6 @@ cppu/source/uno/check.cxx:107
     (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:120
-    (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
     (anonymous namespace)::Char1 c1 char
 cppu/source/uno/check.cxx:130
@@ -208,7 +206,7 @@ extensions/source/propctrlr/eformshelper.hxx:61
     pcr::EFormsHelper m_aSubmissionUINames pcr::MapStringToPropertySet
 extensions/source/propctrlr/eformshelper.hxx:63
     pcr::EFormsHelper m_aBindingUINames pcr::MapStringToPropertySet
-filter/source/graphicfilter/eps/eps.cxx:113
+filter/source/graphicfilter/eps/eps.cxx:114
     (anonymous namespace)::PSWriter pVDev ScopedVclPtrInstance<class VirtualDevice>
 filter/source/graphicfilter/icgm/cgm.hxx:58
     CGM mbPicture _Bool
@@ -298,8 +296,6 @@ include/registry/refltype.hxx:68
     RTUik m_Data4 const sal_uInt32
 include/registry/refltype.hxx:69
     RTUik m_Data5 const sal_uInt32
-include/sfx2/charmapcontrol.hxx:46
-    SfxCharmapCtrl m_pFavCharView VclPtr<class SvxCharViewControl> [16]
 include/sfx2/msg.hxx:95
     SfxTypeAttrib nAID sal_uInt16
 include/sfx2/msg.hxx:96
@@ -320,10 +316,8 @@ include/svl/ondemand.hxx:55
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:32
     MultiLineEditSyntaxHighlight m_aColorConfig const svtools::ColorConfig
-include/svtools/inettbc.hxx:44
-    SvtURLBox bHistoryDisabled _Bool
-include/svtools/valueset.hxx:222
-    ValueSet maDoubleClickHdl Link<class ValueSet *, void>
+include/svx/colorwindow.hxx:67
+    SvxColorWindow maSelectedLink Link<const NamedColor &, void>
 include/svx/graphctl.hxx:52
     GraphCtrl xVD ScopedVclPtrInstance<class VirtualDevice>
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
@@ -339,7 +333,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
@@ -386,7 +380,7 @@ oox/qa/token/tokenmap-test.cxx:34
     oox::TokenmapTest tokenMap const class oox::TokenMap
 oox/qa/unit/vba_compression.cxx:70
     TestVbaCompression m_directories const test::Directories
-oox/source/drawingml/chart/objectformatter.cxx:717
+oox/source/drawingml/chart/objectformatter.cxx:715
     oox::drawingml::chart::ObjectFormatterData maFromLocale const struct com::sun::star::lang::Locale
 registry/source/reflwrit.cxx:140
     writeDouble(sal_uInt8 *, double)::(anonymous union)::(anonymous) b1 sal_uInt32
@@ -417,7 +411,7 @@ sal/rtl/uuid.cxx:67
 sc/inc/compiler.hxx:128
     ScRawToken::(anonymous union)::(anonymous) eItem const class ScTableRefToken::Item
 sc/inc/compiler.hxx:129
-    ScRawToken::(anonymous) table const struct (anonymous struct at /media/disk2/libo4/sc/inc/compiler.hxx:126:9)
+    ScRawToken::(anonymous) table const struct (anonymous struct at /home/noel/libo2/sc/inc/compiler.hxx:126:9)
 sc/inc/compiler.hxx:134
     ScRawToken::(anonymous) pMat class ScMatrix *const
 sc/inc/formulagroup.hxx:39
@@ -568,7 +562,7 @@ svx/source/inc/gridcell.hxx:527
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/gridcell.hxx:528
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/svdraw/svdpdf.hxx:174
+svx/source/svdraw/svdpdf.hxx:171
     ImpSdrPdfImport maDash const class XDash
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree const editeng::Trie
@@ -704,16 +698,10 @@ vcl/inc/salwtype.hxx:205
     SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong
 vcl/inc/salwtype.hxx:211
     SalQueryCharPositionEvent mnCharPos sal_uLong
-vcl/inc/svdata.hxx:272
-    ImplSVNWFData mnMenuFormatBorderX int
-vcl/inc/svdata.hxx:273
-    ImplSVNWFData mnMenuFormatBorderY int
-vcl/inc/svdata.hxx:276
+vcl/inc/svdata.hxx:278
     ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool
-vcl/inc/svdata.hxx:277
-    ImplSVNWFData mbDockingAreaSeparateTB _Bool
-vcl/inc/svdata.hxx:294
-    ImplSVNWFData mbRolloverMenubar _Bool
+vcl/inc/toolbox.h:40
+    ImplToolItem maOverlayImage class Image
 vcl/inc/toolbox.h:108
     vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16>
 vcl/inc/unx/saldisp.hxx:282
@@ -954,7 +942,7 @@ vcl/unx/gtk3/a11y/atkwrapper.hxx:75
     AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1606
+vcl/unx/gtk3/gtk3gtkinst.cxx:1605
      out gpointer *
 writerfilter/inc/ooxml/QNameToString.hxx:41
     writerfilter::QNameToString mMap writerfilter::QNameToString::Map
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 30b301709a37..1c8a67482afe 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
@@ -34,16 +34,20 @@ connectivity/source/drivers/mork/MDatabaseMetaData.hxx:30
     connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper>
 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::ODatabaseContext m_aBasicDLL class BasicDLL
-dbaccess/source/filter/xml/xmlfilter.hxx:66
-    dbaxml::ODBFilter m_pDocElemTokenMap std::unique_ptr<SvXMLTokenMap>
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
-emfio/source/emfuno/xemfparser.cxx:52
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2776
+      class AllSettings &
+emfio/source/emfuno/xemfparser.cxx:50
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:45
     ScannerManager maProtector osl::Mutex
+framework/inc/dispatch/popupmenudispatcher.hxx:114
+    framework::PopupMenuDispatcher m_mutex osl::Mutex
 helpcompiler/inc/HelpCompiler.hxx:196
     HelpCompiler lang const std::string
 include/basegfx/DrawCommands.hxx:142
@@ -64,30 +68,30 @@ include/sfx2/msg.hxx:117
     SfxType0 createSfxPoolItemFunc const std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:119
     SfxType0 nAttribs const sal_uInt16
+include/sfx2/msg.hxx:132
+    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 pType const std::type_info *
 include/sfx2/msg.hxx:132
     SfxType1 nAttribs sal_uInt16
-include/sfx2/msg.hxx:132
-    SfxType1 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:132
     SfxType1 aAttrib struct SfxTypeAttrib [1]
 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 pType const std::type_info *
+include/sfx2/msg.hxx:133
+    SfxType2 nAttribs sal_uInt16
 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
@@ -96,22 +100,22 @@ include/sfx2/msg.hxx:135
     SfxType4 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 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
-    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:136
     SfxType5 nAttribs sal_uInt16
 include/sfx2/msg.hxx:136
     SfxType5 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+include/sfx2/msg.hxx:136
+    SfxType5 aAttrib struct SfxTypeAttrib [5]
+include/sfx2/msg.hxx:136
+    SfxType5 pType const std::type_info *
 include/sfx2/msg.hxx:137
     SfxType6 nAttribs sal_uInt16
 include/sfx2/msg.hxx:137
-    SfxType6 pType const std::type_info *
+    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
 include/sfx2/msg.hxx:137
     SfxType6 aAttrib struct SfxTypeAttrib [6]
 include/sfx2/msg.hxx:137
-    SfxType6 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
+    SfxType6 pType const std::type_info *
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
@@ -148,10 +152,10 @@ include/sfx2/msg.hxx:143
     SfxType13 pType const std::type_info *
 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 aAttrib struct SfxTypeAttrib [13]
+include/sfx2/msg.hxx:143
+    SfxType13 nAttribs sal_uInt16
 include/sfx2/msg.hxx:144
     SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
@@ -190,7 +194,7 @@ include/svtools/unoevent.hxx:163
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
 include/svx/imapdlg.hxx:91
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/unotest/macros_test.hxx:45
+include/unotest/macros_test.hxx:50
     unotest::MacrosTest mpDll std::unique_ptr<BasicDLL>
 include/vcl/commandevent.hxx:310
     CommandGestureData mfX const double
@@ -252,6 +256,8 @@ pyuno/source/module/pyuno_impl.hxx:223
     pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:323
     pyuno::stRuntimeImpl ob_base PyObject
+reportdesign/source/filter/xml/xmlfilter.hxx:70
+    rptxml::ORptFilter m_pDocElemTokenMap ::std::unique_ptr<SvXMLTokenMap>
 reportdesign/source/ui/inc/ReportWindow.hxx:54
     rptui::OReportWindow m_pObjFac std::unique_ptr<DlgEdFactory, o3tl::default_delete<DlgEdFactory> >
 sal/qa/osl/condition/osl_Condition.cxx:72
@@ -340,18 +346,18 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263
     (anonymous namespace)::PDFGrammar::definition value rule<ScannerT>
 sfx2/inc/autoredactdialog.hxx:101
     SfxAutoRedactDialog m_xDocShell class SfxObjectShellLock
-sfx2/source/dialog/basedlgs.cxx:55
+sfx2/source/dialog/basedlgs.cxx:45
     SfxModelessDialog_Impl aMoveIdle class Idle
-sfx2/source/doc/doctempl.cxx:123
+sfx2/source/doc/doctempl.cxx:102
     DocTempl::(anonymous namespace)::DocTempl_EntryData_Impl mxObjShell const class SfxObjectShellLock
 sfx2/source/inc/sfxpicklist.hxx:33
     SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
-slideshow/source/engine/opengl/TransitionImpl.cxx:1989
-    (anonymous namespace)::ThreeFloats x GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats z GLfloat
 slideshow/source/engine/opengl/TransitionImpl.cxx:1989
     (anonymous namespace)::ThreeFloats y GLfloat
+slideshow/source/engine/opengl/TransitionImpl.cxx:1989
+    (anonymous namespace)::ThreeFloats x GLfloat
 starmath/inc/smmod.hxx:69
     SmModule mpLocSymbolData std::unique_ptr<SmLocalizedSymbolData>
 starmath/inc/view.hxx:216
@@ -370,10 +376,10 @@ svl/source/crypto/cryptosign.cxx:285
     (anonymous namespace)::PKIStatusInfo failInfo SECItem
 svx/source/dialog/contimp.hxx:75
     SvxSuperContourDlg aContourItem class SvxContourDlgItem
-svx/source/dialog/weldeditview.cxx:313
+svx/source/dialog/weldeditview.cxx:312
     (anonymous namespace)::WeldEditSource m_rEditAcc class WeldEditAccessible &
-sw/qa/extras/layout/layout.cxx:2702
-      class SvtSysLocaleOptions &
+svx/source/tbxctrls/layctrl.cxx:432
+    (anonymous namespace)::ColumnsWindow mxControl rtl::Reference<SvxColumnsToolBoxControl>
 sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState const class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:75
@@ -400,8 +406,20 @@ vcl/inc/opengl/gdiimpl.hxx:53
     TextureCombo mpMask std::unique_ptr<OpenGLTexture>
 vcl/inc/opengl/zone.hxx:62
     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
+    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/skia/packedsurfaceatlas.hxx:37
+    SkiaPackedSurface mSurface sk_sp<class SkSurface>
+vcl/inc/skia/packedsurfaceatlas.hxx:38
+    SkiaPackedSurface mRect tools::Rectangle
 vcl/inc/WidgetThemeLibrary.hxx:90
     vcl::ControlDrawParameters nSize uint32_t
 vcl/inc/WidgetThemeLibrary.hxx:91
@@ -428,7 +446,7 @@ 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:4909
+vcl/unx/gtk3/gtk3gtkinst.cxx:4914
     (anonymous namespace)::CrippledViewport viewport GtkViewport
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:43
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index c3635675390f..43366b57c194 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -188,8 +188,6 @@ cppu/source/uno/check.cxx:107
     (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
     (anonymous namespace)::second a int
-cppu/source/uno/check.cxx:120
-    (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
     (anonymous namespace)::Char1 c1 char
 cppu/source/uno/check.cxx:130
@@ -242,27 +240,27 @@ desktop/source/deployment/gui/dp_gui_updatedialog.hxx:152
     dp_gui::UpdateDialog m_xExtensionManager css::uno::Reference<css::deployment::XExtensionManager>
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx:114
     dp_gui::UpdateCommandEnv m_installThread ::rtl::Reference<UpdateInstallDialog::Thread>
-desktop/source/deployment/manager/dp_managerfac.cxx:45
+desktop/source/deployment/manager/dp_managerfac.cxx:44
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xUserMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:46
+desktop/source/deployment/manager/dp_managerfac.cxx:45
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xSharedMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:47
+desktop/source/deployment/manager/dp_managerfac.cxx:46
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBundledMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:48
+desktop/source/deployment/manager/dp_managerfac.cxx:47
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xTmpMgr Reference<deployment::XPackageManager>
-desktop/source/deployment/manager/dp_managerfac.cxx:49
+desktop/source/deployment/manager/dp_managerfac.cxx:48
     dp_manager::factory::(anonymous namespace)::PackageManagerFactoryImpl m_xBakMgr Reference<deployment::XPackageManager>
 desktop/unx/source/splashx.c:371
      decorations unsigned long
-desktop/unx/source/splashx.c:371
-     functions 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
      input_mode long
-drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:47
+drawinglayer/source/attribute/sdrfillgraphicattribute.cxx:45
     drawinglayer::attribute::ImpSdrFillGraphicAttribute mbLogSize _Bool
-drawinglayer/source/attribute/sdrsceneattribute3d.cxx:32
+drawinglayer/source/attribute/sdrsceneattribute3d.cxx:30
     drawinglayer::attribute::ImpSdrSceneAttribute mfDistance double
 embeddedobj/source/inc/oleembobj.hxx:132
     OleEmbeddedObject m_nTargetState sal_Int32
@@ -286,6 +284,10 @@ emfio/inc/mtftools.hxx:511
     emfio::MtfTools mrclBounds tools::Rectangle
 extensions/source/propctrlr/genericpropertyhandler.hxx:63
     pcr::GenericPropertyHandler m_xComponentIntrospectionAccess css::uno::Reference<css::beans::XIntrospectionAccess>
+extensions/source/propctrlr/inspectorhelpwindow.hxx:33
+    pcr::InspectorHelpWindow m_nMinLines sal_Int32
+extensions/source/propctrlr/inspectorhelpwindow.hxx:34
+    pcr::InspectorHelpWindow m_nMaxLines sal_Int32
 extensions/source/scanner/scanner.hxx:47
     ScannerManager mpData void *
 framework/inc/services/layoutmanager.hxx:248
@@ -298,8 +300,6 @@ framework/inc/uielement/langselectionmenucontroller.hxx:77
     framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
 framework/inc/uielement/langselectionmenucontroller.hxx:79
     framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/toolbarsmenucontroller.hxx:89
-    framework::ToolbarsMenuController m_aModuleIdentifier class rtl::OUString
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:276
@@ -316,22 +316,22 @@ include/basic/sbxvar.hxx:73
     SbxValues::(anonymous) pData void *
 include/canvas/rendering/irendermodule.hxx:36
     canvas::Vertex a float
+include/canvas/rendering/irendermodule.hxx:36
+    canvas::Vertex b float
 include/canvas/rendering/irendermodule.hxx:36
     canvas::Vertex g float
 include/canvas/rendering/irendermodule.hxx:36
     canvas::Vertex r float
-include/canvas/rendering/irendermodule.hxx:36
-    canvas::Vertex b float
 include/canvas/rendering/irendermodule.hxx:37
     canvas::Vertex v float
 include/canvas/rendering/irendermodule.hxx:37
     canvas::Vertex u float
 include/canvas/rendering/irendermodule.hxx:38
     canvas::Vertex x float
-include/canvas/rendering/irendermodule.hxx:38
-    canvas::Vertex z float
 include/canvas/rendering/irendermodule.hxx:38
     canvas::Vertex y float
+include/canvas/rendering/irendermodule.hxx:38
+    canvas::Vertex z float
 include/comphelper/parallelsort.hxx:89
     comphelper::(anonymous namespace)::ProfileZone mbDummy _Bool
 include/comphelper/unique_disposing_ptr.hxx:30
@@ -406,9 +406,9 @@ include/svx/gridctrl.hxx:254
     DbGridControl m_pCursorDisposeListener std::unique_ptr<DisposeListenerGridBridge>
 include/svx/ofaitem.hxx:44
     OfaRefItem mxRef rtl::Reference<reference_type>
-include/svx/srchdlg.hxx:163
+include/svx/srchdlg.hxx:165
     SvxSearchDialog pSearchController std::unique_ptr<SvxSearchController>
-include/svx/srchdlg.hxx:164
+include/svx/srchdlg.hxx:166
     SvxSearchDialog pOptionsController std::unique_ptr<SvxSearchController>
 include/svx/viewpt3d.hxx:62
     Viewport3D::(anonymous) H double
@@ -420,6 +420,8 @@ 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/field.hxx:157
+    NumericFormatter mnFieldValue sal_Int64
 include/vcl/menu.hxx:454
     MenuBar::MenuBarButtonCallbackArg bHighlight _Bool
 include/vcl/NotebookBarAddonsMerger.hxx:54
@@ -434,12 +436,6 @@ include/vcl/opengl/OpenGLContext.hxx:32
     GLWindow bMultiSampleSupported _Bool
 include/vcl/pdfextoutdevdata.hxx:83
     vcl::PDFExtOutDevData mbSinglePageSheets _Bool
-include/vcl/salnativewidgets.hxx:325
-    SliderValue mnMin long
-include/vcl/salnativewidgets.hxx:326
-    SliderValue mnMax long
-include/vcl/salnativewidgets.hxx:327
-    SliderValue mnCur long
 include/vcl/salnativewidgets.hxx:467
     ToolbarValue mbIsTopDockingArea _Bool
 include/vcl/salnativewidgets.hxx:532
@@ -580,7 +576,7 @@ sc/source/filter/inc/tokstack.hxx:142
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
 sc/source/filter/lotus/lotfilter.hxx:54
     LotusContext eActType enum Lotus123Typ
-sc/source/filter/oox/biffhelper.cxx:38
+sc/source/filter/oox/biffhelper.cxx:37
     oox::xls::(anonymous namespace)::DecodedDouble maStruct union sal_math_Double
 sc/source/filter/xml/xmlcondformat.hxx:111
     ScXMLIconSetFormatContext mpFormatData struct ScIconSetFormatData *
@@ -682,7 +678,7 @@ sdext/source/presenter/PresenterTimer.cxx:104
     sdext::presenter::(anonymous namespace)::TimerScheduler mpLateDestroy std::shared_ptr<TimerScheduler>
 sfx2/source/appl/fileobj.hxx:38
     SvFileObject mxDelMed tools::SvRef<SfxMedium>
-sfx2/source/doc/sfxbasemodel.cxx:462
+sfx2/source/doc/sfxbasemodel.cxx:449
     (anonymous namespace)::SfxSaveGuard m_pFramesLock std::unique_ptr<SfxOwnFramesLocker>
 sfx2/source/inc/appdata.hxx:73
     SfxAppData_Impl pDocTopics std::unique_ptr<SfxDdeDocTopics_Impl>
@@ -766,57 +762,57 @@ svx/source/form/formcontroller.cxx:216
     svxform::(anonymous namespace)::ColumnInfo nNullable sal_Int32
 svx/source/inc/docrecovery.hxx:131
     svx::DocRecovery::TURLInfo Module class rtl::OUString
-svx/source/sdr/attribute/sdrformtextattribute.cxx:155
+svx/source/sdr/attribute/sdrformtextattribute.cxx:153
     drawinglayer::attribute::ImpSdrFormTextAttribute mnFormTextShdwTransp const sal_uInt16
-svx/source/sdr/attribute/sdrtextattribute.cxx:53
+svx/source/sdr/attribute/sdrtextattribute.cxx:51
     drawinglayer::attribute::ImpSdrTextAttribute maPropertiesVersion sal_uInt32
-svx/source/sdr/attribute/sdrtextattribute.cxx:67
+svx/source/sdr/attribute/sdrtextattribute.cxx:65
     drawinglayer::attribute::ImpSdrTextAttribute mbWrongSpell const _Bool
-svx/source/sidebar/line/LinePropertyPanel.hxx:94
+svx/source/sidebar/line/LinePropertyPanel.hxx:85
     svx::sidebar::LinePropertyPanel maStyleControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:95
+svx/source/sidebar/line/LinePropertyPanel.hxx:86
     svx::sidebar::LinePropertyPanel maDashControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:97
+svx/source/sidebar/line/LinePropertyPanel.hxx:88
     svx::sidebar::LinePropertyPanel maStartControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:98
+svx/source/sidebar/line/LinePropertyPanel.hxx:89
     svx::sidebar::LinePropertyPanel maEndControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:99
+svx/source/sidebar/line/LinePropertyPanel.hxx:90
     svx::sidebar::LinePropertyPanel maLineEndListControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:100
+svx/source/sidebar/line/LinePropertyPanel.hxx:91
     svx::sidebar::LinePropertyPanel maLineStyleListControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:101
+svx/source/sidebar/line/LinePropertyPanel.hxx:92
     svx::sidebar::LinePropertyPanel maTransControl sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:102
+svx/source/sidebar/line/LinePropertyPanel.hxx:93
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
-svx/source/sidebar/line/LinePropertyPanel.hxx:103
+svx/source/sidebar/line/LinePropertyPanel.hxx:94
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
 svx/source/sidebar/lists/ListsPropertyPanel.hxx:44
     svx::sidebar::ListsPropertyPanel mxNumBulletDispatcher std::unique_ptr<ToolbarUnoDispatcher>
 svx/source/sidebar/lists/ListsPropertyPanel.hxx:46
     svx::sidebar::ListsPropertyPanel mxOutlineDispatcher std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:78
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:75
     svx::sidebar::ParaPropertyPanel mxHorzAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:80
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:77
     svx::sidebar::ParaPropertyPanel mxVertAlignDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:83
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:80
     svx::sidebar::ParaPropertyPanel mxNumBulletDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:85
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:82
     svx::sidebar::ParaPropertyPanel mxBackColorDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:88
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:85
     svx::sidebar::ParaPropertyPanel mxWriteDirectionDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:90
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:87
     svx::sidebar::ParaPropertyPanel mxParaSpacingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:92
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:89
     svx::sidebar::ParaPropertyPanel mxLineSpacingDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:94
+svx/source/sidebar/paragraph/ParaPropertyPanel.hxx:91
     svx::sidebar::ParaPropertyPanel mxIndentDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:104
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:102
     svx::sidebar::PosSizePropertyPanel mxFlipDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/sidebar/possize/PosSizePropertyPanel.hxx:107
+svx/source/sidebar/possize/PosSizePropertyPanel.hxx:105
     svx::sidebar::PosSizePropertyPanel mxArrangeDispatch std::unique_ptr<ToolbarUnoDispatcher>
-svx/source/svdraw/svdpdf.hxx:196
+svx/source/svdraw/svdpdf.hxx:193
     ImpSdrPdfImport mdPageWidthPts double
-svx/source/tbxctrls/tbcontrl.cxx:202
+svx/source/tbxctrls/tbcontrl.cxx:203
     (anonymous namespace)::SvxFontNameBox_Impl m_aOwnFontList ::std::unique_ptr<FontList>
 sw/inc/accmap.hxx:96
     SwAccessibleMap mvShapes SwShapeList_Impl
@@ -857,13 +853,15 @@ 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
     MailDispatcher m_aListenerVector std::vector< ::rtl::Reference<IMailDispatcherListener> >
 sw/source/uibase/inc/maildispatcher.hxx:152
     MailDispatcher m_xSelfReference ::rtl::Reference<MailDispatcher>
+sw/source/uibase/inc/navipi.hxx:69
+    SwNavigationPI m_xNaviListener std::unique_ptr<NaviStateListener>
 sw/source/uibase/inc/redlndlg.hxx:62
     SwRedlineAcceptDlg m_aUsedSeqNo class SwRedlineDataParentSortArr
 sw/source/uibase/sidebar/TableEditPanel.hxx:51
@@ -964,8 +962,18 @@ vcl/inc/pdf/BitmapID.hxx:24
     vcl::pdf::BitmapID m_nChecksum BitmapChecksum
 vcl/inc/pdf/BitmapID.hxx:25
     vcl::pdf::BitmapID m_nMaskChecksum BitmapChecksum
-vcl/inc/salmenu.hxx:32
-    SalItemParams aImage class Image
+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:59
+    Qt5Instance m_pQApplication std::unique_ptr<QApplication>
+vcl/inc/qt5/Qt5Instance.hxx:60
+    Qt5Instance m_pFakeArgvFreeable std::vector<FreeableCStr>
+vcl/inc/qt5/Qt5Instance.hxx:61
+    Qt5Instance m_pFakeArgv std::unique_ptr<char *[]>
+vcl/inc/qt5/Qt5Instance.hxx:62
+    Qt5Instance m_pFakeArgc std::unique_ptr<int>
 vcl/inc/salmenu.hxx:33
     SalItemParams pMenu VclPtr<class Menu>
 vcl/inc/salmenu.hxx:34
@@ -1002,7 +1010,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:412
+vcl/inc/svdata.hxx:418
     ImplSVEvent mpInstanceRef VclPtr<vcl::Window>
 vcl/inc/unx/gtk/gtkframe.hxx:80
     GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow *
@@ -1056,7 +1064,7 @@ vcl/unx/gtk3/a11y/gtk3atkutil.cxx:138
     DocumentFocusListener m_aRefList std::set<uno::Reference<uno::XInterface> >
 vcl/unx/gtk3/gtk3glomenu.cxx:14
     GLOMenu parent_instance const GMenuModel
-vcl/unx/gtk3/gtk3gtkinst.cxx:1606
+vcl/unx/gtk3/gtk3gtkinst.cxx:1605
      in char *
 vcl/unx/gtk3/gtk3hudawareness.cxx:18
     (anonymous namespace)::HudAwarenessHandle connection GDBusConnection *
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index a50d93c6f4aa..4b50e290daa1 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -381,11 +381,6 @@ namespace pcr
         m_xHelpWindow->SetText( _rHelpText );
     }
 
-    void OBrowserListBox::SetHelpLineLimites(sal_Int32 nMinLines, sal_Int32 nMaxLines)
-    {
-        m_xHelpWindow->SetLimits(nMinLines, nMaxLines);
-    }
-
     void OBrowserListBox::UpdatePlayGround()
     {
         for (auto& line : m_aLines)
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index ad0a3aab6c64..aa312b6fd071 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -100,7 +100,6 @@ namespace pcr
         void                        EnableHelpSection( bool _bEnable );
         bool                        HasHelpSection() const;
         void                        SetHelpText( const OUString& _rHelpText );
-        void                        SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines );
 
         void                        Clear();
 
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 427366e25f91..2ade8a57a3f5 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -27,8 +27,6 @@ namespace pcr
     InspectorHelpWindow::InspectorHelpWindow(weld::Builder& rBuilder)
         : m_xHelpFrame(rBuilder.weld_widget("helpframe"))
         , m_xHelpText(rBuilder.weld_text_view("helptext"))
-        , m_nMinLines( 3 )
-        , m_nMaxLines( 8 )
     {
     }
 
@@ -41,12 +39,6 @@ namespace pcr
         m_xHelpText->set_text(rStr);
     }
 
-    void InspectorHelpWindow::SetLimits(sal_Int32 nMinLines, sal_Int32 nMaxLines)
-    {
-        m_nMinLines = nMinLines;
-        m_nMaxLines = nMaxLines;
-    }
-
 } // namespace pcr
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx
index b67fee9df216..af9bae304f5a 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.hxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx
@@ -30,17 +30,12 @@ namespace pcr
         std::unique_ptr<weld::Widget> m_xHelpFrame;
         std::unique_ptr<weld::TextView> m_xHelpText;
 
-        sal_Int32       m_nMinLines;
-        sal_Int32       m_nMaxLines;
-
     public:
         explicit InspectorHelpWindow(weld::Builder& rBuilder);
         ~InspectorHelpWindow();
 
         void            SetText(const OUString& rStr);
 
-        void            SetLimits(sal_Int32 nMinLines, sal_Int32 nMaxLines);
-
         void            Show(bool bShow) { m_xHelpFrame->set_visible(bShow); }
         bool            IsVisible() const { return m_xHelpFrame->get_visible(); }
     };
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 9629e3d35dc7..94200f274ccc 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -131,7 +131,6 @@ namespace pcr
         xPage->getListBox().SetListener(m_pListener);
         xPage->getListBox().SetObserver(m_pObserver);
         xPage->getListBox().EnableHelpSection(m_bHasHelpSection);
-        xPage->getListBox().SetHelpLineLimites(m_nMinHelpLines, m_nMaxHelpLines);
         xPage->SetHelpId(rHelpId);
 
         m_aShownPages[nId] = PropertyPage(m_xTabControl->get_n_pages() - 1, rText, std::move(xPage));
@@ -226,7 +225,6 @@ namespace pcr
     {
         m_nMinHelpLines = nMinLines;
         m_nMaxHelpLines = nMaxLines;
-        forEachPage( &OPropertyEditor::setHelpLineLimits );
     }
 
     void OPropertyEditor::enableHelpSection( OBrowserPage& rPage, const void* )
@@ -244,11 +242,6 @@ namespace pcr
         rPage.getListBox().SetHelpText( rText );
     }
 
-    void OPropertyEditor::setHelpLineLimits( OBrowserPage& rPage, const void* )
-    {
-        rPage.getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines );
-    }
-
     void OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 nPageId, sal_uInt16 nPos )
     {
         // let the current page handle this
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index f0e1b994e23d..a6ec4c211b87 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -124,7 +124,6 @@ namespace pcr
         void    setPageControlObserver( OBrowserPage& _rPage, const void* );
         void    enableHelpSection( OBrowserPage& _rPage, const void* );
         static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString );
-        void    setHelpLineLimits( OBrowserPage& _rPage, const void* );
 
         DECL_LINK(OnPageDeactivate, const OString&, bool);
         DECL_LINK(OnPageActivate, const OString&, void);
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 929350853408..869ee956e4a4 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -111,7 +111,6 @@ class PopupMenuDispatcher final : public  ::cppu::WeakImplHelper<
         css::uno::Reference< css::container::XNameAccess >      m_xPopupCtrlQuery;   /// reference to query for popup controller
         css::uno::Reference< css::uri::XUriReferenceFactory >   m_xUriRefFactory;   /// reference to the uri reference factory
         css::uno::Reference< css::uno::XComponentContext >      m_xContext;   /// factory shared with our owner to create new services!
-        osl::Mutex                                              m_mutex;
         bool                                                    m_bAlreadyDisposed;   /// Protection against multiple disposing calls.
         bool                                                    m_bActivateListener;   /// dispatcher is listener for frame activation
 
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 132f4cda065e..4e0b0a04d9ff 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -154,7 +154,6 @@ public:
     sal_Int64               Denormalize( sal_Int64 nValue ) const;
 
 protected:
-    sal_Int64               mnFieldValue;
     sal_Int64               mnLastValue;
     sal_Int64               mnMin;
     sal_Int64               mnMax;
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 995a7268e149..041dda702c4e 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -67,7 +67,6 @@ private:
 
     TGroupFunctionMap                               m_aFunctions;
 
-    mutable ::std::unique_ptr<SvXMLTokenMap>        m_pDocElemTokenMap;
     mutable ::std::unique_ptr<SvXMLTokenMap>        m_pDocContentElemTokenMap;
     mutable ::std::unique_ptr<SvXMLTokenMap>        m_pReportElemTokenMap;
     mutable ::std::unique_ptr<SvXMLTokenMap>        m_pGroupElemTokenMap;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 42919c8a3bde..d0801b7e44d4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1056,7 +1056,6 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
     {
         mnLastValue = nTempValue;
         SetText( aName );
-        mnFieldValue = mnLastValue;
         SetEmptyFieldValueData( false );
         return;
     }
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 1b5dfa58905a..3012c5916570 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -37,7 +37,6 @@ struct ImplToolItem
     VclPtr<vcl::Window> mpWindow; //don't dispose mpWindow - we get copied around
     void*               mpUserData;
     Image               maImage;
-    Image               maOverlayImage;
     long                mnImageAngle;
     bool                mbMirrorMode;
     OUString            maText;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index aa79e0890623..86a9a38b8887 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -537,7 +537,6 @@ void NumericFormatter::ImplNumericReformat()
 
 NumericFormatter::NumericFormatter(Edit* pEdit)
     : FormatterBase(pEdit)
-    , mnFieldValue(0)
     , mnLastValue(0)
     , mnMin(0)
     // a "large" value substantially smaller than SAL_MAX_INT64, to avoid
@@ -599,7 +598,6 @@ void NumericFormatter::SetShowTrailingZeros( bool bShowTrailingZeros )
 void NumericFormatter::SetValue( sal_Int64 nNewValue )
 {
     SetUserValue( nNewValue );
-    mnFieldValue = mnLastValue;
     SetEmptyFieldValueData( false );
 }
 
@@ -1415,7 +1413,6 @@ void MetricFormatter::SetCustomUnitText( const OUString& rStr )
 void MetricFormatter::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
 {
     SetUserValue( nNewValue, eInUnit );
-    mnFieldValue = mnLastValue;
 }
 
 OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const
@@ -1855,7 +1852,6 @@ CurrencyFormatter::~CurrencyFormatter()
 void CurrencyFormatter::SetValue( sal_Int64 nNewValue )
 {
     SetUserValue( nNewValue );
-    mnFieldValue = mnLastValue;
     SetEmptyFieldValueData( false );
 }
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4b0d02493448..8db0cb65d6e8 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2651,7 +2651,6 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::si
     if ( bImage )
     {
         const Image* pImage = &(pItem->maImage);
-        const Image& rOverlayImage = pItem->maOverlayImage;
         aImageSize = pImage->GetSizePixel();
 
         // determine drawing flags
@@ -2696,8 +2695,6 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::si
             }
         }
         rRenderContext.DrawImage(Point( nImageOffX, nImageOffY ), *pImage, nImageStyle);
-        if (!!rOverlayImage)
-            rRenderContext.DrawImage(Point( nImageOffX, nImageOffY ), rOverlayImage, nImageStyle);
     }
 
     // draw the text


More information about the Libreoffice-commits mailing list