diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:38:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:38:21 +0000 |
| commit | 0bd9b9d4756267c52dc695817bfc9d90e096a0a6 (patch) | |
| tree | 7526b51aa9ee0aabf94258c6ea593c92d45b588e /dbaccess/source/ui/app | |
| parent | 2c804441a8c9a6344e132f5df4ddd26a9ba9e57d (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui/app')
| -rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 82b9802d42cd..a03e589c7679 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppView.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.25 $ * * This file is part of OpenOffice.org. * @@ -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::lang; 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 @@ DBG_NAME(OApplicationView); //------------------------------------------------------------------------------ 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 @@ OApplicationView::~OApplicationView() ::std::auto_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } - m_pElementNotification = NULL; } // ----------------------------------------------------------------------------- void OApplicationView::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ) @@ -515,6 +500,18 @@ void OApplicationView::getSelectionElementNames( ::std::vector< ::rtl::OUString> 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"); |