vcl/inc/salvtables.hxx | 15 +++++++++++
vcl/source/app/salvtables.cxx | 56 ++++++++++++++++++------------------------
2 files changed, 40 insertions(+), 31 deletions(-)
New commits:
commit aa1c19e2a366cff3d91e4455dde500a4011a3279
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Oct 20 10:53:53 2021 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Oct 22 14:43:29 2021 +0200
Move SalInstanceImage decl to header file
Change-Id: Ic71e10a9cb296e8fed366b7dd622d8875d68f2d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123876
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 53288170c764..aeb1e7bc4e0f 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1890,4 +1890,19 @@ public:
virtual void sort_native_button_order() 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;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c1b514d03324..9ea77f27162a 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3034,37 +3034,6 @@ public:
virtual void set_text(const OUString& rText) override {
m_xProgressBar->SetText(rText); }
};
-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:
@@ -3108,6 +3077,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)
