diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-17 09:44:51 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-17 09:44:51 +0000 |
| commit | 74f3b19d29678c65ff435da2424a34aec8e4447b (patch) | |
| tree | 998f1e7de8d6a47c26247e2a83f0568aea395db0 /padmin/source/newppdlg.cxx | |
| parent | 0d62f6ce8c986f881431ecde4c276c3391693c7a (diff) | |
INTEGRATION: CWS cups01 (1.8.26); FILE MERGED
2004/02/13 15:32:27 pl 1.8.26.2: RESYNC: (1.8-1.9); FILE MERGED
2003/08/15 13:21:14 pl 1.8.26.1: removed a bunch of warnings
Diffstat (limited to 'padmin/source/newppdlg.cxx')
| -rw-r--r-- | padmin/source/newppdlg.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index 295ed61d9f69..2769b99f1dff 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newppdlg.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2004-01-07 15:43:14 $ + * last change: $Author: obo $ $Date: 2004-03-17 10:44:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,13 +111,13 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) : ModalDialog( pParent, PaResId( RID_PPDIMPORT_DLG ) ), m_aOKBtn( this, PaResId( RID_PPDIMP_BTN_OK ) ), m_aCancelBtn( this, PaResId( RID_PPDIMP_BTN_CANCEL ) ), - m_aSearchBtn( this, PaResId( RID_PPDIMP_BTN_SEARCH ) ), + m_aPathTxt( this, PaResId( RID_PPDIMP_TXT_PATH ) ), m_aPathBox( this, PaResId( RID_PPDIMP_LB_PATH ) ), + m_aSearchBtn( this, PaResId( RID_PPDIMP_BTN_SEARCH ) ), m_aDriverTxt( this, PaResId( RID_PPDIMP_TXT_DRIVER ) ), m_aDriverLB( this, PaResId( RID_PPDIMP_LB_DRIVER ) ), m_aPathGroup( this, PaResId( RID_PPDIMP_GROUP_PATH ) ), m_aDriverGroup( this, PaResId( RID_PPDIMP_GROUP_DRIVER ) ), - m_aPathTxt( this, PaResId( RID_PPDIMP_TXT_PATH ) ), m_aLoadingPPD( PaResId( RID_PPDIMP_STR_LOADINGPPD ) ) { FreeResource(); @@ -214,8 +214,6 @@ void PPDImportDialog::Import() IMPL_LINK( PPDImportDialog, ClickBtnHdl, PushButton*, pButton ) { - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - if( pButton == &m_aCancelBtn ) { EndDialog( 0 ); |