User: hr Date: 06/06/19 18:02:34 Modified: /dba/connectivity/source/commontools/ CommonTools.cxx
Log: INTEGRATION: CWS warnings01 (1.20.20); FILE MERGED 2006/01/25 20:47:08 sb 1.20.20.2: RESYNC: (1.20-1.21); FILE MERGED 2005/12/22 11:44:01 fs 1.20.20.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: CommonTools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/CommonTools.cxx?r1=1.21&r2=1.22 Delta lines: +8 -10 -------------------- --- CommonTools.cxx 21 Dec 2005 13:14:19 -0000 1.21 +++ CommonTools.cxx 20 Jun 2006 01:02:32 -0000 1.22 @@ -327,15 +327,20 @@ #include <ctype.h> //isdigit namespace dbtools { -sal_Bool isCharOk(char c,const ::rtl::OUString& _rSpecials); +//------------------------------------------------------------------ +sal_Bool isCharOk(sal_Unicode c,const ::rtl::OUString& _rSpecials) +{ + + return ( ((c >= 97) && (c <= 122)) || ((c >= 65) && (c <= 90)) || ((c >= 48) && (c <= 57)) || + c == '_' || _rSpecials.indexOf(c) != -1); +} //------------------------------------------------------------------------------ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSpecials) { // Ueberpruefung auf korrekte Namensgebung im SQL Sinne // Dieses ist wichtig fuer Tabellennamen beispielsweise - ::rtl::OString aName(rName,rName.getLength(),RTL_TEXTENCODING_ASCII_US); - const char* pStr = aName.getStr(); + const sal_Unicode* pStr = rName.getStr(); if (*pStr > 127 || isdigit(*pStr)) return sal_False; @@ -357,13 +362,6 @@ // 11.04.00 - 74902 - FS return sal_True; -} -//------------------------------------------------------------------ -sal_Bool isCharOk(char c,const ::rtl::OUString& _rSpecials) -{ - - return ( ((c >= 97) && (c <= 122)) || ((c >= 65) && (c <= 90)) || ((c >= 48) && (c <= 57)) || - c == '_' || _rSpecials.indexOf(c) != -1); } //------------------------------------------------------------------ // Erzeugt einen neuen Namen falls noetig --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
