loplugin:unusedfields

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

12 files changed, 40 insertions, 65 deletions

diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index a66a8db6d3eb..55cdaa2dee90 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -174,6 +174,8 @@ dbaccess/source/core/dataaccess/connection.hxx:102
     dbaccess::OConnection m_nInAppend std::atomic<std::size_t>
 dbaccess/source/core/inc/databasecontext.hxx:85
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+      class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:57
     drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 drawinglayer/inc/texture/texture3d.hxx:59
@@ -358,12 +360,8 @@ include/vcl/font/Feature.hxx:100
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sImageId class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:44
-    AddonsParams sControlType class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:45
-    AddonsParams nWidth sal_uInt16
+include/vcl/toolkit/ivctrl.hxx:67
+    SvxIconChoiceCtrlEntry pUserData void *
 include/xmloff/shapeimport.hxx:140
     SdXML3DLightContext mbSpecular _Bool
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
@@ -750,8 +748,6 @@ sw/source/core/text/inftxt.hxx:682
     SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:140
     (anonymous namespace)::SwFieldSlot aText class rtl::OUString
-sw/source/core/text/porlay.cxx:1312
-      const sw::MergedPara *const &
 sw/source/uibase/docvw/romenu.hxx:34
     SwReadOnlyPopup m_aBuilder class VclBuilder
 sw/source/uibase/docvw/romenu.hxx:46
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 468015125711..008b0353cea8 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -248,9 +248,9 @@ framework/inc/helper/uiconfigelementwrapperbase.hxx:128
     framework::UIConfigElementWrapperBase m_bConfigListening _Bool
 framework/inc/xml/menudocumenthandler.hxx:187
     framework::OReadMenuPopupHandler m_bMenuMode _Bool
-framework/source/fwe/classes/addonsoptions.cxx:344
-    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
 framework/source/fwe/classes/addonsoptions.cxx:345
+    framework::AddonsOptions_Impl m_aEmptyAddonToolBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
+framework/source/fwe/classes/addonsoptions.cxx:346
     framework::AddonsOptions_Impl m_aEmptyAddonNotebookBar Sequence<Sequence<struct com::sun::star::beans::PropertyValue> >
 i18npool/inc/textconversion.hxx:79
     i18npool::(anonymous) code sal_Unicode
diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results
index 746700e1d380..96e0f6e2b919 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -42,6 +42,8 @@ dbaccess/source/core/inc/databasecontext.hxx:85
     dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
     sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard ::osl::MutexGuard
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+      class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:48
     emfio::emfreader::(anonymous namespace)::XEmfParser context_ uno::Reference<uno::XComponentContext>
 extensions/source/scanner/scanner.hxx:43
@@ -117,11 +119,11 @@ include/sfx2/msg.hxx:137
 include/sfx2/msg.hxx:138
     SfxType7 nAttribs sal_uInt16
 include/sfx2/msg.hxx:138
+    SfxType7 pType const std::type_info *
+include/sfx2/msg.hxx:138
     SfxType7 aAttrib struct SfxTypeAttrib [7]
 include/sfx2/msg.hxx:138
     SfxType7 createSfxPoolItemFunc std::function<SfxPoolItem *(void)>
-include/sfx2/msg.hxx:138
-    SfxType7 pType const std::type_info *
 include/sfx2/msg.hxx:139
     SfxType8 aAttrib struct SfxTypeAttrib [8]
 include/sfx2/msg.hxx:139
@@ -206,16 +208,14 @@ include/vcl/font/Feature.hxx:100
     vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/NotebookBarAddonsMerger.hxx:36
     NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:43
-    AddonsParams sImageId class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:44
-    AddonsParams sControlType class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:45
-    AddonsParams nWidth sal_uInt16
+include/vcl/toolkit/ivctrl.hxx:67
+    SvxIconChoiceCtrlEntry pUserData void *
 include/vcl/uitest/uiobject.hxx:279
     TabPageUIObject mxTabPage VclPtr<class TabPage>
 include/xmloff/formlayerexport.hxx:172
     xmloff::OOfficeFormsExport m_pImpl std::unique_ptr<OFormsRootExport>
