diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:35:30 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:35:30 +0000 |
commit | 7f3fa9a8c96232018759568f79861cc4e78db41b (patch) | |
tree | b070ef4f101441351bcab0510be894a5beef4e8e | |
parent | 03a0551bedf61c4d746c4c4df5b231815cd2933a (diff) |
INTEGRATION: CWS dba24 (1.5.260); FILE MERGED
2005/02/09 08:07:50 oj 1.5.260.1: #i26950# remove the need for XNamed
-rw-r--r-- | connectivity/source/inc/adabas/BViews.hxx | 7 | ||||
-rw-r--r-- | connectivity/source/inc/ado/AColumns.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/inc/ado/AGroups.hxx | 8 |
3 files changed, 10 insertions, 13 deletions
diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx index 5eefce885973..ee37b1699f56 100644 --- a/connectivity/source/inc/adabas/BViews.hxx +++ b/connectivity/source/inc/adabas/BViews.hxx @@ -2,9 +2,9 @@ * * $RCSfile: BViews.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-10-30 11:03:59 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:35:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,10 +77,9 @@ namespace connectivity sal_Bool m_bInDrop; // OCatalog* m_pParent; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); 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 void appendObject( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 728e8793eea0..cc796925a507 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AColumns.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-11-09 06:59:00 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:35:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,11 +86,11 @@ namespace connectivity WpADOColumns m_aCollection; OConnection* m_pConnection; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); // return a object which is the copy of the descriptor - 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 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: diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index 1e5d1f55b028..3cb4f7f3ee3b 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AGroups.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-11-09 06:59:00 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:35:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,11 +87,9 @@ namespace connectivity OCatalog* m_pCatalog; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject(); - // return a object which is the copy of the descriptor - 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 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: |