User: vg Date: 05/03/10 07:25:43 Modified: /dba/connectivity/source/drivers/dbase/ DIndexes.cxx
Log: INTEGRATION: CWS dba24 (1.12.52); FILE MERGED 2005/02/09 08:07:42 oj 1.12.52.1: #i26950# remove the need for XNamed File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DIndexes.cxx?r1=1.12&r2=1.13 Delta lines: +3 -9 ------------------- --- DIndexes.cxx 2 Aug 2004 17:00:25 -0000 1.12 +++ DIndexes.cxx 10 Mar 2005 15:25:40 -0000 1.13 @@ -77,6 +77,7 @@ using namespace ::comphelper; using namespace utl; +using namespace connectivity; using namespace connectivity::dbase; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -87,7 +88,7 @@ namespace starutil = ::com::sun::star::util; -Reference< XNamed > ODbaseIndexes::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName) { // Dir* pDir = m_pTable->getConnection()->getDir(); // String aPath = pDir->GetName(); @@ -99,7 +100,7 @@ if(!UCBContentHelper::Exists(sFile)) throw SQLException(::rtl::OUString::createFromAscii("Index file doesn't exists!"),*m_pTable,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); - Reference< XNamed > xRet; + sdbcx::ObjectType xRet; SvStream* pFileStream = ::connectivity::file::OFileTable::createStream_simpleError(sFile,STREAM_READ | STREAM_NOCREATE| STREAM_SHARE_DENYWRITE); if(pFileStream) { @@ -157,12 +158,5 @@ } // ------------------------------------------------------------------------- -Reference< XNamed > ODbaseIndexes::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]