+include/xmloff/xmlstyle.hxx:145
+    SvXMLStylesContext mpStyleStylesElemTokenMap std::unique_ptr<SvXMLTokenMap>
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
     GtvApplicationWindow parent_instance GtkApplicationWindow
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:55
@@ -390,8 +390,6 @@ sw/source/core/frmedt/fetab.cxx:75
     (anonymous namespace)::TableWait m_pWait const std::unique_ptr<SwWait>
 sw/source/core/layout/dbg_lay.cxx:171
     SwImplEnterLeave nAction enum DbgAction
-sw/source/core/text/porlay.cxx:1312
-      const sw::MergedPara *const &
 sw/source/uibase/inc/condedit.hxx:43
     ConditionEdit m_aDropTargetHelper class ConditionEditDropTarget
 sw/source/uibase/inc/conttree.hxx:294
@@ -460,8 +458,28 @@ vcl/unx/gtk3/gtk3gtkinst.cxx:5345
     (anonymous namespace)::CustomCellRendererSurfaceClass parent_class GtkCellRendererTextClass
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx:42
     writerfilter::ooxml::OOXMLStreamImpl mxFastParser css::uno::Reference<css::xml::sax::XFastParser>
+xmloff/inc/XMLTextColumnsContext.hxx:39
+    XMLTextColumnsContext pColumnAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/inc/XMLTextColumnsContext.hxx:40
+    XMLTextColumnsContext pColumnSepAttrTokenMap std::unique_ptr<SvXMLTokenMap>
 xmloff/source/chart/transporttypes.hxx:149
     CustomLabelField sRuns std::vector<OUString>
+xmloff/source/draw/sdxmlimp_impl.hxx:108
+    SdXMLImport mpBodyElemTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:109
+    SdXMLImport mpStylesElemTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:110
+    SdXMLImport mpMasterPageElemTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:111
+    SdXMLImport mpPageMasterAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:112
+    SdXMLImport mpPageMasterStyleAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/draw/sdxmlimp_impl.hxx:113
+    SdXMLImport mpPresentationPlaceholderAttrTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/style/xmlnumfi.cxx:68
+    SvXMLNumImpData pStylesElemTokenMap std::unique_ptr<SvXMLTokenMap>
+xmloff/source/text/txtimp.cxx:520
+    XMLTextImportHelper::Impl m_xTextMasterPageElemTokenMap std::unique_ptr<SvXMLTokenMap>
 xmlsecurity/qa/unit/signing/signing2.cxx:42
     SigningTest2 mxSEInitializer uno::Reference<xml::crypto::XSEInitializer>
 xmlsecurity/qa/unit/signing/signing2.cxx:43
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index e39d19fd5233..8c12ff96fbc6 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -104,8 +104,6 @@ codemaker/source/javamaker/classfile.cxx:508
      floatBytes float
 codemaker/source/javamaker/classfile.cxx:540
      doubleBytes double
-comphelper/qa/container/comphelper_ifcontainer.cxx:44
-    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *const
 comphelper/qa/unit/parallelsorttest.cxx:44
     ParallelSortTest mnThreads size_t
 comphelper/source/misc/asyncnotification.cxx:86
@@ -214,6 +212,8 @@ cppu/source/uno/copy.hxx:39
     cppu::(anonymous namespace)::SequencePrefix nRefCount sal_Int32
 cppu/source/uno/copy.hxx:40
     cppu::(anonymous namespace)::SequencePrefix nElements sal_Int32
+cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx:45
+    (anonymous namespace)::ContainerListener m_pStats struct (anonymous namespace)::ContainerStats *
 cppuhelper/source/access_control.cxx:79
     cppu::(anonymous namespace)::permission m_str1 rtl_uString *
 cppuhelper/source/access_control.cxx:80
