diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-07 13:51:59 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-07 13:51:59 +0100 |
| commit | 49706d873f9ce608aaa12d9c6e9c3602c98daf29 (patch) | |
| tree | eaab2aba5ae09e4a8dc3c6fcf2ac0811b639494f /dbaccess/source | |
| parent | 806452bde48d5fe2d73bf0c0ec3732e8c1eb6e29 (diff) | |
masterfix: #i10000# fixed conflict resolutionsooo/DEV300_m67
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasecontext.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index f9284d692..48d455f85 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -209,10 +209,9 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - void registerPrivate(const ::rtl::OUString& _sName - ,const ::rtl::Reference<ODatabaseModelImpl>& _pModelImpl); - void deregisterPrivate(const ::rtl::OUString& _sName); - void nameChangePrivate(const ::rtl::OUString& _sRegisteredName,const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName); + void registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl); + void revokeDatabaseDocument( const ODatabaseModelImpl& _rModelImpl); + void databaseDocumentURLChange(const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName); void storeTransientProperties( ODatabaseModelImpl& _rModelImpl); void appendAtTerminateListener(const ODatabaseModelImpl& _rDataSourceModel); void removeFromTerminateListener(const ODatabaseModelImpl& _rDataSourceModel); |