diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:07:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:07:01 +0000 |
| commit | 5143099c430bd5e43400524f40f1478cbce1a0dc (patch) | |
| tree | 90a948c3c333c9ecc6467df52740064b06c9cac6 /sc/source/ui/dbgui/scuiimoptdlg.cxx | |
| parent | 0fa66ee3a27f34cfca871280a661bed00dbfcd12 (diff) | |
INTEGRATION: CWS calc41 (1.6.142); FILE MERGED
2007/01/12 14:53:37 er 1.6.142.1: #i72457# dBase export now supports multibyte encodings, adapt field width determination and error handling
Diffstat (limited to 'sc/source/ui/dbgui/scuiimoptdlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/scuiimoptdlg.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 5914a4441ab4..b2afdfe09b51 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: scuiimoptdlg.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2006-07-21 13:28:33 $ + * last change: $Author: obo $ $Date: 2007-01-25 11:07:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -174,13 +174,12 @@ ScImportOptionsDlg::ScImportOptionsDlg( aEdTextSep.SetText( aEdTextSep.GetEntry(0) ); if ( bOnlyDbtoolsEncodings ) - { //!TODO: Unicode and MultiByte would need work in each filter - // Think of field lengths in dBase export + { + // Even dBase export allows multibyte now if ( bMultiByte ) - aLbFont.FillFromDbTextEncodingMap( bImport, RTL_TEXTENCODING_INFO_UNICODE ); + aLbFont.FillFromDbTextEncodingMap( bImport ); else - aLbFont.FillFromDbTextEncodingMap( bImport, RTL_TEXTENCODING_INFO_UNICODE | - RTL_TEXTENCODING_INFO_MULTIBYTE ); + aLbFont.FillFromDbTextEncodingMap( bImport, RTL_TEXTENCODING_INFO_MULTIBYTE ); } else if ( !bAscii ) { //!TODO: Unicode would need work in each filter |