Tag: cws_src680_internatiodel User: er Date: 06/01/19 07:24:36 Modified: /dba/connectivity/source/drivers/flat/ ETable.cxx
Log: RESYNC: (1.48-1.51); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/flat/ ================================================= File [changed]: ETable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/ETable.cxx?r1=1.48.52.1&r2=1.48.52.2 Delta lines: +26 -50 --------------------- --- ETable.cxx 24 Jun 2005 13:07:47 -0000 1.48.52.1 +++ ETable.cxx 19 Jan 2006 15:24:32 -0000 1.48.52.2 @@ -1,22 +1,20 @@ /************************************************************************* * + * OpenOffice.org - a multi-platform office productivity suite + * * $RCSfile$ * * $Revision$ * * last change: $Author$ $Date$ * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * Sun Microsystems Inc., October, 2000 * * GNU Lesser General Public License Version 2.1 * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. + * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or @@ -33,30 +31,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * ************************************************************************/ #include <ctype.h> @@ -145,7 +119,7 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -void OFlatTable::fillColumns() +void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) { BOOL bRead = TRUE; @@ -191,6 +165,7 @@ m_aScales.reserve(nFieldCount); sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(); + CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale); // read description sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter(); sal_Unicode cThousandDelimiter = pConnection->getThousandDelimiter(); @@ -232,6 +207,7 @@ (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0))) { bNumeric = FALSE; + nStartPosFirstLine2 = nStartPosFirstLine; } else { @@ -255,7 +231,7 @@ // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen? if ((!cDecimalDelimiter || c != cDecimalDelimiter) && (!cThousandDelimiter || c != cThousandDelimiter) && - !isdigit(c)) + !aCharClass.isDigit(aField2,j)) { bNumeric = FALSE; break; @@ -437,7 +413,7 @@ nSize > 100000 ? 16384 : nSize > 10000 ? 4096 : 1024); - fillColumns(); + fillColumns(aAppLocale); refreshColumns(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
