strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba24 (1.5.32); FILE MERGED

Browse source 
2005/02/09 08:07:47 oj 1.5.32.1: #i26950# remove the need for XNamed
This commit is contained in:
Vladimir Glazounov 2005-03-10 14:31:32 +00:00
parent df4a4353cf
commit d4b5ee96c6
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
connectivity/source/drivers/mysql/YTables.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: YTables.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: rt $ $Date: 2004-10-22 08:44:24 $
* last change: $Author: vg $ $Date: 2005-03-10 15:31:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -109,7 +109,7 @@
#endif
using namespace ::comphelper;
using namespace connectivity;
using namespace ::cppu;
using namespace connectivity::mysql;
using namespace ::com::sun::star::uno;
@ -121,7 +121,7 @@ using namespace ::com::sun::star::lang;
using namespace dbtools;
typedef connectivity::sdbcx::OCollection OCollection_TYPE;
Reference< XNamed > OTables::createObject(const ::rtl::OUString& _rName)
sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
{
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
@ -140,7 +140,7 @@ Reference< XNamed > OTables::createObject(const ::rtl::OUString& _rName)
aCatalog <<= sCatalog;
Reference< XResultSet > xResult = m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes);
Reference< XNamed > xRet = NULL;
sdbcx::ObjectType xRet = NULL;
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
@ -199,13 +199,6 @@ Reference< XPropertySet > OTables::createEmptyObject()
{
return new OMySQLTable(this,static_cast<OMySQLCatalog&>(m_rParent).getConnection());
}
// -----------------------------------------------------------------------------
Reference< XNamed > OTables::cloneObject(const Reference< XPropertySet >& _xDescriptor)
{
Reference< XNamed > xName(_xDescriptor,UNO_QUERY);
OSL_ENSURE(xName.is(),"Must be a XName interface here !");
return xName.is() ? createObject(xName->getName()) : Reference< XNamed >();
}
// -------------------------------------------------------------------------
// XAppend
void OTables::appendObject( const Reference< XPropertySet >& descriptor )
@ -288,4 +281,10 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
}
// -----------------------------------------------------------------------------
::rtl::OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
{
OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!");
return ::dbtools::composeTableName(m_xMetaData,_xObject,sal_False,::dbtools::eInDataManipulation);
}
// -----------------------------------------------------------------------------