diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-09-05 00:15:25 -0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-05 09:26:10 +0200 |
| commit | a60f9112146b23566a6a0ff3a5109889f4b7c0b1 (patch) | |
| tree | 174f64efee745533f2ffa8f6c9b56cbb823462c3 /binaryurp/source/writer.cxx | |
| parent | a82e532ce006c54b2740de74d1da5d11307da7c1 (diff) | |
OUString and RTL_CONSTASCII cleanup
Change-Id: Ic56451b2c13d8561bb6e6ee92bf9147b35640a5c
Diffstat (limited to 'binaryurp/source/writer.cxx')
| -rw-r--r-- | binaryurp/source/writer.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index a8091a9c2dfd..7d15fd750c72 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -163,10 +163,8 @@ void Writer::execute() { (item.oid != "UrpProtocolProperties" && !item.member.equals( css::uno::TypeDescription( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XInterface::" - "release")))) && + "com.sun.star.uno.XInterface::" + "release")) && bridge_->isCurrentContextMode()), item.currentContext); } else { @@ -241,8 +239,7 @@ void Writer::sendRequest( OSL_ASSERT(functionId >= 0); if (functionId > SAL_MAX_UINT16) { throw css::uno::RuntimeException( - OUString( - RTL_CONSTASCII_USTRINGPARAM("function ID too large for URP")), + "function ID too large for URP", css::uno::Reference< css::uno::XInterface >()); } std::vector< unsigned char > buf; @@ -409,8 +406,7 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) { std::vector< unsigned char > header; if (buffer.size() > SAL_MAX_UINT32) { throw css::uno::RuntimeException( - OUString( - RTL_CONSTASCII_USTRINGPARAM("message too large for URP")), + "message too large for URP", css::uno::Reference< css::uno::XInterface >()); } Marshal::write32(&header, static_cast< sal_uInt32 >(buffer.size())); @@ -435,10 +431,8 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) { } catch (const css::io::IOException & e) { css::uno::Any exc(cppu::getCaughtException()); throw css::lang::WrappedTargetRuntimeException( - (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Binary URP write raised IO exception: ")) + - e.Message), + ("Binary URP write raised IO exception: " + + e.Message), css::uno::Reference< css::uno::XInterface >(), exc); } n = static_cast< std::vector< unsigned char >::size_type >(n - k); |