User: kz Date: 2008-06-25 12:28:16+0000 Modified: dba/dbaccess/inc/dataview.hxx
Log: INTEGRATION: CWS dba30d (1.3.30); FILE MERGED 2008/05/29 11:36:34 fs 1.3.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: dataview.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/dataview.hxx?r1=1.3&r2=1.4 Delta lines: +3 -3 ------------------- --- dataview.hxx 2008-04-10 12:12:41+0000 1.3 +++ dataview.hxx 2008-06-25 12:28:13+0000 1.4 @@ -52,13 +52,13 @@ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with protected: - IController* m_pController; // the controller in where we resides in + IController& m_rController; // the controller in where we resides in FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: ODataView( Window* pParent, - IController* _pController, + IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , WinBits nStyle = 0 ); virtual ~ODataView(); @@ -72,7 +72,7 @@ virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - inline IController* getCommandController() const { return m_pController; } + inline IController& getCommandController() const { return m_rController; } /** will be called when the controls need to be resized. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
