loplugin:unusedfields

Change-Id: I42a55562747e6097c1193e285da67235f5364bea
Reviewed-on: https://gerrit.libreoffice.org/55610
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 2 insertions, 18 deletions

diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 73826ddfbc96..1d7f1ce40018 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -66,7 +66,6 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent )
     , mnId(0)
     , meType(VALUESETITEM_NONE)
     , mbVisible(true)
-    , mpData(nullptr)
     , mxAcc()
 {
 }
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index cc45bcd27475..7be6ca57b85a 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -75,10 +75,8 @@ struct SvtValueSetItem
     sal_uInt16          mnId;
     sal_uInt8           meType;
     bool                mbVisible;
-    Image               maImage;
     Color               maColor;
     OUString            maText;
-    void*               mpData;
     css::uno::Reference< css::accessibility::XAccessible > mxAcc;
 
     explicit SvtValueSetItem( SvtValueSet& rParent );
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c51a032e58f1..7835a7a575ca 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2294,7 +2294,6 @@ SvtValueSet::SvtValueSet()
     mnUserItemHeight    = 0;
     mnFirstLine         = 0;
     mnSelItemId         = 0;
-    mnHighItemId        = 0;
     mnCols              = 0;
     mnCurCol            = 0;
     mnUserCols          = 0;
@@ -2849,7 +2848,6 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
         Any aNewAny;
         ImplFireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny);
     }
-    maHighlightHdl.Call(this);
 }
 
 void SvtValueSet::SetNoSelection()
@@ -3365,28 +3363,17 @@ void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtV
         }
         else
         {
-            Size aImageSize = pItem->maImage.GetSizePixel();
             Size  aRectSize = aRect.GetSize();
             Point aPos(aRect.Left(), aRect.Top());
-            aPos.AdjustX((aRectSize.Width() - aImageSize.Width()) / 2 );
+            aPos.AdjustX(aRectSize.Width() / 2 );
 
             if (pItem->meType != VALUESETITEM_IMAGE_AND_TEXT)
-                aPos.AdjustY((aRectSize.Height() - aImageSize.Height()) / 2 );
+                aPos.AdjustY(aRectSize.Height() / 2 );
 
             DrawImageFlags  nImageStyle  = DrawImageFlags::NONE;
             if (!IsEnabled())
                 nImageStyle  |= DrawImageFlags::Disable;
 
-            if (aImageSize.Width()  > aRectSize.Width() ||
-                aImageSize.Height() > aRectSize.Height())
-            {
-                maVirDev->SetClipRegion(vcl::Region(aRect));
-                maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
-                maVirDev->SetClipRegion();
-            }
-            else
-                maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle);
-
             if (pItem->meType == VALUESETITEM_IMAGE_AND_TEXT)
             {
                 maVirDev->SetFont(rRenderContext.GetFont());