@@ -318,10 +318,6 @@ framework/inc/uielement/langselectionmenucontroller.hxx:73
     framework::LanguageSelectionMenuController m_xMenuDispatch_Font css::uno::Reference<css::frame::XDispatch>
 framework/inc/uielement/langselectionmenucontroller.hxx:75
     framework::LanguageSelectionMenuController m_xMenuDispatch_CharDlgForParagraph css::uno::Reference<css::frame::XDispatch>
-framework/inc/uielement/menubarmanager.hxx:186
-    framework::MenuBarManager m_aMenuItemCommand class rtl::OUString
-framework/inc/uielement/toolbarmerger.hxx:37
-    framework::AddonsParams aImageId class rtl::OUString
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:272
     framework::ToolbarLayoutManager m_pGlobalSettings std::unique_ptr<GlobalSettings>
 framework/source/layoutmanager/toolbarlayoutmanager.hxx:276
@@ -428,13 +424,13 @@ include/test/beans/xpropertyset.hxx:56
     apitest::XPropertySet::PropsToTest constrained std::vector<OUString>
 include/unotools/fontcfg.hxx:159
     utl::FontSubstConfiguration maSubstHash utl::FontSubstConfiguration::UniqueSubstHash
-include/vcl/NotebookBarAddonsMerger.hxx:53
+include/vcl/NotebookBarAddonsMerger.hxx:45
     AddonNotebookBarItem sTarget class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:54
+include/vcl/NotebookBarAddonsMerger.hxx:46
     AddonNotebookBarItem sContext class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:55
+include/vcl/NotebookBarAddonsMerger.hxx:47
     AddonNotebookBarItem sControlType class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:56
+include/vcl/NotebookBarAddonsMerger.hxx:48
     AddonNotebookBarItem nWidth sal_uInt16
 include/vcl/opengl/OpenGLContext.hxx:32
     GLWindow bMultiSampleSupported _Bool
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx
index e6d9dd68caf5..67efcf09da34 100644
--- a/include/vcl/toolkit/ivctrl.hxx
+++ b/include/vcl/toolkit/ivctrl.hxx
@@ -64,7 +64,6 @@ class SvxIconChoiceCtrlEntry
 
     OUString aText;
     OUString aQuickHelpText;
-    void*  pUserData;
 
     friend class SvxIconChoiceCtrl_Impl;
     friend class IcnCursor_Impl;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 991b22edc9fa..f606d9aef30b 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -142,7 +142,6 @@ public:
 class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
 {
     std::unique_ptr<SvXMLStylesContext_Impl> mpImpl;
-    std::unique_ptr<SvXMLTokenMap>           mpStyleStylesElemTokenMap;
 
 
     css::uno::Reference< css::container::XNameContainer > mxParaStyles;
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index 2e9572b8b84b..03f820534392 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -42,7 +42,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText,
                                                 const Image& rImage )
     : aImage(rImage)
     , aText(rText)
