vcl/inc/salvtables.hxx | 26 +++++++++++++ vcl/source/app/salvtables.cxx | 84 +++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 49 deletions(-)
New commits: commit 1fd0900cbea45712665e1b198de671f1d5182013 Author: Szymon Kłos <[email protected]> AuthorDate: Tue May 12 12:28:51 2020 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Tue May 12 19:47:35 2020 +0200 Move SalInstanceButton to header file Change-Id: I3f6aa1975ae5859e0c340c82627d95e49313a668 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94050 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index de8a3c6704f2..aaed72a8301b 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -979,4 +979,30 @@ public: virtual ~SalInstanceComboBoxWithEdit() override; }; +class SalInstanceButton : public SalInstanceContainer, public virtual weld::Button +{ +private: + VclPtr<::Button> m_xButton; + Link<::Button*, void> const m_aOldClickHdl; + + DECL_LINK(ClickHdl, ::Button*, void); + +public: + SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + + virtual void set_label(const OUString& rText) override; + + virtual void set_image(VirtualDevice* pDevice) override; + + virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override; + + virtual void set_from_icon_name(const OUString& rIconName) override; + + virtual void set_label_line_wrap(bool wrap) override; + + virtual OUString get_label() const override; + + virtual ~SalInstanceButton() override; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ \ No newline at end of file diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index a6d9ed05753d..b63d64df87c5 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2358,63 +2358,49 @@ IMPL_LINK_NOARG(SalInstanceVerticalNotebook, ActivatePageHdl, VerticalTabControl m_aEnterPageHdl.Call(get_current_page_ident()); } -namespace -{ -class SalInstanceButton : public SalInstanceContainer, public virtual weld::Button +SalInstanceButton::SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : SalInstanceContainer(pButton, pBuilder, bTakeOwnership) + , m_xButton(pButton) + , m_aOldClickHdl(pButton->GetClickHdl()) { -private: - VclPtr<::Button> m_xButton; - Link<::Button*, void> const m_aOldClickHdl; - - DECL_LINK(ClickHdl, ::Button*, void); - -public: - SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceContainer(pButton, pBuilder, bTakeOwnership) - , m_xButton(pButton) - , m_aOldClickHdl(pButton->GetClickHdl()) - { - m_xButton->SetClickHdl(LINK(this, SalInstanceButton, ClickHdl)); - } - - virtual void set_label(const OUString& rText) override { m_xButton->SetText(rText); } + m_xButton->SetClickHdl(LINK(this, SalInstanceButton, ClickHdl)); +} - virtual void set_image(VirtualDevice* pDevice) override - { - m_xButton->SetImageAlign(ImageAlign::Left); - if (pDevice) - m_xButton->SetModeImage(createImage(*pDevice)); - else - m_xButton->SetModeImage(Image()); - } +void SalInstanceButton::set_label(const OUString& rText) { m_xButton->SetText(rText); } - virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override - { - m_xButton->SetImageAlign(ImageAlign::Left); - m_xButton->SetModeImage(Image(rImage)); - } +void SalInstanceButton::set_image(VirtualDevice* pDevice) +{ + m_xButton->SetImageAlign(ImageAlign::Left); + if (pDevice) + m_xButton->SetModeImage(createImage(*pDevice)); + else + m_xButton->SetModeImage(Image()); +} - virtual void set_from_icon_name(const OUString& rIconName) override - { - m_xButton->SetModeImage(Image(StockImage::Yes, rIconName)); - } +void SalInstanceButton::set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) +{ + m_xButton->SetImageAlign(ImageAlign::Left); + m_xButton->SetModeImage(Image(rImage)); +} - virtual void set_label_line_wrap(bool wrap) override - { - WinBits nBits = m_xButton->GetStyle(); - nBits &= ~WB_WORDBREAK; - if (wrap) - nBits |= WB_WORDBREAK; - m_xButton->SetStyle(nBits); - m_xButton->queue_resize(); - } +void SalInstanceButton::set_from_icon_name(const OUString& rIconName) +{ + m_xButton->SetModeImage(Image(StockImage::Yes, rIconName)); +} - virtual OUString get_label() const override { return m_xButton->GetText(); } +void SalInstanceButton::set_label_line_wrap(bool wrap) +{ + WinBits nBits = m_xButton->GetStyle(); + nBits &= ~WB_WORDBREAK; + if (wrap) + nBits |= WB_WORDBREAK; + m_xButton->SetStyle(nBits); + m_xButton->queue_resize(); +} - virtual ~SalInstanceButton() override { m_xButton->SetClickHdl(Link<::Button*, void>()); } -}; +OUString SalInstanceButton::get_label() const { return m_xButton->GetText(); } -} +SalInstanceButton::~SalInstanceButton() { m_xButton->SetClickHdl(Link<::Button*, void>()); } IMPL_LINK(SalInstanceButton, ClickHdl, ::Button*, pButton, void) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
