summaryrefslogtreecommitdiff
path: root/extensions/source/plugin/base
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/plugin/base')
-rw-r--r--extensions/source/plugin/base/context.cxx66
-rw-r--r--extensions/source/plugin/base/manager.cxx28
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx31
-rw-r--r--extensions/source/plugin/base/plcom.cxx2
-rw-r--r--extensions/source/plugin/base/plmodel.cxx20
-rw-r--r--extensions/source/plugin/base/service.cxx2
-rw-r--r--extensions/source/plugin/base/xplugin.cxx6
7 files changed, 76 insertions, 79 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(),
generated by cgit (git 2.34.1) at 2024-07-19 02:35:12 +0000