User: obo Date: 2006/07/10 08:01:58 Modified: dba/dbaccess/source/core/api/FilteredContainer.cxx
Log: INTEGRATION: CWS qiq (1.6.122); FILE MERGED 2006/06/27 11:53:46 fs 1.6.122.2: RESYNC: (1.6-1.7); FILE MERGED 2006/05/24 06:40:19 fs 1.6.122.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# 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.7&r2=1.8 Delta lines: +3 -3 ------------------- --- FilteredContainer.cxx 20 Jun 2006 02:34:56 -0000 1.7 +++ FilteredContainer.cxx 10 Jul 2006 15:01:55 -0000 1.8 @@ -42,7 +42,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #endif #ifndef _CONNECTIVITY_DBTOOLS_HXX_ -#include <connectivity/dbtools.hxx> +#include "connectivity/dbtools.hxx" #endif #ifndef _WLDCRD_HXX #include <tools/wldcrd.hxx> @@ -239,7 +239,7 @@ // we're not interested in the "wasNull", as the getStrings would return an empty string in // that case, which is sufficient here - composeTableName(m_xMetaData, sCatalog, sSchema, sName, sComposedName, sal_False,::dbtools::eInDataManipulation); + sComposedName = composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation ); const ::rtl::OUString* tableFilter = aTableFilter.getConstArray(); const ::rtl::OUString* tableFilterEnd = aTableFilter.getConstArray() + nTableFilterLen; @@ -338,7 +338,7 @@ ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); - return ::dbtools::composeTableName(m_xMetaData,_xObject,sal_False,::dbtools::eInDataManipulation); + return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); } // .............................................................................. } // namespace --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
