diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-07-06 15:36:39 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-07-07 12:00:41 +0200 |
| commit | d792875d79a63364dba02426ef75d696ae0f02ef (patch) | |
| tree | eb80100bfea605e29788778091d543499a969e86 /vcl | |
| parent | b61b6fa6ee97a735ba30a4b725075b4c0fffbdd5 (diff) | |
jsdialog: Move SalInstanceCalendar decl to header file
Change-Id: Ide9e685d724d646f0ab8825b1fce2b6fd130d3ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154135
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salvtables.hxx | 29 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 29 |
2 files changed, 29 insertions, 29 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index bfd3259e48fc..7c246a9d9d72 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -27,6 +27,7 @@ #include <vcl/toolkit/svtabbx.hxx> #include <vcl/toolkit/svlbitm.hxx> #include <o3tl/sorted_vector.hxx> +#include "calendar.hxx" #include "iconview.hxx" #include "listbox.hxx" #include "messagedialog.hxx" @@ -2169,4 +2170,32 @@ public: virtual ~SalInstanceScrolledWindow() override; }; +class SalInstanceCalendar : public SalInstanceWidget, public virtual weld::Calendar +{ +private: + VclPtr<::Calendar> m_xCalendar; + + DECL_LINK(SelectHdl, ::Calendar*, void); + DECL_LINK(ActivateHdl, ::Calendar*, void); + +public: + SalInstanceCalendar(::Calendar* pCalendar, SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : SalInstanceWidget(pCalendar, pBuilder, bTakeOwnership) + , m_xCalendar(pCalendar) + { + m_xCalendar->SetSelectHdl(LINK(this, SalInstanceCalendar, SelectHdl)); + m_xCalendar->SetActivateHdl(LINK(this, SalInstanceCalendar, ActivateHdl)); + } + + virtual void set_date(const Date& rDate) override { m_xCalendar->SetCurDate(rDate); } + + virtual Date get_date() const override { return m_xCalendar->GetFirstSelectedDate(); } + + virtual ~SalInstanceCalendar() override + { + m_xCalendar->SetSelectHdl(Link<::Calendar*, void>()); + m_xCalendar->SetActivateHdl(Link<::Calendar*, void>()); + } +}; + /* 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 103a266361c5..53d670b8537c 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -76,7 +76,6 @@ #include <vcl/toolkit/viewdataentry.hxx> #include <vcl/virdev.hxx> #include <bitmaps.hlst> -#include <calendar.hxx> #include <menutogglebutton.hxx> #include <verticaltabctrl.hxx> #include <window.h> @@ -3280,34 +3279,6 @@ public: virtual void set_text(const OUString& rText) override { m_xProgressBar->SetText(rText); } }; - -class SalInstanceCalendar : public SalInstanceWidget, public virtual weld::Calendar -{ -private: - VclPtr<::Calendar> m_xCalendar; - - DECL_LINK(SelectHdl, ::Calendar*, void); - DECL_LINK(ActivateHdl, ::Calendar*, void); - -public: - SalInstanceCalendar(::Calendar* pCalendar, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceWidget(pCalendar, pBuilder, bTakeOwnership) - , m_xCalendar(pCalendar) - { - m_xCalendar->SetSelectHdl(LINK(this, SalInstanceCalendar, SelectHdl)); - m_xCalendar->SetActivateHdl(LINK(this, SalInstanceCalendar, ActivateHdl)); - } - - virtual void set_date(const Date& rDate) override { m_xCalendar->SetCurDate(rDate); } - - virtual Date get_date() const override { return m_xCalendar->GetFirstSelectedDate(); } - - virtual ~SalInstanceCalendar() override - { - m_xCalendar->SetSelectHdl(Link<::Calendar*, void>()); - m_xCalendar->SetActivateHdl(Link<::Calendar*, void>()); - } -}; } IMPL_LINK_NOARG(SalInstanceCalendar, SelectHdl, ::Calendar*, void) |