diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-09 17:26:40 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-09 17:26:40 +0100 |
| commit | d8352bc6e00ae778fb060a0124ee98db3c76d6cf (patch) | |
| tree | cf18b5a4b49d13b67d2b1c6ffbb7d137f55c01e4 /reportdesign | |
| parent | 05e2a9183ccb47ed1a20df5e72c26353aed985eb (diff) | |
autorecovery: make m_pView a private member of the GenericController, with defined access methods
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inc/ReportController.hxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 6f2e64c24edb..3117fe284a7c 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -108,8 +108,7 @@ namespace rptui OXReportControllerObserver* m_pReportControllerObserver; - const ODesignView* getDesignView() const { return static_cast< const ODesignView* >( m_pView ); } - ODesignView* getDesignView() { return static_cast< ODesignView* >( m_pView ); } + ODesignView* getDesignView() const { return static_cast< ODesignView* >( getView() ); } ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xReportDefinition; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportEngine> m_xReportEngine; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 7aac70c21887..36435f73eb90 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -402,7 +402,7 @@ void OReportController::disposing() } if ( getDesignView() ) EndListening( *getDesignView() ); - m_pView = NULL; + clearView(); } // ----------------------------------------------------------------------------- FeatureState OReportController::GetState(sal_uInt16 _nId) const @@ -1825,7 +1825,7 @@ sal_Bool OReportController::Construct(Window* pParent) { ODesignView* pMyOwnView = new ODesignView( pParent, getORB(), *this ); StartListening( *pMyOwnView ); - m_pView = pMyOwnView; + setView( *pMyOwnView ); // now that we have a view we can create the clipboard listener m_aSystemClipboard = TransferableDataHelper::CreateFromSystemClipboard( getView() ); |