[Libreoffice-commits] .: 2 commits - binaryurp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 01:13:15 PDT 2012
binaryurp/source/bridge.cxx | 87 ++++++++--------------------------
binaryurp/source/bridgefactory.cxx | 24 ++-------
binaryurp/source/currentcontext.cxx | 10 +--
binaryurp/source/incomingrequest.cxx | 13 +----
binaryurp/source/marshal.cxx | 6 --
binaryurp/source/outgoingrequests.cxx | 3 -
binaryurp/source/proxy.cxx | 7 +-
binaryurp/source/reader.cxx | 85 +++++++++------------------------
binaryurp/source/unmarshal.cxx | 84 ++++++++------------------------
binaryurp/source/writer.cxx | 16 +-----
10 files changed, 94 insertions(+), 241 deletions(-)
New commits:
commit 7a7a2c5495e9e03181843c327a0c28fd6e5e88bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 5 10:12:40 2012 +0200
Cosmetics
Change-Id: I7b217c4fb48bbee4a2872d15cf23a955b464ffca
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 89ef720..e59311d 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -180,12 +180,8 @@ Bridge::Bridge(
factory_(factory), name_(name), connection_(connection),
provider_(provider),
binaryUno_(UNO_LB_UNO),
- cppToBinaryMapping_(
- CPPU_CURRENT_LANGUAGE_BINDING_NAME,
- UNO_LB_UNO),
- binaryToCppMapping_(
- UNO_LB_UNO,
- CPPU_CURRENT_LANGUAGE_BINDING_NAME),
+ cppToBinaryMapping_(CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_UNO),
+ binaryToCppMapping_(UNO_LB_UNO, CPPU_CURRENT_LANGUAGE_BINDING_NAME),
protPropTid_(
reinterpret_cast< sal_Int8 const * >(".UrpProtocolPropertiesTid"),
RTL_CONSTASCII_LENGTH(".UrpProtocolPropertiesTid")),
@@ -193,10 +189,8 @@ Bridge::Bridge(
protPropType_(
cppu::UnoType<
css::uno::Reference< css::bridge::XProtocolProperties > >::get()),
- protPropRequest_(
- "com.sun.star.bridge.XProtocolProperties::requestChange"),
- protPropCommit_(
- "com.sun.star.bridge.XProtocolProperties::commitChange"),
+ protPropRequest_("com.sun.star.bridge.XProtocolProperties::requestChange"),
+ protPropCommit_("com.sun.star.bridge.XProtocolProperties::commitChange"),
state_(STATE_INITIAL), threadPool_(0), currentContextMode_(false),
proxies_(0), calls_(0), normalCall_(false), activeCalls_(0),
mode_(MODE_REQUESTED)
@@ -696,8 +690,7 @@ void Bridge::handleRequestChangeReply(
}
if (n != exp) {
throw css::uno::RuntimeException(
- "URP: requestChange reply with unexpected return value"
- " received",
+ "URP: requestChange reply with unexpected return value received",
static_cast< cppu::OWeakObject * >(this));
}
decrementCalls();
@@ -797,8 +790,7 @@ void Bridge::handleCommitChangeRequest(
assert(ok);
(void) ok; // avoid warnings
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
- if ( s[i].Name == "CurrentContext" )
- {
+ if (s[i].Name == "CurrentContext") {
ccMode = true;
} else {
ccMode = false;
@@ -883,8 +875,8 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
for (sal_Int32 i = 0; i != sInstanceName.getLength(); ++i) {
if (sInstanceName[i] > 0x7F) {
throw css::io::IOException(
- "XBridge::getInstance sInstanceName contains non-ASCII"
- " character",
+ ("XBridge::getInstance sInstanceName contains non-ASCII"
+ " character"),
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -997,8 +989,7 @@ void Bridge::makeReleaseCall(
AttachThread att(getThreadPool());
sendRequest(
att.getTid(), oid, type,
- css::uno::TypeDescription(
- "com.sun.star.uno.XInterface::release"),
+ css::uno::TypeDescription("com.sun.star.uno.XInterface::release"),
std::vector< BinaryAny >());
}
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index c53e56c..634ddb3 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -52,14 +52,12 @@ css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
}
OUString BridgeFactory::static_getImplementationName() {
- return OUString(
- "com.sun.star.comp.bridge.BridgeFactory");
+ return OUString("com.sun.star.comp.bridge.BridgeFactory");
}
css::uno::Sequence< OUString >
BridgeFactory::static_getSupportedServiceNames() {
- OUString name(
- "com.sun.star.bridge.BridgeFactory");
+ OUString name("com.sun.star.bridge.BridgeFactory");
return css::uno::Sequence< OUString >(&name, 1);
}
@@ -132,11 +130,10 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
throw css::bridge::BridgeExistsException(
sName, static_cast< cppu::OWeakObject * >(this));
}
- if ( sProtocol != "urp" || !aConnection.is() )
- {
+ if (sProtocol != "urp" || !aConnection.is()) {
throw css::lang::IllegalArgumentException(
- "BridgeFactory::createBridge: sProtocol != urp ||"
- " aConnection == null",
+ ("BridgeFactory::createBridge: sProtocol != urp ||"
+ " aConnection == null"),
static_cast< cppu::OWeakObject * >(this), -1);
}
b.set(new Bridge(this, sName, aConnection, anInstanceProvider));
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index ffe33e2..b156196 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -81,8 +81,8 @@ void IncomingRequest::execute() const {
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
("caught C++ exception: " +
- rtl::OStringToOUString(
- rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
+ OStringToOUString(
+ OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
css::uno::Reference< css::uno::XInterface >());
// best-effort string conversion
}
@@ -156,10 +156,8 @@ bool IncomingRequest::execute_throw(
OSL_TRACE(
(OSL_LOG_PREFIX "initial element '%s':"
" NoSuchElementException '%s'"),
- (OUStringToOString(oid_, RTL_TEXTENCODING_UTF8).
- getStr()),
- (OUStringToOString(
- e.Message, RTL_TEXTENCODING_UTF8).
+ OUStringToOString(oid_, RTL_TEXTENCODING_UTF8).getStr(),
+ (OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
getStr()));
}
}
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index 43a73ac..d5c9f71 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -76,7 +76,7 @@ void writeString(
std::vector< unsigned char > * buffer, OUString const & value)
{
assert(buffer != 0);
- rtl::OString v;
+ OString v;
if (!value.convertToString(
&v, RTL_TEXTENCODING_UTF8,
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index b688987..4d01b2b 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -110,8 +110,8 @@ void Proxy::do_dispatch(
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
("caught C++ exception: " +
- rtl::OStringToOUString(
- rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
+ OStringToOUString(
+ OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
css::uno::Reference< css::uno::XInterface >());
// best-effort string conversion
}
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index d938a8e..353c07e 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -24,6 +24,7 @@
#include <memory>
#include <vector>
+#include "boost/scoped_ptr.hpp"
#include "com/sun/star/connection/XConnection.hpp"
#include "com/sun/star/io/IOException.hpp"
#include "com/sun/star/uno/Any.hxx"
@@ -54,8 +55,6 @@
#include "specialfunctionids.hxx"
#include "unmarshal.hxx"
-#include <boost/scoped_ptr.hpp>
-
namespace binaryurp {
namespace {
@@ -119,8 +118,7 @@ void Reader::execute() {
header.done();
if (count == 0) {
throw css::io::IOException(
- "binaryurp::Reader: block with zero message count"
- " received",
+ "binaryurp::Reader: block with zero message count received",
css::uno::Reference< css::uno::XInterface >());
}
Unmarshal block(bridge_, state_, read(con, size, false));
@@ -158,8 +156,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
if (((flags2 & 0x40) != 0) != forceSynchronous) {
// bit 6: SYNCHRONOUS
throw css::uno::RuntimeException(
- "URP: request message with MUSTREPLY != SYNCHRONOUS"
- " received",
+ ("URP: request message with MUSTREPLY != SYNCHRONOUS"
+ " received"),
css::uno::Reference< css::uno::XInterface >());
}
} else {
@@ -182,8 +180,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (!lastType_.is()) {
throw css::uno::RuntimeException(
- "URP: request message with NEWTYPE received when last"
- " interface type has not yet been set",
+ ("URP: request message with NEWTYPE received when last"
+ " interface type has not yet been set"),
css::uno::Reference< css::uno::XInterface >());
}
type = lastType_;
@@ -200,8 +198,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (lastOid_.isEmpty()) {
throw css::uno::RuntimeException(
- "URP: request message with NEWOID received when last"
- " OID has not yet been set",
+ ("URP: request message with NEWOID received when last OID has"
+ " not yet been set"),
css::uno::Reference< css::uno::XInterface >());
}
oid = lastOid_;
@@ -211,8 +209,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
type.makeComplete();
if (type.get()->eTypeClass != typelib_TypeClass_INTERFACE) {
throw css::uno::RuntimeException(
- "URP: request message with non-interface interface type"
- " received",
+ "URP: request message with non-interface interface type received",
css::uno::Reference< css::uno::XInterface >());
}
typelib_InterfaceTypeDescription * itd =
@@ -248,8 +245,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (forceSynchronous) {
throw css::uno::RuntimeException(
- "URP: synchronous request message with non-oneway"
- " function ID received",
+ ("URP: synchronous request message with non-oneway function ID"
+ " received"),
css::uno::Reference< css::uno::XInterface >());
}
synchronous = true;
@@ -302,8 +299,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
break;
default:
throw css::uno::RuntimeException(
- "URP: request message with UrpProtocolProperties OID"
- " and unknown function ID received",
+ ("URP: request message with UrpProtocolProperties OID and"
+ " unknown function ID received"),
css::uno::Reference< css::uno::XInterface >());
}
} else {
@@ -333,16 +330,15 @@ void Reader::readMessage(Unmarshal & unmarshal) {
css::uno::XInterface > >::get())))))
{
throw css::uno::RuntimeException(
- "URP: queryInterface request message with"
- " unknown OID received",
+ ("URP: queryInterface request message with unknown OID"
+ " received"),
css::uno::Reference< css::uno::XInterface >());
}
}
break;
case SPECIAL_FUNCTION_ID_RESERVED:
throw css::uno::RuntimeException(
- "URP: request message with unknown function ID 1"
- " received",
+ "URP: request message with unknown function ID 1 received",
css::uno::Reference< css::uno::XInterface >());
case SPECIAL_FUNCTION_ID_RELEASE:
break;
@@ -429,8 +425,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
}
if (!ok) {
throw css::uno::RuntimeException(
- "URP: reply message with bad exception type"
- " received",
+ "URP: reply message with bad exception type received",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -502,8 +497,8 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
}
if (lastTid_.getLength() == 0) {
throw css::uno::RuntimeException(
- "URP: message with NEWTID received when last TID has not"
- " yet been set",
+ ("URP: message with NEWTID received when last TID has not yet been"
+ " set"),
css::uno::Reference< css::uno::XInterface >());
}
return lastTid_;
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 59b37e7..f0c9ef5 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -146,8 +146,7 @@ css::uno::TypeDescription Unmarshal::readType() {
case typelib_TypeClass_ANY:
if ((flags & 0x80) != 0) {
throw css::io::IOException(
- "binaryurp::Unmarshal: cache flag of simple type is"
- " set",
+ "binaryurp::Unmarshal: cache flag of simple type is set",
css::uno::Reference< css::uno::XInterface >());
}
return css::uno::TypeDescription(
@@ -163,8 +162,7 @@ css::uno::TypeDescription Unmarshal::readType() {
if ((flags & 0x80) == 0) {
if (idx == cache::ignore || !state_.typeCache[idx].is()) {
throw css::io::IOException(
- "binaryurp::Unmarshal: unknown type cache"
- " index",
+ "binaryurp::Unmarshal: unknown type cache index",
css::uno::Reference< css::uno::XInterface >());
}
return state_.typeCache[idx];
@@ -176,8 +174,7 @@ css::uno::TypeDescription Unmarshal::readType() {
{
throw css::io::IOException(
- "binaryurp::Unmarshal: type with unknown"
- " name: " + str,
+ "binaryurp::Unmarshal: type with unknown name: " + str,
css::uno::Reference< css::uno::XInterface >());
}
for (css::uno::TypeDescription t2(t);
@@ -189,16 +186,16 @@ css::uno::TypeDescription Unmarshal::readType() {
t2.get())->pType);
if (!t2.is()) {
throw css::io::IOException(
- "binaryurp::Unmarshal: sequence type with"
- " unknown component type",
+ ("binaryurp::Unmarshal: sequence type with unknown"
+ " component type"),
css::uno::Reference< css::uno::XInterface >());
}
switch (t2.get()->eTypeClass) {
case typelib_TypeClass_VOID:
case typelib_TypeClass_EXCEPTION:
throw css::io::IOException(
- "binaryurp::Unmarshal: sequence type with"
- " bad component type",
+ ("binaryurp::Unmarshal: sequence type with bad"
+ " component type"),
css::uno::Reference< css::uno::XInterface >());
default:
break;
@@ -222,8 +219,7 @@ OUString Unmarshal::readOid() {
for (sal_Int32 i = 0; i != oid.getLength(); ++i) {
if (oid[i] > 0x7F) {
throw css::io::IOException(
- "binaryurp::Unmarshal: OID contains non-ASCII"
- " character",
+ "binaryurp::Unmarshal: OID contains non-ASCII character",
css::uno::Reference< css::uno::XInterface >());
}
}
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 7d15fd7..664208a 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -163,8 +163,7 @@ void Writer::execute() {
(item.oid != "UrpProtocolProperties" &&
!item.member.equals(
css::uno::TypeDescription(
- "com.sun.star.uno.XInterface::"
- "release")) &&
+ "com.sun.star.uno.XInterface::release")) &&
bridge_->isCurrentContextMode()),
item.currentContext);
} else {
@@ -431,8 +430,7 @@ 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(
- ("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);
commit a60f9112146b23566a6a0ff3a5109889f4b7c0b1
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Wed Sep 5 00:15:25 2012 -0300
OUString and RTL_CONSTASCII cleanup
Change-Id: Ic56451b2c13d8561bb6e6ee92bf9147b35640a5c
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 183d9d7..89ef720 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -179,15 +179,13 @@ Bridge::Bridge(
css::uno::Reference< css::bridge::XInstanceProvider > const & provider):
factory_(factory), name_(name), connection_(connection),
provider_(provider),
- binaryUno_(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
+ binaryUno_(UNO_LB_UNO),
cppToBinaryMapping_(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)),
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
+ CPPU_CURRENT_LANGUAGE_BINDING_NAME,
+ UNO_LB_UNO),
binaryToCppMapping_(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)),
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME))),
+ UNO_LB_UNO,
+ CPPU_CURRENT_LANGUAGE_BINDING_NAME),
protPropTid_(
reinterpret_cast< sal_Int8 const * >(".UrpProtocolPropertiesTid"),
RTL_CONSTASCII_LENGTH(".UrpProtocolPropertiesTid")),
@@ -196,13 +194,9 @@ Bridge::Bridge(
cppu::UnoType<
css::uno::Reference< css::bridge::XProtocolProperties > >::get()),
protPropRequest_(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.bridge.XProtocolProperties::requestChange"))),
+ "com.sun.star.bridge.XProtocolProperties::requestChange"),
protPropCommit_(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.bridge.XProtocolProperties::commitChange"))),
+ "com.sun.star.bridge.XProtocolProperties::commitChange"),
state_(STATE_INITIAL), threadPool_(0), currentContextMode_(false),
proxies_(0), calls_(0), normalCall_(false), activeCalls_(0),
mode_(MODE_REQUESTED)
@@ -210,14 +204,12 @@ Bridge::Bridge(
assert(factory.is() && connection.is());
if (!binaryUno_.is()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("URP: no binary UNO environment")),
+ "URP: no binary UNO environment",
css::uno::Reference< css::uno::XInterface >());
}
if (!(cppToBinaryMapping_.is() && binaryToCppMapping_.is())) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("URP: no C++ UNO mapping")),
+ "URP: no C++ UNO mapping",
css::uno::Reference< css::uno::XInterface >());
}
passive_.set();
@@ -473,9 +465,7 @@ OUString Bridge::registerOutgoingInterface(
assert(stub != &newStub);
if (j->second.references == SAL_MAX_UINT32) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: stub reference count overflow")),
+ "URP: stub reference count overflow",
css::uno::Reference< css::uno::XInterface >());
}
++j->second.references;
@@ -517,15 +507,13 @@ void Bridge::releaseStub(
Stubs::iterator i(stubs_.find(oid));
if (i == stubs_.end()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("URP: release unknown stub")),
+ "URP: release unknown stub",
css::uno::Reference< css::uno::XInterface >());
}
Stub::iterator j(i->second.find(type));
if (j == i->second.end()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("URP: release unknown stub")),
+ "URP: release unknown stub",
css::uno::Reference< css::uno::XInterface >());
}
assert(j->second.references > 0);
@@ -643,9 +631,7 @@ bool Bridge::makeCall(
}
if (resp.get() == 0) {
throw css::lang::DisposedException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "Binary URP bridge disposed during call")),
+ "Binary URP bridge disposed during call",
static_cast< cppu::OWeakObject * >(this));
}
*returnValue = resp->returnValue;
@@ -710,10 +696,8 @@ void Bridge::handleRequestChangeReply(
}
if (n != exp) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: requestChange reply with unexpected return value"
- " received")),
+ "URP: requestChange reply with unexpected return value"
+ " received",
static_cast< cppu::OWeakObject * >(this));
}
decrementCalls();
@@ -796,9 +780,7 @@ void Bridge::handleRequestChangeRequest(
}
default:
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: unexpected requestChange request received")),
+ "URP: unexpected requestChange request received",
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -824,9 +806,7 @@ void Bridge::handleCommitChangeRequest(
ret = mapCppToBinaryAny(
css::uno::makeAny(
css::bridge::InvalidProtocolChangeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "InvalidProtocolChangeException")),
+ "InvalidProtocolChangeException",
css::uno::Reference< css::uno::XInterface >(), s[i],
1)));
break;
@@ -853,9 +833,7 @@ void Bridge::handleCommitChangeRequest(
break;
default:
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: unexpected commitChange request received")),
+ "URP: unexpected commitChange request received",
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -899,18 +877,14 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
{
if (sInstanceName.isEmpty()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "XBridge::getInstance sInstanceName must be non-empty")),
+ "XBridge::getInstance sInstanceName must be non-empty",
static_cast< cppu::OWeakObject * >(this));
}
for (sal_Int32 i = 0; i != sInstanceName.getLength(); ++i) {
if (sInstanceName[i] > 0x7F) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "XBridge::getInstance sInstanceName contains non-ASCII"
- " character")),
+ "XBridge::getInstance sInstanceName contains non-ASCII"
+ " character",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -927,9 +901,7 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
bool exc = makeCall(
sInstanceName,
css::uno::TypeDescription(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uno.XInterface::queryInterface"))),
+ "com.sun.star.uno.XInterface::queryInterface"),
false, inArgs, &ret, &outArgs);
throwException(exc, ret);
return css::uno::Reference< css::uno::XInterface >(
@@ -996,7 +968,7 @@ void Bridge::removeEventListener(
void Bridge::sendCommitChangeRequest() {
assert(mode_ == MODE_REQUESTED || mode_ == MODE_REPLY_1);
css::uno::Sequence< css::bridge::ProtocolProperty > s(1);
- s[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentContext"));
+ s[0].Name = "CurrentContext";
std::vector< BinaryAny > a;
a.push_back(mapCppToBinaryAny(css::uno::makeAny(s)));
sendProtPropRequest(OutgoingRequest::KIND_COMMIT_CHANGE, a);
@@ -1026,9 +998,7 @@ void Bridge::makeReleaseCall(
sendRequest(
att.getTid(), oid, type,
css::uno::TypeDescription(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uno.XInterface::release"))),
+ "com.sun.star.uno.XInterface::release"),
std::vector< BinaryAny >());
}
@@ -1075,9 +1045,7 @@ void Bridge::checkDisposed() {
assert(state_ != STATE_INITIAL);
if (state_ != STATE_STARTED) {
throw css::lang::DisposedException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "Binary URP bridge already disposed")),
+ "Binary URP bridge already disposed",
static_cast< cppu::OWeakObject * >(this));
}
}
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 2830f26..c53e56c 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -53,14 +53,13 @@ css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
OUString BridgeFactory::static_getImplementationName() {
return OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.bridge.BridgeFactory"));
+ "com.sun.star.comp.bridge.BridgeFactory");
}
css::uno::Sequence< OUString >
BridgeFactory::static_getSupportedServiceNames() {
OUString name(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory"));
+ "com.sun.star.bridge.BridgeFactory");
return css::uno::Sequence< OUString >(&name, 1);
}
@@ -136,10 +135,8 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
if ( sProtocol != "urp" || !aConnection.is() )
{
throw css::lang::IllegalArgumentException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "BridgeFactory::createBridge: sProtocol != urp ||"
- " aConnection == null")),
+ "BridgeFactory::createBridge: sProtocol != urp ||"
+ " aConnection == null",
static_cast< cppu::OWeakObject * >(this), -1);
}
b.set(new Bridge(this, sName, aConnection, anInstanceProvider));
@@ -168,17 +165,13 @@ BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException) {
osl::MutexGuard g(*this);
if (unnamed_.size() > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "BridgeFactory::getExistingBridges: too many")),
+ "BridgeFactory::getExistingBridges: too many",
static_cast< cppu::OWeakObject * >(this));
}
sal_Int32 n = static_cast< sal_Int32 >(unnamed_.size());
if (named_.size() > static_cast< sal_uInt32 >(SAL_MAX_INT32 - n)) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "BridgeFactory::getExistingBridges: too many")),
+ "BridgeFactory::getExistingBridges: too many",
static_cast< cppu::OWeakObject * >(this));
}
n = static_cast< sal_Int32 >(n + named_.size());
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index 6fead06..a2d6c1a 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -44,11 +44,10 @@ css::uno::UnoInterfaceReference get() {
css::uno::UnoInterfaceReference cc;
if (!uno_getCurrentContext(
reinterpret_cast< void ** >(&cc.m_pUnoI),
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
+ OUString(UNO_LB_UNO).pData, 0))
{
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("uno_getCurrentContext failed")),
+ "uno_getCurrentContext failed",
css::uno::Reference< css::uno::XInterface >());
}
return cc;
@@ -58,11 +57,10 @@ void set(css::uno::UnoInterfaceReference const & value) {
css::uno::UnoInterfaceReference cc(value);
if (!uno_setCurrentContext(
cc.m_pUnoI,
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
+ OUString(UNO_LB_UNO).pData, 0))
{
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("uno_setCurrentContext failed")),
+ "uno_setCurrentContext failed",
css::uno::Reference< css::uno::XInterface >());
}
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 391b0e4..ffe33e2 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -80,8 +80,7 @@ void IncomingRequest::execute() const {
isExc = !execute_throw(&ret, &outArgs);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- (OUString(
- RTL_CONSTASCII_USTRINGPARAM("caught C++ exception: ")) +
+ ("caught C++ exception: " +
rtl::OStringToOUString(
rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
css::uno::Reference< css::uno::XInterface >());
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index 8027176..43a73ac 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -83,9 +83,7 @@ void writeString(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "UNO string contains invalid UTF-16 sequence")),
+ "UNO string contains invalid UTF-16 sequence",
css::uno::Reference< css::uno::XInterface >());
}
writeCompressed(buffer, static_cast< sal_uInt32 >(v.getLength()));
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 6969664..2a15d04 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -51,8 +51,7 @@ OutgoingRequest OutgoingRequests::top(rtl::ByteSequence const & tid) {
Map::iterator i(map_.find(tid));
if (i == map_.end()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM("URP: reply for unknown TID")),
+ "URP: reply for unknown TID",
css::uno::Reference< css::uno::XInterface >());
}
OSL_ASSERT(!i->second.empty());
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 955c614..b688987 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -109,10 +109,9 @@ void Proxy::do_dispatch(
do_dispatch_throw(member, returnValue, arguments, exception);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- (OUString(
- RTL_CONSTASCII_USTRINGPARAM("caught C++ exception: ")) +
- rtl::OStringToOUString(
- rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
+ ("caught C++ exception: " +
+ rtl::OStringToOUString(
+ rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
css::uno::Reference< css::uno::XInterface >());
// best-effort string conversion
}
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 7db83a1..d938a8e 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -69,9 +69,7 @@ css::uno::Sequence< sal_Int8 > read(
assert(connection.is());
if (size > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Reader: block size too large")),
+ "binaryurp::Reader: block size too large",
css::uno::Reference< css::uno::XInterface >());
}
css::uno::Sequence< sal_Int8 > buf;
@@ -81,9 +79,7 @@ css::uno::Sequence< sal_Int8 > read(
}
if (n != static_cast< sal_Int32 >(size)) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Reader: premature end of input")),
+ "binaryurp::Reader: premature end of input",
css::uno::Reference< css::uno::XInterface >());
}
assert(buf.getLength() == static_cast< sal_Int32 >(size));
@@ -123,10 +119,8 @@ void Reader::execute() {
header.done();
if (count == 0) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Reader: block with zero message count"
- " received")),
+ "binaryurp::Reader: block with zero message count"
+ " received",
css::uno::Reference< css::uno::XInterface >());
}
Unmarshal block(bridge_, state_, read(con, size, false));
@@ -164,10 +158,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
if (((flags2 & 0x40) != 0) != forceSynchronous) {
// bit 6: SYNCHRONOUS
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with MUSTREPLY != SYNCHRONOUS"
- " received")),
+ "URP: request message with MUSTREPLY != SYNCHRONOUS"
+ " received",
css::uno::Reference< css::uno::XInterface >());
}
} else {
@@ -190,10 +182,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (!lastType_.is()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with NEWTYPE received when last"
- " interface type has not yet been set")),
+ "URP: request message with NEWTYPE received when last"
+ " interface type has not yet been set",
css::uno::Reference< css::uno::XInterface >());
}
type = lastType_;
@@ -203,19 +193,15 @@ void Reader::readMessage(Unmarshal & unmarshal) {
oid = unmarshal.readOid();
if (oid.isEmpty()) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: emtpy OID")),
+ "binaryurp::Unmarshal: emtpy OID",
css::uno::Reference< css::uno::XInterface >());
}
lastOid_ = oid;
} else {
if (lastOid_.isEmpty()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with NEWOID received when last"
- " OID has not yet been set")),
+ "URP: request message with NEWOID received when last"
+ " OID has not yet been set",
css::uno::Reference< css::uno::XInterface >());
}
oid = lastOid_;
@@ -225,19 +211,15 @@ void Reader::readMessage(Unmarshal & unmarshal) {
type.makeComplete();
if (type.get()->eTypeClass != typelib_TypeClass_INTERFACE) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with non-interface interface type"
- " received")),
+ "URP: request message with non-interface interface type"
+ " received",
css::uno::Reference< css::uno::XInterface >());
}
typelib_InterfaceTypeDescription * itd =
reinterpret_cast< typelib_InterfaceTypeDescription * >(type.get());
if (functionId >= itd->nMapFunctionIndexToMemberIndex) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with unknown function ID received")),
+ "URP: request message with unknown function ID received",
css::uno::Reference< css::uno::XInterface >());
}
sal_Int32 memberId = itd->pMapFunctionIndexToMemberIndex[functionId];
@@ -266,10 +248,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (forceSynchronous) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: synchronous request message with non-oneway"
- " function ID received")),
+ "URP: synchronous request message with non-oneway"
+ " function ID received",
css::uno::Reference< css::uno::XInterface >());
}
synchronous = true;
@@ -322,10 +302,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
break;
default:
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with UrpProtocolProperties OID"
- " and unknown function ID received")),
+ "URP: request message with UrpProtocolProperties OID"
+ " and unknown function ID received",
css::uno::Reference< css::uno::XInterface >());
}
} else {
@@ -355,20 +333,16 @@ void Reader::readMessage(Unmarshal & unmarshal) {
css::uno::XInterface > >::get())))))
{
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: queryInterface request message with"
- " unknown OID received")),
+ "URP: queryInterface request message with"
+ " unknown OID received",
css::uno::Reference< css::uno::XInterface >());
}
}
break;
case SPECIAL_FUNCTION_ID_RESERVED:
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with unknown function ID 1"
- " received")),
+ "URP: request message with unknown function ID 1"
+ " received",
css::uno::Reference< css::uno::XInterface >());
case SPECIAL_FUNCTION_ID_RELEASE:
break;
@@ -376,9 +350,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
obj = bridge_->findStub(oid, type);
if (!obj.is()) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: request message with unknown OID received")),
+ "URP: request message with unknown OID received",
css::uno::Reference< css::uno::XInterface >());
}
break;
@@ -457,10 +429,8 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
}
if (!ok) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: reply message with bad exception type"
- " received")),
+ "URP: reply message with bad exception type"
+ " received",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -532,10 +502,8 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
}
if (lastTid_.getLength() == 0) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "URP: message with NEWTID received when last TID has not"
- " yet been set")),
+ "URP: message with NEWTID received when last TID has not"
+ " yet been set",
css::uno::Reference< css::uno::XInterface >());
}
return lastTid_;
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 13cd07c..59b37e7 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -146,10 +146,8 @@ css::uno::TypeDescription Unmarshal::readType() {
case typelib_TypeClass_ANY:
if ((flags & 0x80) != 0) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: cache flag of simple type is"
- " set")),
+ "binaryurp::Unmarshal: cache flag of simple type is"
+ " set",
css::uno::Reference< css::uno::XInterface >());
}
return css::uno::TypeDescription(
@@ -165,10 +163,8 @@ css::uno::TypeDescription Unmarshal::readType() {
if ((flags & 0x80) == 0) {
if (idx == cache::ignore || !state_.typeCache[idx].is()) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: unknown type cache"
- " index")),
+ "binaryurp::Unmarshal: unknown type cache"
+ " index",
css::uno::Reference< css::uno::XInterface >());
}
return state_.typeCache[idx];
@@ -180,10 +176,8 @@ css::uno::TypeDescription Unmarshal::readType() {
{
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: type with unknown"
- " name: ")) + str,
+ "binaryurp::Unmarshal: type with unknown"
+ " name: " + str,
css::uno::Reference< css::uno::XInterface >());
}
for (css::uno::TypeDescription t2(t);
@@ -195,20 +189,16 @@ css::uno::TypeDescription Unmarshal::readType() {
t2.get())->pType);
if (!t2.is()) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: sequence type with"
- " unknown component type")),
+ "binaryurp::Unmarshal: sequence type with"
+ " unknown component type",
css::uno::Reference< css::uno::XInterface >());
}
switch (t2.get()->eTypeClass) {
case typelib_TypeClass_VOID:
case typelib_TypeClass_EXCEPTION:
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: sequence type with"
- " bad component type")),
+ "binaryurp::Unmarshal: sequence type with"
+ " bad component type",
css::uno::Reference< css::uno::XInterface >());
default:
break;
@@ -222,9 +212,7 @@ css::uno::TypeDescription Unmarshal::readType() {
}
default:
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: type of unknown type class")),
+ "binaryurp::Unmarshal: type of unknown type class",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -234,10 +222,8 @@ OUString Unmarshal::readOid() {
for (sal_Int32 i = 0; i != oid.getLength(); ++i) {
if (oid[i] > 0x7F) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: OID contains non-ASCII"
- " character")),
+ "binaryurp::Unmarshal: OID contains non-ASCII"
+ " character",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -245,9 +231,7 @@ OUString Unmarshal::readOid() {
if (oid.isEmpty() && idx != cache::ignore) {
if (state_.oidCache[idx].isEmpty()) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: unknown OID cache index")),
+ "binaryurp::Unmarshal: unknown OID cache index",
css::uno::Reference< css::uno::XInterface >());
}
return state_.oidCache[idx];
@@ -271,9 +255,7 @@ rtl::ByteSequence Unmarshal::readTid() {
if (tid.getLength() == 0) {
if (idx == cache::ignore || state_.tidCache[idx].getLength() == 0) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: unknown TID cache index")),
+ "binaryurp::Unmarshal: unknown TID cache index",
css::uno::Reference< css::uno::XInterface >());
}
return state_.tidCache[idx];
@@ -297,9 +279,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
sal_uInt8 v = read8();
if (v > 1) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: boolean of unknown value")),
+ "binaryurp::Unmarshal: boolean of unknown value",
css::uno::Reference< css::uno::XInterface >());
}
return BinaryAny(type, &v);
@@ -346,9 +326,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
css::uno::TypeDescription t(readType());
if (t.get()->eTypeClass == typelib_TypeClass_ANY) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: any of type ANY")),
+ "binaryurp::Unmarshal: any of type ANY",
css::uno::Reference< css::uno::XInterface >());
}
return readValue(t);
@@ -371,9 +349,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
}
if (!found) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: unknown enum value")),
+ "binaryurp::Unmarshal: unknown enum value",
css::uno::Reference< css::uno::XInterface >());
}
return BinaryAny(type, &v);
@@ -404,9 +380,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
void Unmarshal::done() const {
if (data_ != end_) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: block contains excess data")),
+ "binaryurp::Unmarshal: block contains excess data",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -414,9 +388,7 @@ void Unmarshal::done() const {
void Unmarshal::check(sal_Int32 size) const {
if (end_ - data_ < size) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: trying to read past end of block")),
+ "binaryurp::Unmarshal: trying to read past end of block",
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -430,9 +402,7 @@ sal_uInt16 Unmarshal::readCacheIndex() {
sal_uInt16 idx = read16();
if (idx >= cache::size && idx != cache::ignore) {
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: cache index out of range")),
+ "binaryurp::Unmarshal: cache index out of range",
css::uno::Reference< css::uno::XInterface >());
}
return idx;
@@ -454,9 +424,7 @@ OUString Unmarshal::readString() {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: string size too large")),
+ "binaryurp::Unmarshal: string size too large",
css::uno::Reference< css::uno::XInterface >());
}
check(static_cast< sal_Int32 >(n));
@@ -469,9 +437,7 @@ OUString Unmarshal::readString() {
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
{
throw css::io::IOException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: string does not contain UTF-8")),
+ "binaryurp::Unmarshal: string does not contain UTF-8",
css::uno::Reference< css::uno::XInterface >());
}
data_ += n;
@@ -483,9 +449,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: sequence size too large")),
+ "binaryurp::Unmarshal: sequence size too large",
css::uno::Reference< css::uno::XInterface >());
}
if (n == 0) {
@@ -513,9 +477,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) {
// sal_uInt32 * sal_Int32 -> sal_uInt64 cannot overflow
if (size > SAL_MAX_SIZE - SAL_SEQUENCE_HEADER_SIZE) {
throw css::uno::RuntimeException(
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "binaryurp::Unmarshal: sequence size too large")),
+ "binaryurp::Unmarshal: sequence size too large",
css::uno::Reference< css::uno::XInterface >());
}
void * buf = allocate(
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index a8091a9..7d15fd7 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);
More information about the Libreoffice-commits
mailing list