diff options
Diffstat (limited to 'extensions/source/plugin')
19 files changed, 146 insertions, 160 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 1a3b532548f5..2dbc83b722c1 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -64,15 +64,15 @@ private: Reference< ::com::sun::star::uno::XComponentContext > m_xContext; FILE* fp; Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin; - ::rtl::OUString m_aMIMEType; - ::rtl::OUString m_aTarget; - ::rtl::OUString m_aFileName; + OUString m_aMIMEType; + OUString m_aTarget; + OUString m_aFileName; public: FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const ::rtl::OUString& mimetype, - const ::rtl::OUString& target, + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ); virtual ~FileSink(); @@ -95,14 +95,14 @@ public: virtual ~XPluginContext_Impl(); - virtual ::rtl::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 ); - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::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 ); - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual ::rtl::OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + 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 ); + 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 ); + 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 ); + 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 ); + 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 ); + 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 ); + virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); }; Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw() @@ -120,14 +120,14 @@ XPluginContext_Impl::~XPluginContext_Impl() { } -::rtl::OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) +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 ) { - return ::rtl::OUString(); + return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) +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 ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -135,11 +135,11 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu { INetURLObject aURL; aURL.SetSmartProtocol( INET_PROT_FILE ); - aURL.SetSmartURL( ::rtl::OUStringToOString( url, m_aEncoding ) ); + aURL.SetSmartURL( OUStringToOString( url, m_aEncoding ) ); - rtl::OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); + OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); // the mimetype cannot be specified - plugin->provideNewStream( ::rtl::OUString(), + plugin->provideNewStream( OUString(), Reference< XActiveDataSource >(), aUrl, 0, 0, aUrl.startsWith("file:") ); @@ -153,7 +153,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -177,7 +177,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu } } -void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +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 ) { getURL( plugin, url, target ); @@ -185,18 +185,18 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin listener->disposing( ::com::sun::star::lang::EventObject() ); } -::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) +OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString("Mozilla 3.0"); + return OUString("Mozilla 3.0"); } -void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) +void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { } -void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) +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 ) { Sequence< sal_Int8 > aBuf; @@ -228,11 +228,11 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString("Referer"); + aValues[0].Name = OUString("Referer"); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString("PostString"); - aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); + aValues[1].Name = OUString("PostString"); + aValues[1].Value <<= OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = xDesktop->loadComponentFromURL( @@ -254,7 +254,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } -void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +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 ) { postURL( plugin, url, target, buf, file ); @@ -262,7 +262,7 @@ void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugi listener->disposing( ::com::sun::star::lang::EventObject() ); } -void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) +void XPluginContext_Impl::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 ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, mimetype, target, source ); @@ -272,8 +272,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 ::rtl::OUString& mimetype, - const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : m_xContext( rxContext ), m_xPlugin( plugin ), m_aMIMEType( mimetype ), @@ -308,7 +308,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index d3f87150104f..536547cd1e25 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -77,9 +77,9 @@ PluginManager::PluginManager() { } -const Sequence< ::rtl::OUString >& PluginManager::getAdditionalSearchPaths() +const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() { - static Sequence< ::rtl::OUString > aPaths; + static Sequence< OUString > aPaths; if( ! aPaths.getLength() ) { @@ -105,7 +105,7 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -::rtl::OUString XPluginManager_Impl::getImplementationName() throw( ) +OUString XPluginManager_Impl::getImplementationName() throw( ) { return getImplementationName_Static(); @@ -113,10 +113,10 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName) throw( ) +sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw( ) { - Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -124,16 +124,16 @@ sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName } // ::com::sun::star::lang::XServiceInfo -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // XPluginManager_Impl -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginManager"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginManager"); return aSNS; } @@ -178,8 +178,8 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug Sequence<com::sun::star::plugin::PluginDescription> aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); - rtl::OUString aVal( pCfg->getValue( rtl::OUString( "BrowserPlugins" ), - rtl::OUString( "Disabled" ) ) ); + OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), + OUString( "Disabled" ) ) ); if( ! aVal.toBoolean() ) { aRet = impl_getPluginDescriptions(); @@ -187,7 +187,7 @@ 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< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) +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 ) { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); @@ -203,7 +203,7 @@ 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< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) throw() +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() { 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; diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 7e48f9b45761..cdb20e2a8765 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -90,9 +90,6 @@ void TRACES( char const* s, char const* s2 ) using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; // Move deprecated functions which no longer appear in npapi.h before // their use to avoid errors that they're undeclared at point of use @@ -139,12 +136,12 @@ NPNetscapeFuncs aNPNFuncs = NPN_ForceRedraw }; -static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString& url ) +static OString normalizeURL( XPlugin_Impl* plugin, const OString& url ) { - ::rtl::OString aLoadURL; + OString aLoadURL; if( url.indexOf( ':' ) == -1 ) { - aLoadURL = ::rtl::OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); + aLoadURL = OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); int nPos; if( ( nPos = aLoadURL.indexOf( "://" ) ) != -1 ) { @@ -316,8 +313,8 @@ extern "C" { pImpl->getPluginContext()-> newStream( pImpl, - ::rtl::OStringToOUString( type, pImpl->getTextEncoding () ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( type, pImpl->getTextEncoding () ), + OStringToOUString( target, pImpl->getTextEncoding() ), ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) ); pImpl->leavePluginCallback(); @@ -340,7 +337,7 @@ extern "C" { ::com::sun::star::uno::Sequence<sal_Int8> Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); PluginEventListener* pListener = new PluginEventListener( pImpl, url, aPostURL.getStr(), notifyData ); @@ -357,8 +354,8 @@ extern "C" { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURLNotify( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( target, pImpl->getTextEncoding() ), Bytes, file, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > ( pListener ) ); @@ -381,14 +378,14 @@ extern "C" { return NPERR_INVALID_INSTANCE_ERROR; ::com::sun::star::uno::Sequence<sal_Int8> Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); try { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURL( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( window, pImpl->getTextEncoding () ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( window, pImpl->getTextEncoding () ), Bytes, file ); pImpl->leavePluginCallback(); @@ -475,7 +472,7 @@ extern "C" { { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> - displayStatusText( pImpl, ::rtl::OStringToOUString( message, pImpl->getTextEncoding() ) ); + displayStatusText( pImpl, OStringToOUString( message, pImpl->getTextEncoding() ) ); pImpl->leavePluginCallback(); } catch( const ::com::sun::star::plugin::PluginException& ) @@ -492,7 +489,7 @@ extern "C" { XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance ); if( pImpl ) { - rtl::OUString UserAgent; + OUString UserAgent; try { pImpl->enterPluginCallback(); @@ -501,7 +498,7 @@ extern "C" { pImpl->leavePluginCallback(); if( pAgent ) free( pAgent ); - pAgent = strdup( ::rtl::OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); + pAgent = strdup( OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); } catch( const ::com::sun::star::plugin::PluginException& ) { diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 11fc4e30b765..034c2db35350 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -48,7 +48,7 @@ #include <osl/file.hxx> #include <plugin/impl.hxx> -PluginComm::PluginComm( const ::rtl::OString& rLibName, bool bReusable ) : +PluginComm::PluginComm( const OString& rLibName, bool bReusable ) : m_nRefCount( 0 ), m_aLibName( rLibName ) { diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 296685c9a37f..6942c39c956a 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -53,10 +53,10 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) // XPluginManager_Impl -Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() +Sequence< OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginModel"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginModel"); return aSNS; } @@ -69,14 +69,14 @@ static ::osl::Mutex aPropertyMutex; static ::com::sun::star::beans::Property aProps[] = { ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aMime ), + OUString::createFromAscii( aMime ), 1, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ), ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aCreationURL ), + OUString::createFromAscii( aCreationURL ), 2, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ) }; @@ -87,7 +87,7 @@ PluginModel::PluginModel() : { } -PluginModel::PluginModel(const ::rtl::OUString& rURL, const rtl::OUString& rMimeType ) : +PluginModel::PluginModel(const OUString& rURL, const OUString& rMimeType ) : BroadcasterHelperHolder( aPropertyMutex ), OPropertySetHelper( m_aHelper ), OPropertyArrayHelper( aProps, 2 ), @@ -186,9 +186,9 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject -::rtl::OUString PluginModel::getServiceName() throw() +OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString("com.sun.star.plugin.PluginModel"); + return OUString("com.sun.star.plugin.PluginModel"); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index cb0ba02dcf13..0521775c9539 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -63,7 +63,7 @@ extern "C" { { void* pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString aImplName( OUString::createFromAscii( pImplementationName ) ); if( pXUnoSMgr ) { diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 5e96bee3a39e..701974da9b7e 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -779,15 +779,15 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, #endif if( isfile && stype == NP_ASFILEONLY ) { - rtl::OString aFileName; + OString aFileName; if( url.startsWith("file:") ) { OUString aSysName; osl_getSystemPathFromFileURL( url.pData, &aSysName.pData ); - aFileName = rtl::OUStringToOString( aSysName, m_aEncoding ); + aFileName = OUStringToOString( aSysName, m_aEncoding ); } else - aFileName = rtl::OUStringToOString( url, m_aEncoding ); + aFileName = OUStringToOString( url, m_aEncoding ); m_pPluginComm-> NPP_StreamAsFile( &m_aInstance, pStream->getStream(), diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index df8e96681b45..f93300f34e34 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -60,13 +60,13 @@ class XPlugin_Impl; namespace plugstringhelper { -rtl::OUString getString( CFStringRef i_xString ); -rtl::OUString getString( CFURLRef i_xURL ); -CFMutableStringRef createString( const rtl::OUString& i_rString ); -CFURLRef createURL( const rtl::OUString& i_rString ); -rtl::OUString getURLFromPath( const rtl::OUString& i_rPath ); -CFURLRef createURLFromPath( const rtl::OUString& i_rPath ); -rtl::OUString CFURLtoOSLURL( CFURLRef i_xURL ); +OUString getString( CFStringRef i_xString ); +OUString getString( CFURLRef i_xURL ); +CFMutableStringRef createString( const OUString& i_rString ); +CFURLRef createURL( const OUString& i_rString ); +OUString getURLFromPath( const OUString& i_rPath ); +CFURLRef createURLFromPath( const OUString& i_rPath ); +OUString CFURLtoOSLURL( CFURLRef i_xURL ); } //================================================================================================== @@ -100,7 +100,7 @@ class MacPluginComm : virtual long doIt(); public: - MacPluginComm( const rtl::OUString& rMIME, const rtl::OUString& rName, NSView* pView ); + MacPluginComm( const OUString& rMIME, const OUString& rName, NSView* pView ); virtual ~MacPluginComm(); // FIXME: diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 6e10027b8053..54c414c1037a 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -134,7 +134,7 @@ private: const char** m_pArgv; const char** m_pArgn; int m_nArgs; - rtl::OString m_aLastGetUrl; + OString m_aLastGetUrl; Reference< com::sun::star::awt::XControlModel > m_xModel; @@ -148,7 +148,7 @@ private: ::std::list<PluginInputStream*> m_aInputStreams; ::std::list<PluginOutputStream*> m_aOutputStreams; ::std::list<PluginEventListener*> m_aPEventListeners; - ::rtl::OUString m_aURL; + OUString m_aURL; sal_Bool m_bIsDisposed; @@ -157,8 +157,8 @@ private: #endif void prependArg( const char* pName, const char* pValue ); // arguments will be strdup'ed - void initArgs( const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + void initArgs( const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void freeArgs(); void handleSpecialArgs(); @@ -175,9 +175,9 @@ public: void destroyStreams(); - void setLastGetUrl( const rtl::OString& rUrl ) { m_aLastGetUrl = rUrl; } + void setLastGetUrl( const OString& rUrl ) { m_aLastGetUrl = rUrl; } - com::sun::star::plugin::PluginDescription fitDescription( const rtl::OUString& rURL ); + com::sun::star::plugin::PluginDescription fitDescription( const OUString& rURL ); ::std::list<PluginInputStream*>& getInputStreams() { return m_aInputStreams; } ::std::list<PluginOutputStream*>& getOutputStreams() { return m_aOutputStreams; } @@ -208,17 +208,17 @@ public: void initInstance( const com::sun::star::plugin::PluginDescription& rDescription, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void initInstance( - const rtl::OUString& rURL, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const OUString& rURL, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); - const rtl::OUString& getRefererURL() { return m_aURL; } - ::rtl::OUString getCreationURL(); + const OUString& getRefererURL() { return m_aURL; } + OUString getCreationURL(); PluginStream* getStreamFromNPStream( NPStream* ); @@ -255,7 +255,7 @@ public: virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException ); // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const rtl::OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const rtl::OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); + 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(); // com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(); @@ -277,7 +277,7 @@ public: static PluginManager& get(); static void setServiceFactory( const Reference< com::sun::star::lang::XMultiServiceFactory >& xFactory ); - static const Sequence< rtl::OUString >& getAdditionalSearchPaths(); + static const Sequence< OUString >& getAdditionalSearchPaths(); ::std::list<PluginComm*>& getPluginComms() { return m_aPluginComms; } ::std::list<XPlugin_Impl*>& getPlugins() { return m_aAllPlugins; } @@ -303,19 +303,19 @@ public: // checks whether plugins are disabled virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); + 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 ); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const rtl::OUString& url ) throw(); + 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(); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(); - virtual rtl::OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + virtual OUString SAL_CALL getImplementationName() throw(); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static Sequence< rtl::OUString > getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); + static OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginManager" ); + return OUString( "com.sun.star.extensions.PluginManager" ); } }; Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index c315b298118b..b45eae8dfed0 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -68,8 +68,8 @@ class PluginModel : public BroadcasterHelperHolder, public com::sun::star::awt::XControlModel { private: - rtl::OUString m_aCreationURL; - rtl::OUString m_aMimeType; + OUString m_aCreationURL; + OUString m_aMimeType; std::list< Reference< com::sun::star::lang::XEventListener > > m_aDisposeListeners; @@ -81,12 +81,12 @@ class PluginModel : public BroadcasterHelperHolder, { rtl_freeMemory( pMem ); } PluginModel(); - PluginModel( const rtl::OUString& rURL, const rtl::OUString& rMimeType ); + PluginModel( const OUString& rURL, const OUString& rMimeType ); virtual ~PluginModel(); - const rtl::OUString& getCreationURL() { return m_aCreationURL; } - void setMimeType( const rtl::OUString& rMime ) { m_aMimeType = rMime; } + const OUString& getCreationURL() { return m_aCreationURL; } + void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; } // XInterface virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException ) @@ -101,11 +101,11 @@ class PluginModel : public BroadcasterHelperHolder, // com::sun::star::lang::XTypeProvider - static Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString SAL_CALL getImplementationName_Static() throw( ) + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginModel" ); + return OUString( "com.sun.star.extensions.PluginModel" ); } // OPropertySetHelper @@ -121,7 +121,7 @@ class PluginModel : public BroadcasterHelperHolder, virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(); // com::sun::star::io::XPersistObject - virtual rtl::OUString SAL_CALL getServiceName() throw(); + virtual OUString SAL_CALL getServiceName() throw(); virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(); virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(); diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index 35bd9ad9d4bb..0b8a6cad7dec 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -37,18 +37,18 @@ class PluginComm { protected: int m_nRefCount; - ::rtl::OString m_aLibName; + OString m_aLibName; std::list< String > m_aFilesToDelete; public: - PluginComm( const ::rtl::OString& rLibName, bool bReusable = true ); + PluginComm( const OString& rLibName, bool bReusable = true ); virtual ~PluginComm(); int getRefCount() { return m_nRefCount; } void addRef() { m_nRefCount++; } void decRef() { m_nRefCount--; if( ! m_nRefCount ) delete this; } - const ::rtl::OString& getLibName() { return m_aLibName; } - void setLibName( const ::rtl::OString& rName ) { m_aLibName = rName; } + const OString& getLibName() { return m_aLibName; } + void setLibName( const OString& rName ) { m_aLibName = rName; } void addFileToDelete( const String& filename ) { m_aFilesToDelete.push_back( filename ); } diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 234964f5181d..27a188dcc327 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -109,7 +109,7 @@ public: void invalidate() { m_bValid = false; } sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 ); - sal_uLong SendMessage( const rtl::OString& rMessage, sal_uLong nMessageID = 0 ) + sal_uLong SendMessage( const OString& rMessage, sal_uLong nMessageID = 0 ) { return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID ); } diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index 9f985645ccd2..f95e8470111c 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -76,7 +76,7 @@ public: virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value); - static bool getPluginappPath(rtl::OString * path); + static bool getPluginappPath(OString * path); }; #endif diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index b512d199d499..0bc91bcb6174 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -78,7 +78,7 @@ class PluginComm_Impl : virtual long doIt(); public: - PluginComm_Impl( const rtl::OUString& rMIME, const rtl::OUString& rName, HWND hWnd ); + PluginComm_Impl( const OUString& rMIME, const OUString& rName, HWND hWnd ); virtual ~PluginComm_Impl(); public: diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index a5c800f412c2..3f449ac90296 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -178,8 +178,8 @@ void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow ) static oslModule LoadModule( const char* pPath ) { - ::rtl::OUString sSystemPath( ::rtl::OUString::createFromAscii( pPath ) ); - ::rtl::OUString sFileURL; + OUString sSystemPath( OUString::createFromAscii( pPath ) ); + OUString sFileURL; osl_getFileURLFromSystemPath( sSystemPath.pData, &sFileURL.pData ); oslModule pLib = osl_loadModule( sFileURL.pData, SAL_LOADMODULE_LAZY ); diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index d711543d58f9..d7140f1d3fb4 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -55,11 +55,11 @@ UnxPluginComm::UnxPluginComm( int nDescriptor1, int nDescriptor2 ) : - PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ), false ), + PluginComm( OUStringToOString( library, osl_getThreadTextEncoding() ), false ), PluginConnector( nDescriptor2 ), m_nCommPID( 0 ) { - rtl::OString path; + OString path; if (!getPluginappPath(&path)) { SAL_WARN("extensions.plugin", "cannot construct path to pluginapp.bin"); @@ -70,7 +70,7 @@ UnxPluginComm::UnxPluginComm( char pWindow[32]; sprintf( pWindow, "%d", (int)aParent ); sprintf( pDesc, "%d", nDescriptor1 ); - rtl::OString aLib(rtl::OUStringToOString(library, osl_getThreadTextEncoding())); + OString aLib(OUStringToOString(library, osl_getThreadTextEncoding())); char const* pArgs[5]; pArgs[0] = path.getStr(); @@ -134,9 +134,9 @@ UnxPluginComm::~UnxPluginComm() } } -bool UnxPluginComm::getPluginappPath(rtl::OString * path) { +bool UnxPluginComm::getPluginappPath(OString * path) { OSL_ASSERT(path != NULL); - rtl::OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); + OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 85b56cda6a3e..26a4d10d989e 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -48,13 +48,9 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; // Unix specific implementation -static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDescriptions ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Trying plugin %s ... ", rPath.getStr() ); @@ -69,7 +65,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& return false; } - rtl::OString aBaseName = rPath.copy(nPos+1); + OString aBaseName = rPath.copy(nPos+1); if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so"))) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +85,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString path; + OString path; if (!UnxPluginComm::getPluginappPath(&path)) { #if OSL_DEBUG_LEVEL > 1 @@ -97,11 +93,11 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& #endif return false; } - rtl::OStringBuffer cmd; + OStringBuffer cmd; tools::appendUnixShellWord(&cmd, path); cmd.append(' '); tools::appendUnixShellWord(&cmd, rPath); - rtl::OString aCommand(cmd.makeStringAndClear()); + OString aCommand(cmd.makeStringAndClear()); FILE* pResult = popen( aCommand.getStr(), "r" ); int nDescriptions = 0; @@ -188,9 +184,9 @@ union maxDirent struct dirent asDirent; }; -static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static void CheckPluginRegistryFiles( const OString& rPath, list< PluginDescription* >& rDescriptions ) { - rtl::OStringBuffer aPath( 1024 ); + OStringBuffer aPath( 1024 ); aPath.append( rPath ); aPath.append( "/pluginreg.dat" ); FILE* fp = fopen( aPath.getStr(), "r" ); @@ -207,7 +203,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes for( nDotPos = nLineLen-1; nDotPos > 0 && aLine[nDotPos] != ':'; nDotPos-- ) ; if( aLine[0] == '/' && aLine[nDotPos] == ':' && aLine[nDotPos+1] == '$' ) - CheckPlugin( rtl::OString(aLine, nDotPos), rDescriptions ); + CheckPlugin( OString(aLine, nDotPos), rDescriptions ); } fclose( fp ); } @@ -222,7 +218,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes char* pBaseName = u.asDirent.d_name; if( rtl_str_compare( ".", pBaseName ) && rtl_str_compare( "..", pBaseName ) ) { - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( rPath ); aBuf.append( '/' ); aBuf.append( pBaseName ); @@ -255,26 +251,26 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" ); // netscape!, quick, beam me back to the 90's when Motif roamed the earth - rtl::OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); + OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); if( pHome ) aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins"); if( pNPXPluginPath ) aSearchBuffer.append(':').append(pNPXPluginPath); - const Sequence< ::rtl::OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); + const Sequence< OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); for( i = 0; i < rPaths.getLength(); i++ ) { - aSearchBuffer.append(':').append(rtl::OUStringToOString( + aSearchBuffer.append(':').append(OUStringToOString( rPaths.getConstArray()[i], aEncoding)); } - rtl::OString aSearchPath = aSearchBuffer.makeStringAndClear(); + OString aSearchPath = aSearchBuffer.makeStringAndClear(); sal_Int32 nIndex = 0; maxDirent u; do { - rtl::OString aPath(aSearchPath.getToken(0, ':', nIndex)); + OString aPath(aSearchPath.getToken(0, ':', nIndex)); if (!aPath.isEmpty()) { DIR* pDIR = opendir(aPath.getStr()); @@ -286,7 +282,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th pBaseName[1] != '.' || pBaseName[2] != 0 ) { - rtl::OStringBuffer aFileName(aPath); + OStringBuffer aFileName(aPath); aFileName.append('/').append(pBaseName); CheckPlugin( aFileName.makeStringAndClear(), aPlugins ); } @@ -298,7 +294,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th while ( nIndex >= 0 ); // try ~/.mozilla/pluginreg.dat - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); aBuf.append( pHome ); aBuf.append( "/.mozilla" ); CheckPluginRegistryFiles( aBuf.makeStringAndClear(), aPlugins ); diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 1e60f6c32274..41c1539a986d 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -51,9 +51,6 @@ extern NPNetscapeFuncs aNPNFuncs; #include <tools/debug.hxx> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #if OSL_DEBUG_LEVEL > 1 void TRACE( char const * s ); diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index 706f71d33f18..237ce4309880 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -60,10 +60,6 @@ using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; typedef map< OString, OUString, less< OString > > PluginLocationMap; |