Tag: cws_dev300_odbmacros3 User: fs Date: 2008-05-07 08:23:37+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx
Log: #i49133# XController2 support File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.10&r2=1.10.2.1 Delta lines: +9 -7 ------------------- --- genericcontroller.hxx 2008-04-10 12:14:19+0000 1.10 +++ genericcontroller.hxx 2008-05-07 08:23:35+0000 1.10.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: genericcontroller.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.2.1 $ * * This file is part of OpenOffice.org. * @@ -39,7 +39,7 @@ /** === begin UNO includes === **/ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/CommandGroup.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> @@ -190,7 +190,7 @@ , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::frame::XDispatchInformationProvider - , ::com::sun::star::frame::XController + , ::com::sun::star::frame::XController2 , ::com::sun::star::frame::XTitle , ::com::sun::star::frame::XTitleChangeBroadcaster > OGenericUnoController_Base; @@ -396,8 +396,6 @@ ODataView* getView() const { return m_pView; } // shows a error box if the SQLExceptionInfo is valid void showError(const ::dbtools::SQLExceptionInfo& _rInfo); - // temp - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getComponentWindow() const; // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state @@ -444,7 +442,11 @@ virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); - // ::com::sun::star::frame::XController + // ::com::sun::star::frame::XController2 + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException); + + // ::com::sun::star::frame::XController2 virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ) = 0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
