[Libreoffice-commits] core.git: 2 commits - codemaker/source compilerplugins/clang include/svx sc/source svl/source svx/source sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Aug 8 07:30:38 UTC 2018


 codemaker/source/cppumaker/dependencies.cxx                         |    7 
 codemaker/source/cppumaker/dependencies.hxx                         |    2 
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  144 ++++----
 compilerplugins/clang/unusedfields.readonly.results                 |  162 +++-------
 compilerplugins/clang/unusedfields.untouched.results                |   74 ++--
 compilerplugins/clang/unusedfields.writeonly.results                |   98 ++----
 include/svx/paraprev.hxx                                            |    1 
 include/svx/relfld.hxx                                              |    3 
 sc/source/filter/xml/xmltransformationi.hxx                         |    2 
 svl/source/misc/sharedstringpool.cxx                                |   97 +----
 svx/source/dialog/paraprev.cxx                                      |    2 
 svx/source/dialog/relfld.cxx                                        |    3 
 sw/source/uibase/docvw/romenu.cxx                                   |    7 
 sw/source/uibase/docvw/romenu.hxx                                   |    1 
 14 files changed, 250 insertions(+), 353 deletions(-)

New commits:
commit c83a8071666af2f8e96a4b1808d7650ba112f931
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 7 18:47:36 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 8 09:30:23 2018 +0200

    loplugin:unusedfields
    
    Change-Id: I9ae44279f1cce06bd6868005fbb878ba4894aed7
    Reviewed-on: https://gerrit.libreoffice.org/58706
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/codemaker/source/cppumaker/dependencies.cxx b/codemaker/source/cppumaker/dependencies.cxx
index aed0df3d944b..d32ac98396a0 100644
--- a/codemaker/source/cppumaker/dependencies.cxx
+++ b/codemaker/source/cppumaker/dependencies.cxx
@@ -43,8 +43,7 @@ Dependencies::Dependencies(
     m_byteDependency(false), m_shortDependency(false),
     m_unsignedShortDependency(false), m_longDependency(false),
     m_unsignedLongDependency(false), m_hyperDependency(false),
-    m_unsignedHyperDependency(false), m_floatDependency(false),
-    m_doubleDependency(false), m_charDependency(false),
+    m_unsignedHyperDependency(false), m_charDependency(false),
     m_stringDependency(false), m_typeDependency(false), m_anyDependency(false),
     m_sequenceDependency(false)
 {
@@ -168,10 +167,8 @@ Dependencies::Dependencies(
                     m_unsignedHyperDependency = true;
                     break;
                 case unoidl::ConstantValue::TYPE_FLOAT:
-                    m_floatDependency = true;
                     break;
                 case unoidl::ConstantValue::TYPE_DOUBLE:
-                    m_doubleDependency = true;
                     break;
                 }
             }
@@ -251,10 +248,8 @@ void Dependencies::insert(OUString const & name, Kind kind) {
         m_unsignedHyperDependency = true;
         break;
     case UnoType::Sort::Float:
-        m_floatDependency = true;
         break;
     case UnoType::Sort::Double:
-        m_doubleDependency = true;
         break;
     case UnoType::Sort::Char:
         m_charDependency = true;
diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx
index c7eae1dfc6b6..5e7adb442024 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -114,8 +114,6 @@ private:
     bool m_unsignedLongDependency;
     bool m_hyperDependency;
     bool m_unsignedHyperDependency;
-    bool m_floatDependency;
-    bool m_doubleDependency;
     bool m_charDependency;
     bool m_stringDependency;
     bool m_typeDependency;
diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 21e02d81160d..b90e7a4dffed 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
     libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-    libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo/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:201
@@ -176,11 +176,11 @@ include/drawinglayer/texture/texture3d.hxx:62
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 include/drawinglayer/texture/texture3d.hxx:64
     drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap
-include/filter/msfilter/svdfppt.hxx:883
+include/filter/msfilter/svdfppt.hxx:882
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:884
+include/filter/msfilter/svdfppt.hxx:883
     ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:885
+include/filter/msfilter/svdfppt.hxx:884
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/LibreOfficeKit/LibreOfficeKitGtk.h:33
     _LOKDocView aDrawingArea GtkDrawingArea
@@ -204,12 +204,12 @@ include/svx/ClassificationDialog.hxx:63
     svx::ClassificationDialog m_nInsertMarkings sal_Int16
 include/svx/itemwin.hxx:34
     SvxLineBox aDelayTimer class Timer
+include/svx/paraprev.hxx:40
+    SvxParaPrevWindow aSize class Size
+include/vcl/font/Feature.hxx:102
+    vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/xmloff/shapeimport.hxx:140
     SdXML3DLightContext mbSpecular _Bool
-include/xmloff/txtparae.hxx:209
-    XMLTextParagraphExport m_sBookmarkHidden const class rtl::OUString
-include/xmloff/txtparae.hxx:210
-    XMLTextParagraphExport m_sBookmarkCondition const class rtl::OUString
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx:102
     jfw_plugin::SunVersion usVersion class rtl::OUString
 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35
@@ -250,27 +250,27 @@ lotuswordpro/source/filter/clone.hxx:23
     detail::has_clone::(anonymous) a char [2]
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx:188
     oox::drawingml::ConditionAtom maIter struct oox::drawingml::IteratorAttr
-oox/source/drawingml/diagram/layoutnodecontext.cxx:83
+oox/source/drawingml/diagram/layoutnodecontext.cxx:84
     oox::drawingml::AlgorithmContext mnRevision sal_Int32
-oox/source/drawingml/diagram/layoutnodecontext.cxx:125
+oox/source/drawingml/diagram/layoutnodecontext.cxx:126
     oox::drawingml::ChooseContext msName class rtl::OUString
 oox/source/drawingml/hyperlinkcontext.hxx:43
     oox::drawingml::HyperLinkContext maProperties class oox::PropertyMap &
-oox/source/ppt/timenodelistcontext.cxx:156
+oox/source/ppt/timenodelistcontext.cxx:196
     oox::ppt::MediaNodeContext mbIsNarration _Bool
-oox/source/ppt/timenodelistcontext.cxx:157
+oox/source/ppt/timenodelistcontext.cxx:197
     oox::ppt::MediaNodeContext mbFullScrn _Bool
-oox/source/ppt/timenodelistcontext.cxx:366
+oox/source/ppt/timenodelistcontext.cxx:391
     oox::ppt::SequenceTimeNodeContext mbConcurrent _Bool
-oox/source/ppt/timenodelistcontext.cxx:590
+oox/source/ppt/timenodelistcontext.cxx:628
     oox::ppt::AnimContext mnValueType sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:671
+oox/source/ppt/timenodelistcontext.cxx:710
     oox::ppt::AnimScaleContext mbZoomContents _Bool
-oox/source/ppt/timenodelistcontext.cxx:811
+oox/source/ppt/timenodelistcontext.cxx:850
     oox::ppt::AnimMotionContext msPtsTypes class rtl::OUString
-oox/source/ppt/timenodelistcontext.cxx:812
+oox/source/ppt/timenodelistcontext.cxx:851
     oox::ppt::AnimMotionContext mnPathEditMode sal_Int32
-oox/source/ppt/timenodelistcontext.cxx:813
+oox/source/ppt/timenodelistcontext.cxx:852
     oox::ppt::AnimMotionContext mnAngle sal_Int32
 opencl/source/openclwrapper.cxx:305
     openclwrapper::(anonymous namespace)::OpenCLEnv mpOclCmdQueue cl_command_queue [1]
@@ -298,23 +298,23 @@ sal/textenc/textenc.cxx:406
     (anonymous namespace)::FullTextEncodingData module_ osl::Module
 sc/inc/column.hxx:128
     ScColumn maCellsEvent sc::CellStoreEvent
-sc/inc/compiler.hxx:261
+sc/inc/compiler.hxx:260
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:262
+sc/inc/compiler.hxx:261
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:263
     ScCompiler::AddInMap pUpper const char *
 sc/inc/formulalogger.hxx:42
     sc::FormulaLogger maMessages std::vector<OUString>
 sc/inc/interpretercontext.hxx:31
     ScInterpreterContext mrDoc const class ScDocument &
-sc/inc/token.hxx:397
+sc/inc/token.hxx:412
     SingleDoubleRefModifier aDub struct ScComplexRefData
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1237
-    (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1238
+    (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1239
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
 sc/source/filter/inc/htmlpars.hxx:614
     ScHTMLQueryParser mnUnusedId ScHTMLTableId
@@ -338,6 +338,12 @@ sc/source/filter/xml/xmldrani.hxx:75
     ScXMLDatabaseRangeContext bIsSelection _Bool
 sc/source/filter/xml/xmlexternaltabi.hxx:112
     ScXMLExternalRefCellContext mnCellType sal_Int16
+sc/source/filter/xml/xmltransformationi.hxx:75
+    ScXMLColumnSortContext maSortParam struct ScSortParam
+sc/source/filter/xml/xmltransformationi.hxx:123
+    ScXMLColumnNumberContext aType class rtl::OUString
+sc/source/filter/xml/xmltransformationi.hxx:157
+    ScXMLDateTimeContext aType class rtl::OUString
 sc/source/ui/inc/acredlin.hxx:58
     ScAcceptChgDlg aReOpenIdle class Idle
 sc/source/ui/inc/anyrefdg.hxx:119
@@ -386,15 +392,15 @@ sd/source/ui/table/TableDesignPane.hxx:106
     sd::TableDesignPane aImpl class sd::TableDesignWidget
 sd/source/ui/view/DocumentRenderer.cxx:1317
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1215
-    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1216
-    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1217
-    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1218
+    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+sd/source/ui/view/viewshel.cxx:1219
     sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sfx2/source/doc/doctempl.cxx:114
+sfx2/source/doc/doctempl.cxx:115
     DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
 slideshow/source/engine/animationnodes/animationbasenode.hxx:89
     slideshow::internal::AnimationBaseNode mpSubsetManager slideshow::internal::SubsettableShapeManagerSharedPtr
@@ -402,17 +408,17 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:296
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex texcoord glm::vec2
-slideshow/source/engine/smilfunctionparser.cxx:498
-    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:499
-    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
+    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:500
-    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
+    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:501
-    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
+    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:502
-    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
+    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
 slideshow/source/engine/smilfunctionparser.cxx:503
+    slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
+slideshow/source/engine/smilfunctionparser.cxx:504
     slideshow::internal::(anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 starmath/inc/view.hxx:218
     SmViewShell maGraphicController class SmGraphicController
@@ -420,47 +426,47 @@ starmath/source/accessibility.hxx:273
     SmEditSource rEditAcc class SmEditAccessible &
 svgio/inc/svgcharacternode.hxx:89
     svgio::svgreader::SvgTextPosition maY ::std::vector<double>
-svl/source/crypto/cryptosign.cxx:120
-    (anonymous namespace)::(anonymous) extnID SECItem
 svl/source/crypto/cryptosign.cxx:121
-    (anonymous namespace)::(anonymous) critical SECItem
+    (anonymous namespace)::(anonymous) extnID SECItem
 svl/source/crypto/cryptosign.cxx:122
+    (anonymous namespace)::(anonymous) critical SECItem
+svl/source/crypto/cryptosign.cxx:123
     (anonymous namespace)::(anonymous) extnValue SECItem
-svl/source/crypto/cryptosign.cxx:280
-    (anonymous namespace)::(anonymous) statusString SECItem
 svl/source/crypto/cryptosign.cxx:281
+    (anonymous namespace)::(anonymous) statusString SECItem
+svl/source/crypto/cryptosign.cxx:282
     (anonymous namespace)::(anonymous) failInfo SECItem
 svtools/source/inc/svimpbox.hxx:125
     SvImpLBox aFctSet class ImpLBSelEng
 svtools/source/svhtml/htmlkywd.cxx:558
-    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo4/svtools/source/svhtml/htmlkywd.cxx:558:5)
+    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
 svtools/source/svhtml/htmlkywd.cxx:560
     HTML_OptionEntry::(anonymous) sToken const sal_Char *
 svtools/source/svhtml/htmlkywd.cxx:561
     HTML_OptionEntry::(anonymous) pUToken const class rtl::OUString *
 svx/inc/GalleryControl.hxx:47
     svx::sidebar::GalleryControl mpGallery class Gallery *
-svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1082
-    (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1083
-    (anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition multiplicativeExpression ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1084
-    (anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition unaryExpression ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1085
-    (anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition basicExpression ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1086
-    (anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition unaryFunction ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1087
-    (anonymous namespace)::ExpressionGrammar::definition ternaryFunction ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition binaryFunction ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1088
-    (anonymous namespace)::ExpressionGrammar::definition funcRef_decl ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition ternaryFunction ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1089
-    (anonymous namespace)::ExpressionGrammar::definition functionReference ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition funcRef_decl ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1090
-    (anonymous namespace)::ExpressionGrammar::definition modRef_decl ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition functionReference ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1091
-    (anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::rule<ScannerT>
+    (anonymous namespace)::ExpressionGrammar::definition modRef_decl ::boost::spirit::rule<ScannerT>
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1092
+    (anonymous namespace)::ExpressionGrammar::definition modifierReference ::boost::spirit::rule<ScannerT>
+svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx:1093
     (anonymous namespace)::ExpressionGrammar::definition identifier ::boost::spirit::rule<ScannerT>
 svx/source/dialog/framelinkarray.cxx:376
     svx::frame::MergedCellIterator mnFirstRow size_t
@@ -468,15 +474,15 @@ svx/source/dialog/imapwnd.hxx:78
     IMapWindow maItemInfos struct SfxItemInfo [1]
 svx/source/gallery2/galbrws2.cxx:115
     (anonymous namespace)::GalleryThemePopup maBuilder class VclBuilder
-svx/source/stbctrls/pszctrl.cxx:93
+svx/source/stbctrls/pszctrl.cxx:94
     FunctionPopup_Impl m_aBuilder class VclBuilder
 svx/source/stbctrls/selctrl.cxx:37
     SelectionTypePopup m_aBuilder class VclBuilder
-svx/source/stbctrls/zoomctrl.cxx:55
+svx/source/stbctrls/zoomctrl.cxx:56
     ZoomPopup_Impl m_aBuilder class VclBuilder
 svx/source/svdraw/svdcrtv.cxx:49
     ImplConnectMarkerOverlay maObjects sdr::overlay::OverlayObjectList
-svx/source/xml/xmleohlp.cxx:71
+svx/source/xml/xmleohlp.cxx:72
     OutputStorageWrapper_Impl aTempFile class utl::TempFile
 sw/inc/unosett.hxx:144
     SwXNumberingRules m_pImpl ::sw::UnoImplPtr<Impl>
@@ -488,7 +494,7 @@ sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
 sw/source/core/inc/swfont.hxx:975
     SvStatistics nGetStretchTextSize sal_uInt16
-sw/source/core/layout/dbg_lay.cxx:169
+sw/source/core/layout/dbg_lay.cxx:170
     SwImplEnterLeave nAction enum DbgAction
 sw/source/core/text/inftxt.hxx:683
     SwTextSlot aText class rtl::OUString
@@ -504,6 +510,8 @@ sw/source/ui/dbui/mmaddressblockpage.hxx:212
     SwCustomizeAddressBlockDialog m_aTextFilter class TextFilter
 sw/source/uibase/docvw/romenu.hxx:35
     SwReadOnlyPopup m_aBuilder class VclBuilder
+sw/source/uibase/docvw/romenu.hxx:62
+    SwReadOnlyPopup m_rDocPos const class Point &
 sw/source/uibase/inc/chrdlg.hxx:43
     SwCharDlg m_nCharUrlId sal_uInt16
 sw/source/uibase/inc/chrdlg.hxx:45
@@ -538,9 +546,9 @@ ucb/source/ucp/gio/gio_mount.hxx:51
     OOoMountOperationClass _gtk_reserved3 void (*)(void)
 ucb/source/ucp/gio/gio_mount.hxx:52
     OOoMountOperationClass _gtk_reserved4 void (*)(void)
-unotools/source/config/defaultoptions.cxx:93
+unotools/source/config/defaultoptions.cxx:94
     SvtDefaultOptions_Impl m_aUserDictionaryPath class rtl::OUString
-vcl/headless/svpgdi.cxx:285
+vcl/headless/svpgdi.cxx:286
     (anonymous namespace)::SourceHelper aTmpBmp class SvpSalBitmap
 vcl/inc/canvasbitmap.hxx:44
     vcl::unotools::VclCanvasBitmap m_aAlpha ::Bitmap
@@ -552,6 +560,12 @@ vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
 vcl/inc/opengl/zone.hxx:46
     OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5Menu.hxx:74
+    Qt5MenuItem mbVisible _Bool
+vcl/inc/qt5/Qt5Object.hxx:34
+    Qt5Object m_aSystemData struct SystemEnvData
+vcl/inc/qt5/Qt5Object.hxx:36
+    Qt5Object m_pParent class Qt5Frame *
 vcl/inc/salmenu.hxx:42
     SalMenuButtonItem mnId sal_uInt16
 vcl/inc/salmenu.hxx:43
@@ -574,19 +588,19 @@ vcl/inc/unx/i18n_ic.hxx:47
     SalI18N_InputContext maDestroyCallback XIMCallback
 vcl/source/app/salvtables.cxx:1354
     SalInstanceEntry m_aTextFilter class SalInstanceEntry::WeldTextFilter
-vcl/source/gdi/jobset.cxx:34
-    ImplOldJobSetupData cDeviceName char [32]
 vcl/source/gdi/jobset.cxx:35
+    ImplOldJobSetupData cDeviceName char [32]
+vcl/source/gdi/jobset.cxx:36
     ImplOldJobSetupData cPortName char [32]
-vcl/unx/gtk3/gtk3gtkinst.cxx:2231
+vcl/unx/gtk3/gtk3gtkinst.cxx:2234
     CrippledViewport viewport GtkViewport
 vcl/unx/gtk/a11y/atkhypertext.cxx:29
     (anonymous) atk_hyper_link AtkHyperlink
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk/gloactiongroup.cxx:28
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass AtkObjectClass
+vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
     GLOMenu parent_instance GMenuModel
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index ae56f3629458..ea73ac566494 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -176,7 +176,7 @@ dbaccess/source/core/inc/ContentHelper.hxx:108
     dbaccess::OContentHelper m_aErrorHelper const ::connectivity::SQLError
 dbaccess/source/filter/hsqldb/parseschema.hxx:36
     dbahsql::SchemaParser m_PrimaryKeys std::map<OUString, std::vector<OUString> >
-dbaccess/source/ui/control/tabletree.cxx:183
+dbaccess/source/ui/control/tabletree.cxx:182
     dbaui::(anonymous namespace)::OViewSetter m_aEqualFunctor ::comphelper::UStringMixEqual
 dbaccess/source/ui/inc/charsetlistbox.hxx:42
     dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay
@@ -226,6 +226,8 @@ filter/source/graphicfilter/icgm/chart.hxx:46
     DataNode nBoxX2 sal_Int16
 filter/source/graphicfilter/icgm/chart.hxx:47
     DataNode nBoxY2 sal_Int16
+filter/source/graphicfilter/idxf/dxf2mtf.hxx:54
+    DXF2GDIMetaFile aDefaultLineInfo const class LineInfo
 filter/source/graphicfilter/idxf/dxfreprd.hxx:76
     DXFRepresentation aPalette class DXFPalette
 filter/source/graphicfilter/itga/itga.cxx:51
@@ -242,7 +244,7 @@ framework/inc/xml/menudocumenthandler.hxx:160
     framework::OReadMenuHandler m_bMenuPopupMode _Bool
 framework/inc/xml/menudocumenthandler.hxx:190
     framework::OReadMenuPopupHandler m_bMenuMode _Bool
-framework/source/fwe/classes/addonsoptions.cxx:301
+framework/source/fwe/classes/addonsoptions.cxx:302
     framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
 i18npool/inc/textconversion.hxx:80
     i18npool::(anonymous) code sal_Unicode
@@ -268,13 +270,13 @@ include/editeng/brushitem.hxx:53
     SvxBrushItem maSecOptions class SvtSecurityOptions
 include/editeng/charsetcoloritem.hxx:35
     SvxCharSetColorItem eFrom rtl_TextEncoding
-include/filter/msfilter/svdfppt.hxx:710
+include/filter/msfilter/svdfppt.hxx:711
     PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [5]
-include/filter/msfilter/svdfppt.hxx:883
+include/filter/msfilter/svdfppt.hxx:882
     ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:884
+include/filter/msfilter/svdfppt.hxx:883
     ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:885
+include/filter/msfilter/svdfppt.hxx:884
     ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/oox/core/contexthandler2.hxx:220
     oox::core::ContextHandler2Helper mnRootStackSize size_t
@@ -314,48 +316,6 @@ include/svl/ondemand.hxx:58
     OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale
 include/svtools/editsyntaxhighlighter.hxx:33
     MultiLineEditSyntaxHighlight m_aColorConfig svtools::ColorConfig
-include/svx/colorbox.hxx:99
-    ColorListBox m_aSelectedLink Link<class ColorListBox &, void>
-include/svx/colorwindow.hxx:118
-    ColorWindow maCommand class rtl::OUString
-include/svx/colorwindow.hxx:136
-    ColorWindow maSelectedLink Link<const NamedColor &, void>
-include/svx/pagectrl.hxx:44
-    SvxPageWindow bResetBackground _Bool
-include/svx/pagectrl.hxx:45
-    SvxPageWindow bFrameDirection _Bool
-include/svx/pagectrl.hxx:46
-    SvxPageWindow nFrameDirection enum SvxFrameDirection
-include/svx/pagectrl.hxx:64
-    SvxPageWindow bTable _Bool
-include/svx/pagectrl.hxx:65
-    SvxPageWindow bHorz _Bool
-include/svx/pagectrl.hxx:66
-    SvxPageWindow bVert _Bool
-include/svx/paraprev.hxx:43
-    SvxParaPrevWindow nLeftMargin long
-include/svx/paraprev.hxx:44
-    SvxParaPrevWindow nRightMargin long
-include/svx/paraprev.hxx:45
-    SvxParaPrevWindow nFirstLineOfst short
-include/svx/paraprev.hxx:47
-    SvxParaPrevWindow nUpper sal_uInt16
-include/svx/paraprev.hxx:48
-    SvxParaPrevWindow nLower sal_uInt16
-include/svx/paraprev.hxx:50
-    SvxParaPrevWindow eAdjust enum SvxAdjust
-include/svx/paraprev.hxx:52
-    SvxParaPrevWindow eLastLine enum SvxAdjust
-include/svx/paraprev.hxx:54
-    SvxParaPrevWindow eLine enum SvxPrevLineSpace
-include/svx/relfld.hxx:31
-    SvxRelativeField nRelMin sal_uInt16
-include/svx/relfld.hxx:32
-    SvxRelativeField nRelMax sal_uInt16
-include/svx/relfld.hxx:33
-    SvxRelativeField bRelativeMode _Bool
-include/svx/relfld.hxx:35
-    SvxRelativeField bNegativeEnabled _Bool
 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:51
     sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool
 include/svx/sdr/overlay/overlaymanager.hxx:73
@@ -364,7 +324,7 @@ include/svx/svdmark.hxx:141
     SdrMarkList maPointName class rtl::OUString
 include/svx/svdmark.hxx:142
     SdrMarkList maGluePointName class rtl::OUString
-include/svx/svdoedge.hxx:161
+include/svx/svdoedge.hxx:160
     SdrEdgeObj mbBoundRectCalculationRunning _Bool
 include/svx/svdpntv.hxx:170
     SdrPaintView maDrawinglayerOpt class SvtOptionsDrawinglayer
@@ -377,7 +337,7 @@ include/test/sheet/xnamedranges.hxx:38
 include/test/sheet/xspreadsheets2.hxx:46
     apitest::XSpreadsheets2 xDocument css::uno::Reference<css::sheet::XSpreadsheetDocument>
 include/unoidl/unoidl.hxx:443
-    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /media/noel/disk2/libo4/include/unoidl/unoidl.hxx:443:5)
+    unoidl::ConstantValue  union unoidl::ConstantValue::(anonymous at /home/noel/libo/include/unoidl/unoidl.hxx:443:5)
 include/unoidl/unoidl.hxx:444
     unoidl::ConstantValue::(anonymous) booleanValue _Bool
 include/unoidl/unoidl.hxx:445
@@ -400,11 +360,11 @@ include/unoidl/unoidl.hxx:453
     unoidl::ConstantValue::(anonymous) doubleValue double
 include/unotest/bootstrapfixturebase.hxx:37
     test::BootstrapFixtureBase m_directories class test::Directories
-include/vcl/filter/pdfdocument.hxx:188
+include/vcl/filter/pdfdocument.hxx:200
     vcl::filter::PDFNameElement m_nLength sal_uInt64
 include/vcl/opengl/OpenGLContext.hxx:57
     OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool
-include/vcl/opengl/OpenGLContext.hxx:180
+include/vcl/opengl/OpenGLContext.hxx:179
     OpenGLContext mpLastFramebuffer class OpenGLFramebuffer *
 include/vcl/ppdparser.hxx:134
     psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey *
@@ -450,8 +410,6 @@ sal/osl/unx/process.cxx:828
     osl_procStat sigcatch char [24]
 sal/rtl/alloc_arena.hxx:100
     rtl_arena_st m_hash_table_0 struct rtl_arena_segment_type *[64]
-sal/rtl/alloc_cache.hxx:135
-    rtl_cache_st m_hash_table_0 struct rtl_cache_bufctl_type *[8]
 sal/rtl/digest.cxx:181
     DigestContextMD2 m_state sal_uInt32 [16]
 sal/rtl/digest.cxx:182
@@ -460,11 +418,11 @@ sal/rtl/uuid.cxx:64
     UUID clock_seq_low sal_uInt8
 sal/rtl/uuid.cxx:65
     UUID node sal_uInt8 [6]
-sc/inc/compiler.hxx:129
+sc/inc/compiler.hxx:128
     ScRawToken::(anonymous union)::(anonymous) eItem class ScTableRefToken::Item
-sc/inc/compiler.hxx:130
-    ScRawToken::(anonymous) table struct (anonymous struct at /media/noel/disk2/libo4/sc/inc/compiler.hxx:127:9)
-sc/inc/compiler.hxx:135
+sc/inc/compiler.hxx:129
+    ScRawToken::(anonymous) table struct (anonymous struct at /home/noel/libo/sc/inc/compiler.hxx:126:9)
+sc/inc/compiler.hxx:134
     ScRawToken::(anonymous) pMat class ScMatrix *
 sc/inc/formulagroup.hxx:39
     sc::FormulaGroupEntry::(anonymous) mpCells class ScFormulaCell **
@@ -518,9 +476,9 @@ sd/inc/sdmod.hxx:116
     SdModule gImplImpressPropertySetInfoCache SdExtPropertySetInfoCache
 sd/inc/sdmod.hxx:117
     SdModule gImplDrawPropertySetInfoCache SdExtPropertySetInfoCache
-sd/source/core/CustomAnimationCloner.cxx:69
-    sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
 sd/source/core/CustomAnimationCloner.cxx:70
+    sd::CustomAnimationClonerImpl maSourceNodeVector std::vector<Reference<XAnimationNode> >
+sd/source/core/CustomAnimationCloner.cxx:71
     sd::CustomAnimationClonerImpl maCloneNodeVector std::vector<Reference<XAnimationNode> >
 sd/source/ui/sidebar/MasterPageContainer.cxx:148
     sd::sidebar::MasterPageContainer::Implementation maLargePreviewBeingCreated class Image
@@ -542,17 +500,17 @@ sdext/source/pdfimport/tree/style.hxx:42
     pdfi::StyleContainer::Style Contents class rtl::OUString
 sfx2/source/appl/lnkbase2.cxx:96
     sfx2::ImplDdeItem pLink class sfx2::SvBaseLink *
-slideshow/source/engine/slideshowimpl.cxx:152
+slideshow/source/engine/slideshowimpl.cxx:153
     (anonymous namespace)::FrameSynchronization maTimer canvas::tools::ElapsedTime
-sot/source/sdstor/ucbstorage.cxx:407
+sot/source/sdstor/ucbstorage.cxx:408
     UCBStorageStream_Impl m_aKey class rtl::OString
-starmath/source/view.cxx:855
+starmath/source/view.cxx:856
     SmViewShell_Impl aOpts class SvtMiscOptions
 store/source/storbios.cxx:59
     OStoreSuperBlock m_aMarked OStoreSuperBlock::L
-svl/source/crypto/cryptosign.cxx:279
+svl/source/crypto/cryptosign.cxx:280
     (anonymous namespace)::(anonymous) status SECItem
-svl/source/crypto/cryptosign.cxx:300
+svl/source/crypto/cryptosign.cxx:301
     (anonymous namespace)::(anonymous) timeStampToken SECItem
 svl/source/misc/strmadpt.cxx:55
     SvDataPipe_Impl::Page m_aBuffer sal_Int8 [1]
@@ -580,8 +538,6 @@ svtools/source/dialogs/insdlg.cxx:52
     OleObjectDescriptor dwFullUserTypeName sal_uInt32
 svtools/source/dialogs/insdlg.cxx:53
     OleObjectDescriptor dwSrcOfCopy sal_uInt32
-svtools/source/misc/transfer2.cxx:322
-    TransferDataContainer_Impl pGrf std::unique_ptr<Graphic>
 svtools/source/table/gridtablerenderer.cxx:69
     svt::table::CachedSortIndicator m_sortAscending class BitmapEx
 svtools/source/table/gridtablerenderer.cxx:70
@@ -600,15 +556,15 @@ svx/source/inc/gridcell.hxx:526
     DbPatternField m_pValueFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
 svx/source/inc/gridcell.hxx:527
     DbPatternField m_pPaintFormatter ::std::unique_ptr< ::dbtools::FormattedColumnValue>
-svx/source/svdraw/svdpdf.hxx:168
+svx/source/svdraw/svdpdf.hxx:173
     ImpSdrPdfImport maLineJoin basegfx::B2DLineJoin
-svx/source/svdraw/svdpdf.hxx:169
+svx/source/svdraw/svdpdf.hxx:174
     ImpSdrPdfImport maLineCap css::drawing::LineCap
-svx/source/svdraw/svdpdf.hxx:170
+svx/source/svdraw/svdpdf.hxx:175
     ImpSdrPdfImport maDash class XDash
 sw/inc/acmplwrd.hxx:42
     SwAutoCompleteWord m_LookupTree editeng::Trie
-sw/inc/calc.hxx:194
+sw/inc/calc.hxx:196
     SwCalc m_aSysLocale class SvtSysLocale
 sw/inc/hints.hxx:199
     SwAttrSetChg m_bDelSet _Bool
@@ -628,27 +584,25 @@ sw/source/core/inc/swblocks.hxx:68
     SwImpBlocks m_bInPutMuchBlocks _Bool
 sw/source/core/text/atrhndl.hxx:48
     SwAttrHandler::SwAttrStack m_pInitialArray class SwTextAttr *[3]
-sw/source/filter/html/swhtml.hxx:454
-    SwHTMLParser m_bBodySeen _Bool
 sw/source/filter/inc/rtf.hxx:32
     RTFSurround::(anonymous) nVal sal_uInt8
-sw/source/ui/dbui/dbinsdlg.cxx:115
+sw/source/ui/dbui/dbinsdlg.cxx:116
     DB_Column::(anonymous) pText class rtl::OUString *
-sw/source/ui/dbui/dbinsdlg.cxx:117
+sw/source/ui/dbui/dbinsdlg.cxx:118
     DB_Column::(anonymous) nFormat sal_uInt32
-sw/source/uibase/dbui/mmconfigitem.cxx:106
+sw/source/uibase/dbui/mmconfigitem.cxx:107
     SwMailMergeConfigItem_Impl m_aFemaleGreetingLines std::vector<OUString>
-sw/source/uibase/dbui/mmconfigitem.cxx:108
+sw/source/uibase/dbui/mmconfigitem.cxx:109
     SwMailMergeConfigItem_Impl m_aMaleGreetingLines std::vector<OUString>
-sw/source/uibase/dbui/mmconfigitem.cxx:110
+sw/source/uibase/dbui/mmconfigitem.cxx:111
     SwMailMergeConfigItem_Impl m_aNeutralGreetingLines std::vector<OUString>
 sw/source/uibase/inc/fldmgr.hxx:78
     SwInsertField_Data m_aDBDataSource css::uno::Any
-sw/source/uibase/inc/labimg.hxx:49
+sw/source/uibase/inc/labimg.hxx:50
     SwLabItem m_aBin class rtl::OUString
 sw/source/uibase/inc/optload.hxx:107
     CaptionComboBox aDefault class rtl::OUString
-toolkit/source/awt/vclxtoolkit.cxx:433
+toolkit/source/awt/vclxtoolkit.cxx:434
     (anonymous namespace)::VCLXToolkit mxSelection css::uno::Reference<css::datatransfer::clipboard::XClipboard>
 ucb/source/ucp/gio/gio_mount.hxx:46
     OOoMountOperationClass parent_class GMountOperationClass
@@ -716,8 +670,6 @@ vcl/inc/svdata.hxx:284
     ImplSVNWFData mbNoActiveTabTextRaise _Bool
 vcl/inc/svdata.hxx:286
     ImplSVNWFData mbProgressNeedsErase _Bool
-vcl/inc/svdata.hxx:295
-    ImplSVNWFData mbRolloverMenubar _Bool
 vcl/inc/unx/i18n_status.hxx:56
     vcl::I18NStatus m_aCurrentIM class rtl::OUString
 vcl/inc/unx/saldisp.hxx:288
@@ -734,45 +686,45 @@ vcl/source/filter/jpeg/transupp.h:148
     (anonymous) crop_xoffset_set JCROP_CODE
 vcl/source/filter/jpeg/transupp.h:150
     (anonymous) crop_yoffset_set JCROP_CODE
-vcl/source/fontsubset/sft.cxx:1048
-    vcl::_subHeader2 firstCode sal_uInt16
 vcl/source/fontsubset/sft.cxx:1049
-    vcl::_subHeader2 entryCount sal_uInt16
+    vcl::_subHeader2 firstCode sal_uInt16
 vcl/source/fontsubset/sft.cxx:1050
+    vcl::_subHeader2 entryCount sal_uInt16
+vcl/source/fontsubset/sft.cxx:1051
     vcl::_subHeader2 idDelta sal_uInt16
-vcl/source/gdi/dibtools.cxx:50
-    (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
 vcl/source/gdi/dibtools.cxx:51
-    (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30
+    (anonymous namespace)::CIEXYZ aXyzX FXPT2DOT30
 vcl/source/gdi/dibtools.cxx:52
+    (anonymous namespace)::CIEXYZ aXyzY FXPT2DOT30
+vcl/source/gdi/dibtools.cxx:53
     (anonymous namespace)::CIEXYZ aXyzZ FXPT2DOT30
-vcl/source/gdi/dibtools.cxx:63
-    (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ
 vcl/source/gdi/dibtools.cxx:64
-    (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ
+    (anonymous namespace)::CIEXYZTriple aXyzRed struct (anonymous namespace)::CIEXYZ
 vcl/source/gdi/dibtools.cxx:65
+    (anonymous namespace)::CIEXYZTriple aXyzGreen struct (anonymous namespace)::CIEXYZ
+vcl/source/gdi/dibtools.cxx:66
     (anonymous namespace)::CIEXYZTriple aXyzBlue struct (anonymous namespace)::CIEXYZ
-vcl/source/gdi/dibtools.cxx:105
-    (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:106
-    (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5RedMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:107
-    (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5GreenMask sal_uInt32
 vcl/source/gdi/dibtools.cxx:108
+    (anonymous namespace)::DIBV5Header nV5BlueMask sal_uInt32
+vcl/source/gdi/dibtools.cxx:109
     (anonymous namespace)::DIBV5Header nV5AlphaMask sal_uInt32
-vcl/source/gdi/dibtools.cxx:110
-    (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple
 vcl/source/gdi/dibtools.cxx:111
-    (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32
+    (anonymous namespace)::DIBV5Header aV5Endpoints struct (anonymous namespace)::CIEXYZTriple
 vcl/source/gdi/dibtools.cxx:112
-    (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5GammaRed sal_uInt32
 vcl/source/gdi/dibtools.cxx:113
+    (anonymous namespace)::DIBV5Header nV5GammaGreen sal_uInt32
+vcl/source/gdi/dibtools.cxx:114
     (anonymous namespace)::DIBV5Header nV5GammaBlue sal_uInt32
-vcl/source/gdi/dibtools.cxx:115
-    (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32
 vcl/source/gdi/dibtools.cxx:116
-    (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
+    (anonymous namespace)::DIBV5Header nV5ProfileData sal_uInt32
 vcl/source/gdi/dibtools.cxx:117
+    (anonymous namespace)::DIBV5Header nV5ProfileSize sal_uInt32
+vcl/source/gdi/dibtools.cxx:118
     (anonymous namespace)::DIBV5Header nV5Reserved sal_uInt32
 vcl/source/gdi/pdfwriter_impl.hxx:301
     vcl::PDFWriterImpl::TransparencyEmit m_pSoftMaskStream std::unique_ptr<SvMemoryStream>
@@ -782,9 +734,9 @@ vcl/unx/generic/print/bitmap_gfx.cxx:67
     psp::HexEncoder mpFileBuffer sal_Char [16400]
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk/gloactiongroup.cxx:28
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass AtkObjectClass
+vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
     GLOMenu parent_instance GMenuModel
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 0accd33a6ac2..c9408f3d0b37 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/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+    libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-    libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+    libvlc_event_t u union (anonymous union at /home/noel/libo/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
@@ -74,11 +74,11 @@ cui/source/inc/swpossizetabpage.hxx:88
     SvxSwPosSizeTabPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
 cui/source/inc/textattr.hxx:69
     SvxTextAttrPage m_xCtlPosition std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:102
+cui/source/inc/transfrm.hxx:104
     SvxPositionSizeTabPage m_xCtlPos std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:189
+cui/source/inc/transfrm.hxx:191
     SvxAngleTabPage m_xCtlRect std::unique_ptr<weld::CustomWeld>
-cui/source/inc/transfrm.hxx:192
+cui/source/inc/transfrm.hxx:194
     SvxAngleTabPage m_xCtlAngle std::unique_ptr<weld::CustomWeld>
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:116
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
@@ -100,8 +100,6 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:33
     _LOKDocView aDrawingArea GtkDrawingArea
 include/LibreOfficeKit/LibreOfficeKitGtk.h:38
     _LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/crypto/DocumentDecryption.hxx:38
-    oox::core::DocumentDecryption mxContext css::uno::Reference<css::uno::XComponentContext>
 include/oox/vml/vmlshapecontext.hxx:116
     oox::vml::ShapeTypeContext m_pShapeType std::shared_ptr<ShapeType>
 include/registry/registry.hxx:35
@@ -120,20 +118,18 @@ include/svtools/unoevent.hxx:162
     SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface>
 include/svx/ClassificationDialog.hxx:63
     svx::ClassificationDialog m_nInsertMarkings sal_Int16
-include/svx/colorwindow.hxx:133
+include/svx/colorwindow.hxx:132
     ColorWindow mxColorSetWin std::unique_ptr<weld::CustomWeld>
-include/svx/colorwindow.hxx:134
+include/svx/colorwindow.hxx:133
     ColorWindow mxRecentColorSetWin std::unique_ptr<weld::CustomWeld>
 include/svx/hdft.hxx:87
     SvxHFPage m_xBspWin std::unique_ptr<weld::CustomWeld>
+include/vcl/font/Feature.hxx:102
+    vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/uitest/uiobject.hxx:270
     TabPageUIObject mxTabPage VclPtr<class TabPage>
 include/xmloff/formlayerexport.hxx:173
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
-include/xmloff/txtparae.hxx:209
-    XMLTextParagraphExport m_sBookmarkHidden const class rtl::OUString
-include/xmloff/txtparae.hxx:210
-    XMLTextParagraphExport m_sBookmarkCondition const class rtl::OUString
 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35
     GtvApplicationWindowPrivate lokDialog GtkWidget *
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:50
@@ -190,14 +186,16 @@ sc/inc/interpretercontext.hxx:31
     ScInterpreterContext mrDoc const class ScDocument &
 sc/qa/unit/ucalc_column.cxx:104
     aInputs aName const char *
-sc/source/core/data/document.cxx:1237
-    (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
 sc/source/core/data/document.cxx:1238
+    (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aSwitch sc::AutoCalcSwitch
+sc/source/core/data/document.cxx:1239
     (anonymous namespace)::BroadcastRecalcOnRefMoveHandler aBulk class ScBulkBroadcast
-sc/source/core/data/formulacell.cxx:1809
+sc/source/core/data/formulacell.cxx:1811
     (anonymous namespace)::StackCleaner pInt std::unique_ptr<ScInterpreter>
 sc/source/filter/inc/sheetdatacontext.hxx:61
     oox::xls::SheetDataContext aReleaser class SolarMutexReleaser
+sc/source/filter/xml/xmltransformationi.hxx:75
+    ScXMLColumnSortContext maSortParam struct ScSortParam
 sc/source/ui/inc/crdlg.hxx:33
     ScColOrRowDlg m_xBtnRows std::unique_ptr<weld::RadioButton>
 sc/source/ui/inc/delcodlg.hxx:39
@@ -224,21 +222,23 @@ sd/source/ui/table/TableDesignPane.hxx:106
     sd::TableDesignPane aImpl class sd::TableDesignWidget
 sd/source/ui/view/DocumentRenderer.cxx:1317
     sd::DocumentRenderer::Implementation mxObjectShell SfxObjectShellRef
-sd/source/ui/view/viewshel.cxx:1215
-    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1216
-    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aDrawLock sd::slidesorter::view::class SlideSorterView::DrawLock
 sd/source/ui/view/viewshel.cxx:1217
-    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+    sd::KeepSlideSorterInSyncWithPageChanges m_aModelLock sd::slidesorter::controller::class SlideSorterController::ModelChangeLock
 sd/source/ui/view/viewshel.cxx:1218
+    sd::KeepSlideSorterInSyncWithPageChanges m_aUpdateLock sd::slidesorter::controller::class PageSelector::UpdateLock
+sd/source/ui/view/viewshel.cxx:1219
     sd::KeepSlideSorterInSyncWithPageChanges m_aContext sd::slidesorter::controller::class SelectionObserver::Context
-sd/source/ui/view/ViewShellBase.cxx:192
+sd/source/ui/view/ViewShellBase.cxx:193
     sd::ViewShellBase::Implementation mpPageCacheManager std::shared_ptr<slidesorter::cache::PageCacheManager>
-sfx2/source/doc/doctempl.cxx:114
+sfx2/source/doc/doctempl.cxx:115
     DocTempl::DocTempl_EntryData_Impl mxObjShell class SfxObjectShellLock
-sfx2/source/view/viewfrm.cxx:160
-    (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button>
+sfx2/source/inc/sfxpicklist.hxx:33
+    SfxPickList mxImpl std::unique_ptr<SfxPickListImpl>
 sfx2/source/view/viewfrm.cxx:161
+    (anonymous namespace)::SfxEditDocumentDialog m_xEditDocument std::unique_ptr<weld::Button>
+sfx2/source/view/viewfrm.cxx:162
     (anonymous namespace)::SfxEditDocumentDialog m_xCancel std::unique_ptr<weld::Button>
 starmath/inc/dialog.hxx:347
     SmSymbolDialog m_xSymbolSetDisplayArea std::unique_ptr<weld::CustomWeld>
@@ -256,18 +256,18 @@ starmath/inc/view.hxx:218
     SmViewShell maGraphicController class SmGraphicController
 starmath/source/accessibility.hxx:273
     SmEditSource rEditAcc class SmEditAccessible &
-svl/source/crypto/cryptosign.cxx:120
-    (anonymous namespace)::(anonymous) extnID SECItem
 svl/source/crypto/cryptosign.cxx:121
-    (anonymous namespace)::(anonymous) critical SECItem
+    (anonymous namespace)::(anonymous) extnID SECItem
 svl/source/crypto/cryptosign.cxx:122
+    (anonymous namespace)::(anonymous) critical SECItem
+svl/source/crypto/cryptosign.cxx:123
     (anonymous namespace)::(anonymous) extnValue SECItem
-svl/source/crypto/cryptosign.cxx:280
-    (anonymous namespace)::(anonymous) statusString SECItem
 svl/source/crypto/cryptosign.cxx:281
+    (anonymous namespace)::(anonymous) statusString SECItem
+svl/source/crypto/cryptosign.cxx:282
     (anonymous namespace)::(anonymous) failInfo SECItem
 svtools/source/svhtml/htmlkywd.cxx:558
-    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /media/noel/disk2/libo4/svtools/source/svhtml/htmlkywd.cxx:558:5)
+    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
 svtools/source/svhtml/htmlkywd.cxx:560
     HTML_OptionEntry::(anonymous) sToken const sal_Char *
 svtools/source/svhtml/htmlkywd.cxx:561
@@ -278,7 +278,7 @@ sw/source/core/crsr/crbm.cxx:64
     (anonymous namespace)::CursorStateHelper m_aSaveState class SwCursorSaveState
 sw/source/core/frmedt/fetab.cxx:79
     TableWait m_pWait const std::unique_ptr<SwWait>
-sw/source/core/layout/dbg_lay.cxx:169
+sw/source/core/layout/dbg_lay.cxx:170
     SwImplEnterLeave nAction enum DbgAction
 sw/source/ui/envelp/labfmt.hxx:75
     SwLabFormatPage m_xPreview std::unique_ptr<weld::CustomWeld>
@@ -298,6 +298,8 @@ sw/source/uibase/inc/num.hxx:82
     SwNumPositionTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/outline.hxx:98
     SwOutlineSettingsTabPage m_xPreviewWIN std::unique_ptr<weld::CustomWeld>
+sw/source/uibase/inc/pggrid.hxx:44
+    SwTextGridPage m_xExampleWN std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/regionsw.hxx:233
     SwSectionIndentTabPage m_xPreviewWin std::unique_ptr<weld::CustomWeld>
 sw/source/uibase/inc/splittbl.hxx:30
@@ -318,13 +320,17 @@ uui/source/unknownauthdlg.hxx:36
     UnknownAuthDialog m_xOptionButtonDontAccept std::unique_ptr<weld::RadioButton>
 vcl/inc/opengl/zone.hxx:46
     OpenGLVCLContextZone aZone class OpenGLZone
+vcl/inc/qt5/Qt5Menu.hxx:74
+    Qt5MenuItem mbVisible _Bool
+vcl/inc/qt5/Qt5Object.hxx:34
+    Qt5Object m_aSystemData struct SystemEnvData
 vcl/inc/salprn.hxx:44
     SalPrinterQueueInfo mpPortName std::unique_ptr<OUString>
 vcl/source/app/salvtables.cxx:504
     SalInstanceContainer m_xContainer VclPtr<vcl::Window>
-vcl/source/gdi/jobset.cxx:34
-    ImplOldJobSetupData cDeviceName char [32]
 vcl/source/gdi/jobset.cxx:35
+    ImplOldJobSetupData cDeviceName char [32]
+vcl/source/gdi/jobset.cxx:36
     ImplOldJobSetupData cPortName char [32]
 vcl/source/uitest/uno/uitest_uno.cxx:35
     UITestUnoObj mpUITest std::unique_ptr<UITest>
@@ -332,7 +338,7 @@ vcl/unx/generic/print/prtsetup.hxx:73
     RTSPaperPage m_xContainer std::unique_ptr<weld::Widget>
 vcl/unx/generic/print/prtsetup.hxx:108
     RTSDevicePage m_xContainer std::unique_ptr<weld::Widget>
-vcl/unx/gtk3/gtk3gtkinst.cxx:2231
+vcl/unx/gtk3/gtk3gtkinst.cxx:2234
     CrippledViewport viewport GtkViewport
 vcl/unx/gtk/a11y/atkhypertext.cxx:29
     (anonymous) atk_hyper_link AtkHyperlink
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 1b1a0798a2c1..99dea1bb3856 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -2,7 +2,7 @@ basctl/source/basicide/basicbox.hxx:69
     basctl::DocListenerBox m_aNotifier class basctl::DocumentEventNotifier
 basctl/source/inc/basidesh.hxx:87
     basctl::Shell m_aNotifier class basctl::DocumentEventNotifier
-basctl/source/inc/bastype2.hxx:180
+basctl/source/inc/bastype2.hxx:185
     basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier
 basic/qa/cppunit/test_scanner.cxx:26
     (anonymous namespace)::Symbol line sal_uInt16
@@ -66,14 +66,14 @@ chart2/source/inc/MediaDescriptorHelper.hxx:75
     apphelper::MediaDescriptorHelper ReadOnly _Bool
 chart2/source/view/charttypes/PieChart.hxx:128
     chart::PieChart::PieLabelInfo fValue double
-codemaker/source/cppumaker/dependencies.hxx:105
+codemaker/source/cppumaker/dependencies.hxx:108
     codemaker::cppumaker::Dependencies m_voidDependency _Bool
-codemaker/source/cppumaker/dependencies.hxx:111
-    codemaker::cppumaker::Dependencies m_unsignedLongDependency _Bool
-codemaker/source/cppumaker/dependencies.hxx:114
+codemaker/source/cppumaker/dependencies.hxx:117
     codemaker::cppumaker::Dependencies m_floatDependency _Bool
-codemaker/source/cppumaker/dependencies.hxx:115
+codemaker/source/cppumaker/dependencies.hxx:118
     codemaker::cppumaker::Dependencies m_doubleDependency _Bool
+comphelper/qa/container/comphelper_ifcontainer.cxx:45
+    ContainerListener m_pStats struct ContainerStats *const
 configmgr/source/components.cxx:164
     configmgr::Components::WriteThread reference_ rtl::Reference<WriteThread> *
 connectivity/source/drivers/mork/MorkParser.hxx:133
@@ -142,8 +142,6 @@ cppu/source/uno/check.cxx:134
     (anonymous namespace)::Char3 c3 char
 cppu/source/uno/check.cxx:138
     (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
-cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:47
-    ContainerListener m_pStats struct ContainerStats *
 cppuhelper/source/access_control.cxx:80
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:81
@@ -200,9 +198,9 @@ emfio/inc/mtftools.hxx:128
     emfio::LOGFONTW lfClipPrecision sal_uInt8
 emfio/inc/mtftools.hxx:129
     emfio::LOGFONTW lfQuality sal_uInt8
-emfio/source/reader/emfreader.cxx:310
-    (anonymous namespace)::BLENDFUNCTION aBlendOperation unsigned char
 emfio/source/reader/emfreader.cxx:311
+    (anonymous namespace)::BLENDFUNCTION aBlendOperation unsigned char
+emfio/source/reader/emfreader.cxx:312
     (anonymous namespace)::BLENDFUNCTION aBlendFlags unsigned char
 extensions/source/scanner/scanner.hxx:45
     ScannerManager mpData void *
@@ -210,7 +208,7 @@ framework/inc/services/layoutmanager.hxx:258
     framework::LayoutManager m_bGlobalSettings _Bool
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:285
     framework::ToolbarLayoutManager m_bGlobalSettings _Bool
-framework/source/services/frame.cxx:420
+framework/source/services/frame.cxx:421
     (anonymous namespace)::Frame m_pWindowCommandDispatch class framework::WindowCommandDispatch *
 include/basic/basmgr.hxx:52
     BasicError nReason enum BasicErrorReason
@@ -246,18 +244,16 @@ include/svx/bmpmask.hxx:130
     SvxBmpMask aSelItem class SvxBmpMaskSelectItem
 include/svx/imapdlg.hxx:118
     SvxIMapDlg aIMapItem class SvxIMapDlgItem
-include/svx/svdobj.hxx:944
-    SdrObject bNotMasterCachable _Bool
+include/svx/relfld.hxx:31
+    SvxRelativeField bRelative _Bool
 include/vcl/opengl/OpenGLContext.hxx:41
     GLWindow bMultiSampleSupported _Bool
-include/vcl/salnativewidgets.hxx:415
+include/vcl/salnativewidgets.hxx:446
     ToolbarValue mbIsTopDockingArea _Bool
-include/vcl/salnativewidgets.hxx:463
+include/vcl/salnativewidgets.hxx:507
     PushButtonValue mbBevelButton _Bool
-include/vcl/salnativewidgets.hxx:464
+include/vcl/salnativewidgets.hxx:508
     PushButtonValue mbSingleLine _Bool
-include/xmloff/AutoStyleEntry.hxx:22
-    xmloff::AutoStyleEntry m_nFamily sal_Int32
 include/xmloff/shapeimport.hxx:180
     SdXML3DSceneAttributesHelper mbVRPUsed _Bool
 include/xmloff/shapeimport.hxx:181
@@ -288,12 +284,6 @@ sal/rtl/alloc_arena.hxx:35
     rtl_arena_stat_type m_mem_total sal_Size
 sal/rtl/alloc_arena.hxx:36
     rtl_arena_stat_type m_mem_alloc sal_Size
-sal/rtl/alloc_cache.hxx:35
-    rtl_cache_stat_type m_mem_total sal_Size
-sal/rtl/alloc_cache.hxx:36
-    rtl_cache_stat_type m_mem_alloc sal_Size
-sal/rtl/alloc_cache.hxx:151
-    rtl_cache_st m_cpu_stats struct rtl_cache_stat_type
 sal/rtl/math.cxx:1005
      md union sal_math_Double
 sal/textenc/tcvtutf7.cxx:96
@@ -312,11 +302,11 @@ sal/textenc/tcvtutf7.cxx:396
     ImplUTF7FromUCContextData mnBitBuffer sal_uInt32
 sal/textenc/tcvtutf7.cxx:397
     ImplUTF7FromUCContextData mnBufferBits sal_uInt32
-sc/inc/compiler.hxx:261
+sc/inc/compiler.hxx:260
     ScCompiler::AddInMap pODFF const char *
-sc/inc/compiler.hxx:262
+sc/inc/compiler.hxx:261
     ScCompiler::AddInMap pEnglish const char *
-sc/inc/compiler.hxx:264
+sc/inc/compiler.hxx:263
     ScCompiler::AddInMap pUpper const char *
 sc/inc/document.hxx:2527
     ScMutationDisable mpDocument class ScDocument *
@@ -326,7 +316,7 @@ sc/inc/pivot.hxx:78
     ScDPLabelData mbIsValue _Bool
 sc/source/core/data/cellvalues.cxx:25
     sc::(anonymous namespace)::BlockPos mnEnd size_t
-sc/source/core/data/column4.cxx:1314
+sc/source/core/data/column4.cxx:1315
     (anonymous namespace)::StartListeningFormulaCellsHandler mnStartRow SCROW
 sc/source/filter/excel/xltoolbar.hxx:23
     TBCCmd cmdID sal_uInt16
@@ -354,7 +344,7 @@ sc/source/filter/excel/xltoolbar.hxx:76
     CTBS reserved3 sal_uInt16
 sc/source/filter/excel/xltoolbar.hxx:79
     CTBS ictbView sal_uInt16
-sc/source/filter/excel/xltools.cxx:103
+sc/source/filter/excel/xltools.cxx:104
      smD union sal_math_Double
 sc/source/filter/inc/exp_op.hxx:52
     ExportBiff5 pExcRoot struct RootData *
@@ -368,11 +358,11 @@ sc/source/filter/inc/root.hxx:95
     LOTUS_ROOT eActType enum Lotus123Typ
 sc/source/filter/inc/root.hxx:96
     LOTUS_ROOT aActRange class ScRange
-sc/source/filter/inc/tokstack.hxx:144
+sc/source/filter/inc/tokstack.hxx:145
     TokenPool pP_Err TokenPoolPool<sal_uInt16, 8>
 sc/source/filter/oox/biffhelper.cxx:41
     oox::xls::(anonymous namespace)::DecodedDouble maStruct union sal_math_Double
-sc/source/filter/xml/xmldpimp.hxx:254
+sc/source/filter/xml/xmldpimp.hxx:253
     ScXMLDataPilotFieldContext mbHasHiddenMember _Bool
 sc/source/filter/xml/xmldrani.hxx:75
     ScXMLDatabaseRangeContext bIsSelection _Bool
@@ -406,7 +396,7 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:296
     Vertex normal glm::vec3
 slideshow/source/engine/opengl/TransitionImpl.hxx:297
     Vertex texcoord glm::vec2
-slideshow/source/engine/slideshowimpl.cxx:1042
+slideshow/source/engine/slideshowimpl.cxx:1043
     (anonymous namespace)::SlideShowImpl::PrefetchPropertiesFunc mpSlideShowImpl class (anonymous namespace)::SlideShowImpl *const
 soltools/cpp/cpp.h:143
     macroValidator pMacro Nlist *
@@ -414,17 +404,17 @@ starmath/inc/view.hxx:158
     SmCmdBoxWindow aController class SmEditController
 store/source/storbase.hxx:248
     store::PageData m_aMarked store::PageData::L
-svl/source/crypto/cryptosign.cxx:144
+svl/source/crypto/cryptosign.cxx:145
     (anonymous namespace)::(anonymous) version SECItem
-svl/source/crypto/cryptosign.cxx:146
-    (anonymous namespace)::(anonymous) reqPolicy SECItem
 svl/source/crypto/cryptosign.cxx:147
-    (anonymous namespace)::(anonymous) nonce SECItem
+    (anonymous namespace)::(anonymous) reqPolicy SECItem
 svl/source/crypto/cryptosign.cxx:148
-    (anonymous namespace)::(anonymous) certReq SECItem
+    (anonymous namespace)::(anonymous) nonce SECItem
 svl/source/crypto/cryptosign.cxx:149
+    (anonymous namespace)::(anonymous) certReq SECItem
+svl/source/crypto/cryptosign.cxx:150
     (anonymous namespace)::(anonymous) extensions (anonymous namespace)::Extension *
-svl/source/crypto/cryptosign.cxx:193
+svl/source/crypto/cryptosign.cxx:194
     (anonymous namespace)::SigningCertificateV2 certs struct (anonymous namespace)::ESSCertIDv2 **
 svl/source/misc/inethist.cxx:48
     INetURLHistory_Impl::head_entry m_nMagic sal_uInt32
@@ -450,13 +440,13 @@ svx/source/sidebar/line/LinePropertyPanel.hxx:105
     svx::sidebar::LinePropertyPanel maEdgeStyle sfx2::sidebar::ControllerItem
 svx/source/sidebar/line/LinePropertyPanel.hxx:106
     svx::sidebar::LinePropertyPanel maCapStyle sfx2::sidebar::ControllerItem
-svx/source/svdraw/svdpdf.hxx:192
+svx/source/svdraw/svdpdf.hxx:197
     ImpSdrPdfImport mdPageWidthPts double
-svx/source/table/tablertfimporter.cxx:53
+svx/source/table/tablertfimporter.cxx:54
     sdr::table::RTFCellDefault maItemSet class SfxItemSet
 sw/inc/shellio.hxx:146
     SwReader aFileName class rtl::OUString
-sw/source/core/doc/tblafmt.cxx:185
+sw/source/core/doc/tblafmt.cxx:186
     SwAfVersions m_nVerticalAlignmentVersion sal_uInt16
 sw/source/core/inc/swfont.hxx:973
     SvStatistics nGetTextSize sal_uInt16
@@ -481,11 +471,7 @@ sw/source/filter/inc/rtf.hxx:29
 sw/source/filter/inc/rtf.hxx:30
     RTFSurround::(anonymous union)::(anonymous) nJunk sal_uInt8
 sw/source/filter/inc/rtf.hxx:31
-    RTFSurround::(anonymous) Flags struct (anonymous struct at /media/noel/disk2/libo4/sw/source/filter/inc/rtf.hxx:27:9)
-sw/source/uibase/docvw/romenu.hxx:69
-    SwReadOnlyPopup m_pImageMap class ImageMap *
-sw/source/uibase/docvw/romenu.hxx:70
-    SwReadOnlyPopup m_pTargetURL class INetImage *
+    RTFSurround::(anonymous) Flags struct (anonymous struct at /home/noel/libo/sw/source/filter/inc/rtf.hxx:27:9)
 ucb/source/ucp/gio/gio_mount.hxx:46
     OOoMountOperationClass parent_class GMountOperationClass
 ucb/source/ucp/gio/gio_mount.hxx:49
@@ -506,6 +492,10 @@ vcl/inc/opengl/RenderList.hxx:29
     Vertex color glm::vec4
 vcl/inc/opengl/RenderList.hxx:30
     Vertex lineData glm::vec4
+vcl/inc/qt5/Qt5Frame.hxx:59
+    Qt5Frame m_pSalMenu class Qt5Menu *
+vcl/inc/qt5/Qt5Graphics.hxx:50
+    Qt5Graphics m_pFontCollection class PhysicalFontCollection *
 vcl/inc/salmenu.hxx:34
     SalItemParams nBits enum MenuItemBits
 vcl/inc/salmenu.hxx:42
@@ -536,9 +526,9 @@ vcl/inc/sft.hxx:461
     vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32)
 vcl/inc/unx/gtk/gtkframe.hxx:215
     GtkSalFrame m_nFloatFlags enum FloatWinPopupFlags
-vcl/opengl/salbmp.cxx:435
+vcl/opengl/salbmp.cxx:440
     (anonymous namespace)::ScanlineWriter mpCurrentScanline sal_uInt8 *
-vcl/source/filter/graphicfilter.cxx:1008
+vcl/source/filter/graphicfilter.cxx:1009
     ImpFilterLibCache mpLast struct ImpFilterLibCacheEntry *
 vcl/source/filter/jpeg/Exif.hxx:56
     Exif::ExifIFD type sal_uInt16
@@ -550,9 +540,9 @@ vcl/unx/generic/app/wmadaptor.cxx:1270
     _mwmhints status unsigned long
 vcl/unx/gtk/a11y/atkwrapper.hxx:49
     AtkObjectWrapper aParent AtkObject
-vcl/unx/gtk/a11y/atkwrapper.hxx:78
-    AtkObjectWrapperClass aParentClass GtkWidgetAccessibleClass
-vcl/unx/gtk/gloactiongroup.cxx:28
+vcl/unx/gtk/a11y/atkwrapper.hxx:80
+    AtkObjectWrapperClass aParentClass AtkObjectClass
+vcl/unx/gtk/gloactiongroup.cxx:30
     GLOAction parent_instance GObject
 vcl/unx/gtk/glomenu.cxx:20
     GLOMenu parent_instance GMenuModel
@@ -560,7 +550,9 @@ vcl/unx/gtk/hudawareness.cxx:20
     (anonymous) connection GDBusConnection *
 vcl/unx/gtk/hudawareness.cxx:23
     (anonymous) notify GDestroyNotify
-writerfilter/source/dmapper/DomainMapperTableManager.hxx:57
-    writerfilter::dmapper::DomainMapperTableManager m_pTableStyleTextProperies writerfilter::dmapper::PropertyMapPtr
+vcl/unx/kde4/KDEXLib.hxx:49
+    KDEXLib::SocketData pending YieldFunc
+vcl/unx/kde4/KDEXLib.hxx:50
+    KDEXLib::SocketData queued YieldFunc
 writerfilter/source/dmapper/PropertyMap.hxx:197
     writerfilter::dmapper::SectionPropertyMap m_nDebugSectionNumber sal_Int32
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index 019cee94345e..6cfb7f824d0e 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -37,7 +37,6 @@ enum class SvxPrevLineSpace
 
 class SVX_DLLPUBLIC SvxParaPrevWindow final : public vcl::Window
 {
-    Size                aSize;
     OUString            aText;
     tools::Rectangle    Lines[9];
 
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 63dd9178e889..9702c2402894 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -27,9 +27,6 @@
 
 class SVX_DLLPUBLIC SvxRelativeField : public MetricField
 {
-private:
-    bool                bRelative;
-
 public:
     SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit);
 
diff --git a/sc/source/filter/xml/xmltransformationi.hxx b/sc/source/filter/xml/xmltransformationi.hxx
index 2fc712f158fe..bc6d77e4921f 100644
--- a/sc/source/filter/xml/xmltransformationi.hxx
+++ b/sc/source/filter/xml/xmltransformationi.hxx
@@ -72,8 +72,6 @@ public:
 
 class ScXMLColumnSortContext : public ScXMLImportContext
 {
-    ScSortParam maSortParam;
-
 public:
     ScXMLColumnSortContext(ScXMLImport& rImport,
                            const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList);
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 5291fe0ac9a7..07d33436c9e0 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -28,8 +28,6 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent,  WinBits nBits) :
     // Count in Twips by default
     SetMapMode(MapMode(MapUnit::MapTwip));
 
-    aSize = Size(11905, 16837);
-
     SetBorderStyle(WindowBorderStyle::MONO);
 }
 
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 26d3aca05138..68031f8e920a 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -23,7 +23,6 @@
 SvxRelativeField::SvxRelativeField(
         vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit)
     : MetricField( pParent, nBits)
-    , bRelative(false)
 {
     SetUnit(eUnit);
     SetDecimalDigits( 2 );
@@ -48,7 +47,6 @@ void SvxRelativeField::SetRelative( bool bNewRelative )
 
     if ( bNewRelative )
     {
-        bRelative = true;
         SetDecimalDigits( 0 );
         SetMin( 0 );
         SetMax( 0 );
@@ -56,7 +54,6 @@ void SvxRelativeField::SetRelative( bool bNewRelative )
     }
     else
     {
-        bRelative = false;
         SetDecimalDigits( 2 );
         SetMin( 0 );
         SetMax( 9999 );
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 0cb03faa3364..a3062c4c9766 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -106,16 +106,15 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
     , m_nReadonlyCopy(m_xMenu->GetItemId("copy"))
     , m_rView(rV)
     , m_aBrushItem(RES_BACKGROUND)
-    , m_rDocPos(rDPos)
 {
     m_bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk();
     SwWrtShell &rSh = m_rView.GetWrtShell();
     OUString sDescription;
-    rSh.IsURLGrfAtPos( m_rDocPos, &m_sURL, &m_sTargetFrameName, &sDescription );
+    rSh.IsURLGrfAtPos( rDPos, &m_sURL, &m_sTargetFrameName, &sDescription );
     if ( m_sURL.isEmpty() )
     {
         SwContentAtPos aContentAtPos( IsAttrAtPos::InetAttr );
-        if( rSh.GetContentAtPos( m_rDocPos, aContentAtPos))
+        if( rSh.GetContentAtPos( rDPos, aContentAtPos))
         {
             const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr);
             m_sURL = rIItem.GetValue();
@@ -125,7 +124,7 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
 
     bool bLink = false;
     const Graphic *pGrf;
-    if ( nullptr == (pGrf = rSh.GetGrfAtPos( m_rDocPos, m_sGrfName, bLink )) )
+    if ( nullptr == (pGrf = rSh.GetGrfAtPos( rDPos, m_sGrfName, bLink )) )
     {
         m_xMenu->EnableItem(m_nReadonlySaveGraphic, false);
     }
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index 78d592165450..5803adbab8e0 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -59,7 +59,6 @@ class SwReadOnlyPopup
 
     SwView &m_rView;
     SvxBrushItem m_aBrushItem;
-    const Point &m_rDocPos;
                 Graphic m_aGraphic;
     OUString    m_sURL,
                 m_sTargetFrameName;
commit c2f318c6e57bf7b5d3b3c1cb19846e5261080daa
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Aug 7 17:01:29 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 8 09:30:15 2018 +0200

    improve SharedStringPool
    
    we don't need two sets, we can simplify the logic and let the key
    in the map perform the same function that one of the sets was
    performing.
    
    Change-Id: If042fd0d1483fb603967164c429a085a4f0b31eb
    Reviewed-on: https://gerrit.libreoffice.org/58692
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx
index af1d80ef65d0..406f643f0fd6 100644
--- a/svl/source/misc/sharedstringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -24,34 +24,15 @@ inline sal_Int32 getRefCount( const rtl_uString* p )
     return (p->refCount & 0x3FFFFFFF);
 }
 
-typedef std::unordered_set<OUString> StrHashType;
-typedef std::pair<StrHashType::iterator, bool> InsertResultType;
-typedef std::unordered_map<const rtl_uString*, OUString> StrStoreType;
-
-InsertResultType findOrInsert( StrHashType& rPool, const OUString& rStr )
-{
-    StrHashType::iterator it = rPool.find(rStr);
-    bool bInserted = false;
-    if (it == rPool.end())
-    {
-        // Not yet in the pool.
-        std::pair<StrHashType::iterator, bool> r = rPool.insert(rStr);
-        assert(r.second);
-        it = r.first;
-        bInserted = true;
-    }
-
-    return InsertResultType(it, bInserted);
-}
-
 }
 
 struct SharedStringPool::Impl
 {
     mutable osl::Mutex maMutex;
-    StrHashType maStrPool;
-    StrHashType maStrPoolUpper;
-    StrStoreType maStrStore;
+    // set of upper-case, so we can share these as the value in the maStrMap
+    std::unordered_set<OUString> maStrPoolUpper;
+    // map with rtl_uString* as key so we can avoid some ref-counting
+    std::unordered_map<OUString,rtl_uString*> maStrMap;
     const CharClass& mrCharClass;
 
     explicit Impl( const CharClass& rCharClass ) : mrCharClass(rCharClass) {}
@@ -68,72 +49,44 @@ SharedString SharedStringPool::intern( const OUString& rStr )
 {
     osl::MutexGuard aGuard(&mpImpl->maMutex);
 
-    InsertResultType aRes = findOrInsert(mpImpl->maStrPool, rStr);
-
-    rtl_uString* pOrig = aRes.first->pData;
-
-    if (!aRes.second)
+    auto mapIt = mpImpl->maStrMap.find(rStr);
+    if (mapIt == mpImpl->maStrMap.end())
     {
-        // No new string has been inserted. Return the existing string in the pool.
-        StrStoreType::const_iterator it = mpImpl->maStrStore.find(pOrig);
-        assert(it != mpImpl->maStrStore.end());
-
-        rtl_uString* pUpper = it->second.pData;
-        return SharedString(pOrig, pUpper);
+        // This is a new string insertion. Establish mapping to upper-case variant.
+        OUString aUpper = mpImpl->mrCharClass.uppercase(rStr);
+        auto insertResult = mpImpl->maStrPoolUpper.insert(aUpper);
+        mapIt = mpImpl->maStrMap.emplace_hint(mapIt, rStr, insertResult.first->pData);
     }
-
-    // This is a new string insertion. Establish mapping to upper-case variant.
-
-    OUString aUpper = mpImpl->mrCharClass.uppercase(rStr);
-    aRes = findOrInsert(mpImpl->maStrPoolUpper, aUpper);
-    assert(aRes.first != mpImpl->maStrPoolUpper.end());
-
-    mpImpl->maStrStore.emplace(pOrig, *aRes.first);
-
-    return SharedString(pOrig, aRes.first->pData);
+    return SharedString(mapIt->first.pData, mapIt->second);
 }
 
 void SharedStringPool::purge()
 {
     osl::MutexGuard aGuard(&mpImpl->maMutex);
 
-    StrHashType aNewStrPool;
-    StrHashType::iterator it = mpImpl->maStrPool.begin(), itEnd = mpImpl->maStrPool.end();
-    for (; it != itEnd; ++it)
+    std::unordered_set<OUString> aNewStrPoolUpper;
     {
-        const rtl_uString* p = it->pData;
-        if (getRefCount(p) == 1)
+        auto it = mpImpl->maStrMap.begin(), itEnd = mpImpl->maStrMap.end();
+        while (it != itEnd)
         {
-            // Remove it from the upper string map.  This should unref the
-            // upper string linked to this original string.
-            mpImpl->maStrStore.erase(p);
+            const rtl_uString* p = it->first.pData;
+            if (getRefCount(p) == 1)
+                it = mpImpl->maStrMap.erase(it);
+            else
+            {
+                // Still referenced outside the pool. Keep it.
+                aNewStrPoolUpper.insert(it->second);
+                ++it;
+            }
         }
-        else
-            // Still referenced outside the pool. Keep it.
-            aNewStrPool.insert(*it);
-    }
-
-    mpImpl->maStrPool.swap(aNewStrPool);
-
-    aNewStrPool.clear(); // for re-use.
-
-    // Purge the upper string pool as well.
-    it = mpImpl->maStrPoolUpper.begin();
-    itEnd = mpImpl->maStrPoolUpper.end();
-    for (; it != itEnd; ++it)
-    {
-        const rtl_uString* p = it->pData;
-        if (getRefCount(p) > 1)
-            aNewStrPool.insert(*it);
     }
-
-    mpImpl->maStrPoolUpper.swap(aNewStrPool);
+    mpImpl->maStrPoolUpper = std::move(aNewStrPoolUpper);
 }
 
 size_t SharedStringPool::getCount() const
 {
     osl::MutexGuard aGuard(&mpImpl->maMutex);
-    return mpImpl->maStrPool.size();
+    return mpImpl->maStrMap.size();
 }
 
 size_t SharedStringPool::getCountIgnoreCase() const


More information about the Libreoffice-commits mailing list