diff options
Diffstat (limited to 'extensions/source/plugin')
-rw-r--r-- | extensions/source/plugin/base/context.cxx | 142 | ||||
-rw-r--r-- | extensions/source/plugin/base/evtlstnr.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/manager.cxx | 36 | ||||
-rw-r--r-- | extensions/source/plugin/base/multiplx.cxx | 184 | ||||
-rw-r--r-- | extensions/source/plugin/base/nfuncs.cxx | 22 | ||||
-rw-r--r-- | extensions/source/plugin/base/plctrl.cxx | 128 | ||||
-rw-r--r-- | extensions/source/plugin/base/plmodel.cxx | 54 | ||||
-rw-r--r-- | extensions/source/plugin/base/service.cxx | 6 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 46 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/impl.hxx | 112 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/model.hxx | 32 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/multiplx.hxx | 88 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/plctrl.hxx | 124 |
13 files changed, 488 insertions, 488 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index a11f1a635227..5ca22a0f8fb8 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -58,23 +58,23 @@ using namespace com::sun::star::frame; namespace ext_plug { -class FileSink : public ::cppu::WeakAggImplHelper1< ::com::sun::star::io::XOutputStream > +class FileSink : public ::cppu::WeakAggImplHelper1< css::io::XOutputStream > { private: - Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + Reference< css::uno::XComponentContext > m_xContext; FILE* fp; - Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin; + Reference< css::plugin::XPlugin > m_xPlugin; OUString m_aTarget; OUString m_aFileName; public: - FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &, - const Reference< ::com::sun::star::plugin::XPlugin > & plugin, + FileSink( const Reference< css::uno::XComponentContext > &, + const Reference< css::plugin::XPlugin > & plugin, const OUString& target, - const Reference< ::com::sun::star::io::XActiveDataSource > & source ); + const Reference< css::io::XActiveDataSource > & source ); virtual ~FileSink(); - // ::com::sun::star::io::XOutputStream + // css::io::XOutputStream virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput() throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -83,32 +83,32 @@ public: } using namespace ext_plug; -class XPluginContext_Impl : public ::cppu::WeakAggImplHelper1< ::com::sun::star::plugin::XPluginContext > +class XPluginContext_Impl : public ::cppu::WeakAggImplHelper1< css::plugin::XPluginContext > { - Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - rtl_TextEncoding m_aEncoding; + Reference< css::uno::XComponentContext > m_xContext; + rtl_TextEncoding m_aEncoding; public: - XPluginContext_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & ); + XPluginContext_Impl( const Reference< css::uno::XComponentContext > & ); virtual ~XPluginContext_Impl(); - virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getValue(const Reference< css::plugin::XPlugin > & plugin, css::plugin::PluginVariable variable) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< css::lang::XEventListener > & listener) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< css::lang::XEventListener > & listener) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL newStream(const Reference< css::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< css::io::XActiveDataSource > & source) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL displayStatusText(const Reference< css::plugin::XPlugin > & plugin, const OUString& message) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getUserAgent(const Reference< css::plugin::XPlugin > & plugin) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; }; -Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) +Reference< css::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) { return new XPluginContext_Impl( m_xContext ); } -XPluginContext_Impl::XPluginContext_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext ) +XPluginContext_Impl::XPluginContext_Impl( const Reference< css::uno::XComponentContext > & rxContext ) : m_xContext( rxContext ), m_aEncoding( osl_getThreadTextEncoding() ) { @@ -118,14 +118,14 @@ XPluginContext_Impl::~XPluginContext_Impl() { } -OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +OUString XPluginContext_Impl::getValue( const Reference< css::plugin::XPlugin > & /*plugin*/, css::plugin::PluginVariable /*variable*/ ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::getURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( css::plugin::PluginException, RuntimeException, std::exception ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -150,52 +150,52 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu { try { - ::com::sun::star::beans::PropertyValue aValue; + css::beans::PropertyValue aValue; aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( &aValue, 1 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( url, target, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } catch(...) { - throw ::com::sun::star::plugin::PluginException(); + throw css::plugin::PluginException(); } } } -void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::getURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< css::lang::XEventListener > & listener ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { getURL( plugin, url, target ); if( listener.is() ) - listener->disposing( ::com::sun::star::lang::EventObject() ); + listener->disposing( css::lang::EventObject() ); } -OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +OUString XPluginContext_Impl::getUserAgent(const Reference< css::plugin::XPlugin > & /*plugin*/) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { return OUString("Mozilla 3.0"); } -void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::displayStatusText(const Reference< css::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { } -void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::postURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { Sequence< sal_Int8 > aBuf; @@ -223,43 +223,43 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl { try { - ::com::sun::star::beans::PropertyValue aValues[2]; + css::beans::PropertyValue aValues[2]; aValues[0].Name = "Referer"; aValues[0].Value <<= pPlugin->getRefererURL(); aValues[1].Name = "PostString"; aValues[1].Value <<= OStringToOUString( reinterpret_cast<char const *>(( file ? aBuf : buf ).getConstArray()), m_aEncoding ); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( aValues, 2 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( url, target, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } catch( ... ) { - throw ::com::sun::star::plugin::PluginException(); + throw css::plugin::PluginException(); } } } -void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::postURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< css::lang::XEventListener > & listener ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { postURL( plugin, url, target, buf, file ); if( listener.is() ) - listener->disposing( ::com::sun::star::lang::EventObject() ); + listener->disposing( css::lang::EventObject() ); } -void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString&, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::newStream( const Reference< css::plugin::XPlugin > & plugin, const OUString&, const OUString& target, const Reference< css::io::XActiveDataSource > & source ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, target, source ); pNewSink->acquire(); @@ -267,8 +267,8 @@ void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin:: -FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : +FileSink::FileSink( const Reference< css::uno::XComponentContext > & rxContext, const Reference< css::plugin::XPlugin > & plugin, + const OUString& target, const Reference< css::io::XActiveDataSource > & source ) : m_xContext( rxContext ), m_xPlugin( plugin ), m_aTarget( target ) @@ -277,9 +277,9 @@ FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > OString aFile = OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); fp = fopen( aFile.getStr() , "wb" ); - Reference< ::com::sun::star::io::XActiveDataControl > xControl( source, UNO_QUERY ); + Reference< css::io::XActiveDataControl > xControl( source, UNO_QUERY ); - source->setOutputStream( Reference< ::com::sun::star::io::XOutputStream > ( this ) ); + source->setOutputStream( Reference< css::io::XOutputStream > ( this ) ); if( xControl.is() ) xControl->start(); } @@ -301,21 +301,21 @@ void FileSink::closeOutput() throw (RuntimeException, std::exception) { try { - ::com::sun::star::beans::PropertyValue aValue; + css::beans::PropertyValue aValue; aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( &aValue, 1 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( m_aFileName, m_aTarget, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index 228778b86dda..ef865fdf6d04 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -62,7 +62,7 @@ PluginEventListener::~PluginEventListener() free( m_pNormalizedUrl ); } -void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& /*rEvt*/ ) throw(std::exception) +void PluginEventListener::disposing( const css::lang::EventObject& /*rEvt*/ ) throw(std::exception) { m_pPlugin->getPluginComm()-> NPP_URLNotify( &m_pPlugin->getNPPInstance(), diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 688a0b2eacff..231ab0ef4993 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -68,7 +68,7 @@ PluginManager& PluginManager::get() return *pManager; } -void PluginManager::setServiceFactory( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) +void PluginManager::setServiceFactory( const Reference< css::lang::XMultiServiceFactory >& xFactory ) { PluginManager& rManager = get(); if( ! rManager.m_xSMgr.is() ) @@ -100,13 +100,13 @@ const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() } -Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( Exception ) +Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( Exception ) { Reference< XInterface > xService = *new XPluginManager_Impl( comphelper::getComponentContext(rSMgr) ); return xService; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString XPluginManager_Impl::getImplementationName() throw( ) { @@ -114,13 +114,13 @@ OUString XPluginManager_Impl::getImplementationName() throw( ) } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw( ) { return cppu::supportsService(this, ServiceName); } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames() throw( ) { return getSupportedServiceNames_Static(); @@ -134,10 +134,10 @@ Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static() thro return aSNS; } -XPluginManager_Impl::XPluginManager_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext ) +XPluginManager_Impl::XPluginManager_Impl( const Reference< css::uno::XComponentContext > & rxContext ) : m_xContext( rxContext ) { - PluginManager::setServiceFactory( Reference< ::com::sun::star::lang::XMultiServiceFactory>(rxContext->getServiceManager(), UNO_QUERY_THROW) ); + PluginManager::setServiceFactory( Reference< css::lang::XMultiServiceFactory>(rxContext->getServiceManager(), UNO_QUERY_THROW) ); } XPluginManager_Impl::~XPluginManager_Impl() @@ -157,23 +157,23 @@ XPlugin_Impl* XPluginManager_Impl::getXPluginFromNPP( NPP instance ) return NULL; } -XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< ::com::sun::star::plugin::XPlugin >& plugin ) +XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< css::plugin::XPlugin >& plugin ) { ::std::list<XPlugin_Impl*>::iterator iter; for( iter = PluginManager::get().getPlugins().begin(); iter != PluginManager::get().getPlugins().end(); ++iter ) { - if( plugin == Reference< ::com::sun::star::plugin::XPlugin >((*iter)) ) + if( plugin == Reference< css::plugin::XPlugin >((*iter)) ) return *iter; } return NULL; } -Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() +Sequence<css::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw (RuntimeException, std::exception) { - Sequence<com::sun::star::plugin::PluginDescription> aRet; + Sequence<css::plugin::PluginDescription> aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), @@ -185,10 +185,10 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug return aRet; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) - throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) +Reference< css::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< css::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const css::plugin::PluginDescription& plugintype) + throw( RuntimeException,css::plugin::PluginException, std::exception ) { - XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); + XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); pImpl->setPluginContext( acontext ); PluginManager::get().getPlugins().push_back( pImpl ); @@ -201,10 +201,10 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin return pImpl; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw (RuntimeException, std::exception) +Reference< css::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< css::awt::XToolkit > & toolkit, const Reference< css::awt::XWindowPeer > & parent, const OUString& url ) throw (RuntimeException, std::exception) { - XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); - Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; + XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); + Reference< css::plugin::XPlugin > xRef = pImpl; pImpl->setPluginContext( acontext ); @@ -219,7 +219,7 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugi pImpl->createPeer( toolkit, parent ); pImpl->provideNewStream( pImpl->getDescription().Mimetype, - Reference< com::sun::star::io::XActiveDataSource >(), + Reference< css::io::XActiveDataSource >(), url, 0, 0, comphelper::isFileUrl(url) ); diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index 54ca0015df44..e28d492532bc 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -34,17 +34,17 @@ MRCListenerMultiplexerHelper::MRCListenerMultiplexerHelper ( - const Reference< ::com::sun::star::awt::XWindow > & rControl - , const Reference< ::com::sun::star::awt::XWindow > & rPeer + const Reference< css::awt::XWindow > & rControl + , const Reference< css::awt::XWindow > & rPeer ) : xPeer( rPeer ) - , xControl( Reference< ::com::sun::star::awt::XControl >( rControl, UNO_QUERY ) ) + , xControl( Reference< css::awt::XControl >( rControl, UNO_QUERY ) ) , aListenerHolder( aMutex ) { } -void MRCListenerMultiplexerHelper::setPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer ) +void MRCListenerMultiplexerHelper::setPeer( const Reference< css::awt::XWindow > & rPeer ) { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); if( xPeer != rPeer ) @@ -76,30 +76,30 @@ void MRCListenerMultiplexerHelper::setPeer( const Reference< ::com::sun::star::a // MRCListenerMultiplexerHelper void MRCListenerMultiplexerHelper::disposeAndClear() { - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = xControl; aListenerHolder.disposeAndClear( aEvt ); } // MRCListenerMultiplexerHelper -void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ) +void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ) { // add a listener to the source (peer) - if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get()) + if( type == cppu::UnoType<css::awt::XWindowListener>::get()) rPeer->addWindowListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get()) + else if( type == cppu::UnoType<css::awt::XKeyListener>::get()) rPeer->addKeyListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get()) + else if( type == cppu::UnoType<css::awt::XFocusListener>::get()) rPeer->addFocusListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseListener>::get()) rPeer->addMouseListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseMotionListener>::get()) rPeer->addMouseMotionListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get()) + else if( type == cppu::UnoType<css::awt::XPaintListener>::get()) rPeer->addPaintListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get()) + else if( type == cppu::UnoType<css::awt::XTopWindowListener>::get()) { - Reference< ::com::sun::star::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); + Reference< css::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); if( xTop.is() ) xTop->addTopWindowListener( this ); } @@ -110,24 +110,24 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st } // MRCListenerMultiplexerHelper -void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ) +void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ) { // the last listener is removed, remove the listener from the source (peer) - if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get()) + if( type == cppu::UnoType<css::awt::XWindowListener>::get()) rPeer->removeWindowListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get()) + else if( type == cppu::UnoType<css::awt::XKeyListener>::get()) rPeer->removeKeyListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get()) + else if( type == cppu::UnoType<css::awt::XFocusListener>::get()) rPeer->removeFocusListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseListener>::get()) rPeer->removeMouseListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseMotionListener>::get()) rPeer->removeMouseMotionListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get()) + else if( type == cppu::UnoType<css::awt::XPaintListener>::get()) rPeer->removePaintListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get()) + else if( type == cppu::UnoType<css::awt::XTopWindowListener>::get()) { - Reference< ::com::sun::star::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); + Reference< css::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); if( xTop.is() ) xTop->removeTopWindowListener( this ); } @@ -162,12 +162,12 @@ void MRCListenerMultiplexerHelper::unadvise(const Type & type, const Reference< } } -// ::com::sun::star::lang::XEventListener -void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) throw(std::exception) +// css::lang::XEventListener +void MRCListenerMultiplexerHelper::disposing(const css::lang::EventObject& ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); // peer is disposed, clear the reference - xPeer = Reference< ::com::sun::star::awt::XWindow > (); + xPeer = Reference< css::awt::XWindow > (); } #define MULTIPLEX( InterfaceName, MethodName, EventName ) \ @@ -198,136 +198,136 @@ if( pCont ) \ } \ } -// ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) +// css::awt::XFocusListener +void MRCListenerMultiplexerHelper::focusGained(const css::awt::FocusEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) + MULTIPLEX( css::awt::XFocusListener, focusGained, css::awt::FocusEvent ) } -// ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) +// css::awt::XFocusListener +void MRCListenerMultiplexerHelper::focusLost(const css::awt::FocusEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) + MULTIPLEX( css::awt::XFocusListener, focusLost, css::awt::FocusEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowResized(const css::awt::WindowEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) + MULTIPLEX( css::awt::XWindowListener, windowResized, css::awt::WindowEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowMoved(const css::awt::WindowEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) + MULTIPLEX( css::awt::XWindowListener, windowMoved, css::awt::WindowEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowShown(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XWindowListener, windowShown, css::lang::EventObject ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowHidden(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XWindowListener, windowHidden, css::lang::EventObject ) } -// ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) +// css::awt::XKeyListener +void MRCListenerMultiplexerHelper::keyPressed(const css::awt::KeyEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) + MULTIPLEX( css::awt::XKeyListener, keyPressed, css::awt::KeyEvent ) } -// ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) +// css::awt::XKeyListener +void MRCListenerMultiplexerHelper::keyReleased(const css::awt::KeyEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) + MULTIPLEX( css::awt::XKeyListener, keyReleased, css::awt::KeyEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mousePressed(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mousePressed, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseReleased(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseReleased, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseEntered(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseEntered, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseExited(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseExited, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseMotionListener +void MRCListenerMultiplexerHelper::mouseDragged(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseMotionListener, mouseDragged, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseMotionListener +void MRCListenerMultiplexerHelper::mouseMoved(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseMotionListener, mouseMoved, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XPaintListener -void MRCListenerMultiplexerHelper::windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) +// css::awt::XPaintListener +void MRCListenerMultiplexerHelper::windowPaint(const css::awt::PaintEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) + MULTIPLEX( css::awt::XPaintListener, windowPaint, css::awt::PaintEvent ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowOpened(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowOpened(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowOpened, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowClosing( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowClosing, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowClosed( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosed, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowClosed, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowMinimized( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowMinimized, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowMinimized, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowNormalized( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowNormalized, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowNormalized, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowActivated( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowActivated, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowDeactivated( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowDeactivated, css::lang::EventObject ) } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index f57540abd0ed..865fed5b88b8 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -198,7 +198,7 @@ IMPL_LINK_TYPED( AsynchronousGetURL, getURL, void*, p, void ) aUrl, aTarget ); } - catch(const ::com::sun::star::plugin::PluginException&) + catch(const css::plugin::PluginException&) { } pImpl->leavePluginCallback(); @@ -316,11 +316,11 @@ extern "C" { pImpl, OStringToOUString( type, pImpl->getTextEncoding () ), OStringToOUString( target, pImpl->getTextEncoding() ), - ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) + css::uno::Reference< css::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -336,7 +336,7 @@ extern "C" { if( ! pImpl ) return NPERR_INVALID_INSTANCE_ERROR; - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); + css::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); OString aPostURL = normalizeURL( pImpl, url ); PluginEventListener* pListener = @@ -359,10 +359,10 @@ extern "C" { OStringToOUString( target, pImpl->getTextEncoding() ), Bytes, file, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > ( pListener ) ); + css::uno::Reference< css::lang::XEventListener > ( pListener ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -378,7 +378,7 @@ extern "C" { if( ! pImpl ) return NPERR_INVALID_INSTANCE_ERROR; - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); + css::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); OString aPostURL = normalizeURL( pImpl, url ); try { @@ -391,7 +391,7 @@ extern "C" { file ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -475,7 +475,7 @@ extern "C" { displayStatusText( pImpl, OStringToOUString( message, pImpl->getTextEncoding() ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& ) + catch( const css::plugin::PluginException& ) { pImpl->leavePluginCallback(); return; @@ -500,7 +500,7 @@ extern "C" { free( pAgent ); pAgent = strdup( OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); } - catch( const ::com::sun::star::plugin::PluginException& ) + catch( const css::plugin::PluginException& ) { pImpl->leavePluginCallback(); } @@ -533,7 +533,7 @@ int32_t SAL_CALL NP_LOADDS NPN_Write( NPP instance, NPStream* stream, int32_t l return 0; pImpl->enterPluginCallback(); - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( static_cast<sal_Int8*>(buffer), len ); + css::uno::Sequence<sal_Int8> Bytes( static_cast<sal_Int8*>(buffer), len ); static_cast<PluginOutputStream*>(pStream)->getOutputStream()->writeBytes( Bytes ); pImpl->leavePluginCallback(); diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 917809d03976..4204586707a0 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -64,25 +64,25 @@ MRCListenerMultiplexerHelper* PluginControl_Impl::getMultiplexer() } -void PluginControl_Impl::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +void PluginControl_Impl::addEventListener( const Reference< css::lang::XEventListener > & l ) throw( RuntimeException, std::exception ) { _aDisposeListeners.push_back( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginControl_Impl::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginControl_Impl::removeEventListener( const Reference< css::lang::XEventListener > & l ) throw( RuntimeException, std::exception ) { _aDisposeListeners.remove( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- +//---- css::lang::XComponent ---------------------------------------------------------------------------------- void PluginControl_Impl::dispose() throw( RuntimeException, std::exception ) { // send disposing events - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; if( getMultiplexer() ) getMultiplexer()->disposeAndClear(); @@ -92,7 +92,7 @@ void PluginControl_Impl::dispose() } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) { @@ -106,14 +106,14 @@ void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWi _xPeerWindow->setPosSize( _nX, _nY, _nWidth, _nHeight, nFlags ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -::com::sun::star::awt::Rectangle PluginControl_Impl::getPosSize() +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +css::awt::Rectangle PluginControl_Impl::getPosSize() throw( RuntimeException, std::exception ) { return _xPeerWindow->getPosSize(); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { @@ -122,7 +122,7 @@ void PluginControl_Impl::setVisible( sal_Bool bVisible ) _xPeerWindow->setVisible( _bVisible && !_bInDesignMode ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) { @@ -131,7 +131,7 @@ void PluginControl_Impl::setEnable( sal_Bool bEnable ) _xPeerWindow->setEnable( _bEnable ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setFocus() throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) @@ -147,14 +147,14 @@ void PluginControl_Impl::releasePeer() _xParentWindow->removeFocusListener( this ); _xPeerWindow->dispose(); _pSysChild = NULL; - _xPeerWindow = Reference< ::com::sun::star::awt::XWindow > (); - _xPeer = Reference< ::com::sun::star::awt::XWindowPeer > (); - getMultiplexer()->setPeer( Reference< ::com::sun::star::awt::XWindow > () ); + _xPeerWindow = Reference< css::awt::XWindow > (); + _xPeer = Reference< css::awt::XWindowPeer > (); + getMultiplexer()->setPeer( Reference< css::awt::XWindow > () ); } } -//---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ -void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XToolkit > & /*xToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer > & xParentPeer ) +//---- css::awt::XControl ------------------------------------------------------------------------------------ +void PluginControl_Impl::createPeer( const Reference< css::awt::XToolkit > & /*xToolkit*/, const Reference< css::awt::XWindowPeer > & xParentPeer ) throw( RuntimeException, std::exception ) { if (_xPeer.is()) @@ -164,7 +164,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo } _xParentPeer = xParentPeer; - _xParentWindow = Reference< ::com::sun::star::awt::XWindow > ( xParentPeer, UNO_QUERY ); + _xParentWindow = Reference< css::awt::XWindow > ( xParentPeer, UNO_QUERY ); DBG_ASSERT( _xParentWindow.is(), "### no parent peer window!" ); vcl::Window* pImpl = VCLUnoHelper::GetWindow( xParentPeer ); @@ -175,8 +175,8 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo _pSysChild->GrabFocus(); // get peer - _xPeer = Reference< ::com::sun::star::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() ); - _xPeerWindow = Reference< ::com::sun::star::awt::XWindow > ( _xPeer, UNO_QUERY ); + _xPeer = Reference< css::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() ); + _xPeerWindow = Reference< css::awt::XWindow > ( _xPeer, UNO_QUERY ); // !_BOTH_ MUST BE VALID! DBG_ASSERT( (_xPeer.is() && _xPeerWindow.is()), "### no peer!" ); @@ -193,7 +193,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo getMultiplexer()->setPeer( _xPeerWindow ); } -//---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ +//---- css::awt::XControl ------------------------------------------------------------------------------------ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) { @@ -202,119 +202,119 @@ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) _xPeerWindow->setVisible( _bVisible && !_bInDesignMode ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addPaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addPaintListener( const Reference< css::awt::XPaintListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XPaintListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removePaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removePaintListener( const Reference< css::awt::XPaintListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XPaintListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addWindowListener( const Reference< css::awt::XWindowListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XWindowListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeWindowListener( const Reference< css::awt::XWindowListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XWindowListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addFocusListener( const Reference< css::awt::XFocusListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XFocusListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeFocusListener( const Reference< css::awt::XFocusListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XFocusListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addKeyListener( const Reference< css::awt::XKeyListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XKeyListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeKeyListener( const Reference< css::awt::XKeyListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XKeyListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addMouseListener( const Reference< css::awt::XMouseListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XMouseListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeMouseListener( const Reference< css::awt::XMouseListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XMouseListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XMouseMotionListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XMouseMotionListener>::get(), l ); } -//---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- +//---- css::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::draw( sal_Int32 /*x*/, sal_Int32 /*y*/ ) throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } -//---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- +//---- css::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::setZoom( float /*ZoomX*/, float /*ZoomY*/ ) throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } -//---- ::com::sun::star::lang::XEventListener ------------------------------------------------------------------------------ -void PluginControl_Impl::disposing( const ::com::sun::star::lang::EventObject & /*rSource*/ ) +//---- css::lang::XEventListener ------------------------------------------------------------------------------ +void PluginControl_Impl::disposing( const css::lang::EventObject & /*rSource*/ ) throw( RuntimeException, std::exception ) { } -//---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ -void PluginControl_Impl::focusGained( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) +//---- css::awt::XFocusListener ------------------------------------------------------------------------------ +void PluginControl_Impl::focusGained( const css::awt::FocusEvent & /*rEvt*/ ) throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) _xPeerWindow->setFocus(); } -//---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ -void PluginControl_Impl::focusLost( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) +//---- css::awt::XFocusListener ------------------------------------------------------------------------------ +void PluginControl_Impl::focusLost( const css::awt::FocusEvent & /*rEvt*/ ) throw( RuntimeException, std::exception ) { } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 5c67281c7899..ee52e1c8c9a5 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::uno; -Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ) +Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ) { Reference< XInterface > xService = *new PluginModel(); return xService; @@ -42,12 +42,12 @@ Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< :: Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException, std::exception ) { Any aRet( ::cppu::queryInterface( type, - static_cast< ::com::sun::star::lang::XComponent* >(this), - static_cast< ::com::sun::star::io::XPersistObject* >(this ), - static_cast< ::com::sun::star::awt::XControlModel* >(this), - static_cast< ::com::sun::star::beans::XPropertySet* >(this), - static_cast< ::com::sun::star::beans::XMultiPropertySet* >(this), - static_cast< ::com::sun::star::beans::XFastPropertySet* >(this) + static_cast< css::lang::XComponent* >(this), + static_cast< css::io::XPersistObject* >(this ), + static_cast< css::awt::XControlModel* >(this), + static_cast< css::beans::XPropertySet* >(this), + static_cast< css::beans::XMultiPropertySet* >(this), + static_cast< css::beans::XFastPropertySet* >(this) ) ); return aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( type ); } @@ -67,18 +67,18 @@ static const char* aMime = "TYPE"; static ::osl::Mutex aPropertyMutex; -static ::com::sun::star::beans::Property aProps[] = +static css::beans::Property aProps[] = { - ::com::sun::star::beans::Property( + css::beans::Property( OUString::createFromAscii( aMime ), 1, ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::BOUND ), - ::com::sun::star::beans::Property( + css::beans::PropertyAttribute::BOUND ), + css::beans::Property( OUString::createFromAscii( aCreationURL ), 2, ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::BOUND ) + css::beans::PropertyAttribute::BOUND ) }; PluginModel::PluginModel() : @@ -101,9 +101,9 @@ PluginModel::~PluginModel() { } -Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw(std::exception) +Reference< css::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw(std::exception) { - static Reference< ::com::sun::star::beans::XPropertySetInfo > aInfo = + static Reference< css::beans::XPropertySetInfo > aInfo = createPropertySetInfo( *this ); return aInfo; } @@ -135,7 +135,7 @@ sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue, void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception, std::exception) + throw(css::uno::Exception, std::exception) { if( rValue.getValueTypeClass() == TypeClass_STRING ) // FIXME wrong type! @@ -146,7 +146,7 @@ void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, rValue >>= m_aMimeType; } else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() @@ -157,26 +157,26 @@ void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const t rValue <<= m_aMimeType; } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginModel::addEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.push_back( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginModel::removeEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.remove( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- +//---- css::lang::XComponent ---------------------------------------------------------------------------------- void PluginModel::dispose() throw(std::exception) { // send disposing events - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); - ::std::list< Reference< ::com::sun::star::lang::XEventListener > > aLocalListeners = m_aDisposeListeners; - for( ::std::list< Reference< ::com::sun::star::lang::XEventListener > >::iterator it = aLocalListeners.begin(); + ::std::list< Reference< css::lang::XEventListener > > aLocalListeners = m_aDisposeListeners; + for( ::std::list< Reference< css::lang::XEventListener > >::iterator it = aLocalListeners.begin(); it != aLocalListeners.end(); ++it ) (*it)->disposing( aEvt ); @@ -186,18 +186,18 @@ void PluginModel::dispose() throw(std::exception) } -// ::com::sun::star::io::XPersistObject +// css::io::XPersistObject OUString PluginModel::getServiceName() throw(std::exception) { return OUString("com.sun.star.plugin.PluginModel"); } -void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) +void PluginModel::write(const Reference< css::io::XObjectOutputStream > & OutStream) throw(std::exception) { OutStream->writeUTF( m_aCreationURL ); } -void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) +void PluginModel::read(const Reference< css::io::XObjectInputStream > & InStream) throw(std::exception) { m_aCreationURL = InStream->readUTF(); } diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index e4b6bfc9dc9e..40c4824b28f6 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -66,10 +66,10 @@ extern "C" { if( pXUnoSMgr ) { - Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( - static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) + Reference< css::lang::XMultiServiceFactory > xMgr( + static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); - Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; + Reference< css::lang::XSingleServiceFactory > xFactory; if( aImplName.equals( XPluginManager_Impl::getImplementationName_Static() ) ) { xFactory = ::cppu::createSingleFactory( diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index f8e69e757fc2..d65515ba5f6d 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -112,7 +112,7 @@ Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException, } -XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) : +XPlugin_Impl::XPlugin_Impl( const uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) : PluginControl_Impl(), m_xSMgr( rSMgr ), m_pPluginComm( NULL ), @@ -131,7 +131,7 @@ XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiSe memset( &m_aNPWindow, 0, sizeof( m_aNPWindow ) ); m_xModel = new PluginModel(); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); xPS->addPropertyChangeListener( OUString(), this ); Guard< Mutex > aGuard( ::PluginManager::get().getPluginMutex() ); @@ -181,7 +181,7 @@ void XPlugin_Impl::checkListeners( const char* normalizedURL ) if( ! strcmp( normalizedURL, (*iter)->getURL() ) || ! strcmp( normalizedURL, (*iter)->getNormalizedURL() ) ) { - (*iter)->disposing( com::sun::star::lang::EventObject() ); + (*iter)->disposing( css::lang::EventObject() ); delete *iter; m_aPEventListeners.remove( *iter ); return; @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void ) } uno::Reference< XPlugin > xProtection( this ); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); xPS->removePropertyChangeListener( OUString(), this ); { Guard< Mutex > aPluginGuard( ::PluginManager::get().getPluginMutex() ); @@ -460,7 +460,7 @@ OUString XPlugin_Impl::getCreationURL() Guard< Mutex > aGuard( m_aMutex ); OUString aRet; - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { Any aValue = xPS->getPropertyValue("URL"); @@ -470,12 +470,12 @@ OUString XPlugin_Impl::getCreationURL() } -sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XControlModel > & Model ) +sal_Bool XPlugin_Impl::setModel( const uno::Reference< css::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( Model, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( Model, UNO_QUERY ); if( ! xPS.is() ) return sal_False; @@ -489,7 +489,7 @@ sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XCon return sal_False; } -void XPlugin_Impl::createPeer( const uno::Reference< com::sun::star::awt::XToolkit > & xToolkit, const uno::Reference< com::sun::star::awt::XWindowPeer > & Parent ) +void XPlugin_Impl::createPeer( const uno::Reference< css::awt::XToolkit > & xToolkit, const uno::Reference< css::awt::XWindowPeer > & Parent ) throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -585,7 +585,7 @@ void XPlugin_Impl::loadPlugin() #else m_aNPWindow.window = (void*)pEnvData->hWnd; #endif - com::sun::star::awt::Rectangle aPosSize = getPosSize(); + css::awt::Rectangle aPosSize = getPosSize(); for( int i = 0; i < m_nArgs; i++ ) { @@ -649,7 +649,7 @@ PluginStream* XPlugin_Impl::getStreamFromNPStream( NPStream* stream ) } sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, - const uno::Reference< com::sun::star::io::XActiveDataSource > & stream, + const uno::Reference< css::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) @@ -662,7 +662,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, m_nProvidingState = PROVIDING_NOW; Any aAny; aAny <<= url; - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { try @@ -724,7 +724,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, // set mimetype on model { - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { try @@ -746,7 +746,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, PluginInputStream* pStream = new PluginInputStream( this, aURL.getStr(), length, lastmodified ); - uno::Reference< com::sun::star::io::XOutputStream > xNewStream( pStream ); + uno::Reference< css::io::XOutputStream > xNewStream( pStream ); if( iter != m_aPEventListeners.end() ) pStream->getStream().notifyData = (*iter)->getNotifyData(); @@ -811,21 +811,21 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, } else { - uno::Reference< com::sun::star::io::XConnectable > xConnectable( stream, UNO_QUERY ); + uno::Reference< css::io::XConnectable > xConnectable( stream, UNO_QUERY ); pStream->setPredecessor( xConnectable ); if( xConnectable.is() ) { - xConnectable->setSuccessor( static_cast< com::sun::star::io::XConnectable* >(pStream) ); + xConnectable->setSuccessor( static_cast< css::io::XConnectable* >(pStream) ); while( xConnectable->getPredecessor().is() ) xConnectable = xConnectable->getPredecessor(); } stream->setOutputStream( xNewStream ); pStream->setSource( stream ); - uno::Reference< com::sun::star::io::XActiveDataControl > xController; + uno::Reference< css::io::XActiveDataControl > xController; if( xConnectable.is() ) - xController = uno::Reference< com::sun::star::io::XActiveDataControl >( xConnectable, UNO_QUERY ); + xController = uno::Reference< css::io::XActiveDataControl >( xConnectable, UNO_QUERY ); else - xController = uno::Reference< com::sun::star::io::XActiveDataControl >( stream, UNO_QUERY ); + xController = uno::Reference< css::io::XActiveDataControl >( stream, UNO_QUERY ); if( xController.is() ) xController->start(); @@ -839,11 +839,11 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, return bRet; } -void XPlugin_Impl::disposing( const com::sun::star::lang::EventObject& /*rSource*/ ) throw(std::exception) +void XPlugin_Impl::disposing( const css::lang::EventObject& /*rSource*/ ) throw(std::exception) { } -void XPlugin_Impl::propertyChange(const com::sun::star::beans::PropertyChangeEvent& rEvent) +void XPlugin_Impl::propertyChange(const css::beans::PropertyChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -1062,12 +1062,12 @@ void PluginInputStream::load() m_pContent = new ::ucbhelper::Content( aUrl.GetMainURL(INetURLObject::DECODE_TO_IURI), - uno::Reference< com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); m_pContent->openStream( static_cast< XOutputStream* >( this ) ); } - catch(const com::sun::star::uno::Exception &) + catch(const css::uno::Exception &) { } } @@ -1151,7 +1151,7 @@ void PluginInputStream::closeOutput() throw(std::exception) Guard< Mutex > aGuard( pPlugin->getMutex() ); flush(); - m_xSource = uno::Reference< com::sun::star::io::XActiveDataSource >(); + m_xSource = uno::Reference< css::io::XActiveDataSource >(); } sal_uInt32 PluginInputStream::read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size ) diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 8de11bdea6bd..1ca8c23c4a72 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -115,14 +115,14 @@ class XPlugin_Impl; class PluginDisposer; class PluginEventListener; -class XPlugin_Impl : public com::sun::star::plugin::XPlugin, +class XPlugin_Impl : public css::plugin::XPlugin, public PluginControl_Impl, - public com::sun::star::beans::XPropertyChangeListener + public css::beans::XPropertyChangeListener { private: ::osl::Mutex m_aMutex; - Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - Reference< com::sun::star::plugin::XPluginContext > m_rBrowserContext; + Reference< css::lang::XMultiServiceFactory > m_xSMgr; + Reference< css::plugin::XPluginContext > m_rBrowserContext; PluginComm* m_pPluginComm; NPP_t m_aInstance; @@ -133,12 +133,12 @@ private: const char** m_pArgv; const char** m_pArgn; int m_nArgs; - OString m_aLastGetUrl; + OString m_aLastGetUrl; - Reference< com::sun::star::awt::XControlModel > m_xModel; + Reference< css::awt::XControlModel > m_xModel; - ::com::sun::star::plugin::PluginDescription m_aDescription; - sal_Int16 m_aPluginMode; + css::plugin::PluginDescription m_aDescription; + sal_Int16 m_aPluginMode; int m_nProvidingState; int m_nCalledFromPlugin; @@ -167,7 +167,7 @@ private: void modelChanged(); public: - XPlugin_Impl( const Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr ); + XPlugin_Impl( const Reference< css::lang::XMultiServiceFactory > & rSMgr ); virtual ~XPlugin_Impl(); ::osl::Mutex& getMutex() { return m_aMutex; } @@ -176,7 +176,7 @@ public: void setLastGetUrl( const OString& rUrl ) { m_aLastGetUrl = rUrl; } - com::sun::star::plugin::PluginDescription fitDescription( const OUString& rURL ); + css::plugin::PluginDescription fitDescription( const OUString& rURL ); ::std::list<PluginInputStream*>& getInputStreams() { return m_aInputStreams; } ::std::list<PluginOutputStream*>& getOutputStreams() { return m_aOutputStreams; } @@ -189,8 +189,8 @@ public: m_pPluginComm->addRef(); } } - Reference< com::sun::star::lang::XMultiServiceFactory > getServiceManager() { return m_xSMgr; } - const com::sun::star::plugin::PluginDescription& getDescription() const { return m_aDescription; } + Reference< css::lang::XMultiServiceFactory > getServiceManager() { return m_xSMgr; } + const css::plugin::PluginDescription& getDescription() const { return m_aDescription; } rtl_TextEncoding getTextEncoding() { return m_aEncoding; } NPP_t& getNPPInstance() { return m_aInstance; } NPWindow& getNPWindow() { return m_aNPWindow; } @@ -205,7 +205,7 @@ public: void checkListeners( const char* normalizedURL ); void initInstance( - const com::sun::star::plugin::PluginDescription& rDescription, + const css::plugin::PluginDescription& rDescription, const Sequence< OUString >& argn, const Sequence< OUString >& argv, sal_Int16 mode ); @@ -223,12 +223,12 @@ public: const SystemEnvData* getSysChildSysData() { return _pSysChild->GetSystemData(); } - const Reference< com::sun::star::plugin::XPluginContext > & getPluginContext() const + const Reference< css::plugin::XPluginContext > & getPluginContext() const { return m_rBrowserContext; } - void setPluginContext( const Reference< com::sun::star::plugin::XPluginContext > & ); + void setPluginContext( const Reference< css::plugin::XPluginContext > & ); // XInterface - virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL queryInterface( const Type& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE @@ -236,31 +236,31 @@ public: // OWeakAggObject virtual Any SAL_CALL queryAggregation( const Type& ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // PluginContol_Impl virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createPeer( const Reference< com::sun::star::awt::XToolkit > & xToolkit, const Reference< com::sun::star::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const Reference< css::awt::XToolkit > & xToolkit, const Reference< css::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setModel( const Reference< com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference< com::sun::star::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL setModel( const Reference< css::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< css::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) SAL_OVERRIDE { return m_xModel; } virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) SAL_OVERRIDE; + // css::plugin::XPlugin + virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< css::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) SAL_OVERRIDE; - // com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent& rEvent) + // css::beans::XPropertyChangeListener + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class PluginManager { private: - Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + Reference< css::lang::XMultiServiceFactory > m_xSMgr; ::std::list<PluginComm*> m_aPluginComms; ::std::list<XPlugin_Impl*> m_aAllPlugins; ::osl::Mutex m_aPluginMutex; @@ -271,7 +271,7 @@ private: public: static PluginManager& get(); - static void setServiceFactory( const Reference< com::sun::star::lang::XMultiServiceFactory >& xFactory ); + static void setServiceFactory( const Reference< css::lang::XMultiServiceFactory >& xFactory ); static const Sequence< OUString >& getAdditionalSearchPaths(); ::std::list<PluginComm*>& getPluginComms() { return m_aPluginComms; } @@ -280,29 +280,29 @@ public: }; class XPluginManager_Impl : - public cppu::WeakAggImplHelper2< com::sun::star::plugin::XPluginManager, - com::sun::star::lang::XServiceInfo > + public cppu::WeakAggImplHelper2< css::plugin::XPluginManager, + css::lang::XServiceInfo > { - Reference< com::sun::star::uno::XComponentContext > m_xContext; + Reference< css::uno::XComponentContext > m_xContext; public: - XPluginManager_Impl( const Reference< com::sun::star::uno::XComponentContext > & ); + XPluginManager_Impl( const Reference< css::uno::XComponentContext > & ); virtual ~XPluginManager_Impl(); static XPlugin_Impl* getXPluginFromNPP( NPP ); - static XPlugin_Impl* getPluginImplementation( const Reference< com::sun::star::plugin::XPlugin >& plugin ); + static XPlugin_Impl* getPluginImplementation( const Reference< css::plugin::XPlugin >& plugin ); - virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; + virtual Reference< css::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; // has to be implemented per system - static Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); + static Sequence< css::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); // calls system specific impl_getPluginDescriptions // checks whether plugins are disabled - virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions() + virtual Sequence< css::plugin::PluginDescription > SAL_CALL getPluginDescriptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) SAL_OVERRIDE; + virtual Reference< css::plugin::XPlugin > SAL_CALL createPlugin( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const css::plugin::PluginDescription& plugintype) throw( RuntimeException,css::plugin::PluginException, std::exception ) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< css::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< css::awt::XToolkit > & toolkit, const Reference< css::awt::XWindowPeer > & parent, const OUString& url ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw() SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw() SAL_OVERRIDE; @@ -315,7 +315,7 @@ public: return OUString( "com.sun.star.extensions.PluginManager" ); } }; -Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); +Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ); enum PluginStreamType { InputStream, OutputStream }; @@ -338,23 +338,23 @@ public: class PluginInputStream : public PluginStream, public cppu::WeakAggImplHelper2< - ::com::sun::star::io::XOutputStream, - ::com::sun::star::io::XConnectable + css::io::XOutputStream, + css::io::XConnectable > { private: ::ucbhelper::Content* m_pContent; sal_Int32 m_nMode; - sal_uInt32 m_nWritePos; + sal_uInt32 m_nWritePos; - Reference< com::sun::star::io::XActiveDataSource > m_xSource; + Reference< css::io::XActiveDataSource > m_xSource; // hold a reference on input until closeOutput is called - Reference< com::sun::star::io::XConnectable > m_xPredecessor; - Reference< com::sun::star::io::XConnectable > m_xSuccessor; + Reference< css::io::XConnectable > m_xPredecessor; + Reference< css::io::XConnectable > m_xSuccessor; // needed to hold a reference to self in NP_SEEK mode - Reference< com::sun::star::io::XOutputStream > m_xSelf; + Reference< css::io::XOutputStream > m_xSelf; SvFileStream m_aFileStream; public: @@ -369,7 +369,7 @@ public: void setMode( sal_Int32 nMode ); sal_uInt32 read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size ); - void setSource( const Reference< com::sun::star::io::XActiveDataSource >& xSource ) { m_xSource = xSource; } + void setSource( const Reference< css::io::XActiveDataSource >& xSource ) { m_xSource = xSource; } // get contents ot url via ucbhelper::Content void load(); @@ -383,21 +383,21 @@ public: virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< com::sun::star::io::XConnectable >& xPredecessor ) throw(std::exception) SAL_OVERRIDE + virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPredecessor ) throw(std::exception) SAL_OVERRIDE { m_xPredecessor = xPredecessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE + virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE { return m_xPredecessor; } - virtual void SAL_CALL setSuccessor( const Reference< com::sun::star::io::XConnectable >& xSuccessor ) throw(std::exception) SAL_OVERRIDE + virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSuccessor ) throw(std::exception) SAL_OVERRIDE { m_xSuccessor = xSuccessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE + virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE { return m_xSuccessor; } }; class PluginOutputStream : public PluginStream { private: - Reference< com::sun::star::io::XOutputStream > m_xStream; + Reference< css::io::XOutputStream > m_xStream; public: PluginOutputStream( XPlugin_Impl* pPlugin, const char* url, sal_uInt32 len, sal_uInt32 lastmod ); @@ -405,15 +405,15 @@ public: virtual PluginStreamType getStreamType() SAL_OVERRIDE; - Reference< com::sun::star::io::XOutputStream > & getOutputStream() { return m_xStream; } + Reference< css::io::XOutputStream > & getOutputStream() { return m_xStream; } }; class PluginEventListener : - public cppu::WeakAggImplHelper1< com::sun::star::lang::XEventListener > + public cppu::WeakAggImplHelper1< css::lang::XEventListener > { private: XPlugin_Impl* m_pPlugin; - Reference< com::sun::star::plugin::XPlugin > m_xPlugin; // just to hold the plugin + Reference< css::plugin::XPlugin > m_xPlugin; // just to hold the plugin char* m_pUrl; char* m_pNormalizedUrl; void* m_pNotifyData; @@ -428,8 +428,8 @@ public: const char* getNormalizedURL() { return m_pNormalizedUrl; } void* getNotifyData() { return m_pNotifyData; } - // com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(std::exception) SAL_OVERRIDE; }; #endif diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index bd1f2a22e7d0..c5f1ee8bcf86 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -60,15 +60,15 @@ class PluginModel : public BroadcasterHelperHolder, public cppu::OPropertySetHelper, public cppu::OPropertyArrayHelper, public cppu::OWeakAggObject, - public com::sun::star::lang::XComponent, - public com::sun::star::io::XPersistObject, - public com::sun::star::awt::XControlModel + public css::lang::XComponent, + public css::io::XPersistObject, + public css::awt::XControlModel { private: OUString m_aCreationURL; OUString m_aMimeType; - std::list< Reference< com::sun::star::lang::XEventListener > > + std::list< Reference< css::lang::XEventListener > > m_aDisposeListeners; public: // these are here to force memory de/allocation to sal lib. @@ -82,17 +82,17 @@ class PluginModel : public BroadcasterHelperHolder, virtual ~PluginModel(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual Any SAL_CALL queryInterface( const Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - virtual Any SAL_CALL queryAggregation( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL queryAggregation( const Type& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() throw( ); static OUString SAL_CALL getImplementationName_Static() throw( ) @@ -109,23 +109,23 @@ class PluginModel : public BroadcasterHelperHolder, const Any& rValue ) throw() SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, std::exception) SAL_OVERRIDE; virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() SAL_OVERRIDE; - virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception) SAL_OVERRIDE; + virtual Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception) SAL_OVERRIDE; - // com::sun::star::io::XPersistObject + // css::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const Reference< css::io::XObjectOutputStream > & OutStream) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const Reference< css::io::XObjectInputStream > & InStream) throw(std::exception) SAL_OVERRIDE; - // com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XComponent + virtual void SAL_CALL addEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; private: using cppu::OPropertySetHelper::getFastPropertyValue; }; -Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); +Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ); #endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MODEL_HXX diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index faa6a219531a..352efc23d3ef 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.hxx @@ -67,13 +67,13 @@ class MRCListenerMultiplexerHelper : public MRCListenerMultiplexerHelper_Mutex, public ::cppu::WeakAggImplHelper7< - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::awt::XWindowListener, - ::com::sun::star::awt::XKeyListener, - ::com::sun::star::awt::XMouseListener, - ::com::sun::star::awt::XMouseMotionListener, - ::com::sun::star::awt::XPaintListener, - ::com::sun::star::awt::XTopWindowListener > + css::awt::XFocusListener, + css::awt::XWindowListener, + css::awt::XKeyListener, + css::awt::XMouseListener, + css::awt::XMouseMotionListener, + css::awt::XPaintListener, + css::awt::XTopWindowListener > { public: /** @@ -84,14 +84,14 @@ public: * @param rPeer The peer from which the original events are dispatched. Null is * allowed. */ - MRCListenerMultiplexerHelper( const Reference< ::com::sun::star::awt::XWindow > & rControl, const Reference< ::com::sun::star::awt::XWindow > & rPeer ); + MRCListenerMultiplexerHelper( const Reference< css::awt::XWindow > & rControl, const Reference< css::awt::XWindow > & rPeer ); /** * Remove all listeners from the previous set peer and add the needed listeners to rPeer. * @param rPeer The peer from which the original events are dispatched. Null is * allowed. */ - void setPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer ); + void setPeer( const Reference< css::awt::XWindow > & rPeer ); /** * Remove all listeners and send a disposing message. @@ -107,54 +107,54 @@ public: */ void unadvise(const Type& type, const Reference< XInterface > & listener); - // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XFocusListener - void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XWindowListener - void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XKeyListener - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XMouseListener - void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XMouseMotionListener - void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XPaintListener - void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XTopWindowListener - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + void SAL_CALL disposing(const css::lang::EventObject& Source) throw(std::exception) SAL_OVERRIDE; + // css::awt::XFocusListener + void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XWindowListener + void SAL_CALL windowResized(const css::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMoved(const css::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowShown(const css::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowHidden(const css::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XKeyListener + void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; + // css::awt::XMouseListener + void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XMouseMotionListener + void SAL_CALL mouseDragged(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseMoved(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XPaintListener + void SAL_CALL windowPaint(const css::awt::PaintEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XTopWindowListener + void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; protected: /** * Remove the listener with the uik rUik from the peer rPeer. * @param rPeer the peer from which the listener is removed. * @param rUik the listener uik, which specify the type of the listener. */ - void adviseToPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ); + void adviseToPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ); /** * Add the listener with the uik rUik to the peer rPeer. * @param rPeer the peer to which the listener is added. * @param rUik the listener uik, which specify the type of the listener. */ - void unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ); + void unadviseFromPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ); private: /** The source of the events. Normally this is the peer object.*/ - Reference< ::com::sun::star::awt::XWindow > xPeer; - WeakReference< ::com::sun::star::awt::XControl > xControl; + Reference< css::awt::XWindow > xPeer; + WeakReference< css::awt::XControl > xControl; ::cppu::OMultiTypeInterfaceContainerHelper aListenerHolder; diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index c42dcc96cd5b..d7533567cd96 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -68,79 +68,79 @@ class SystemChildWindow; class PluginControl_Impl : public ::cppu::WeakAggImplHelper4< - ::com::sun::star::awt::XControl, - ::com::sun::star::awt::XWindow, - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::awt::XView > + css::awt::XControl, + css::awt::XWindow, + css::awt::XFocusListener, + css::awt::XView > { public: - // ::com::sun::star::awt::XControl - virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xContext ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + // css::awt::XControl + virtual void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface > & xContext ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { _xContext = xContext; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xContext; } - virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel > & Model ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return static_cast<com::sun::star::awt::XView*>(this); } + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return static_cast<css::awt::XView*>(this); } - virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isTransparent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDesignMode() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _bInDesignMode; } - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit > & xToolkit, const css::uno::Reference< css::awt::XWindowPeer > & Parent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xPeer; } - // ::com::sun::star::awt::XWindow - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject & rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::awt::XView - virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & /*aDevice*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + // css::awt::XWindow + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getPosSize() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject & rSource ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::awt::XFocusListener + virtual void SAL_CALL focusGained( const css::awt::FocusEvent & rEvt ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent & rEvt ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XComponent + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::awt::XView + virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics > & /*aDevice*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > (); } + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return css::uno::Reference< css::awt::XGraphics > (); } - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return ::com::sun::star::awt::Size(_nWidth, _nHeight); } + virtual css::awt::Size SAL_CALL getSize() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return css::awt::Size(_nWidth, _nHeight); } - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: PluginControl_Impl(); @@ -152,7 +152,7 @@ protected: void releasePeer(); protected: - ::std::list< Reference< ::com::sun::star::lang::XEventListener > > _aDisposeListeners; + ::std::list< Reference< css::lang::XEventListener > > _aDisposeListeners; MRCListenerMultiplexerHelper* _pMultiplexer; Reference< XInterface > _xContext; @@ -168,11 +168,11 @@ protected: bool _bEnable; VclPtr<SystemChildWindow> _pSysChild; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > _xPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > _xPeerWindow; + css::uno::Reference< css::awt::XWindowPeer > _xPeer; + css::uno::Reference< css::awt::XWindow > _xPeerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > _xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > _xParentPeer; + css::uno::Reference< css::awt::XWindow > _xParentWindow; + css::uno::Reference< css::awt::XWindowPeer > _xParentPeer; }; #endif |