Tag: cws_src680_dba22ui User: fs Date: 2006/12/06 03:24:47 Modified: dba/connectivity/source/commontools/dbtools.cxx dba/connectivity/source/commontools/TIndexes.cxx
Log: reverted previous change - it's allowed to call this with a non-SDB connection 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.67.2.1&r2=1.67.2.2 Delta lines: +4 -4 ------------------- --- dbtools.cxx 5 Dec 2006 09:46:53 -0000 1.67.2.1 +++ dbtools.cxx 6 Dec 2006 11:24:44 -0000 1.67.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbtools.cxx,v $ * - * $Revision: 1.67.2.1 $ + * $Revision: 1.67.2.2 $ * - * last change: $Author: fs $ $Date: 2006/12/05 09:46:53 $ + * last change: $Author: fs $ $Date: 2006/12/06 11:24:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1529,8 +1529,8 @@ ::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) { - bool bUseCatalogInSelect = getBooleanDataSourceSetting( _rxConnection, "UseCatalogInSelect" ); - bool bUseSchemaInSelect = getBooleanDataSourceSetting( _rxConnection, "UseSchemaInSelect" ); + sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCatalogInSelect" ) ), sal_True ); + sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseSchemaInSelect" ) ), sal_True ); return impl_doComposeTableName( _rxConnection->getMetaData(), File [changed]: TIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TIndexes.cxx?r1=1.10.20.1&r2=1.10.20.2 Delta lines: +3 -3 ------------------- --- TIndexes.cxx 5 Dec 2006 09:46:53 -0000 1.10.20.1 +++ TIndexes.cxx 6 Dec 2006 11:24:45 -0000 1.10.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: TIndexes.cxx,v $ * - * $Revision: 1.10.20.1 $ + * $Revision: 1.10.20.2 $ * - * last change: $Author: fs $ $Date: 2006/12/05 09:46:53 $ + * last change: $Author: fs $ $Date: 2006/12/06 11:24:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,7 +186,7 @@ Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY); Reference< XPropertySet > xColProp; - sal_Bool bAddIndexAppendix = ::dbtools::getBooleanDataSourceSetting( m_pTable->getConnection(), "AddIndexAppendix" ); + sal_Bool bAddIndexAppendix = ::dbtools::isDataSourcePropertyEnabled(m_pTable->getConnection(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AddIndexAppendix")),sal_True); sal_Int32 nCount = xColumns->getCount(); for(sal_Int32 i = 0 ; i < nCount; ++i) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
