From 14b366e57a904c2c0d04804f15d8daf755f14541 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 30 Nov 2018 09:23:42 +0200
Subject: loplugin:singlevalfields

Change-Id: I70dc861573fd1b3d799c88aa2a6d9a3eda0e2a43
Reviewed-on: https://gerrit.libreoffice.org/64327
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 cui/source/customize/cfgutil.cxx | 16 ++++------------
 cui/source/inc/cfgutil.hxx       |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'cui/source')

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f0fa0ca6ab81..92bc0590f7e7 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -442,10 +442,6 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
 
 struct CuiConfigGroupBoxResource_Impl
 {
-    OUString m_hdImage;
-    OUString m_libImage;
-    OUString m_macImage;
-    OUString m_docImage;
     OUString m_sMyMacros;
     OUString m_sProdMacros;
     OUString m_sMacros;
@@ -456,10 +452,6 @@ struct CuiConfigGroupBoxResource_Impl
 };
 
 CuiConfigGroupBoxResource_Impl::CuiConfigGroupBoxResource_Impl() :
-    m_hdImage(RID_CUIBMP_HARDDISK),
-    m_libImage(RID_CUIBMP_LIB),
-    m_macImage(RID_CUIBMP_MACRO),
-    m_docImage(RID_CUIBMP_DOC),
     m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)),
     m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
     m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)),
@@ -1493,7 +1485,7 @@ OUString CuiConfigGroupListBox::GetImage(
     {
         if (node->getName() == "user" || node->getName() == "share" )
         {
-            aImage = xImp->m_hdImage;
+            aImage = RID_CUIBMP_HARDDISK;
         }
         else
         {
@@ -1530,16 +1522,16 @@ OUString CuiConfigGroupListBox::GetImage(
             }
             else
             {
-                aImage = xImp->m_docImage;
+                aImage = RID_CUIBMP_DOC;
             }
         }
     }
     else
     {
         if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
-            aImage = xImp->m_macImage;
+            aImage = RID_CUIBMP_MACRO;
         else
-            aImage = xImp->m_libImage;
+            aImage = RID_CUIBMP_LIB;
     }
     return aImage;
 }
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index a0ed8437e750..49f0c7ae060f 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -228,7 +228,7 @@ class CuiConfigGroupListBox
     SfxStylesInfo_Impl* m_pStylesInfo;
     std::unique_ptr<weld::TreeView> m_xTreeView;
 
-    OUString GetImage(
+    static OUString GetImage(
         const css::uno::Reference< css::script::browse::XBrowseNode >& node,
         css::uno::Reference< css::uno::XComponentContext > const & xCtx,
         bool bIsRootNode);
-- 
cgit