Tag: cws_dev300_dba30c User: oj Date: 2008-05-06 11:26:20+0000 Modified: dba/connectivity/source/drivers/dbase/DTable.cxx
Log: #i88577# check for visual foxpro and accept text encoding when set File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DTable.cxx?r1=1.105.10.1&r2=1.105.10.2 Delta lines: +7 -6 ------------------- --- DTable.cxx 2008-05-06 08:14:05+0000 1.105.10.1 +++ DTable.cxx 2008-05-06 11:26:18+0000 1.105.10.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DTable.cxx,v $ - * $Revision: 1.105.10.1 $ + * $Revision: 1.105.10.2 $ * * This file is part of OpenOffice.org. * @@ -120,6 +120,7 @@ } else { + m_eEncoding = getConnection()->getTextEncoding(); // Konsistenzpruefung des Header: m_aHeader.db_typ = (DBFType)nType; switch (m_aHeader.db_typ) @@ -132,10 +133,10 @@ case dBaseFSMemo: case dBaseIVMemoSQL: case dBaseIIIMemo: - case dBaseIVMemo: case FoxProMemo: m_pFileStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); - if ( m_aHeader.db_frei[17] != 0x00 && getConnection()->isTextEncodingDefaulted() ) + if ( m_aHeader.db_frei[17] != 0x00 + && !m_aHeader.db_frei[18] && !m_aHeader.db_frei[19] && getConnection()->isTextEncodingDefaulted() ) { switch(m_aHeader.db_frei[17]) { @@ -159,12 +160,12 @@ case 0xCA: m_eEncoding = RTL_TEXTENCODING_MS_1254; break; // Turkish Windows case 0xCB: m_eEncoding = RTL_TEXTENCODING_MS_1253; break; // Greek Windows default: - m_eEncoding = getConnection()->getTextEncoding(); break; } } - else - m_eEncoding = getConnection()->getTextEncoding(); + break; + case dBaseIVMemo: + m_pFileStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); break; default: { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
