diff options
| author | Manal Alhassoun <malhassoun@kacst.edu.sa> | 2013-07-03 13:20:16 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-03 12:59:05 +0000 |
| commit | 1611669c400a87e6a092e6312fd83b4f9f89257b (patch) | |
| tree | c08721b7dde0ab123ad6a461028af12f3edbe1f6 /starmath/inc | |
| parent | 052ad2cf198aa27eb1719be1864477119c6576e9 (diff) | |
fonttypedialog.ui widget
Change-Id: I4aac9046a004d84cd47d563aee8b7338e0d17896
Reviewed-on: https://gerrit.libreoffice.org/4697
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 | 33 | ||||
| -rw-r--r-- | starmath/inc/starmath.hrc | 1 | ||||
| -rw-r--r-- | starmath/inc/utility.hxx | 1 |
3 files changed, 12 insertions, 23 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index a16b2f53a8bb..4274266ec90a 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -142,27 +142,16 @@ public: class SmFontTypeDialog : public ModalDialog { - FixedText aFixedText1; - SmFontPickListBox aVariableFont; - FixedText aFixedText2; - SmFontPickListBox aFunctionFont; - FixedText aFixedText3; - SmFontPickListBox aNumberFont; - FixedText aFixedText4; - SmFontPickListBox aTextFont; - FixedText aFixedText5; - SmFontPickListBox aSerifFont; - FixedText aFixedText6; - SmFontPickListBox aSansFont; - FixedText aFixedText7; - SmFontPickListBox aFixedFont; - FixedLine aFixedLine1; - FixedLine aFixedLine2; - OKButton aOKButton1; - HelpButton aHelpButton1; - CancelButton aCancelButton1; - MenuButton aMenuButton; - PushButton aDefaultButton; + SmFontPickListBox* m_pVariableFont; + SmFontPickListBox* m_pFunctionFont; + SmFontPickListBox* m_pNumberFont; + SmFontPickListBox* m_pTextFont; + SmFontPickListBox* m_pSerifFont; + SmFontPickListBox* m_pSansFont; + SmFontPickListBox* m_pFixedFont; + HelpButton* m_pHelpButton1; + MenuButton* m_pMenuButton; + PushButton* m_pDefaultButton; OutputDevice *pFontListDev; @@ -171,7 +160,7 @@ class SmFontTypeDialog : public ModalDialog DECL_LINK(HelpButtonClickHdl, Button *); public: - SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool bFreeRes = true); + SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 74aebf6d8852..192f22edc48c 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -77,7 +77,6 @@ #define RID_FONTDIALOG (RID_APP_START + 2) -#define RID_FONTTYPEDIALOG (RID_APP_START + 4) #define RID_SYMDEFINEDIALOG (RID_APP_START + 9) #define RID_PRINTUIOPTIONS (RID_APP_START + 11) diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 01a41cd03d4e..1770a91ffe81 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -159,6 +159,7 @@ protected: public: SmFontPickListBox(Window* pParent, const ResId& rResId); + SmFontPickListBox (Window* pParent, WinBits nBits); SmFontPickListBox& operator = (const SmFontPickList& rList); |