diff options
author | Andreas Schlüns <as@openoffice.org> | 2001-11-02 06:56:17 +0000 |
---|---|---|
committer | Andreas Schlüns <as@openoffice.org> | 2001-11-02 06:56:17 +0000 |
commit | f5411e5bc04edc92fb768a5429c80b7c4991a2f3 (patch) | |
tree | 0c1dfa3ea2d634e3190a86dbca3908a648d929f2 /framework | |
parent | b26f07ac1643c2c757fbf96ce96923608f6cebc4 (diff) |
#93753# new namespace drafts for DispatchInfo
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/services/frame.hxx | 12 | ||||
-rw-r--r-- | framework/source/classes/menumanager.cxx | 11 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 18 |
3 files changed, 20 insertions, 21 deletions
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index b5ee2ba09bf3..85f4be79ce33 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: as $ $Date: 2001-10-26 09:45:29 $ + * last change: $Author: as $ $Date: 2001-11-02 07:54:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,8 +130,8 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ -#include <com/sun/star/frame/XDispatchInformationProvider.hpp> +#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ +#include <drafts/com/sun/star/frame/XDispatchInformationProvider.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTION_HPP_ @@ -297,7 +297,7 @@ class Frame : // interfaces public css::lang::XServiceInfo , public css::frame::XFramesSupplier , // => XFrame => XComponent public css::frame::XDispatchProvider , - public css::frame::XDispatchInformationProvider , + public dcss::frame::XDispatchInformationProvider , public css::frame::XDispatchProviderInterception , public css::task::XStatusIndicatorFactory , public css::awt::XWindowListener , // => XEventListener @@ -427,7 +427,7 @@ class Frame : // interfaces virtual ::rtl::OUString SAL_CALL queryDescription ( const ::rtl::OUString& sURL ) throw( css::uno::RuntimeException ); virtual void SAL_CALL queryDescriptions ( const css::uno::Sequence< ::rtl::OUString >& lURLs , css::uno::Sequence< ::rtl::OUString >& lDescriptions ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< dcss::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XActionLockable diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 799ed5d2c537..47f2a4293c64 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menumanager.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2001-10-10 13:08:39 $ + * last change: $Author: as $ $Date: 2001-11-02 07:55:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,11 +112,9 @@ #ifndef _COM_SUN_STAR_CONTAINER_XENUMERATION_HPP_ #include <com/sun/star/container/XEnumeration.hpp> #endif -#if SUPD > 631 -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ -#include <com/sun/star/frame/XDispatchInformationProvider.hpp> +#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XDISPATCHINFORMATIONPROVIDER_HPP_ +#include <drafts/com/sun/star/frame/XDispatchInformationProvider.hpp> #endif -#endif // SUPD //_________________________________________________________________________________________________________________ // includes of other projects @@ -166,6 +164,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; +using namespace ::drafts::com::sun::star::frame; using namespace ::com::sun::star::container; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 3796a583e7c4..a9a5ddc14d09 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: as $ $Date: 2001-10-26 09:46:09 $ + * last change: $Author: as $ $Date: 2001-11-02 07:54:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,7 +273,7 @@ DEFINE_XINTERFACE_17 ( Frame DIRECT_INTERFACE(css::lang::XComponent ), DIRECT_INTERFACE(css::task::XStatusIndicatorFactory ), DIRECT_INTERFACE(css::frame::XDispatchProvider ), - DIRECT_INTERFACE(css::frame::XDispatchInformationProvider ), + DIRECT_INTERFACE(dcss::frame::XDispatchInformationProvider ), DIRECT_INTERFACE(css::frame::XDispatchProviderInterception ), DIRECT_INTERFACE(css::beans::XMultiPropertySet ), DIRECT_INTERFACE(css::beans::XFastPropertySet ), @@ -296,7 +296,7 @@ DEFINE_XTYPEPROVIDER_17 ( Frame css::beans::XFastPropertySet , css::beans::XPropertySet , css::frame::XDispatchProvider , - css::frame::XDispatchInformationProvider , + dcss::frame::XDispatchInformationProvider , css::frame::XDispatchProviderInterception , css::awt::XWindowListener , css::awt::XTopWindowListener , @@ -1567,7 +1567,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); - css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); + css::uno::Reference< dcss::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); aReadLock.unlock(); /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ @@ -1588,7 +1588,7 @@ void SAL_CALL Frame::queryDescriptions( const css::uno::Sequence< ::rtl::OUStrin /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); - css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); + css::uno::Reference< dcss::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); aReadLock.unlock(); /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ @@ -1599,7 +1599,7 @@ void SAL_CALL Frame::queryDescriptions( const css::uno::Sequence< ::rtl::OUStrin } //***************************************************************************************************************** -css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation() throw( css::uno::RuntimeException ) +css::uno::Sequence< dcss::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation() throw( css::uno::RuntimeException ) { /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ // Look for rejected calls! @@ -1607,11 +1607,11 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); - css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); + css::uno::Reference< dcss::frame::XDispatchInformationProvider > xProvider( m_xController, css::uno::UNO_QUERY ); aReadLock.unlock(); /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ - css::uno::Sequence< css::frame::DispatchInformation > lInfos; + css::uno::Sequence< dcss::frame::DispatchInformation > lInfos; if( xProvider.is() == sal_True ) { lInfos = xProvider->getConfigurableDispatchInformation(); |