diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 13:45:33 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 13:45:33 +0000 |
| commit | 0dbe15f13df27413633255c18c5df74f73b10fc0 (patch) | |
| tree | ce0e6b657294b09b1aa4e8ce005085ac7b523204 /framework/source | |
| parent | 3b68e276b076f290e9650a2aadb31da570ff137a (diff) | |
INTEGRATION: CWS bgdlremove (1.2.72); FILE MERGED
2007/05/11 08:57:55 kso 1.2.72.1: #i76911# - ucbhelper lib no longer uses VOS.
(vos::ORef => rtl::Reference, vos::OMutex => osl::Mutex, ...)
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index c6d7e4adf28d..5f470130f1dc 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -4,9 +4,9 @@ * * $RCSfile: popupmenudispatcher.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:05:51 $ + * last change: $Author: ihi $ $Date: 2007-06-05 14:45:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -136,7 +136,7 @@ const sal_Int32 PROTOCOL_LENGTH = 19; // constructor //***************************************************************************************************************** PopupMenuDispatcher::PopupMenuDispatcher( - const Reference< XMultiServiceFactory >& xFactory ) + const uno::Reference< XMultiServiceFactory >& xFactory ) // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) @@ -217,7 +217,7 @@ throw( css::uno::Exception, css::uno::RuntimeException) m_xWeakFrame = xFrame; m_bActivateListener = sal_True; - Reference< css::frame::XFrameActionListener > xFrameActionListener( + uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( (OWeakObject *)this, css::uno::UNO_QUERY ); xFrame->addFrameActionListener( xFrameActionListener ); } @@ -328,7 +328,7 @@ throw( RuntimeException ) //***************************************************************************************************************** void SAL_CALL PopupMenuDispatcher::addStatusListener( - const Reference< XStatusListener >& xControl, + const uno::Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException ) { @@ -344,7 +344,7 @@ throw( RuntimeException ) //***************************************************************************************************************** void SAL_CALL PopupMenuDispatcher::removeStatusListener( - const Reference< XStatusListener >& xControl, + const uno::Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException ) { @@ -391,16 +391,16 @@ SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce if ( m_bActivateListener ) { - Reference< XFrame > xFrame( m_xWeakFrame.get(), UNO_QUERY ); + uno::Reference< XFrame > xFrame( m_xWeakFrame.get(), UNO_QUERY ); if ( xFrame.is() ) { - xFrame->removeFrameActionListener( Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); + xFrame->removeFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); m_bActivateListener = sal_False; } } // Forget our factory. - m_xFactory = Reference< XMultiServiceFactory >(); + m_xFactory = uno::Reference< XMultiServiceFactory >(); } } |