include/vcl/salvtables.hxx | 15 +++++++++++ vcl/source/app/salvtables.cxx | 56 ++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 31 deletions(-)
New commits: commit aa8f12e46804029ee6eef47097e5a4de4bf7e511 Author: Szymon Kłos <[email protected]> AuthorDate: Wed Oct 20 10:53:53 2021 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Fri Oct 29 10:22:56 2021 +0200 Move SalInstanceImage decl to header file Change-Id: Ic71e10a9cb296e8fed366b7dd622d8875d68f2d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123876 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124223 diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx index be939b4176f6..16b3db623c73 100644 --- a/include/vcl/salvtables.hxx +++ b/include/vcl/salvtables.hxx @@ -1540,4 +1540,19 @@ public: virtual ~SalInstanceRadioButton() override; }; +class SalInstanceImage : public SalInstanceWidget, public virtual weld::Image +{ +private: + VclPtr<FixedImage> m_xImage; + +public: + SalInstanceImage(FixedImage* pImage, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + + virtual void set_from_icon_name(const OUString& rIconName) override; + + virtual void set_image(VirtualDevice* pDevice) override; + + virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override; +}; + #endif diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 32deb0c9a310..6fa2797b73a6 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2928,37 +2928,6 @@ public: } }; -class SalInstanceImage : public SalInstanceWidget, public virtual weld::Image -{ -private: - VclPtr<FixedImage> m_xImage; - -public: - SalInstanceImage(FixedImage* pImage, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceWidget(pImage, pBuilder, bTakeOwnership) - , m_xImage(pImage) - { - } - - virtual void set_from_icon_name(const OUString& rIconName) override - { - m_xImage->SetImage(::Image(StockImage::Yes, rIconName)); - } - - virtual void set_image(VirtualDevice* pDevice) override - { - if (pDevice) - m_xImage->SetImage(createImage(*pDevice)); - else - m_xImage->SetImage(::Image()); - } - - virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override - { - m_xImage->SetImage(::Image(rImage)); - } -}; - class SalInstanceCalendar : public SalInstanceWidget, public virtual weld::Calendar { private: @@ -3007,6 +2976,31 @@ IMPL_LINK_NOARG(SalInstanceCalendar, ActivateHdl, ::Calendar*, void) signal_activated(); } +SalInstanceImage::SalInstanceImage(FixedImage* pImage, SalInstanceBuilder* pBuilder, + bool bTakeOwnership) + : SalInstanceWidget(pImage, pBuilder, bTakeOwnership) + , m_xImage(pImage) +{ +} + +void SalInstanceImage::set_from_icon_name(const OUString& rIconName) +{ + m_xImage->SetImage(::Image(StockImage::Yes, rIconName)); +} + +void SalInstanceImage::set_image(VirtualDevice* pDevice) +{ + if (pDevice) + m_xImage->SetImage(createImage(*pDevice)); + else + m_xImage->SetImage(::Image()); +} + +void SalInstanceImage::set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) +{ + m_xImage->SetImage(::Image(rImage)); +} + WeldTextFilter::WeldTextFilter(Link<OUString&, bool>& rInsertTextHdl) : TextFilter(OUString()) , m_rInsertTextHdl(rInsertTextHdl)
