From 8b27d78b4afaa9c47ca0fda144c8060f2f14046b Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 19 Mar 2013 09:22:44 +0100 Subject: automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- shell/source/backends/desktopbe/desktopbackend.cxx | 18 ++++++------------ shell/source/backends/gconfbe/gconfaccess.cxx | 3 +-- shell/source/backends/gconfbe/gconfbackend.cxx | 9 +++------ shell/source/backends/kde4be/kde4backend.cxx | 9 +++------ shell/source/backends/kdebe/kdebackend.cxx | 9 +++------ 5 files changed, 16 insertions(+), 32 deletions(-) (limited to 'shell') diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index a5631c9d7486..c83401082cfa 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -55,8 +55,7 @@ namespace { rtl::OUString SAL_CALL getDefaultImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.DesktopBackend")); + "com.sun.star.comp.configuration.backend.DesktopBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() { @@ -147,8 +146,7 @@ void Default::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } @@ -198,8 +196,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::getCurrentContext()); if (current.is()) { current->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; } @@ -209,20 +206,17 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.GconfBackend"))); + "com.sun.star.configuration.backend.GconfBackend")); } else if ( desktop == "KDE" ) { backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDEBackend"))); + "com.sun.star.configuration.backend.KDEBackend")); } else if ( desktop == "KDE4" ) { backend = createBackend( context, rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.backend.KDE4Backend"))); + "com.sun.star.configuration.backend.KDE4Backend")); } return backend.is() ? backend : static_cast< cppu::OWeakObject * >(new Default); diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 71276daae499..34aa138f10a7 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -69,8 +69,7 @@ GConfClient* getGconfClient() mClient = gconf_client_get_default(); if (!mClient) { - throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM - ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection")),NULL); + throw uno::RuntimeException(rtl::OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); } static const char * const PreloadValuesList[] = diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index ac7b736dc72b..b4f258af9b08 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.GconfBackend")); + "com.sun.star.comp.configuration.backend.GconfBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "GNOME"; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index ca41910d5118..f6b7fb9bf8d2 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.KDE4Backend")); + "com.sun.star.comp.configuration.backend.KDE4Backend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 4945433e5abc..82a4989e8df2 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -56,8 +56,7 @@ namespace { rtl::OUString SAL_CALL getServiceImplementationName() { return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.configuration.backend.KDEBackend")); + "com.sun.star.comp.configuration.backend.KDEBackend"); } css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { @@ -149,8 +148,7 @@ Service::Service(): enabled_(false) { if (context.is()) { rtl::OUString desktop; context->getValueByName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= + rtl::OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE" && KApplication::kApplication() != 0; } @@ -163,8 +161,7 @@ void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")), + rtl::OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -- cgit v1.2.3