binaryurp/source/bridge.cxx | 2 +- bridges/source/cpp_uno/cc50_solaris_intel/except.cxx | 3 +-- bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx | 4 ++-- bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx | 3 +-- bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit f6edfefd53caf7e4aa6c2b39cdaf666ad54884c3 Author: Krisztian Pinter <pin.termina...@gmail.com> Date: Mon Feb 18 15:10:30 2013 +0100 RTL_CONSTASCII_USTRINGPARAM removals Change-Id: Ib483f271d3c826a2b7192b22a174ff9f7b18c3f8 Reviewed-on: https://gerrit.libreoffice.org/2241 Reviewed-by: Olivier Hallot <olivier.hal...@alta.org.br> Tested-by: Olivier Hallot <olivier.hal...@alta.org.br> diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 5b463f5..31fc342 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -182,7 +182,7 @@ Bridge::Bridge( protPropTid_( reinterpret_cast< sal_Int8 const * >(".UrpProtocolPropertiesTid"), RTL_CONSTASCII_LENGTH(".UrpProtocolPropertiesTid")), - protPropOid_(RTL_CONSTASCII_USTRINGPARAM("UrpProtocolProperties")), + protPropOid_("UrpProtocolProperties"), protPropType_( cppu::UnoType< css::uno::Reference< css::bridge::XProtocolProperties > >::get()), diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx index f7c5514..36bd7a6 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx @@ -408,8 +408,7 @@ void cc50_solaris_intel_fillUnoException( if (pExcTypeDescr == 0) // the thing that should not be { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "exception type not found: ") ) + aName, + "exception type not found: " + aName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx index 32330cc..85a5965 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx @@ -321,7 +321,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName( "void" ); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); @@ -394,7 +394,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + "illegal member type description!", ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx index 56de9c4..ebb0918 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx @@ -401,8 +401,7 @@ void cc50_solaris_sparc_fillUnoException( if (pExcTypeDescr == 0) // the thing that should not be { RuntimeException aRE( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "exception type not found: ") ) + aName, + "exception type not found: " + aName, Reference< XInterface >() ); Type const & rType = ::getCppuType( &aRE ); uno_type_any_constructAndConvert( diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx index 20142dc..6fad40b 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx @@ -299,7 +299,7 @@ void unoInterfaceProxyDispatch( aParam.bOut = sal_False; typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); + OUString aVoidName( "void" ); typelib_typedescriptionreference_new( &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); @@ -372,7 +372,7 @@ void unoInterfaceProxyDispatch( default: { ::com::sun::star::uno::RuntimeException aExc( - OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), + "illegal member type description!", ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); Type const & rExcType = ::getCppuType( &aExc ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits