diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-08 11:20:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-08 11:40:49 +0300 |
| commit | 0a6be648dbe084625e72f91d4c906e88776bf77f (patch) | |
| tree | 9d8565dd8dcbe06efc37873010d31c54e60c0f84 | |
| parent | ce3ac48c3a7c609503eca8560fa050ff097a3e72 (diff) | |
Deduplicate InputDialog (for disable-dynloading)
Change-Id: Id1522e1874ed2b65f7bd8d379b93c35941a7d0b5
| -rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 10 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index f9b0f099a785..c1faf050b9db 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -427,9 +427,9 @@ void SFTreeListBox::ExpandedHdl() } // ---------------------------------------------------------------------------- -// InputDialog ------------------------------------------------------------ +// CuiInputDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- -InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) +CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ), aText( this, CUI_RES( FT_NEWLIB ) ), aEdit( this, CUI_RES( ED_LIBNAME ) ), @@ -484,7 +484,7 @@ InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) } -InputDialog::~InputDialog() +CuiInputDialog::~CuiInputDialog() { } // ---------------------------------------------------------------------------- @@ -933,7 +933,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) } SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); @@ -1065,7 +1065,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) sal_uInt16 nMode = INPUTMODE_RENAME; SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) ); + std::auto_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); SAL_WNODEPRECATED_DECLARATIONS_POP xNewDlg->SetObjectName( aNewName ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9b0a86859bee..514089c7dbdf 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -98,7 +98,7 @@ public: void deleteAllTree( ); }; -class InputDialog : public ModalDialog +class CuiInputDialog : public ModalDialog { private: FixedText aText; @@ -107,8 +107,8 @@ private: CancelButton aCancelButton; public: - InputDialog( Window * pParent, sal_uInt16 nMode ); - ~InputDialog(); + CuiInputDialog( Window * pParent, sal_uInt16 nMode ); + ~CuiInputDialog(); String GetObjectName() const { return aEdit.GetText(); } void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} |