User: vg Date: 05/03/10 08:29:51 Modified: /dba/dbaccess/source/core/api/ FilteredContainer.cxx
Log: INTEGRATION: CWS dba24 (1.4.80); FILE MERGED 2005/02/10 16:52:05 fs 1.4.80.2: grammar and debug diagnostics 2005/02/09 08:12:57 oj 1.4.80.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: FilteredContainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/FilteredContainer.cxx?r1=1.4&r2=1.5 Delta lines: +9 -8 ------------------- --- FilteredContainer.cxx 2 Aug 2004 14:59:57 -0000 1.4 +++ FilteredContainer.cxx 10 Mar 2005 16:29:48 -0000 1.5 @@ -272,6 +272,9 @@ sCatalog = xCurrentRow->getString(1); sSchema = xCurrentRow->getString(2); sName = xCurrentRow->getString(3); +#if OSL_DEBUG_LEVEL > 0 + ::rtl::OUString sTableType = xCurrentRow->getString(4); +#endif // we're not interested in the "wasNull", as the getStrings would return an empty string in // that case, which is sufficient here @@ -307,7 +310,7 @@ } catch (SQLException&) { - OSL_ENSURE(0,"OFilteredContainer::construct : catched an SQL-Exception !"); + OSL_ENSURE(0,"OFilteredContainer::construct: caught an SQL-Exception !"); disposing(); return; } @@ -360,14 +363,12 @@ return bFilterMatch; } - // ------------------------------------------------------------------------- - Reference< XNamed > OFilteredContainer::cloneObject(const Reference< XPropertySet >& _xDescriptor) + // ----------------------------------------------------------------------------- + ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { - Reference< XNamed > xName(_xDescriptor,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName.is() ? createObject(xName->getName()) : Reference< XNamed >(); + OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); + return ::dbtools::composeTableName(m_xMetaData,_xObject,sal_False,::dbtools::eInDataManipulation); } - // ----------------------------------------------------------------------------- // .............................................................................. } // namespace // .............................................................................. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
