commit 212196344c99982aa42ec1eecb36006c9a12655f
author Michael Weghorn <m.weghorn@posteo.de> Mon Jul 01 15:36:41 2024 +0200
committer Michael Weghorn <m.weghorn@posteo.de> Tue Jul 02 10:01:16 2024 +0200
tree 2439dce218a30dabfcba754e89d8ccd0a4cdc2f0
parent 9780e0843f5ee6165b8d8bc4c01071e7a2be9742

tdf#161853 vcl: Drop SvtIconChoiceCtrl::DrawEntryImage

Just draw the image using the render context right in
`SvxIconChoiceCtrl_Impl::PaintItem` instead of
having a very specialized static method that's only used
from there.

Change-Id: Idf8967f6df3823742445906e558fcd7f532271af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169833
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins

include/vcl/toolkit/ivctrl.hxx

diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx
index 318be74..0f331a8 100644
--- a/include/vcl/toolkit/ivctrl.hxx
+++ b/include/vcl/toolkit/ivctrl.hxx
@@ -181,10 +181,6 @@ class UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) SvtIconChoiceCtrl final : public Cont
    void                ClickIcon();
    virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
    virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
    static void         DrawEntryImage(
                            SvxIconChoiceCtrlEntry const * pEntry,
                            const Point& rPos,
                            OutputDevice& rDev );

    static OUString     GetEntryText( SvxIconChoiceCtrlEntry const * pEntry );

vcl/source/control/imivctl1.cxx

diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 7140418..9d0cedf 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -1376,7 +1376,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const tools::Rectangle& rRect,
            aPos.AdjustX((rRect.GetWidth() - aImageSize.Width()) / 2 );
        if (nPaintFlags & PAINTFLAG_VER_CENTERED)
            aPos.AdjustY((rRect.GetHeight() - aImageSize.Height()) / 2 );
        SvtIconChoiceCtrl::DrawEntryImage(pEntry, aPos, rRenderContext);
        rRenderContext.DrawImage(aPos, pEntry->GetImage());
    }
}

vcl/source/control/ivctrl.cxx

diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index c20ce45..bf3cb1c 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -125,11 +125,6 @@ void SvtIconChoiceCtrl::RemoveEntry(sal_Int32 nIndex)
    _pImpl->RemoveEntry(nIndex);
}

void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry const * pEntry, const Point& rPos, OutputDevice& rDev )
{
    rDev.DrawImage( rPos, pEntry->GetImage() );
}

OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry const * pEntry )
{
    return pEntry->GetText();