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 /cli_ure/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 'cli_ure/source')
-rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index d5d17baf5b32..828e7f4f41e1 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -237,7 +237,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD) case typelib_TypeClass_INTERFACE: { //special handling for XInterface, since it does not exist in cli. - rtl::OUString usXInterface(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")); + rtl::OUString usXInterface("com.sun.star.uno.XInterface"); if (usXInterface.equals(pTD->pTypeName)) retVal= System::Object::typeid; else @@ -1072,7 +1072,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, { typelib_TypeDescriptionReference * member_type= NULL; - rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")); + rtl::OUString usUnoException("com.sun.star.uno.Exception"); for (; nPos < nMembers; ++nPos) { member_type= comp_td->ppTypeRefs[nPos]; @@ -1092,7 +1092,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, // System.Exception property. Type.GetField("Message") returns null if ( ! aField && usUnoException.equals(td.get()->pTypeName)) {// get Exception.Message property - rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message")); + rtl::OUString usMessageMember("Message"); if (usMessageMember.equals(comp_td->ppMemberNames[nPos])) { sr::PropertyInfo^ pi= cliType->GetProperty( @@ -1625,7 +1625,7 @@ void Bridge::map_to_cli( pCTD = pCTD->pBaseTypeDescription; int nPos = -1; - rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message")); + rtl::OUString usMessageMember("Message"); for (int i = 0; i < pCTD->nMembers; i ++) { #if OSL_DEBUG_LEVEL >= 2 @@ -1685,7 +1685,7 @@ void Bridge::map_to_cli( ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr, true); } - rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")); + rtl::OUString usUnoException("com.sun.star.uno.Exception"); for (sal_Int32 nPos = comp_td->nMembers; nPos--; ) { typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ]; |