Kaydet (Commit) 0a6be648 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Deduplicate InputDialog (for disable-dynloading)

Change-Id: Id1522e1874ed2b65f7bd8d379b93c35941a7d0b5
üst ce3ac48c
...@@ -427,9 +427,9 @@ void SFTreeListBox::ExpandedHdl() ...@@ -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 ) ), : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ),
aText( this, CUI_RES( FT_NEWLIB ) ), aText( this, CUI_RES( FT_NEWLIB ) ),
aEdit( this, CUI_RES( ED_LIBNAME ) ), aEdit( this, CUI_RES( ED_LIBNAME ) ),
...@@ -484,7 +484,7 @@ InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode ) ...@@ -484,7 +484,7 @@ InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode )
} }
InputDialog::~InputDialog() CuiInputDialog::~CuiInputDialog()
{ {
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
...@@ -933,7 +933,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry ) ...@@ -933,7 +933,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
} }
SAL_WNODEPRECATED_DECLARATIONS_PUSH 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 SAL_WNODEPRECATED_DECLARATIONS_POP
xNewDlg->SetObjectName( aNewName ); xNewDlg->SetObjectName( aNewName );
...@@ -1065,7 +1065,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) ...@@ -1065,7 +1065,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
sal_uInt16 nMode = INPUTMODE_RENAME; sal_uInt16 nMode = INPUTMODE_RENAME;
SAL_WNODEPRECATED_DECLARATIONS_PUSH 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 SAL_WNODEPRECATED_DECLARATIONS_POP
xNewDlg->SetObjectName( aNewName ); xNewDlg->SetObjectName( aNewName );
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
void deleteAllTree( ); void deleteAllTree( );
}; };
class InputDialog : public ModalDialog class CuiInputDialog : public ModalDialog
{ {
private: private:
FixedText aText; FixedText aText;
...@@ -107,8 +107,8 @@ private: ...@@ -107,8 +107,8 @@ private:
CancelButton aCancelButton; CancelButton aCancelButton;
public: public:
InputDialog( Window * pParent, sal_uInt16 nMode ); CuiInputDialog( Window * pParent, sal_uInt16 nMode );
~InputDialog(); ~CuiInputDialog();
String GetObjectName() const { return aEdit.GetText(); } String GetObjectName() const { return aEdit.GetText(); }
void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );} void SetObjectName( const String& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.Len() ) );}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment