User: kz Date: 2008-06-25 12:38:40+0000 Modified: dba/dbaccess/source/ui/app/AppView.hxx
Log: INTEGRATION: CWS dba30d (1.16.30); FILE MERGED 2008/06/10 11:04:41 fs 1.16.30.3: +describeCurrentSelectionForType 2008/06/01 21:02:33 fs 1.16.30.2: #i80943# more preparations for context menu interception, including some re-factoring 2008/05/29 11:32:26 fs 1.16.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.hxx?r1=1.16&r2=1.17 Delta lines: +22 -27 --------------------- --- AppView.hxx 2008-04-10 14:01:37+0000 1.16 +++ AppView.hxx 2008-06-25 12:38:37+0000 1.17 @@ -33,9 +33,6 @@ #ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" #endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ -#include <com/sun/star/frame/XController.hpp> -#endif #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif @@ -45,6 +42,9 @@ #ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include <com/sun/star/ucb/XContent.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ +#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp> +#endif #ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> #endif @@ -59,7 +59,6 @@ #endif namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com{ namespace sun { namespace star { namespace frame { class XController; } } } } class Control; class SvLBoxEntry; @@ -67,10 +66,8 @@ namespace dbaui { - class IApplicationElementNotification; class IControlActionListener; - class IContainerFoundListener; - class IViewChangeListener; + class IApplicationController; class OApplicationView; class OApplicationDetailView; class OApplicationSwapWindow; @@ -112,16 +109,10 @@ }; private: ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController> - m_xController; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xObject; OAppBorderWindow* m_pWin; - IApplicationElementNotification* m_pElementNotification; - IControlActionListener* m_pActonListener; - IContainerFoundListener* m_pContainerListener; - IViewChangeListener* m_pViewChangeListener; + IApplicationController& m_rAppController; ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; @@ -141,12 +132,7 @@ public: OApplicationView( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,IController* _pIController - ,IApplicationElementNotification* _pController - ,IControlActionListener* _pActonListener - ,IContainerFoundListener* _pContainerListener - ,IViewChangeListener* _pViewChangeListener - ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& _xController + ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode ); virtual ~OApplicationView(); @@ -161,13 +147,8 @@ virtual long PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); - inline IApplicationElementNotification* getElementNotification() const { return m_pElementNotification; } - inline IControlActionListener* getActionListener() const { return m_pActonListener; } - inline IContainerFoundListener* getContainerListener() const { return m_pContainerListener; } - inline IViewChangeListener* getViewChangeListener() const { return m_pViewChangeListener; } + inline IApplicationController& getAppController() const { return m_rAppController; } inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} - inline ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XController> getController() const { return m_xController; } // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -243,6 +224,20 @@ */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; + /** describes the current selection for the given control + */ + void describeCurrentSelectionForControl( + const Control& _rControl, + ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + ); + + /** describes the current selection for the given ElementType + */ + void describeCurrentSelectionForType( + const ElementType _eType, + ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + ); + /** select all names on the currently selected container. Non existence names where ignored. * * \param _aNames the element names --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
