From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- shell/source/backends/desktopbe/desktopbackend.cxx | 50 +++++++++++----------- shell/source/backends/gconfbe/gconfaccess.cxx | 46 +++++++++----------- shell/source/backends/gconfbe/gconfbackend.cxx | 38 ++++++++-------- shell/source/backends/kde4be/kde4access.cxx | 20 ++++----- shell/source/backends/kde4be/kde4access.hxx | 2 +- shell/source/backends/kde4be/kde4backend.cxx | 38 ++++++++-------- shell/source/backends/kdebe/kdeaccess.cxx | 20 ++++----- shell/source/backends/kdebe/kdeaccess.hxx | 2 +- shell/source/backends/kdebe/kdebackend.cxx | 38 ++++++++-------- shell/source/backends/localebe/localebackend.cxx | 48 ++++++++++----------- shell/source/backends/localebe/localebackend.hxx | 28 ++++++------ shell/source/backends/macbe/macbackend.hxx | 22 +++++----- shell/source/backends/wininetbe/wininetbackend.cxx | 50 +++++++++++----------- shell/source/backends/wininetbe/wininetbackend.hxx | 22 +++++----- 14 files changed, 210 insertions(+), 214 deletions(-) (limited to 'shell/source/backends') diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index c4c8ddbde4f3..3e8e8c176b84 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -53,15 +53,15 @@ namespace { -rtl::OUString SAL_CALL getDefaultImplementationName() { - return rtl::OUString( +OUString SAL_CALL getDefaultImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.DesktopBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.DesktopBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Default: @@ -75,15 +75,15 @@ public: private: virtual ~Default() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getDefaultImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getDefaultSupportedServiceNames(); } @@ -92,7 +92,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -100,13 +100,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -114,7 +114,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -122,7 +122,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -130,7 +130,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -138,18 +138,18 @@ private: {} }; -void Default::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Default::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Default::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -168,7 +168,7 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) css::uno::Reference< css::uno::XInterface > createBackend( css::uno::Reference< css::uno::XComponentContext > const & context, - rtl::OUString const & name) + OUString const & name) { try { return css::uno::Reference< css::lang::XMultiComponentFactory >( @@ -181,8 +181,8 @@ css::uno::Reference< css::uno::XInterface > createBackend( // Assuming these exceptions indicate that the service is not installed: OSL_TRACE( "createInstance(%s) failed with %s", - rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(), - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); return css::uno::Reference< css::uno::XInterface >(); } } @@ -190,12 +190,12 @@ css::uno::Reference< css::uno::XInterface > createBackend( css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) { - rtl::OUString desktop; + OUString desktop; css::uno::Reference< css::uno::XCurrentContext > current( css::uno::getCurrentContext()); if (current.is()) { current->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; } @@ -204,17 +204,17 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( if ( desktop == "GNOME" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.GconfBackend")); } else if ( desktop == "KDE" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.KDEBackend")); } else if ( desktop == "KDE4" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.KDE4Backend")); } return backend.is() diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index b0cc1778be32..1a1131cd828c 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -45,10 +45,6 @@ namespace { namespace uno = css::uno ; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringBuffer; GConfClient* getGconfClient() { @@ -72,7 +68,7 @@ GConfClient* getGconfClient() mClient = gconf_client_get_default(); if (!mClient) { - throw uno::RuntimeException(rtl::OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); + throw uno::RuntimeException(OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); } static const char * const PreloadValuesList[] = @@ -111,7 +107,7 @@ static OUString xdg_user_dir_lookup (const char *type) if (!aSecurity.getHomeDir( aHomeDirURL ) ) { - osl::FileBase::getFileURLFromSystemPath(rtl::OUString("/tmp"), aDocumentsDirURL); + osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), aDocumentsDirURL); return aDocumentsDirURL; } @@ -215,7 +211,7 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) ); case GCONF_VALUE_STRING: - return uno::makeAny( OStringToOUString( rtl::OString( + return uno::makeAny( OStringToOUString( OString( gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) ); default: @@ -228,20 +224,20 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) //------------------------------------------------------------------------------ -static void splitFontName( GConfValue *pGconfValue, rtl::OUString &rName, sal_Int16 &rHeight) +static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight) { - rtl::OString aFont( gconf_value_get_string( pGconfValue ) ); + OString aFont( gconf_value_get_string( pGconfValue ) ); aFont = aFont.trim(); sal_Int32 nIdx = aFont.lastIndexOf( ' ' ); if (nIdx < 1) { // urk rHeight = 12; nIdx = aFont.getLength(); } else { - rtl::OString aSize = aFont.copy( nIdx + 1 ); + OString aSize = aFont.copy( nIdx + 1 ); rHeight = static_cast( aSize.toInt32() ); } - rName = rtl::OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); + rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------ @@ -253,7 +249,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal { case SETTING_PROXY_MODE: { - rtl::OUString aProxyMode; + OUString aProxyMode; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= aProxyMode; @@ -266,7 +262,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_NO_PROXY_FOR: { - rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; if( (GCONF_VALUE_LIST == pGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(pGconfValue)) ) { GSList * list = gconf_value_get_list(pGconfValue); @@ -276,7 +272,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal } // Remove trailing ";" aBuffer.setLength(aBuffer.getLength()-1); - return uno::makeAny(rtl::OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); + return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } else g_warning( "unexpected type for ignore_hosts" ); @@ -285,7 +281,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_MAILER_PROGRAM: { - rtl::OUString aMailer; + OUString aMailer; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= aMailer; sal_Int32 nIndex = 0; @@ -314,22 +310,22 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal sal_Bool bBooleanValue = false; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= bBooleanValue; - return uno::makeAny( rtl::OUString::valueOf( (sal_Bool) bBooleanValue ) ); + return uno::makeAny( OUString::valueOf( (sal_Bool) bBooleanValue ) ); } case SETTING_WORK_DIRECTORY: { - rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); + OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); return uno::makeAny( aDocumentsDirURL ); } case SETTING_USER_GIVENNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); sal_Int32 nIndex = 0; - rtl::OUString aGivenName; + OUString aGivenName; do aGivenName = aCompleteName.getToken( 0, ' ', nIndex ); while ( nIndex == 0 ); @@ -340,10 +336,10 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_USER_SURNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); sal_Int32 nIndex = 0; - rtl::OUString aSurname; + OUString aSurname; do aSurname = aCompleteName.getToken( 0, ' ', nIndex ); while ( nIndex >= 0 ); @@ -354,7 +350,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_SOURCEVIEWFONT_NAME: case SETTING_SOURCEVIEWFONT_HEIGHT: { - rtl::OUString aName; + OUString aName; sal_Int16 nHeight; splitFontName (pGconfValue, aName, nHeight); @@ -394,7 +390,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_WORK_DIRECTORY: { - rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); + OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); osl::Directory aDocumentsDir( aDocumentsDirURL ); if( osl::FileBase::E_None == aDocumentsDir.open() ) @@ -404,7 +400,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_USER_GIVENNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); if( aCompleteName != "Unknown" ) return sal_True; @@ -413,7 +409,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_USER_SURNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); if( aCompleteName != "Unknown" ) { diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index bf40d7cb4571..97441d9e8303 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.GconfBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.GconfBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "GNOME"; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 1669263b3c95..6bd8f4a45bd0 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -46,11 +46,11 @@ namespace uno = css::uno ; } -css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { +css::beans::Optional< css::uno::Any > getValue(OUString const & id) { if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; - ::rtl::OUString sClientProgram; + OUString sClientProgram; aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); if ( aClientProgram.isEmpty() ) @@ -75,7 +75,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { { QFont aFixedFont; QString aFontName; - :: rtl::OUString sFontName; + :: OUString sFontName; aFixedFont = KGlobalSettings::fixedFont(); aFontName = aFixedFont.family(); @@ -88,13 +88,13 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { /* does not make much sense without an accessibility bridge */ sal_Bool ATToolSupport = sal_False; return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) ); + true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) ); } else if (id.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) { QString aDocumentsDir( KGlobalSettings::documentPath() ); - rtl::OUString sDocumentsDir; - rtl::OUString sDocumentsURL; + OUString sDocumentsDir; + OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16(); @@ -124,7 +124,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aFTPProxy.isEmpty() ) { KUrl aProxy(aFTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -178,7 +178,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPProxy.isEmpty() ) { KUrl aProxy(aHTTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -232,7 +232,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPSProxy.isEmpty() ) { KUrl aProxy(aHTTPSProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -278,7 +278,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } if ( !aNoProxyFor.isEmpty() ) { - ::rtl::OUString sNoProxyFor; + OUString sNoProxyFor; aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); sNoProxyFor = (const sal_Unicode *) aNoProxyFor.utf16(); diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx index 26228fb05af5..f77a2ecad7cf 100644 --- a/shell/source/backends/kde4be/kde4access.hxx +++ b/shell/source/backends/kde4be/kde4access.hxx @@ -32,7 +32,7 @@ namespace rtl { class OUString; } namespace kde4access { com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); + OUString const & id); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index d39eb5a6974e..672c41e059ed 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.KDE4Backend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.KDE4Backend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 5785579c06c2..57618e6d3f24 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -42,11 +42,11 @@ namespace uno = css::uno ; } -css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { +css::beans::Optional< css::uno::Any > getValue(OUString const & id) { if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; - ::rtl::OUString sClientProgram; + OUString sClientProgram; aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); if ( aClientProgram.isEmpty() ) @@ -71,7 +71,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { { QFont aFixedFont; QString aFontName; - :: rtl::OUString sFontName; + :: OUString sFontName; aFixedFont = KGlobalSettings::fixedFont(); aFontName = aFixedFont.family(); @@ -84,13 +84,13 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { /* does not make much sense without an accessibility bridge */ sal_Bool ATToolSupport = sal_False; return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) ); + true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) ); } else if (id.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) { QString aDocumentsDir( KGlobalSettings::documentPath() ); - rtl::OUString sDocumentsDir; - rtl::OUString sDocumentsURL; + OUString sDocumentsDir; + OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2(); @@ -120,7 +120,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aFTPProxy.isEmpty() ) { KURL aProxy(aFTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -174,7 +174,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPProxy.isEmpty() ) { KURL aProxy(aHTTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -228,7 +228,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPSProxy.isEmpty() ) { KURL aProxy(aHTTPSProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -274,7 +274,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } if ( !aNoProxyFor.isEmpty() ) { - ::rtl::OUString sNoProxyFor; + OUString sNoProxyFor; aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); sNoProxyFor = (const sal_Unicode *) aNoProxyFor.ucs2(); diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/backends/kdebe/kdeaccess.hxx index cfee08bb129e..2e4cba96e699 100644 --- a/shell/source/backends/kdebe/kdeaccess.hxx +++ b/shell/source/backends/kdebe/kdeaccess.hxx @@ -32,7 +32,7 @@ namespace rtl { class OUString; } namespace kdeaccess { com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); + OUString const & id); } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 5f1825a7da50..607e1b5f12a2 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.KDEBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.KDEBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE" && KApplication::kApplication() != 0; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 5e38f3a66162..42405d76f0db 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -39,7 +39,7 @@ #pragma warning(pop) #endif -rtl::OUString ImplGetLocale(LCID lcid) +OUString ImplGetLocale(LCID lcid) { TCHAR buffer[8]; LPTSTR cp = buffer; @@ -51,10 +51,10 @@ rtl::OUString ImplGetLocale(LCID lcid) // #i50822# minus character must be written before cp *(cp - 1) = '-'; - return rtl::OUString::createFromAscii(buffer); + return OUString::createFromAscii(buffer); } - return rtl::OUString(); + return OUString(); } #elif defined(MACOSX) @@ -71,7 +71,7 @@ rtl::OUString ImplGetLocale(LCID lcid) namespace /* private */ { - void OUStringBufferAppendCFString(rtl::OUStringBuffer& buffer, const CFStringRef s) + void OUStringBufferAppendCFString(OUStringBuffer& buffer, const CFStringRef s) { CFIndex lstr = CFStringGetLength(s); for (CFIndex i = 0; i < lstr; i++) @@ -119,12 +119,12 @@ namespace /* private */ return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref); } - rtl::OUString ImplGetLocale(const char* pref) + OUString ImplGetLocale(const char* pref) { CFStringRef sref = ImplGetAppPreference(pref); CFStringGuard srefGuard(sref); - rtl::OUStringBuffer aLocaleBuffer; + OUStringBuffer aLocaleBuffer; aLocaleBuffer.appendAscii("en-US"); // initialize with fallback value if (sref != NULL) @@ -168,13 +168,13 @@ namespace /* private */ * is called from the main thread only. */ -static rtl::OUString ImplGetLocale(int category) +static OUString ImplGetLocale(int category) { const char *locale = setlocale(category, ""); // Return "en-US" for C locales if( (locale == NULL) || ( locale[0] == 'C' && locale[1] == '\0' ) ) - return rtl::OUString( "en-US" ); + return OUString( "en-US" ); const char *cp; @@ -191,7 +191,7 @@ static rtl::OUString ImplGetLocale(int category) break; } - rtl::OUStringBuffer aLocaleBuffer; + OUStringBuffer aLocaleBuffer; if( uscore != NULL ) { aLocaleBuffer.appendAscii(locale, uscore++ - locale); @@ -229,7 +229,7 @@ LocaleBackend* LocaleBackend::createInstance() // --------------------------------------------------------------------------------------- -rtl::OUString LocaleBackend::getLocale(void) +OUString LocaleBackend::getLocale(void) { #if defined WNT return ImplGetLocale( GetUserDefaultLCID() ); @@ -242,7 +242,7 @@ rtl::OUString LocaleBackend::getLocale(void) //------------------------------------------------------------------------------ -rtl::OUString LocaleBackend::getUILocale(void) +OUString LocaleBackend::getUILocale(void) { #if defined WNT return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) ); @@ -255,7 +255,7 @@ rtl::OUString LocaleBackend::getUILocale(void) // --------------------------------------------------------------------------------------- -rtl::OUString LocaleBackend::getSystemLocale(void) +OUString LocaleBackend::getSystemLocale(void) { // note: the implementation differs from getLocale() only on Windows #if defined WNT @@ -267,20 +267,20 @@ rtl::OUString LocaleBackend::getSystemLocale(void) //------------------------------------------------------------------------------ void LocaleBackend::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( + OUString( "setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } css::uno::Any LocaleBackend::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -307,13 +307,13 @@ css::uno::Any LocaleBackend::getPropertyValue( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; +OUString SAL_CALL LocaleBackend::getBackendName(void) { + return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void) +OUString SAL_CALL LocaleBackend::getImplementationName(void) throw (uno::RuntimeException) { return getBackendName() ; @@ -321,19 +321,19 @@ rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void) //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL LocaleBackend::getBackendServiceNames(void) +uno::Sequence SAL_CALL LocaleBackend::getBackendServiceNames(void) { - uno::Sequence aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.LocaleBackend") ; + uno::Sequence aServiceNameList(1); + aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.LocaleBackend") ; return aServiceNameList ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL LocaleBackend::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL LocaleBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getBackendServiceNames(); + uno::Sequence< OUString > const svc = getBackendServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -344,7 +344,7 @@ sal_Bool SAL_CALL LocaleBackend::supportsService(const rtl::OUString& aServiceNa //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL LocaleBackend::getSupportedServiceNames(void) +uno::Sequence SAL_CALL LocaleBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { return getBackendServiceNames() ; diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index e84be5e2285e..3eea01286f68 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -38,15 +38,15 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < static LocaleBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence SAL_CALL + virtual uno::Sequence SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -55,13 +55,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence SAL_CALL getBackendServiceNames(void) ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -69,7 +69,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -77,13 +77,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -91,7 +91,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -99,7 +99,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -107,7 +107,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -127,13 +127,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < private: // Returns the user locale - static rtl::OUString getLocale(void); + static OUString getLocale(void); // Returns the user UI locale - static rtl::OUString getUILocale(void); + static OUString getUILocale(void); // Returns the system default locale - static rtl::OUString getSystemLocale(void); + static OUString getSystemLocale(void); } ; diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index bc623709449f..041e129cf8f8 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -39,13 +39,13 @@ public: static MacOSXBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& aServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) throw (uno::RuntimeException); - virtual uno::Sequence SAL_CALL getSupportedServiceNames() + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); /** @@ -53,14 +53,14 @@ public: @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void); + static OUString SAL_CALL getBackendName(void); /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void); + static uno::Sequence SAL_CALL getBackendServiceNames(void); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -68,7 +68,7 @@ public: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -76,13 +76,13 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -90,7 +90,7 @@ public: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -98,7 +98,7 @@ public: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -106,7 +106,7 @@ public: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 0b24a47ffb2e..559eb0e51d5b 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -52,8 +52,8 @@ struct Library { typedef struct { - rtl::OUString Server; - rtl::OUString Port; + OUString Server; + OUString Port; } ProxyEntry; //------------------------------------------------------------------------ @@ -62,7 +62,7 @@ typedef struct namespace // private { - ProxyEntry ReadProxyEntry(const rtl::OUString& aProxy, sal_Int32& i) + ProxyEntry ReadProxyEntry(const OUString& aProxy, sal_Int32& i) { ProxyEntry aProxyEntry; @@ -73,14 +73,14 @@ namespace // private return aProxyEntry; } - ProxyEntry FindProxyEntry(const rtl::OUString& aProxyList, const rtl::OUString& aType) + ProxyEntry FindProxyEntry(const OUString& aProxyList, const OUString& aType) { sal_Int32 nIndex = 0; do { // get the next token, e.g. ftp=server:port - rtl::OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex ); + OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex ); // split the next token again into the parts separated // through '=', e.g. ftp=server:port -> ftp and server:port @@ -167,8 +167,8 @@ WinInetBackend::WinInetBackend() // an empty proxy list, so we don't have to check if // proxy is enabled or not - rtl::OUString aProxyList = rtl::OUString::createFromAscii( lpi->lpszProxy ); - rtl::OUString aProxyBypassList = rtl::OUString::createFromAscii( lpi->lpszProxyBypass ); + OUString aProxyList = OUString::createFromAscii( lpi->lpszProxy ); + OUString aProxyBypassList = OUString::createFromAscii( lpi->lpszProxyBypass ); // override default for ProxyType, which is "0" meaning "No proxies". sal_Int32 nProperties = 1; @@ -179,11 +179,11 @@ WinInetBackend::WinInetBackend() // fill proxy bypass list if( aProxyBypassList.getLength() > 0 ) { - rtl::OUStringBuffer aReverseList; + OUStringBuffer aReverseList; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex ); + OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex ); if ( aProxyList.indexOf( aToken ) == -1 ) { if ( aReverseList.getLength() ) @@ -222,13 +222,13 @@ WinInetBackend::WinInetBackend() // there is one and it has a port //------------------------------------------------- - ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, rtl::OUString()); - ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, OUString()); + ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, OUString( "http" ) ); - ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, OUString( "https" ) ); - ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, OUString( "ftp" ) ); if( aTypeIndepProxy.Server.getLength() ) @@ -312,20 +312,20 @@ WinInetBackend* WinInetBackend::createInstance() // --------------------------------------------------------------------------------------- void WinInetBackend::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( + OUString( "setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } css::uno::Any WinInetBackend::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -362,13 +362,13 @@ css::uno::Any WinInetBackend::getPropertyValue( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; +OUString SAL_CALL WinInetBackend::getBackendName(void) { + return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void) +OUString SAL_CALL WinInetBackend::getImplementationName(void) throw (uno::RuntimeException) { return getBackendName() ; @@ -376,20 +376,20 @@ rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void) //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL WinInetBackend::getBackendServiceNames(void) +uno::Sequence SAL_CALL WinInetBackend::getBackendServiceNames(void) { - uno::Sequence aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.WinInetBackend") ; + uno::Sequence aServiceNameList(1); + aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.WinInetBackend") ; return aServiceNameList ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL WinInetBackend::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL WinInetBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getBackendServiceNames(); + uno::Sequence< OUString > const svc = getBackendServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -400,7 +400,7 @@ sal_Bool SAL_CALL WinInetBackend::supportsService(const rtl::OUString& aServiceN //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL WinInetBackend::getSupportedServiceNames(void) +uno::Sequence SAL_CALL WinInetBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { return getBackendServiceNames() ; diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index dd6edf165afb..62a9f5d35fc2 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -38,15 +38,15 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < static WinInetBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence SAL_CALL + virtual uno::Sequence SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -55,13 +55,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence SAL_CALL getBackendServiceNames(void) ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -69,7 +69,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -77,13 +77,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -91,7 +91,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -99,7 +99,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -107,7 +107,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, -- cgit