-    , pUserData(nullptr)
     , nPos(0)
     , pblink(nullptr)
     , pflink(nullptr)
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 99e3bbaf07c3..ea020811934f 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -36,8 +36,6 @@ class XMLTextColumnsContext final :public XMLElementPropertyContext
 {
     std::unique_ptr<XMLTextColumnsArray_Impl> pColumns;
     rtl::Reference<XMLTextColumnSepContext_Impl> mxColumnSep;
-    std::unique_ptr<SvXMLTokenMap> pColumnAttrTokenMap;
-    std::unique_ptr<SvXMLTokenMap> pColumnSepAttrTokenMap;
     sal_Int16                nCount;
     bool                 bAutomatic;
     sal_Int32                nAutomaticDistance;
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index d314caa0c576..c64fac494330 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -104,14 +104,6 @@ class SdXMLImport: public SvXMLImport
     // contexts for Style and AutoStyle import
     rtl::Reference<SdXMLMasterStylesContext> mxMasterStylesContext;
 
-    // token map lists
-    std::unique_ptr<SvXMLTokenMap>              mpBodyElemTokenMap;
-    std::unique_ptr<SvXMLTokenMap>              mpStylesElemTokenMap;
-    std::unique_ptr<SvXMLTokenMap>              mpMasterPageElemTokenMap;
-    std::unique_ptr<SvXMLTokenMap>              mpPageMasterAttrTokenMap;
-    std::unique_ptr<SvXMLTokenMap>              mpPageMasterStyleAttrTokenMap;
-    std::unique_ptr<SvXMLTokenMap>              mpPresentationPlaceholderAttrTokenMap;
-
     sal_Int32                   mnNewPageCount;
     sal_Int32                   mnNewMasterPageCount;
 
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 829a3cbe5980..52e2fc81744c 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -65,7 +65,6 @@ struct SvXMLNumFmtEntry
 class SvXMLNumImpData
 {
     SvNumberFormatter*  pFormatter;
-    std::unique_ptr<SvXMLTokenMap>      pStylesElemTokenMap;
     std::unique_ptr<LocaleDataWrapper>  pLocaleData;
     std::vector<SvXMLNumFmtEntry> m_NameEntries;
 
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index ba19c7ff50d3..5211cc4eb1da 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -64,24 +64,6 @@ enum SvXMLSepTokenMapAttrs
 
 }
 
-const SvXMLTokenMapEntry aColAttrTokenMap[] =
-{
-    { XML_NAMESPACE_STYLE,  XML_REL_WIDTH,      XML_TOK_COLUMN_WIDTH },
-    { XML_NAMESPACE_FO,     XML_START_INDENT,   XML_TOK_COLUMN_MARGIN_LEFT },
-    { XML_NAMESPACE_FO,     XML_END_INDENT,     XML_TOK_COLUMN_MARGIN_RIGHT },
-    XML_TOKEN_MAP_END
-};
-
-const SvXMLTokenMapEntry aColSepAttrTokenMap[] =
-{
-    { XML_NAMESPACE_STYLE,  XML_WIDTH,          XML_TOK_COLUMN_SEP_WIDTH },
-    { XML_NAMESPACE_STYLE,  XML_COLOR,          XML_TOK_COLUMN_SEP_COLOR },
-    { XML_NAMESPACE_STYLE,  XML_HEIGHT,         XML_TOK_COLUMN_SEP_HEIGHT },
-    { XML_NAMESPACE_STYLE,  XML_VERTICAL_ALIGN, XML_TOK_COLUMN_SEP_ALIGN },
-    { XML_NAMESPACE_STYLE,  XML_STYLE,          XML_TOK_COLUMN_SEP_STYLE },
-    XML_TOKEN_MAP_END
-};
-
 SvXMLEnumMapEntry<sal_Int8> const pXML_Sep_Style_Enum[] =
 {
     { XML_NONE,          0 },
@@ -240,8 +222,6 @@ XMLTextColumnsContext::XMLTextColumnsContext(
                                 const XMLPropertyState& rProp,
                                  ::std::vector< XMLPropertyState > &rProps )
 :   XMLElementPropertyContext( rImport, nElement, rProp, rProps )
-,   pColumnAttrTokenMap( new SvXMLTokenMap(aColAttrTokenMap) )
-,   pColumnSepAttrTokenMap( new SvXMLTokenMap(aColSepAttrTokenMap) )
 ,   nCount( 0 )
 ,   bAutomatic( false )
 ,   nAutomaticDistance( 0 )
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 06c997fe980a..4e46cedcc135 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -517,7 +517,6 @@ struct XMLTextImportHelper::Impl
     std::unique_ptr<SvXMLTokenMap> m_xTextFrameAttrTokenMap;
     std::unique_ptr<SvXMLTokenMap> m_xTextContourAttrTokenMap;
     std::unique_ptr<SvXMLTokenMap> m_xTextHyperlinkAttrTokenMap;
-    std::unique_ptr<SvXMLTokenMap> m_xTextMasterPageElemTokenMap;
     std::unique_ptr< std::vector<OUString> > m_xPrevFrmNames;
     std::unique_ptr< std::vector<OUString> > m_xNextFrmNames;
     std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper;