diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /extensions/source | |
parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 8 | ||||
-rw-r--r-- | extensions/source/config/ldap/ldapuserprofilebe.cxx | 20 | ||||
-rw-r--r-- | extensions/source/plugin/unx/sysplug.cxx | 3 | ||||
-rw-r--r-- | extensions/source/propctrlr/objectinspectormodel.cxx | 2 |
5 files changed, 17 insertions, 18 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 25d1d12d1b9d..5ea8c5b0e639 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -534,7 +534,7 @@ namespace abp // failure to create the interaction handler is a serious issue ... if (!xInteractions.is()) { - ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); + ::rtl::OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); if ( _pMessageParent ) ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True ); return sal_False; diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index d0af8438ccf2..1bf4ac6d0b2e 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -52,14 +52,14 @@ namespace abp //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" )); + static const ::rtl::OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" )); + static const ::rtl::OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); return s_sAddressBookNodeName; } @@ -237,8 +237,8 @@ namespace abp const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" )); - const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" )); + const ::rtl::OUString sProgrammaticNodeName( "ProgrammaticFieldName" ); + const ::rtl::OUString sAssignedNodeName( "AssignedFieldName" ); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index b3b2fdc0d07e..58be55f2e894 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -90,16 +90,16 @@ bool LdapUserProfileBe::readLdapConfiguration( LdapDefinition * definition, rtl::OUString * loggedOnUser) { OSL_ASSERT(context.is() && definition != 0 && loggedOnUser != 0); - const rtl::OUString kReadOnlyViewService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")) ; - const rtl::OUString kComponent( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.LDAP/UserDirectory")); - const rtl::OUString kServerDefiniton(RTL_CONSTASCII_USTRINGPARAM ("ServerDefinition")); - const rtl::OUString kServer(RTL_CONSTASCII_USTRINGPARAM ("Server")); - const rtl::OUString kPort(RTL_CONSTASCII_USTRINGPARAM("Port")); - const rtl::OUString kBaseDN(RTL_CONSTASCII_USTRINGPARAM("BaseDN")); - const rtl::OUString kUser(RTL_CONSTASCII_USTRINGPARAM("SearchUser")); - const rtl::OUString kPassword(RTL_CONSTASCII_USTRINGPARAM("SearchPassword")); - const rtl::OUString kUserObjectClass(RTL_CONSTASCII_USTRINGPARAM("UserObjectClass")); - const rtl::OUString kUserUniqueAttr(RTL_CONSTASCII_USTRINGPARAM("UserUniqueAttribute")); + const rtl::OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; + const rtl::OUString kComponent("org.openoffice.LDAP/UserDirectory"); + const rtl::OUString kServerDefiniton("ServerDefinition"); + const rtl::OUString kServer("Server"); + const rtl::OUString kPort("Port"); + const rtl::OUString kBaseDN("BaseDN"); + const rtl::OUString kUser("SearchUser"); + const rtl::OUString kPassword("SearchPassword"); + const rtl::OUString kUserObjectClass("UserObjectClass"); + const rtl::OUString kUserUniqueAttr("UserUniqueAttribute"); uno::Reference< XInterface > xIface; try diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index 584bae01a1dd..d711543d58f9 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -136,8 +136,7 @@ UnxPluginComm::~UnxPluginComm() bool UnxPluginComm::getPluginappPath(rtl::OString * path) { OSL_ASSERT(path != NULL); - rtl::OUString p( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/pluginapp.bin")); + rtl::OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 287ba8b2cb2b..94f6464900b9 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -176,7 +176,7 @@ namespace pcr //-------------------------------------------------------------------- Sequence< ::rtl::OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - ::rtl::OUString sService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspectorModel" ) ); + ::rtl::OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); return Sequence< ::rtl::OUString >( &sService, 1 ); } |