User: vg Date: 05/03/10 07:21:52 Modified: /dba/connectivity/source/drivers/adabas/ BViews.cxx
Log: INTEGRATION: CWS dba24 (1.14.32); FILE MERGED 2005/02/09 08:07:38 oj 1.14.32.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BViews.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BViews.cxx?r1=1.14&r2=1.15 Delta lines: +4 -11 -------------------- --- BViews.cxx 22 Oct 2004 08:42:17 -0000 1.14 +++ BViews.cxx 10 Mar 2005 15:21:49 -0000 1.15 @@ -111,6 +111,7 @@ using namespace ::comphelper; using namespace ::cppu; +using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -121,7 +122,7 @@ using namespace dbtools; typedef connectivity::sdbcx::OCollection OCollection_TYPE; -Reference< XNamed > OViews::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aName,aSchema; sal_Int32 nLen = _rName.indexOf('.'); @@ -142,7 +143,7 @@ Reference< XStatement > xStmt = xConnection->createStatement( ); Reference< XResultSet > xResult = xStmt->executeQuery(sStmt); - Reference< XNamed > xRet = NULL; + sdbcx::ObjectType xRet = NULL; if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -177,8 +178,7 @@ Reference< XPropertySet > OViews::createEmptyObject() { Reference<XConnection> xConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection(); - connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData()); - return pNew; + return new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData()); } // ------------------------------------------------------------------------- // XAppend @@ -274,13 +274,6 @@ OInterfaceIteratorHelper aListenerLoop(m_aContainerListeners); while (aListenerLoop.hasMoreElements()) static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent); -} -// ----------------------------------------------------------------------------- -Reference< XNamed > OViews::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 >(); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
