User: vg      
Date: 05/03/10 07:31:35

Modified:
 /dba/connectivity/source/drivers/mysql/
  YTables.cxx

Log:
 INTEGRATION: CWS dba24 (1.5.32); FILE MERGED
 2005/02/09 08:07:47 oj 1.5.32.1: #i26950# remove the need for XNamed

File Changes:

Directory: /dba/connectivity/source/drivers/mysql/
==================================================

File [changed]: YTables.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YTables.cxx?r1=1.5&r2=1.6
Delta lines:  +9 -10
--------------------
--- YTables.cxx 22 Oct 2004 08:44:24 -0000      1.5
+++ YTables.cxx 10 Mar 2005 15:31:32 -0000      1.6
@@ -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 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 @@
                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 @@
 {
        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 )
@@ -286,6 +279,12 @@
        OInterfaceIteratorHelper aListenerLoop(m_aContainerListeners);
        while (aListenerLoop.hasMoreElements())
                
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);
 }
 // 
-----------------------------------------------------------------------------
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to