From 2a38e27c5301bf98c16c25ebdffbcca67e5f3f37 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 25 Jun 2008 11:49:26 +0000 Subject: INTEGRATION: CWS dba30d (1.12.30); FILE MERGED 2008/06/09 13:43:18 fs 1.12.30.2: #i80943# FOLDER_INDICATOR replaced by usage of css.sdb.application.DatabaseObjectFolder constants 2008/05/29 11:25:36 fs 1.12.30.1: during #i80943#: refactoring: ContextMenuActionListener not needed anymore, superseded by IContextMenuProvider --- dbaccess/source/ui/inc/dbtreelistbox.hxx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'dbaccess/source/ui/inc') diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 599d63d664c4..b28729b29eb8 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbtreelistbox.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -49,8 +49,6 @@ namespace dbaui { - #define FOLDER_INDICATOR 1 - struct DBTreeEditedEntry { SvLBoxEntry* pEntry; @@ -65,17 +63,18 @@ namespace dbaui //======================================================================== class IControlActionListener; - class IController; + class IContextMenuProvider; class DBTreeListBox :public SvTreeListBox { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; OScrollHelper m_aScrollHelper; Timer m_aTimer; // is needed for table updates Point m_aMousePos; SvLBoxEntry* m_pSelectedEntry; SvLBoxEntry* m_pDragedEntry; IControlActionListener* m_pActionListener; - IController* m_pContextMenuActionListener; + IContextMenuProvider* + m_pContextMenuProvider; Link m_aPreExpandHandler; // handler to be called before a node is expanded Link m_aCutHandler; // called when someone press CTRL+X @@ -112,10 +111,7 @@ namespace dbaui ~DBTreeListBox(); void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } - - void setContextMenuActionListener( IController* _pConextListener) { m_pContextMenuActionListener = _pConextListener; } - IController* getContextMenuActionListener( ) const { return m_pContextMenuActionListener; } + void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } inline void setORB(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) { m_xORB = _xORB; } @@ -176,7 +172,6 @@ namespace dbaui protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); // DragSourceHelper overridables -- cgit