Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/19 00:36:08 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: support eComplete in qualifiedNameComponents File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.62&r2=1.62.14.1 Delta lines: +7 -7 ------------------- --- dbtools.cxx 19 Jul 2006 15:51:24 -0000 1.62 +++ dbtools.cxx 19 Sep 2006 07:36:05 -0000 1.62.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbtools.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.62.14.1 $ * - * last change: $Author: kz $ $Date: 2006/07/19 15:51:24 $ + * last change: $Author: fs $ $Date: 2006/09/19 07:36:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -961,13 +961,13 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); - OSL_ENSURE( _eComposeRule == eInDataManipulation, "qualifiedNameComponents: un-implemented case!" ); - OSL_UNUSED( _eComposeRule ); + OSL_ENSURE( ( _eComposeRule == eInDataManipulation ) || ( _eComposeRule == eComplete ), "qualifiedNameComponents: un-implemented case!" ); + bool bComplete = ( _eComposeRule == eComplete ); ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); ::rtl::OUString sName(_rQualifiedName); // do we have catalogs ? - if ( _rxConnMetaData->supportsCatalogsInDataManipulation() ) + if ( bComplete || _rxConnMetaData->supportsCatalogsInDataManipulation() ) { if (_rxConnMetaData->isCatalogAtStart()) { @@ -991,7 +991,7 @@ } } - if ( _rxConnMetaData->supportsSchemasInDataManipulation() ) + if ( bComplete || _rxConnMetaData->supportsSchemasInDataManipulation() ) { sal_Int32 nIndex = sName.indexOf((sal_Unicode)'.'); // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
