diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 10:14:57 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 13:50:36 +0000 |
commit | c1fd218e903d5b7b9f705b379d86f0d237705785 (patch) | |
tree | e85b460fa226b6cd69be7a921c87e885723749ec /sd/source | |
parent | ff5448b6c7be7a4ea60787aa1e64362d7f8f8077 (diff) |
convert name html design to .ui
Change-Id: If384ab765e09a6600d3e9cb559ed58dccb6b18c1
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 25 | ||||
-rw-r--r-- | sd/source/filter/html/pubdlg.src | 38 | ||||
-rw-r--r-- | sd/source/ui/inc/pubdlg.hrc | 7 |
3 files changed, 11 insertions, 59 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 26acda2af336..31076f6bda70 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -350,9 +350,8 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) class SdDesignNameDlg : public ModalDialog { private: - Edit m_aEdit; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; + Edit* m_pEdit; + OKButton* m_pBtnOK; public: SdDesignNameDlg(Window* pWindow, const OUString& aName ); @@ -1581,26 +1580,24 @@ sal_Bool SdPublishingDlg::Save() } // SdDesignNameDlg Methods -SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const OUString& aName): - ModalDialog (pWindow, SdResId( DLG_DESIGNNAME )), - m_aEdit (this, SdResId(EDT_NAME)), - m_aBtnOK (this, SdResId(BTN_SAVE)), - m_aBtnCancel (this, SdResId(BTN_NOSAVE)) +SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const OUString& aName) + : ModalDialog(pWindow, "NameDesignDialog", "modules/sdraw/ui/namedesign.ui") { - FreeResource(); - m_aEdit.SetModifyHdl(LINK(this, SdDesignNameDlg, ModifyHdl )); - m_aEdit.SetText(aName); - m_aBtnOK.Enable(!aName.isEmpty()); + get(m_pEdit, "entry"); + get(m_pBtnOK, "ok"); + m_pEdit->SetModifyHdl(LINK(this, SdDesignNameDlg, ModifyHdl )); + m_pEdit->SetText(aName); + m_pBtnOK->Enable(!aName.isEmpty()); } OUString SdDesignNameDlg::GetDesignName() { - return m_aEdit.GetText(); + return m_pEdit->GetText(); } IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl) { - m_aBtnOK.Enable(!m_aEdit.GetText().isEmpty()); + m_pBtnOK->Enable(!m_pEdit->GetText().isEmpty()); return 0; } diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index d13f62e82967..bf23d8503d50 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -693,42 +693,4 @@ ModalDialog DLG_PUBLISHING }; }; -ModalDialog DLG_DESIGNNAME -{ - HelpID = HID_SD_HTMLEXPORT_DLG_DNAME; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 160 , 40 ) ; - Moveable = TRUE ; - - Edit EDT_NAME - { - HelpID = "sd:Edit:DLG_DESIGNNAME:EDT_NAME"; - BORDER = TRUE ; - Pos = MAP_APPFONT ( 4, 4 ); - Size = MAP_APPFONT ( 152, 14 ); - LEFT = TRUE; - }; - - OKButton BTN_SAVE - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 25 , 22 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - TabStop = TRUE ; - Text [ en-US ] = "~Save"; - }; - - CancelButton BTN_NOSAVE - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 80 , 22 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Do Not Save"; - }; - Text [ en-US ] = "Name HTML Design"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index d5612da51c23..77d84a892af8 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -123,11 +123,4 @@ #define DLG_PUBLISHING 739 -////////////////////////////// - -#define BTN_SAVE 1 -#define BTN_NOSAVE 2 -#define EDT_NAME 3 -#define DLG_DESIGNNAME 740 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |