diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /shell | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
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
Diffstat (limited to 'shell')
35 files changed, 347 insertions, 365 deletions
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<sal_Int16>( 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<rtl::OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) +uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) { - uno::Sequence<rtl::OUString> aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.LocaleBackend") ; + uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL LocaleBackend::getSupportedServiceNames(void) +uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL + virtual uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL getSupportedServiceNames() + virtual uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL getBackendServiceNames(void); + static uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) +uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) { - uno::Sequence<rtl::OUString> aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.WinInetBackend") ; + uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(void) +uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL + virtual uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence<OUString> 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, diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index bf0c3f49466b..ca56e0f2e18d 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -32,7 +32,6 @@ using com::sun::star::lang::IllegalArgumentException; using com::sun::star::lang::WrappedTargetException; using com::sun::star::container::NoSuchElementException; using com::sun::star::container::XNameAccess; -using rtl::OUString; using osl::MutexGuard; using namespace cppu; @@ -41,7 +40,7 @@ using namespace com::sun::star::uno; //------------------------------------------------ -void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) +void SAL_CALL CmdMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -50,7 +49,7 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) //------------------------------------------------ -::rtl::OUString SAL_CALL CmdMailMsg::getRecipient( ) +OUString SAL_CALL CmdMailMsg::getRecipient( ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -131,7 +130,7 @@ OUString SAL_CALL CmdMailMsg::getSubject( ) //------------------------------------------------ -void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachment ) +void SAL_CALL CmdMailMsg::setAttachement( const Sequence< OUString >& aAttachment ) throw (IllegalArgumentException, RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -210,7 +209,7 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) //------------------------------------------------ - sal_Bool SAL_CALL CmdMailMsg::hasByName( const ::rtl::OUString& aName ) + sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx index 1cd1e60baa39..3c810f7194fa 100644 --- a/shell/source/cmdmail/cmdmailmsg.hxx +++ b/shell/source/cmdmail/cmdmailmsg.hxx @@ -37,12 +37,12 @@ class CmdMailMsg : ::com::sun::star::system::XSimpleMailMessage, ::com::sun::star::container::XNameAccess > { - ::rtl::OUString m_aRecipient; - ::rtl::OUString m_aOriginator; - ::rtl::OUString m_aSubject; - ::com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients; - ::com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients; - ::com::sun::star::uno::Sequence< rtl::OUString > m_Attachments; + OUString m_aRecipient; + OUString m_aOriginator; + OUString m_aSubject; + ::com::sun::star::uno::Sequence< OUString > m_CcRecipients; + ::com::sun::star::uno::Sequence< OUString > m_BccRecipients; + ::com::sun::star::uno::Sequence< OUString > m_Attachments; ::osl::Mutex m_aMutex; @@ -54,53 +54,53 @@ public: // XSimpleMailMessage //------------------------------------------------ - virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) + virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRecipient( ) + virtual OUString SAL_CALL getRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) + virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) + virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) + virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOriginator( ) + virtual OUString SAL_CALL getOriginator( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) + virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubject( ) + virtual OUString SAL_CALL getSubject( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) + virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XNameAccess //------------------------------------------------ - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index c12bf984f22b..40c19f9cd278 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -47,10 +47,6 @@ using com::sun::star::system::XSimpleMailClient; using com::sun::star::system::XSimpleMailMessage; using com::sun::star::container::XNameAccess; using com::sun::star::container::NoSuchElementException; -using rtl::OUString; -using rtl::OUStringToOString; -using rtl::OString; -using rtl::OStringBuffer; using osl::MutexGuard; using osl::FileBase; diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx index 3b2fc1422227..e72ebdb2dfd7 100644 --- a/shell/source/cmdmail/cmdmailsuppl.hxx +++ b/shell/source/cmdmail/cmdmailsuppl.hxx @@ -66,13 +66,13 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 47f0749400a4..e8337845c303 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -42,7 +42,7 @@ namespace }; static inline GDBusProxy* lcl_GetPackageKitProxy(const OUString sInterface) { - const OString sFullInterface = rtl::OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); + const OString sFullInterface = OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); GErrorWrapper error(NULL); GDBusProxy* proxy = NULL; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, @@ -71,7 +71,7 @@ namespace shell { namespace sessioninstall boost::shared_ptr<GVariantBuilder> pBuilder(g_variant_builder_new(G_VARIANT_TYPE ("as")), GVariantBuilderDeleter()); for( const OUString* pPackage = stl_begin(vPackages); pPackage != stl_end(vPackages); ++pPackage) { - vPackagesOString.push_back(rtl::OUStringToOString(*pPackage, RTL_TEXTENCODING_ASCII_US)); + vPackagesOString.push_back(OUStringToOString(*pPackage, RTL_TEXTENCODING_ASCII_US)); g_variant_builder_add(pBuilder.get(), "s", vPackagesOString.back().getStr()); } diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx index 78bbc8ef668c..e97f1f61958d 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx @@ -23,30 +23,30 @@ namespace shell { namespace sessioninstall SyncDbusSessionHelper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); virtual ~SyncDbusSessionHelper() {} // XModify Methods - virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* packages */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* packages */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* mime_types */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* mime_types */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* types */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* types */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL RemovePackageByFiles( SAL_UNUSED_PARAMETER ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL RemovePackageByFiles( SAL_UNUSED_PARAMETER ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented // XQuery Methods - virtual void SAL_CALL IsInstalled( const ::rtl::OUString& /* package_name */, const ::rtl::OUString& /* interaction */, ::sal_Bool& /* installed */ ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, ::sal_Bool& /* installed */ ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL SearchFile( const ::rtl::OUString& /* file_name */, const ::rtl::OUString& /* interaction */, ::sal_Bool& /* installed */, ::rtl::OUString& /* package_name */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, ::sal_Bool& /* installed */, OUString& /* package_name */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented private: diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 1d702eb11798..ea326c702c49 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -68,8 +68,6 @@ typedef unsigned short WORD; namespace /* private */ { -using rtl::OUString; -using rtl::OString; void ShowUsage() { @@ -82,10 +80,10 @@ void ShowUsage() } inline OUString OStringToOUString(const OString& str) -{ return rtl::OStringToOUString(str, osl_getThreadTextEncoding()); } +{ return OStringToOUString(str, osl_getThreadTextEncoding()); } inline OString OUStringToOString(const OUString& str) -{ return rtl::OUStringToOString(str, osl_getThreadTextEncoding()); } +{ return OUStringToOString(str, osl_getThreadTextEncoding()); } /** Get the directory where the module is located as system directory, the @@ -316,7 +314,7 @@ typedef std::map< unsigned short , std::string , std::less< unsigned short > > s void add_group_entries( Config& aConfig, - const rtl::OString& GroupName, + const OString& GroupName, Substitutor& Substitutor) { OSL_ASSERT(aConfig.HasGroup(GroupName)); @@ -327,8 +325,8 @@ void add_group_entries( for (size_t i = 0; i < key_count; i++) { - rtl::OString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i)); - rtl::OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i)); + OString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i)); + OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i)); iso_lang_identifier myiso_lang( iso_lang ); LanguageType ltype = LanguageTag( OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8), @@ -340,7 +338,7 @@ void add_group_entries( key_value_utf8 = comphelper::string::strip(key_value_utf8, '\"'); OUString key_value_utf16 = - rtl::OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); + OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); Substitutor.add_substitution( GroupName.getStr(), make_winrc_unicode_string(key_value_utf16)); @@ -364,10 +362,10 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) // as the Config class is currently not able to deal correctly with // UTF8 files starting with a byte-order-mark we create a copy of the // original file without the byte-order-mark - rtl::OUString tmpfile_url; + OUString tmpfile_url; osl_createTempFile(NULL, NULL, &tmpfile_url.pData); - rtl::OUString tmpfile_sys; + OUString tmpfile_sys; osl::FileBase::getSystemPathFromFileURL(tmpfile_url, tmpfile_sys); std::ifstream in(FileName.c_str()); diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 755e1ecef321..dc1192cdb0f9 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -45,10 +45,6 @@ using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; -using rtl::OString; -using rtl::OUString; -using rtl::OStringBuffer; -using rtl::OUStringBuffer; using osl::FileBase; using namespace ::com::sun::star::uno; @@ -72,7 +68,7 @@ namespace // private } } -void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL) +void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) { sal_Int32 nmax = rURL.getLength(); for(sal_Int32 n=0; n < nmax; ++n) @@ -172,7 +168,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar OUString aProgramURL; try { aProgramURL = exp->expandMacros( - rtl::OUString( "$BRAND_BASE_DIR/program/")); + OUString( "$BRAND_BASE_DIR/program/")); } catch (com::sun::star::lang::IllegalArgumentException &) { throw SystemShellExecuteException( @@ -225,7 +221,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar } else if ((nFlags & css::system::SystemShellExecuteFlags::URIS_ONLY) != 0) { throw css::lang::IllegalArgumentException( - (rtl::OUString( + (OUString( "XSystemShellExecute.execute URIS_ONLY with non-absolute" " URI reference ") + aCommand), diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx index daa5937ce0b6..741cdac8642d 100644 --- a/shell/source/unix/exec/shellexec.hxx +++ b/shell/source/unix/exec/shellexec.hxx @@ -34,7 +34,7 @@ class ShellExec : public ::cppu::WeakImplHelper2< com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo > { - ::rtl::OString m_aDesktopEnvironment; + OString m_aDesktopEnvironment; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; @@ -45,26 +45,26 @@ public: // XSystemShellExecute //------------------------------------------------ - virtual void SAL_CALL execute( const ::rtl::OUString& aCommand, const ::rtl::OUString& aParameter, sal_Int32 nFlags ) + virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; // helper function - needed for urltest -void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL); +void escapeForShell( OStringBuffer & rBuffer, const OString & rURL); #endif diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx index bfdd69e05957..5a85dbe18dfa 100644 --- a/shell/source/unix/exec/urltest.cxx +++ b/shell/source/unix/exec/urltest.cxx @@ -64,8 +64,8 @@ int main(int argc, const char *argv[]) printf( "Passing URL: %s\n", url ); // test the encoding functionality from shellexec.cxx - rtl::OString aURL( url ); - rtl::OStringBuffer aBuffer; + OString aURL( url ); + OStringBuffer aBuffer; escapeForShell(aBuffer, aURL); // append encoded URL as (only) parameter to the script diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index f0430e52a5c9..b1a71b795ab4 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -30,12 +30,12 @@ #include <unistd.h> -const rtl::OUString RECENTLY_USED_FILE_NAME(".recently-used"); -const rtl::OUString SLASH("/"); +const OUString RECENTLY_USED_FILE_NAME(".recently-used"); +const OUString SLASH("/"); namespace /* private */ { -inline void ensure_final_slash(/*inout*/ rtl::OUString& path) +inline void ensure_final_slash(/*inout*/ OUString& path) { if (!path.isEmpty() && (SLASH.pData->buffer[0] != path.pData->buffer[path.getLength() - 1])) @@ -49,19 +49,19 @@ recently_used_file::recently_used_file() : file_(NULL) { osl::Security sec; - rtl::OUString homedir_url; + OUString homedir_url; if (sec.getHomeDir(homedir_url)) { - rtl::OUString homedir; + OUString homedir; osl::FileBase::getSystemPathFromFileURL(homedir_url, homedir); - rtl::OUString rufn = homedir; + OUString rufn = homedir; ensure_final_slash(rufn); rufn += RECENTLY_USED_FILE_NAME; - rtl::OString tmp = - rtl::OUStringToOString(rufn, osl_getThreadTextEncoding()); + OString tmp = + OUStringToOString(rufn, osl_getThreadTextEncoding()); file_ = fopen(tmp.getStr(), "r+"); diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 21c467d0ed8f..92695077c2df 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -122,7 +122,7 @@ namespace /* private */ { write_xml_tag(TAG_URI, uri_, file); write_xml_tag(TAG_MIME_TYPE, mime_type_, file); - rtl::OString ts = rtl::OString::valueOf((sal_sSize)timestamp_); + OString ts = OString::valueOf((sal_sSize)timestamp_); write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); if (is_private_) @@ -143,9 +143,9 @@ namespace /* private */ { write_xml_end_tag(TAG_RECENT_ITEM, file); } - static rtl::OString escape_content(const string_t &text) + static OString escape_content(const string_t &text) { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; for (sal_uInt32 i = 0; i < text.length(); i++) { switch (text[i]) @@ -164,7 +164,7 @@ namespace /* private */ { void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const { write_xml_start_tag(name, file); - rtl::OString escaped = escape_content (value); + OString escaped = escape_content (value); file.write(escaped.getStr(), escaped.getLength()); write_xml_end_tag(name, file); } @@ -398,9 +398,9 @@ namespace /* private */ { //------------------------------------------------ void recently_used_item_list_add( - recently_used_item_list_t& item_list, const rtl::OUString& file_url, const rtl::OUString& mime_type) + recently_used_item_list_t& item_list, const OUString& file_url, const OUString& mime_type) { - rtl::OString f = rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8); + OString f = OUStringToOString(file_url, RTL_TEXTENCODING_UTF8); recently_used_item_list_t::iterator iter = std::find_if( @@ -427,7 +427,7 @@ namespace /* private */ { groups.push_back(GROUP_STAR_SUITE); string_t uri(f.getStr()); - string_t mimetype(rtl::OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr()); + string_t mimetype(OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr()); if (mimetype.length() == 0) mimetype = "application/octet-stream"; @@ -481,8 +481,8 @@ namespace /* private */ { */ extern "C" SAL_DLLPUBLIC_EXPORT -void add_to_recently_used_file_list(const rtl::OUString& file_url, - const rtl::OUString& mime_type) +void add_to_recently_used_file_list(const OUString& file_url, + const OUString& mime_type) { try { diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 30ff62deb07b..1279dafa2c19 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -47,7 +47,6 @@ using com::sun::star::uno::XInterface; using com::sun::star::lang::EventObject; using com::sun::star::lang::XServiceInfo; using com::sun::star::lang::IllegalArgumentException; -using rtl::OUString; using osl::Mutex; using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; @@ -282,7 +281,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa if (!(uri.is() && uri->isAbsolute())) { throw css::lang::IllegalArgumentException( - (rtl::OUString( + (OUString( "XSystemShellExecute.execute URIS_ONLY with" " non-absolute URI reference ") + aCommand), diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx index 01941cc2b215..39cd51e47f6f 100644 --- a/shell/source/win32/SysShExec.hxx +++ b/shell/source/win32/SysShExec.hxx @@ -53,20 +53,20 @@ public: // XSystemShellExecute //------------------------------------------------ - virtual void SAL_CALL execute( const ::rtl::OUString& aCommand, const ::rtl::OUString& aParameter, sal_Int32 nFlags ) + virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 5a27c849012b..869a683d0bb6 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -164,7 +164,7 @@ void initMapiMessage( rtl_uString_newFromAscii(&subject, const_cast<char*>(gSubject.c_str())); rtl_uString *decoded_subject = NULL; rtl_uriDecode(subject, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &decoded_subject); - rtl::OUString ou_subject(decoded_subject); + OUString ou_subject(decoded_subject); pMapiMessage->lpszSubject = strdup(OUStringToOString(ou_subject, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr()); } catch (...) { diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 55445ad32f7a..9db17ce8347c 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -49,25 +49,25 @@ using css::system::XSimpleMailMessage; using css::system::SimpleMailClientFlags::NO_USER_INTERFACE; using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG; -typedef std::vector<rtl::OUString> StringList_t; +typedef std::vector<OUString> StringList_t; -const rtl::OUString TO("--to"); -const rtl::OUString CC("--cc"); -const rtl::OUString BCC("--bcc"); -const rtl::OUString FROM("--from"); -const rtl::OUString SUBJECT("--subject"); -const rtl::OUString ATTACH("--attach"); -const rtl::OUString FLAG_MAPI_DIALOG("--mapi-dialog"); -const rtl::OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui"); +const OUString TO("--to"); +const OUString CC("--cc"); +const OUString BCC("--bcc"); +const OUString FROM("--from"); +const OUString SUBJECT("--subject"); +const OUString ATTACH("--attach"); +const OUString FLAG_MAPI_DIALOG("--mapi-dialog"); +const OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui"); namespace /* private */ { /** @internal look if an alternative program is configured which should be used as senddoc executable */ - rtl::OUString getAlternativeSenddocUrl() + OUString getAlternativeSenddocUrl() { - rtl::OUString altSenddocUrl; + OUString altSenddocUrl; HKEY hkey; LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\LibreOffice\\SendAsEMailClient", &hkey); if (lret == ERROR_SUCCESS) @@ -91,13 +91,13 @@ namespace /* private */ the absolute file Url of the senddoc executable. In case of an error an empty string will be returned. */ - rtl::OUString getSenddocUrl() + OUString getSenddocUrl() { - rtl::OUString senddocUrl = getAlternativeSenddocUrl(); + OUString senddocUrl = getAlternativeSenddocUrl(); if (senddocUrl.getLength() == 0) { - senddocUrl = rtl::OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); + senddocUrl = OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; @@ -114,7 +114,7 @@ namespace /* private */ */ bool executeSenddoc(const StringList_t& rCommandArgs) { - rtl::OUString senddocUrl = getSenddocUrl(); + OUString senddocUrl = getSenddocUrl(); if (senddocUrl.getLength() == 0) return false; @@ -122,7 +122,7 @@ namespace /* private */ oslProcessError err = osl_Process_E_Unknown; /* for efficiency reasons we are using a 'bad' cast here - as a vector or rtl::OUStrings is nothing else than + as a vector or OUStrings is nothing else than an array of pointers to rtl_uString's */ err = osl_executeProcess( senddocUrl.pData, @@ -175,49 +175,49 @@ void CSmplMailClient::assembleCommandLine( { OSL_ENSURE(rCommandArgs.empty(), "Provided command argument buffer not empty"); - rtl::OUString to = xSimpleMailMessage->getRecipient(); + OUString to = xSimpleMailMessage->getRecipient(); if (to.getLength() > 0) { rCommandArgs.push_back(TO); rCommandArgs.push_back(to); } - Sequence<rtl::OUString> ccRecipients = xSimpleMailMessage->getCcRecipient(); + Sequence<OUString> ccRecipients = xSimpleMailMessage->getCcRecipient(); for (int i = 0; i < ccRecipients.getLength(); i++) { rCommandArgs.push_back(CC); rCommandArgs.push_back(ccRecipients[i]); } - Sequence<rtl::OUString> bccRecipients = xSimpleMailMessage->getBccRecipient(); + Sequence<OUString> bccRecipients = xSimpleMailMessage->getBccRecipient(); for (int i = 0; i < bccRecipients.getLength(); i++) { rCommandArgs.push_back(BCC); rCommandArgs.push_back(bccRecipients[i]); } - rtl::OUString from = xSimpleMailMessage->getOriginator(); + OUString from = xSimpleMailMessage->getOriginator(); if (from.getLength() > 0) { rCommandArgs.push_back(FROM); rCommandArgs.push_back(from); } - rtl::OUString subject = xSimpleMailMessage->getSubject(); + OUString subject = xSimpleMailMessage->getSubject(); if (subject.getLength() > 0) { rCommandArgs.push_back(SUBJECT); rCommandArgs.push_back(subject); } - Sequence<rtl::OUString> attachments = xSimpleMailMessage->getAttachement(); + Sequence<OUString> attachments = xSimpleMailMessage->getAttachement(); for (int i = 0; i < attachments.getLength(); i++) { - rtl::OUString sysPath; + OUString sysPath; osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath); if (err != osl::FileBase::E_None) throw IllegalArgumentException( - rtl::OUString("Invalid attachment file URL"), + OUString("Invalid attachment file URL"), static_cast<XSimpleMailClient*>(this), 1); @@ -243,7 +243,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage( if (!executeSenddoc(senddocParams)) throw Exception( - rtl::OUString("Send email failed"), + OUString("Send email failed"), static_cast<XSimpleMailClient*>(this)); } @@ -252,7 +252,7 @@ void CSmplMailClient::validateParameter( { if (!xSimpleMailMessage.is()) throw IllegalArgumentException( - rtl::OUString("Empty mail message reference"), + OUString("Empty mail message reference"), static_cast<XSimpleMailClient*>(this), 1); @@ -261,14 +261,14 @@ void CSmplMailClient::validateParameter( // check the flags, the allowed range is 0 - (2^n - 1) if (aFlag < 0 || aFlag > 3) throw IllegalArgumentException( - rtl::OUString("Invalid flag value"), + OUString("Invalid flag value"), static_cast<XSimpleMailClient*>(this), 2); // check if a recipient is specified of the flags NO_USER_INTERFACE is specified if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength()) throw IllegalArgumentException( - rtl::OUString("No recipient specified"), + OUString("No recipient specified"), static_cast<XSimpleMailClient*>(this), 1); } diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx index 58214bcf5878..c9020678b30d 100644 --- a/shell/source/win32/simplemail/smplmailclient.hxx +++ b/shell/source/win32/simplemail/smplmailclient.hxx @@ -36,7 +36,7 @@ public: private: void validateParameter(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag); - void assembleCommandLine(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag, std::vector<rtl::OUString>& rCommandArgs); + void assembleCommandLine(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag, std::vector<OUString>& rCommandArgs); }; #endif diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index d5f23844a055..bae8bec90db7 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -31,7 +31,6 @@ using com::sun::star::uno::RuntimeException; using com::sun::star::uno::Sequence; using com::sun::star::lang::XServiceInfo; using com::sun::star::lang::IllegalArgumentException; -using rtl::OUString; using osl::Mutex; using namespace cppu; @@ -46,7 +45,7 @@ CSmplMailMsg::CSmplMailMsg( ) //------------------------------------------------ -void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) +void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { m_aRecipient = aRecipient; @@ -54,7 +53,7 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) //------------------------------------------------ -::rtl::OUString SAL_CALL CSmplMailMsg::getRecipient( ) +OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) { return m_aRecipient; @@ -126,7 +125,7 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) //------------------------------------------------ -void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachement ) +void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) { m_Attachements = aAttachement; diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index addaab07adff..76e3822a6a32 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -38,59 +38,59 @@ public: //------------------------------------------------ - virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) + virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRecipient( ) + virtual OUString SAL_CALL getRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) + virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) + virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) + virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOriginator( ) + virtual OUString SAL_CALL getOriginator( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) + virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubject( ) + virtual OUString SAL_CALL getSubject( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) + virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aRecipient; - rtl::OUString m_aOriginator; - rtl::OUString m_aSubject; - com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients; - com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients; - com::sun::star::uno::Sequence< rtl::OUString > m_Attachements; + OUString m_aRecipient; + OUString m_aOriginator; + OUString m_aSubject; + com::sun::star::uno::Sequence< OUString > m_CcRecipients; + com::sun::star::uno::Sequence< OUString > m_BccRecipients; + com::sun::star::uno::Sequence< OUString > m_Attachements; }; #endif diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx index 3dc241a911be..76ba6c0dabc4 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.cxx +++ b/shell/source/win32/simplemail/smplmailsuppl.cxx @@ -27,7 +27,6 @@ using com::sun::star::uno::Sequence; using com::sun::star::lang::XServiceInfo; using com::sun::star::system::XSimpleMailClientSupplier; using com::sun::star::system::XSimpleMailClient; -using rtl::OUString; using osl::Mutex; using namespace cppu; diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx index ca88982547c1..557c01d78e53 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.hxx +++ b/shell/source/win32/simplemail/smplmailsuppl.hxx @@ -50,13 +50,13 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; |