diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 9081fab3ae6a..c8242963a490 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -340,8 +340,6 @@ public: Image GetItemImage( sal_uInt16 nItemId ) const; void SetItemColor( sal_uInt16 nItemId, const Color& rColor ); Color GetItemColor( sal_uInt16 nItemId ) const; - void SetItemData( sal_uInt16 nItemId, void* pData ); - void* GetItemData( sal_uInt16 nItemId ) const; void SetItemText( sal_uInt16 nItemId, const OUString& rStr ); const OUString & GetItemText( sal_uInt16 nItemId ) const; void SetColor( const Color& rColor ); diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 399887e17c19..710cd4248c7c 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; ValueSetItem::ValueSetItem( ValueSet& rParent ) : mrParent(rParent) - , mpData(nullptr) , mxAcc() , mnId(0) , meType(ValueSetItemType::None) diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 293c94e86f32..921c83d2ba53 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -44,7 +44,6 @@ struct ValueSetItem { ValueSet& mrParent; OUString maText; - void* mpData; rtl::Reference< ValueItemAcc > mxAcc; Image maImage; Color maColor; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 60cfc1fe2246..d2e3f09d8184 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1723,38 +1723,6 @@ void ValueSet::SetFormat() mbFormat = true; } -void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) -{ - size_t nPos = GetItemPos( nItemId ); - - if ( nPos == VALUESET_ITEM_NOTFOUND ) - return; - - ValueSetItem* pItem = mItemList[nPos].get(); - pItem->mpData = pData; - - if (pItem->meType == ValueSetItemType::UserDraw) - { - if (!mbFormat && IsReallyVisible()) - { - const tools::Rectangle aRect = ImplGetItemRect(nPos); - Invalidate(aRect); - } - else - mbFormat = true; - } -} - -void* ValueSet::GetItemData( sal_uInt16 nItemId ) const -{ - size_t nPos = GetItemPos( nItemId ); - - if ( nPos != VALUESET_ITEM_NOTFOUND ) - return mItemList[nPos]->mpData; - else - return nullptr; -} - void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) { size_t nPos = GetItemPos( nItemId );