Tag: cws_src680_dba24 User: oj Date: 05/02/09 00:13:02 Modified: /dba/dbaccess/source/core/api/ CIndexColumns.cxx, CIndexColumns.hxx, CIndexes.cxx, CIndexes.hxx, CKeyColumns.cxx, CKeyColumns.hxx, CKeys.cxx, CKeys.hxx, CRowSetDataColumn.cxx, CRowSetDataColumn.hxx, FilteredContainer.cxx, HelperCollections.cxx, HelperCollections.hxx, RowSetBase.cxx, column.cxx, tablecontainer.cxx, viewcontainer.cxx /dba/dbaccess/source/core/inc/ FilteredContainer.hxx, column.hxx, tablecontainer.hxx, viewcontainer.hxx
Log: #i26950# remove the need for XNamed File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: CIndexColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexColumns.cxx?r1=1.6&r2=1.6.168.1 Delta lines: +5 -8 ------------------- --- CIndexColumns.cxx 1 Dec 2003 10:30:23 -0000 1.6 +++ CIndexColumns.cxx 9 Feb 2005 08:12:55 -0000 1.6.168.1 @@ -97,13 +97,13 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::rtl::OUString aSchema,aTable; m_pIndex->getTable()->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; m_pIndex->getTable()->getPropertyValue(PROPERTY_NAME) >>= aTable; - Reference< XNamed > xRet = NULL; + connectivity::sdbcx::ObjectType xRet = NULL; Reference<XDatabaseMetaData> xMeta = m_pIndex->getTable()->getConnection()->getMetaData(); if ( xMeta.is() ) { @@ -170,13 +170,10 @@ m_pIndex->refreshColumns(); } // ----------------------------------------------------------------------------- -Reference< XNamed > OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +connectivity::sdbcx::ObjectType OIndexColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { - OIndexColumn* pColumn = new OIndexColumn(sal_True); - Reference<XPropertySet> xProp = pColumn; + Reference<XPropertySet> xProp = new OIndexColumn(sal_True); ::comphelper::copyProperties(_xDescriptor,xProp); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName; + return xProp; } // ----------------------------------------------------------------------------- File [changed]: CIndexColumns.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexColumns.hxx?r1=1.2&r2=1.2.368.1 Delta lines: +5 -5 ------------------- --- CIndexColumns.hxx 12 Oct 2001 11:58:44 -0000 1.2 +++ CIndexColumns.hxx 9 Feb 2005 08:12:56 -0000 1.2.368.1 @@ -75,10 +75,10 @@ { ODBIndex* m_pIndex; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + virtual connectivity::sdbcx::ObjectType cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); public: OIndexColumns( ODBIndex* _pIndex, ::osl::Mutex& _rMutex, File [changed]: CIndexes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexes.cxx?r1=1.12&r2=1.12.80.1 Delta lines: +2 -2 ------------------- --- CIndexes.cxx 2 Aug 2004 14:58:26 -0000 1.12 +++ CIndexes.cxx 9 Feb 2005 08:12:56 -0000 1.12.80.1 @@ -95,9 +95,9 @@ using namespace cppu; -Reference< XNamed > OIndexes::createObject(const ::rtl::OUString& _rName) +ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) { - Reference< XNamed > xRet = NULL; + ObjectType xRet; if ( m_xIndexes.is() && m_xIndexes->hasByName(_rName) ) xRet.set(m_xIndexes->getByName(_rName),UNO_QUERY); else File [changed]: CIndexes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CIndexes.hxx?r1=1.6&r2=1.6.346.1 Delta lines: +4 -4 ------------------- --- CIndexes.hxx 25 Oct 2002 08:55:17 -0000 1.6 +++ CIndexes.hxx 9 Feb 2005 08:12:56 -0000 1.6.346.1 @@ -72,7 +72,7 @@ { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xIndexes; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); File [changed]: CKeyColumns.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CKeyColumns.cxx?r1=1.15&r2=1.15.80.1 Delta lines: +2 -2 ------------------- --- CKeyColumns.cxx 2 Aug 2004 14:58:37 -0000 1.15 +++ CKeyColumns.cxx 9 Feb 2005 08:12:56 -0000 1.15.80.1 @@ -100,9 +100,9 @@ // ------------------------------------------------------------------------- -Reference< XNamed > OKeyColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) { - Reference< XNamed > xRet = NULL; + connectivity::sdbcx::ObjectType xRet = NULL; if ( m_xColumns.is() && m_xColumns->hasByName(_rName) ) xRet.set(m_xColumns->getByName(_rName),UNO_QUERY); else File [changed]: CKeyColumns.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CKeyColumns.hxx?r1=1.5&r2=1.5.346.1 Delta lines: +4 -4 ------------------- --- CKeyColumns.hxx 29 Oct 2002 13:00:39 -0000 1.5 +++ CKeyColumns.hxx 9 Feb 2005 08:12:56 -0000 1.5.346.1 @@ -72,7 +72,7 @@ { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); public: OKeyColumns( connectivity::OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, File [changed]: CKeys.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CKeys.cxx?r1=1.21&r2=1.21.346.1 Delta lines: +5 -5 ------------------- --- CKeys.cxx 25 Oct 2002 08:55:18 -0000 1.21 +++ CKeys.cxx 9 Feb 2005 08:12:57 -0000 1.21.346.1 @@ -111,9 +111,9 @@ typedef connectivity::OKeysHelper OCollection_TYPE; // ------------------------------------------------------------------------- -Reference< XNamed > OKeys::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OKeys::createObject(const ::rtl::OUString& _rName) { - Reference< XNamed > xRet = NULL; + connectivity::sdbcx::ObjectType xRet = NULL; Reference<XPropertySet> xKey; if ( m_xMasterKeys.is() ) File [changed]: CKeys.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CKeys.hxx?r1=1.5&r2=1.5.346.1 Delta lines: +4 -4 ------------------- --- CKeys.hxx 25 Oct 2002 08:55:19 -0000 1.5 +++ CKeys.hxx 9 Feb 2005 08:12:57 -0000 1.5.346.1 @@ -72,7 +72,7 @@ { ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMasterKeys; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); File [changed]: CRowSetDataColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CRowSetDataColumn.cxx?r1=1.26&r2=1.26.80.1 Delta lines: +2 -2 ------------------- --- CRowSetDataColumn.cxx 2 Aug 2004 14:59:11 -0000 1.26 +++ CRowSetDataColumn.cxx 9 Feb 2005 08:12:57 -0000 1.26.80.1 @@ -289,9 +289,9 @@ DBG_DTOR(ORowSetDataColumns ,NULL); } // ----------------------------------------------------------------------------- -Reference< ::com::sun::star::container::XNamed > ORowSetDataColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName) { - Reference< ::com::sun::star::container::XNamed > xNamed; + connectivity::sdbcx::ObjectType xNamed; ::comphelper::UStringMixEqual aCase(isCaseSensitive()); ::connectivity::OSQLColumns::const_iterator first = ::connectivity::find(m_aColumns->begin(),m_aColumns->end(),_rName,aCase); File [changed]: CRowSetDataColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CRowSetDataColumn.hxx?r1=1.11&r2=1.11.80.1 Delta lines: +1 -1 ------------------- --- CRowSetDataColumn.hxx 2 Aug 2004 14:59:22 -0000 1.11 +++ CRowSetDataColumn.hxx 9 Feb 2005 08:12:57 -0000 1.11.80.1 @@ -130,7 +130,7 @@ { ::vos::ORef< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: ORowSetDataColumns( File [changed]: FilteredContainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/FilteredContainer.cxx?r1=1.4&r2=1.4.80.1 Delta lines: +5 -7 ------------------- --- FilteredContainer.cxx 2 Aug 2004 14:59:57 -0000 1.4 +++ FilteredContainer.cxx 9 Feb 2005 08:12:57 -0000 1.4.80.1 @@ -360,14 +360,12 @@ return bFilterMatch; } - // ------------------------------------------------------------------------- - Reference< XNamed > OFilteredContainer::cloneObject(const Reference< XPropertySet >& _xDescriptor) + // ----------------------------------------------------------------------------- + ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { - Reference< XNamed > xName(_xDescriptor,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); - return xName.is() ? createObject(xName->getName()) : Reference< XNamed >(); + OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); + return ::dbtools::composeTableName(m_xMetaData,_xObject,sal_False,::dbtools::eInDataManipulation); } - // ----------------------------------------------------------------------------- // .............................................................................. } // namespace // .............................................................................. File [changed]: HelperCollections.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/HelperCollections.cxx?r1=1.2&r2=1.2.162.1 Delta lines: +7 -7 ------------------- --- HelperCollections.cxx 16 Dec 2003 12:39:23 -0000 1.2 +++ HelperCollections.cxx 9 Feb 2005 08:12:58 -0000 1.2.162.1 @@ -98,7 +98,7 @@ OPrivateColumns_Base::disposing(); } // ------------------------------------------------------------------------- - Reference< XNamed > OPrivateColumns::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const ::rtl::OUString& _rName) { if ( m_aColumns.isValid() ) { @@ -107,21 +107,21 @@ aIter = findRealName(m_aColumns->begin(),m_aColumns->end(),_rName,isCaseSensitive()); if(aIter != m_aColumns->end()) - return Reference< XNamed >(*aIter,UNO_QUERY); + return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY); OSL_ENSURE(0,"Column not found in collection!"); } return NULL; } // ------------------------------------------------------------------------- - Reference< XNamed > OPrivateTables::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateTables::createObject(const ::rtl::OUString& _rName) { if ( !m_aTables.empty() ) { OSQLTables::iterator aIter = m_aTables.find(_rName); OSL_ENSURE(aIter != m_aTables.end(),"Table not found!"); OSL_ENSURE(aIter->second.is(),"Table is null!"); - return Reference< XNamed >(m_aTables.find(_rName)->second,UNO_QUERY); + return connectivity::sdbcx::ObjectType(m_aTables.find(_rName)->second,UNO_QUERY); } return NULL; } File [changed]: HelperCollections.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/HelperCollections.hxx?r1=1.2&r2=1.2.162.1 Delta lines: +5 -5 ------------------- --- HelperCollections.hxx 16 Dec 2003 12:39:43 -0000 1.2 +++ HelperCollections.hxx 9 Feb 2005 08:12:58 -0000 1.2.162.1 @@ -98,7 +98,7 @@ { ::vos::ORef< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual Reference< XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createEmptyObject() { @@ -123,7 +123,7 @@ { OSQLTables m_aTables; protected: - virtual Reference< XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createEmptyObject() { File [changed]: RowSetBase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.73&r2=1.73.26.1 Delta lines: +3 -3 ------------------- --- RowSetBase.cxx 17 Nov 2004 14:42:24 -0000 1.73 +++ RowSetBase.cxx 9 Feb 2005 08:12:58 -0000 1.73.26.1 @@ -138,7 +138,7 @@ { protected: virtual void impl_refresh() throw(RuntimeException); - virtual Reference< XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); public: OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< ::rtl::OUString>()){} }; @@ -147,9 +147,9 @@ { } // ----------------------------------------------------------------------------- -Reference< XNamed > OEmptyCollection::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& _rName) { - return Reference< XNamed >(); + return connectivity::sdbcx::ObjectType(); } // ----------------------------------------------------------------------------- File [changed]: column.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/column.cxx?r1=1.46&r2=1.46.50.1 Delta lines: +4 -6 ------------------- --- column.cxx 22 Oct 2004 08:56:12 -0000 1.46 +++ column.cxx 9 Feb 2005 08:12:58 -0000 1.46.50.1 @@ -656,11 +656,11 @@ } // ------------------------------------------------------------------------- -Reference< XNamed > OColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) { OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!"); - Reference< XNamed > xRet; + connectivity::sdbcx::ObjectType xRet; if ( m_pColFactoryImpl ) { xRet = m_pColFactoryImpl->createColumn(_rName); @@ -803,17 +803,15 @@ ::dbaccess::notifyDataSourceModified(m_xParent,sal_True); } // ------------------------------------------------------------------------- -Reference< XNamed > OColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) +connectivity::sdbcx::ObjectType OColumns::cloneObject(const Reference< XPropertySet >& _xDescriptor) { Reference<XPropertySet> xProp = createEmptyObject(); - Reference< XNamed > xName(xProp,UNO_QUERY); - OSL_ENSURE(xName.is(),"Must be a XName interface here !"); if ( xProp.is() ) ::comphelper::copyProperties(_xDescriptor,xProp); if ( m_pColFactoryImpl ) m_pColFactoryImpl->columnCloned(xProp); - return xName; + return xProp; } // ----------------------------------------------------------------------------- File [changed]: tablecontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/tablecontainer.cxx?r1=1.58&r2=1.58.50.1 Delta lines: +5 -6 ------------------- --- tablecontainer.cxx 22 Oct 2004 08:57:55 -0000 1.58 +++ tablecontainer.cxx 9 Feb 2005 08:12:58 -0000 1.58.50.1 @@ -300,13 +300,13 @@ // ------------------------------------------------------------------------- } // ------------------------------------------------------------------------- -Reference< XNamed > OTableContainer::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUString& _rName) { Reference<XColumnsSupplier > xSup; if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName)) xSup.set(m_xMasterContainer->getByName(_rName),UNO_QUERY); - Reference< XNamed > xRet; + connectivity::sdbcx::ObjectType xRet; if ( m_xMetaData.is() ) { Reference<XPropertySet> xTableDefinition; @@ -441,10 +441,9 @@ m_bInAppend = sal_False; Reference<XPropertySet> xTableDefinition; Reference<XNameAccess> xColumnDefinitions; - Reference< XNamed > xName(descriptor,UNO_QUERY); - if ( xName.is() ) + if ( descriptor.is() ) { - lcl_createDefintionObject(xName->getName(),m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False); + lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False); Reference<XColumnsSupplier> xSup(descriptor,UNO_QUERY); Reference<XDataDescriptorFactory> xFac(xColumnDefinitions,UNO_QUERY); Reference<XAppend> xAppend(xColumnDefinitions,UNO_QUERY); @@ -562,7 +561,7 @@ { if(!m_xMasterContainer.is() || m_xMasterContainer->hasByName(sName)) { - Reference<XNamed> xName = createObject(sName); + ObjectType xName = createObject(sName); insertElement(sName,xName); // and notify our listeners ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(sName), makeAny(xName), Any()); File [changed]: viewcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/viewcontainer.cxx?r1=1.19&r2=1.19.50.1 Delta lines: +2 -2 ------------------- --- viewcontainer.cxx 22 Oct 2004 08:58:09 -0000 1.19 +++ viewcontainer.cxx 9 Feb 2005 08:12:59 -0000 1.19.50.1 @@ -166,9 +166,9 @@ //------------------------------------------------------------------------------ IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDBCX_TABLES) // ----------------------------------------------------------------------------- -Reference< XNamed > OViewContainer::createObject(const ::rtl::OUString& _rName) +ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) { - Reference< XNamed > xProp; + ObjectType xProp; if ( m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName) ) xProp.set(m_xMasterContainer->getByName(_rName),UNO_QUERY); Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: FilteredContainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/FilteredContainer.hxx?r1=1.4&r2=1.4.50.1 Delta lines: +2 -1 ------------------- --- FilteredContainer.hxx 22 Oct 2004 09:00:01 -0000 1.4 +++ FilteredContainer.hxx 9 Feb 2005 08:12:59 -0000 1.4.50.1 @@ -102,7 +102,8 @@ // ::connectivity::sdbcx::OCollection virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + + virtual ::rtl::OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); /** tell the container to free all elements and all additional resources.<BR> After using this method the object may be reconstructed by calling one of the <code>constrcuct</code> methods. File [changed]: column.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/column.hxx?r1=1.23&r2=1.23.50.1 Delta lines: +3 -3 ------------------- --- column.hxx 22 Oct 2004 09:00:16 -0000 1.23 +++ column.hxx 9 Feb 2005 08:12:59 -0000 1.23.50.1 @@ -315,14 +315,14 @@ sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + virtual connectivity::sdbcx::ObjectType cloneObject(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); public: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createBaseObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType createBaseObject(const ::rtl::OUString& _rName) { return OColumns_BASE::createObject(_rName); } File [changed]: tablecontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/tablecontainer.hxx?r1=1.23&r2=1.23.50.1 Delta lines: +1 -1 ------------------- --- tablecontainer.hxx 22 Oct 2004 09:00:56 -0000 1.23 +++ tablecontainer.hxx 9 Feb 2005 08:13:00 -0000 1.23.50.1 @@ -139,7 +139,7 @@ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getTableTypeFilter(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter) const; // ::connectivity::sdbcx::OCollection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); File [changed]: viewcontainer.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/viewcontainer.hxx?r1=1.11&r2=1.11.80.1 Delta lines: +1 -1 ------------------- --- viewcontainer.hxx 2 Aug 2004 15:15:37 -0000 1.11 +++ viewcontainer.hxx 9 Feb 2005 08:13:00 -0000 1.11.80.1 @@ -122,7 +122,7 @@ protected: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getTableTypeFilter(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter) const; // ::connectivity::sdbcx::OCollection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); virtual void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
