User: vg Date: 05/03/10 08:48:56 Modified: /dba/dbaccess/source/ui/dlg/ TextConnectionHelper.cxx
Log: INTEGRATION: CWS dba24 (1.2.48); FILE MERGED 2005/02/28 07:56:18 oj 1.2.48.2: #i43624# correct the header line in none wizard mode 2005/02/28 07:30:26 oj 1.2.48.1: #i43625# correct GetExtension() File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: TextConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?r1=1.2&r2=1.3 Delta lines: +12 -7 -------------------- --- TextConnectionHelper.cxx 27 Oct 2004 13:00:22 -0000 1.2 +++ TextConnectionHelper.cxx 10 Mar 2005 16:48:52 -0000 1.3 @@ -305,7 +305,7 @@ SFX_ITEMSET_GET(_rSet, pExtensionItem, SfxStringItem, DSID_TEXTFILEEXTENSION, sal_True); if (_bValid) { - if (m_bWizardMode) + if (!m_bWizardMode) { SFX_ITEMSET_GET(_rSet, pHdrItem, SfxBoolItem, DSID_TEXTFILEHEADER, sal_True); m_aHeader.Check( pHdrItem->GetValue() ); @@ -465,11 +465,16 @@ { String sExtension; if (m_aRBAccessTextFiles.IsChecked()) - return (String) ::rtl::OUString::createFromAscii("txt"); + sExtension = String::CreateFromAscii("txt"); else if (m_aRBAccessCSVFiles.IsChecked()) - return (String) ::rtl::OUString::createFromAscii("csv"); + sExtension = String::CreateFromAscii("csv"); else - return m_aETOwnExtension.GetText(); + { + sExtension = m_aETOwnExtension.GetText(); + if ( !sExtension.Len() ) + sExtension = m_aFTExtensionExample.GetText(); + } + return sExtension; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
