Tag: cws_dev300_dba31b User: oj Date: 2008-08-19 10:59:12+0000 Modified: dba/dbaccess/source/ui/inc/RelationTableView.hxx dba/dbaccess/source/ui/inc/TableWindow.hxx
Log: #i44447# dispose listener File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: RelationTableView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/RelationTableView.hxx?r1=1.11&r2=1.11.26.1 Delta lines: +17 -6 -------------------- --- RelationTableView.hxx 2008-06-25 12:47:45+0000 1.11 +++ RelationTableView.hxx 2008-08-19 10:59:09+0000 1.11.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationTableView.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.26.1 $ * * This file is part of OpenOffice.org. * @@ -30,18 +30,24 @@ #ifndef DBAUI_RELATION_TABLEVIEW_HXX #define DBAUI_RELATION_TABLEVIEW_HXX -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif +#include <comphelper/containermultiplexer.hxx> +#include <cppuhelper/basemutex.hxx> +#include <rtl/ref.hxx> namespace dbaui { class ORelationDesignView; - class ORelationTableView : public OJoinTableView + class ORelationTableView : public ::cppu::BaseMutex + , public OJoinTableView + , public ::comphelper::OContainerListener { OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection TTableConnectionData::value_type m_pCurrentlyTabConnData; // set when we creating a connection with more than one keycolumn - protected: + ::rtl::Reference< comphelper::OContainerListenerAdapter> + m_pContainerListener; + bool m_bInRemove; + virtual void ConnDoubleClicked( OTableConnection* pConnection ); virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE); @@ -51,6 +57,11 @@ */ virtual bool allowQueries() const; + // OContainerListener + virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + public: ORelationTableView( Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); File [changed]: TableWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/TableWindow.hxx?r1=1.19.68.1&r2=1.19.68.2 Delta lines: +2 -2 ------------------- --- TableWindow.hxx 2008-08-15 10:34:28+0000 1.19.68.1 +++ TableWindow.hxx 2008-08-19 10:59:09+0000 1.19.68.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableWindow.hxx,v $ - * $Revision: 1.19.68.1 $ + * $Revision: 1.19.68.2 $ * * This file is part of OpenOffice.org. * @@ -38,7 +38,7 @@ #include "TableWindowData.hxx" #include <vector> #include <vcl/window.hxx> -#include <unotools/eventlisteneradapter.hxx> + #include <comphelper/containermultiplexer.hxx> #include "cppuhelper/basemutex.hxx" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
