svtools/source/control/valueacc.cxx | 4 ++-- svtools/source/control/valueimp.hxx | 17 +++++++---------- svtools/source/control/valueset.cxx | 32 ++++++++++++++++---------------- 3 files changed, 25 insertions(+), 28 deletions(-)
New commits: commit 02141682a3609191301c259b2a7b5d1d9e8d138a Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 31 08:05:09 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Dec 31 19:41:18 2025 +0100 svtools: Drop unused includes Change-Id: I95f1985dfbb2d93265f97c78da3121b7ae9df4b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196347 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 4b018f9f2477..9a73b1adba4a 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -27,9 +27,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <mutex> -#include <vector> - #define VALUESET_ITEM_NONEITEM 0xFFFE enum class ValueSetItemType commit 14bbecc3979e877d8f5285cfda304bd235bd1a96 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 31 08:03:11 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Dec 31 19:41:13 2025 +0100 svtools: Make ValueSetItemType an enum class Change-Id: Ibcb5e811d0d3b0bb44333dcc50f973644ee59d91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196346 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index e23ae31281d5..23b4a1690a06 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -40,7 +40,7 @@ ValueSetItem::ValueSetItem( ValueSet& rParent ) , mpData(nullptr) , mxAcc() , mnId(0) - , meType(VALUESETITEM_NONE) + , meType(ValueSetItemType::None) , mbVisible(true) { } @@ -265,7 +265,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) { Color nColor; - if (mpValueSetItem && mpValueSetItem->meType == VALUESETITEM_COLOR) + if (mpValueSetItem && mpValueSetItem->meType == ValueSetItemType::Color) nColor = mpValueSetItem->maColor; else nColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 3094c9d32737..4b018f9f2477 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -32,13 +32,13 @@ #define VALUESET_ITEM_NONEITEM 0xFFFE -enum ValueSetItemType +enum class ValueSetItemType { - VALUESETITEM_NONE, - VALUESETITEM_IMAGE, - VALUESETITEM_IMAGE_AND_TEXT, - VALUESETITEM_COLOR, - VALUESETITEM_USERDRAW + None, + Image, + ImageAndText, + Color, + UserDraw }; class ValueItemAcc; @@ -53,7 +53,7 @@ struct ValueSetItem Image maImage; Color maColor; sal_uInt16 mnId; - sal_uInt8 meType; + ValueSetItemType meType; bool mbVisible; explicit ValueSetItem( ValueSet& rParent ); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 46da587e0232..af9dd8bd1c6b 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1072,7 +1072,7 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) mpNoneItem.reset(new ValueSetItem(*this)); mpNoneItem->mnId = 0; - mpNoneItem->meType = VALUESETITEM_NONE; + mpNoneItem->meType = ValueSetItemType::None; mpNoneItem->mbVisible = true; maNoneItemRect.SetLeft( x ); maNoneItemRect.SetTop( y ); @@ -1423,7 +1423,7 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe else maVirDev->DrawText(aTxtPos, pItem->maText); } - else if (pItem->meType == VALUESETITEM_COLOR) + else if (pItem->meType == ValueSetItemType::Color) { maVirDev->SetFillColor(pItem->maColor); maVirDev->DrawRect(aRect); @@ -1440,7 +1440,7 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe maVirDev->SetFillColor(rStyleSettings.GetFaceColor()); maVirDev->DrawRect(aRect); - if (pItem->meType == VALUESETITEM_USERDRAW) + if (pItem->meType == ValueSetItemType::UserDraw) { UserDrawEvent aUDEvt(maVirDev.get(), aRect, pItem->mnId); UserDraw(aUDEvt); @@ -1452,7 +1452,7 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe Point aPos(aRect.Left(), aRect.Top()); aPos.AdjustX((aRectSize.Width() - aImageSize.Width()) / 2 ); - if (pItem->meType != VALUESETITEM_IMAGE_AND_TEXT) + if (pItem->meType != ValueSetItemType::ImageAndText) aPos.AdjustY((aRectSize.Height() - aImageSize.Height()) / 2 ); DrawImageFlags nImageStyle = DrawImageFlags::NONE; @@ -1469,7 +1469,7 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe else maVirDev->DrawImage(aPos, pItem->maImage, nImageStyle); - if (pItem->meType == VALUESETITEM_IMAGE_AND_TEXT) + if (pItem->meType == ValueSetItemType::ImageAndText) { maVirDev->SetFont(rRenderContext.GetFont()); maVirDev->SetTextColor((nStyle & WB_MENUSTYLEVALUESET) ? rStyleSettings.GetMenuTextColor() : rStyleSettings.GetWindowTextColor()); @@ -1558,7 +1558,7 @@ void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) return; ValueSetItem* pItem = mItemList[nPos].get(); - pItem->meType = VALUESETITEM_IMAGE; + pItem->meType = ValueSetItemType::Image; pItem->maImage = rImage; if (!mbFormat && IsReallyVisible()) @@ -1578,7 +1578,7 @@ void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) return; ValueSetItem* pItem = mItemList[nPos].get(); - pItem->meType = VALUESETITEM_COLOR; + pItem->meType = ValueSetItemType::Color; pItem->maColor = rColor; if (!mbFormat && IsReallyVisible()) @@ -1681,7 +1681,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage ) { std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_IMAGE; + pItem->meType = ValueSetItemType::Image; pItem->maImage = rImage; ImplInsertItem( std::move(pItem), VALUESET_APPEND ); } @@ -1692,7 +1692,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, { std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; - pItem->meType = bShowLegend ? VALUESETITEM_IMAGE_AND_TEXT : VALUESETITEM_IMAGE; + pItem->meType = bShowLegend ? ValueSetItemType::ImageAndText : ValueSetItemType::Image; pItem->maImage = rImage; pItem->maText = rText; ImplInsertItem( std::move(pItem), nPos ); @@ -1702,7 +1702,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) { std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_USERDRAW; + pItem->meType = ValueSetItemType::UserDraw; ImplInsertItem( std::move(pItem), nPos ); } @@ -1711,7 +1711,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, { std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_COLOR; + pItem->meType = ValueSetItemType::Color; pItem->maColor = rColor; pItem->maText = rText; ImplInsertItem( std::move(pItem), VALUESET_APPEND ); @@ -1800,7 +1800,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const OUString& rText, size_t nPo "ValueSet::InsertItem(): ItemId already exists" ); std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_USERDRAW; + pItem->meType = ValueSetItemType::UserDraw; pItem->maText = rText; ImplInsertItem( std::move(pItem), nPos ); } @@ -1867,7 +1867,7 @@ void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) ValueSetItem* pItem = mItemList[nPos].get(); pItem->mpData = pData; - if ( pItem->meType == VALUESETITEM_USERDRAW ) + if (pItem->meType == ValueSetItemType::UserDraw) { if (!mbFormat && IsReallyVisible()) { @@ -1935,15 +1935,15 @@ Size ValueSet::GetLargestItemSize() if (!pItem->mbVisible) continue; - if (pItem->meType != VALUESETITEM_IMAGE && - pItem->meType != VALUESETITEM_IMAGE_AND_TEXT) + if (pItem->meType != ValueSetItemType::Image && + pItem->meType != ValueSetItemType::ImageAndText) { // handle determining an optimal size for this case continue; } Size aSize = pItem->maImage.GetSizePixel(); - if (pItem->meType == VALUESETITEM_IMAGE_AND_TEXT) + if (pItem->meType == ValueSetItemType::ImageAndText) { aSize.AdjustHeight(3 * NAME_LINE_HEIGHT + maVirDev->GetTextHeight() );
