diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-28 21:39:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-29 18:25:17 +0200 |
| commit | 5b77e676f57bab2de61dc430e8725c447b73354a (patch) | |
| tree | a7d417d6c231afd547f02c41c68eae22b827b001 /starmath/inc | |
| parent | 2c1f77d34e5a660a72170e30986bd77d9b965ca1 (diff) | |
weld SmFontTypeDialog
Change-Id: I720196ce7359e6e571ecd26c544b9e6a61e17484
Reviewed-on: https://gerrit.libreoffice.org/53626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/dialog.hxx | 29 | ||||
| -rw-r--r-- | starmath/inc/utility.hxx | 13 |
2 files changed, 21 insertions, 21 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 86d1753d974e..3a63fb264f7a 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -144,27 +144,26 @@ public: /**************************************************************************/ -class SmFontTypeDialog : public ModalDialog +class SmFontTypeDialog : public weld::GenericDialogController { - VclPtr<SmFontPickListBox> m_pVariableFont; - VclPtr<SmFontPickListBox> m_pFunctionFont; - VclPtr<SmFontPickListBox> m_pNumberFont; - VclPtr<SmFontPickListBox> m_pTextFont; - VclPtr<SmFontPickListBox> m_pSerifFont; - VclPtr<SmFontPickListBox> m_pSansFont; - VclPtr<SmFontPickListBox> m_pFixedFont; - VclPtr<MenuButton> m_pMenuButton; - VclPtr<PushButton> m_pDefaultButton; - VclPtr<OutputDevice> pFontListDev; - DECL_LINK(MenuSelectHdl, Menu *, bool); - DECL_LINK(DefaultButtonClickHdl, Button *, void); + std::unique_ptr<SmFontPickListBox> m_xVariableFont; + std::unique_ptr<SmFontPickListBox> m_xFunctionFont; + std::unique_ptr<SmFontPickListBox> m_xNumberFont; + std::unique_ptr<SmFontPickListBox> m_xTextFont; + std::unique_ptr<SmFontPickListBox> m_xSerifFont; + std::unique_ptr<SmFontPickListBox> m_xSansFont; + std::unique_ptr<SmFontPickListBox> m_xFixedFont; + std::unique_ptr<weld::MenuButton> m_xMenuButton; + std::unique_ptr<weld::Button> m_xDefaultButton; + + DECL_LINK(MenuSelectHdl, const OString&, void); + DECL_LINK(DefaultButtonClickHdl, weld::Button&, void); public: - SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); + SmFontTypeDialog(weld::Window* pParent, OutputDevice *pFntListDevice); virtual ~SmFontTypeDialog() override; - virtual void dispose() override; void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index a5a731577655..63871c3877e7 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -26,6 +26,7 @@ #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> +#include <vcl/weld.hxx> #include <tools/fract.hxx> #include <deque> @@ -133,17 +134,17 @@ public: // SmFontPickListBox -class SmFontPickListBox final : public SmFontPickList, public ListBox +class SmFontPickListBox final : public SmFontPickList { - DECL_LINK(SelectHdl, ListBox&, void); +private: + std::unique_ptr<weld::ComboBoxText> m_xWidget; -public: - SmFontPickListBox(vcl::Window* pParent, WinBits nBits); + DECL_LINK(SelectHdl, weld::ComboBoxText&, void); +public: + SmFontPickListBox(weld::ComboBoxText* pWidget); SmFontPickListBox& operator = (const SmFontPickList& rList); - virtual void Insert(const vcl::Font &rFont) override; - using Window::Update; }; #endif |