diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:54:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:54:25 +0000 |
| commit | 99d014fd9f9cfec71187d3ad0296085c14bf5f10 (patch) | |
| tree | e5b58192ea0e8adc42816be6a99c76547210ffa2 /dbaccess/inc/genericcontroller.hxx | |
| parent | 30489d37af25d8aea35a028165a58e56d75daa10 (diff) | |
INTEGRATION: CWS dba30c (1.10.8); FILE MERGED
2008/05/13 08:15:39 fs 1.10.8.1: joining changes from CWS odbmacros3 to CWS dba30c:
2008/05/07 08:23:35 fs 1.10.2.1: #i49133# XController2 support
Diffstat (limited to 'dbaccess/inc/genericcontroller.hxx')
| -rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index e3f037aa1e6c..977822506b64 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: genericcontroller.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * 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 @@ namespace dbaui , ::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 @@ namespace dbaui 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 @@ namespace dbaui 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; |