Tag: cws_dev300_dba31c User: oj Date: 2008-10-23 07:18:50+0000 Modified: dba/reportdesign/source/ui/inc/statusbarcontroller.hxx dba/reportdesign/source/ui/misc/statusbarcontroller.cxx
Log: #i77916# check the statusbar vcl File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: statusbarcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/statusbarcontroller.hxx?r1=1.2&r2=1.2.2.1 Delta lines: +9 -5 ------------------- --- statusbarcontroller.hxx 2008-08-19 10:13:44+0000 1.2 +++ statusbarcontroller.hxx 2008-10-23 07:18:45+0000 1.2.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarcontroller.hxx,v $ - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * * This file is part of OpenOffice.org. * @@ -51,16 +51,20 @@ public: OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + + private: + void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException); // XInterface DECLARE_XINTERFACE( ) // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: statusbarcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/statusbarcontroller.cxx?r1=1.2.2.1&r2=1.2.2.2 Delta lines: +36 -24 --------------------- --- statusbarcontroller.cxx 2008-10-17 12:39:53+0000 1.2.2.1 +++ statusbarcontroller.cxx 2008-10-23 07:18:46+0000 1.2.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarcontroller.cxx,v $ - * $Revision: 1.2.2.1 $ + * $Revision: 1.2.2.2 $ * * This file is part of OpenOffice.org. * @@ -137,6 +137,8 @@ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); + if ( m_pController.is() ) + { if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) { Sequence< PropertyValue > aSeq; @@ -157,22 +159,23 @@ static_cast<SvxZoomStatusBarControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoom); } } + } } // XStatusbarController ::sal_Bool SAL_CALL OStatusbarController::mouseButtonDown(const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException) { - return m_pController.getRef()->mouseButtonDown(_aEvent); + return m_pController.is() && m_pController.getRef()->mouseButtonDown(_aEvent); } ::sal_Bool SAL_CALL OStatusbarController::mouseMove( const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException) { - return m_pController.getRef()->mouseMove(_aEvent); + return m_pController.is() && m_pController.getRef()->mouseMove(_aEvent); } ::sal_Bool SAL_CALL OStatusbarController::mouseButtonUp( const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException) { - return m_pController.getRef()->mouseButtonUp(_aEvent); + return m_pController.is() && m_pController.getRef()->mouseButtonUp(_aEvent); } void SAL_CALL OStatusbarController::command( @@ -182,6 +185,7 @@ const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException) { + if ( m_pController.is() ) m_pController.getRef()->command( aPos, nCommand, bMouseEvent, aData ); } @@ -192,16 +196,19 @@ ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException) { - return m_pController.getRef()->paint( xGraphics, rOutputRectangle, nItemId, nStyle ); + if ( m_pController.is() ) + m_pController.getRef()->paint( xGraphics, rOutputRectangle, nItemId, nStyle ); } void SAL_CALL OStatusbarController::click() throw (::com::sun::star::uno::RuntimeException) { + if ( m_pController.is() ) m_pController.getRef()->click(); } void SAL_CALL OStatusbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) { + if ( m_pController.is() ) m_pController.getRef()->doubleClick(); } // ----------------------------------------------------------------------------- @@ -213,7 +220,12 @@ xUp->update(); } // ----------------------------------------------------------------------------- - +// XComponent +void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException) +{ + m_pController.dispose(); + svt::StatusbarController::dispose(); +} // ============================================================================= } // rptui // ============================================================================= --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
