summaryrefslogtreecommitdiff
path: root/starmath/inc/dialog.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-28 21:39:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-29 18:25:17 +0200
commit5b77e676f57bab2de61dc430e8725c447b73354a (patch)
treea7d417d6c231afd547f02c41c68eae22b827b001 /starmath/inc/dialog.hxx
parent2c1f77d34e5a660a72170e30986bd77d9b965ca1 (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/dialog.hxx')
-rw-r--r--starmath/inc/dialog.hxx29
1 files changed, 14 insertions, 15 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;