User: kz Date: 2008-06-25 12:38:24+0000 Modified: dba/dbaccess/source/ui/app/AppView.cxx
Log: INTEGRATION: CWS dba30d (1.24.10); FILE MERGED 2008/06/10 11:12:26 fs 1.24.10.4: #i10000# 2008/06/10 11:04:41 fs 1.24.10.3: +describeCurrentSelectionForType 2008/06/01 21:02:33 fs 1.24.10.2: #i80943# more preparations for context menu interception, including some re-factoring 2008/05/29 11:32:25 fs 1.24.10.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.24&r2=1.25 Delta lines: +17 -20 --------------------- --- AppView.cxx 2008-05-05 15:52:24+0000 1.24 +++ AppView.cxx 2008-06-25 12:38:21+0000 1.25 @@ -42,9 +42,6 @@ #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> #endif -#ifndef DBAUI_IAPPELEMENTNOTIFICATION_HXX -#include "IAppElementNotification.hxx" -#endif #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif @@ -66,9 +63,6 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ -#include <com/sun/star/frame/XController.hpp> -#endif #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #endif @@ -114,7 +108,7 @@ #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <svtools/pathoptions.hxx> #endif - +#include "IApplicationController.hxx" using namespace ::dbaui; using namespace ::com::sun::star::uno; @@ -128,6 +122,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; +using ::com::sun::star::sdb::application::NamedDatabaseObject; //================================================================== // class OAppBorderWindow @@ -274,20 +269,11 @@ //------------------------------------------------------------------------------ OApplicationView::OApplicationView( Window* pParent ,const Reference< XMultiServiceFactory >& _rxOrb - ,IController* _pIController - ,IApplicationElementNotification* _pController - ,IControlActionListener* _pActonListener - ,IContainerFoundListener* _pContainerListener - ,IViewChangeListener* _pViewChangeListener - ,const Reference< XController>& _xController + ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode ) : - ODataView( pParent ,_pIController,_rxOrb,WB_DIALOGCONTROL ) - ,m_xController(_xController) - ,m_pElementNotification( _pController ) - ,m_pActonListener(_pActonListener) - ,m_pContainerListener(_pContainerListener) - ,m_pViewChangeListener(_pViewChangeListener) + ODataView( pParent, _rAppController, _rxOrb, WB_DIALOGCONTROL ) + ,m_rAppController( _rAppController ) ,m_eChildFocus(NONE) { DBG_CTOR(OApplicationView,NULL); @@ -318,7 +304,6 @@ ::std::auto_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } - m_pElementNotification = NULL; } // ----------------------------------------------------------------------------- void OApplicationView::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ) @@ -515,6 +500,18 @@ getDetailView()->getSelectionElementNames( _rNames ); } // ----------------------------------------------------------------------------- +void OApplicationView::describeCurrentSelectionForControl( const Control& _rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects ) +{ + OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); + getDetailView()->describeCurrentSelectionForControl( _rControl, _out_rSelectedObjects ); +} +// ----------------------------------------------------------------------------- +void OApplicationView::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects ) +{ + OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); + getDetailView()->describeCurrentSelectionForType( _eType, _out_rSelectedObjects ); +} +// ----------------------------------------------------------------------------- void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
