From 1f3b28fe29a7e59d23f9f0cee9eff8e16370df4b Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 11 Dec 2009 11:28:14 +0100 Subject: autorecovery: made JumpMark a argument of the to-be-created view. For this purpose, the loader moves this argument from the loader args to the args which are later passed to XModel2.createViewController, and the Controller implementation retrieves it from there. (In this course, XController2.getCreationArguments has been introduced, and implemented in the two known XController2 implementations in the code base.) --- dbaccess/inc/genericcontroller.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dbaccess/inc/genericcontroller.hxx') diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index b4570bc1215b..933a3314d589 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -471,8 +471,9 @@ namespace dbaui // ::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); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException); - // ::com::sun::star::frame::XController2 + // ::com::sun::star::frame::XController 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; -- cgit From d8352bc6e00ae778fb060a0124ee98db3c76d6cf Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 9 Feb 2010 17:26:40 +0100 Subject: autorecovery: make m_pView a private member of the GenericController, with defined access methods --- dbaccess/inc/genericcontroller.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dbaccess/inc/genericcontroller.hxx') diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 33c315a843a2..c35e166d374a 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -222,9 +222,10 @@ namespace dbaui ::std::auto_ptr< OGenericUnoController_Data > m_pData; + ODataView* m_pView; // our (VCL) "main window" #ifdef DBG_UTIL - bool m_bDescribingSupportedFeatures; + bool m_bDescribingSupportedFeatures; #endif protected: @@ -258,7 +259,6 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper; - ODataView* m_pView; // our (VCL) "main window" sal_Bool m_bPreview; sal_Bool m_bReadOnly; @@ -416,7 +416,9 @@ namespace dbaui public: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xServiceFactory; } - ODataView* getView() const { return m_pView; } + ODataView* getView() const { return m_pView; } + void setView( ODataView& i_rView ) { m_pView = &i_rView; } + void clearView() { m_pView = NULL; } // shows a error box if the SQLExceptionInfo is valid void showError(const ::dbtools::SQLExceptionInfo& _rInfo); -- cgit