diff options
| author | Ocke Janssen <oj@openoffice.org> | 2002-11-21 13:04:38 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2002-11-21 13:04:38 +0000 |
| commit | edc30f8c32c5c082407de1d6d90287465087c687 (patch) | |
| tree | 3e4bfbb30842043bc2b3152fc838bb3868fa0871 | |
| parent | ccc6129d3d0024d0304d6daa996250bacad18c49 (diff) | |
#104812# check if schema is in name
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 669adef70fd8..944c98852847 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbtools.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: oj $ $Date: 2002-11-14 07:48:51 $ + * last change: $Author: oj $ $Date: 2002-11-21 14:04:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -636,7 +636,7 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa ::rtl::OUString sName(_rQualifiedName); // do we have catalogs ? - if (_rxConnMetaData->supportsCatalogsInDataManipulation()) + if ( _rxConnMetaData->supportsCatalogsInDataManipulation() ) { if (_rxConnMetaData->isCatalogAtStart()) { @@ -660,11 +660,12 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa } } - if (_rxConnMetaData->supportsSchemasInDataManipulation()) + if ( _rxConnMetaData->supportsSchemasInDataManipulation() ) { sal_Int32 nIndex = sName.indexOf((sal_Unicode)'.'); // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); - _rSchema = sName.copy(0, nIndex); + if ( nIndex != -1 ) + _rSchema = sName.copy(0, nIndex); sName = sName.copy(nIndex + 1); } @@ -1788,6 +1789,9 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.47 2002/11/14 07:48:51 oj + * #105110# extend createUniqueName with bool param + * * Revision 1.46 2002/10/07 12:48:11 oj * #i3289# correct table name quoting so that in every situation the correct schema, catalog is used * |