[Libreoffice-commits] .: binaryurp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 22 07:48:27 PDT 2012
binaryurp/source/bridge.cxx | 80 +++++++++++++++++-----------------
binaryurp/source/bridge.hxx | 30 ++++++------
binaryurp/source/bridgefactory.cxx | 30 ++++++------
binaryurp/source/bridgefactory.hxx | 16 +++---
binaryurp/source/currentcontext.cxx | 8 +--
binaryurp/source/incomingrequest.cxx | 10 ++--
binaryurp/source/incomingrequest.hxx | 4 -
binaryurp/source/lessoperators.cxx | 4 -
binaryurp/source/marshal.cxx | 10 ++--
binaryurp/source/marshal.hxx | 2
binaryurp/source/outgoingrequests.cxx | 2
binaryurp/source/proxy.cxx | 10 ++--
binaryurp/source/proxy.hxx | 10 ++--
binaryurp/source/reader.cxx | 34 +++++++-------
binaryurp/source/reader.hxx | 2
binaryurp/source/readerstate.hxx | 2
binaryurp/source/unmarshal.cxx | 50 ++++++++++-----------
binaryurp/source/unmarshal.hxx | 4 -
binaryurp/source/writer.cxx | 18 +++----
binaryurp/source/writer.hxx | 12 ++---
binaryurp/source/writerstate.hxx | 2
21 files changed, 170 insertions(+), 170 deletions(-)
New commits:
commit e47fe5cc409b4df2ee3ae58ecf911c1e155bf2e7
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Sat Aug 18 15:05:22 2012 -0300
Change rtl::OUString to OUString
My first commit. Any problem, question, warnings, please tell me.
Change-Id: Ibb02fe15776f3ffe74ddb9488c63a45c447bb493
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 8e7d1d2..183d9d7 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -84,10 +84,10 @@ sal_Int32 random() {
return n;
}
-rtl::OUString toString(css::uno::TypeDescription const & type) {
+OUString toString(css::uno::TypeDescription const & type) {
typelib_TypeDescription * d = type.get();
assert(d != 0 && d->pTypeName != 0);
- return rtl::OUString(d->pTypeName);
+ return OUString(d->pTypeName);
}
extern "C" void SAL_CALL freeProxyCallback(
@@ -174,19 +174,19 @@ struct Bridge::SubStub {
};
Bridge::Bridge(
- rtl::Reference< BridgeFactory > const & factory, rtl::OUString const & name,
+ rtl::Reference< BridgeFactory > const & factory, OUString const & name,
css::uno::Reference< css::connection::XConnection > const & connection,
css::uno::Reference< css::bridge::XInstanceProvider > const & provider):
factory_(factory), name_(name), connection_(connection),
provider_(provider),
- binaryUno_(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
+ binaryUno_(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
cppToBinaryMapping_(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO))),
binaryToCppMapping_(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)),
- rtl::OUString(
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)),
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME))),
protPropTid_(
reinterpret_cast< sal_Int8 const * >(".UrpProtocolPropertiesTid"),
@@ -196,11 +196,11 @@ Bridge::Bridge(
cppu::UnoType<
css::uno::Reference< css::bridge::XProtocolProperties > >::get()),
protPropRequest_(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.bridge.XProtocolProperties::requestChange"))),
protPropCommit_(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.bridge.XProtocolProperties::commitChange"))),
state_(STATE_INITIAL), threadPool_(0), currentContextMode_(false),
@@ -210,13 +210,13 @@ Bridge::Bridge(
assert(factory.is() && connection.is());
if (!binaryUno_.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("URP: no binary UNO environment")),
css::uno::Reference< css::uno::XInterface >());
}
if (!(cppToBinaryMapping_.is() && binaryToCppMapping_.is())) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("URP: no C++ UNO mapping")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -402,7 +402,7 @@ rtl::Reference< Writer > Bridge::getWriter() {
}
css::uno::UnoInterfaceReference Bridge::registerIncomingInterface(
- rtl::OUString const & oid, css::uno::TypeDescription const & type)
+ OUString const & oid, css::uno::TypeDescription const & type)
{
assert(type.is());
if (oid.isEmpty()) {
@@ -434,15 +434,15 @@ css::uno::UnoInterfaceReference Bridge::registerIncomingInterface(
return obj;
}
-rtl::OUString Bridge::registerOutgoingInterface(
+OUString Bridge::registerOutgoingInterface(
css::uno::UnoInterfaceReference const & object,
css::uno::TypeDescription const & type)
{
assert(type.is());
if (!object.is()) {
- return rtl::OUString();
+ return OUString();
}
- rtl::OUString oid;
+ OUString oid;
if (!Proxy::isProxy(this, object, &oid)) {
binaryUno_.get()->pExtEnv->getObjectIdentifier(
binaryUno_.get()->pExtEnv, &oid.pData, object.get());
@@ -473,7 +473,7 @@ rtl::OUString Bridge::registerOutgoingInterface(
assert(stub != &newStub);
if (j->second.references == SAL_MAX_UINT32) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: stub reference count overflow")),
css::uno::Reference< css::uno::XInterface >());
@@ -485,7 +485,7 @@ rtl::OUString Bridge::registerOutgoingInterface(
}
css::uno::UnoInterfaceReference Bridge::findStub(
- rtl::OUString const & oid, css::uno::TypeDescription const & type)
+ OUString const & oid, css::uno::TypeDescription const & type)
{
assert(!oid.isEmpty() && type.is());
osl::MutexGuard g(mutex_);
@@ -507,7 +507,7 @@ css::uno::UnoInterfaceReference Bridge::findStub(
}
void Bridge::releaseStub(
- rtl::OUString const & oid, css::uno::TypeDescription const & type)
+ OUString const & oid, css::uno::TypeDescription const & type)
{
assert(!oid.isEmpty() && type.is());
css::uno::UnoInterfaceReference obj;
@@ -517,14 +517,14 @@ void Bridge::releaseStub(
Stubs::iterator i(stubs_.find(oid));
if (i == stubs_.end()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("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(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("URP: release unknown stub")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -618,7 +618,7 @@ void Bridge::decrementActiveCalls() throw () {
}
bool Bridge::makeCall(
- rtl::OUString const & oid, css::uno::TypeDescription const & member,
+ OUString const & oid, css::uno::TypeDescription const & member,
bool setter, std::vector< BinaryAny > const & inArguments,
BinaryAny * returnValue, std::vector< BinaryAny > * outArguments)
{
@@ -643,7 +643,7 @@ bool Bridge::makeCall(
}
if (resp.get() == 0) {
throw css::lang::DisposedException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"Binary URP bridge disposed during call")),
static_cast< cppu::OWeakObject * >(this));
@@ -710,7 +710,7 @@ void Bridge::handleRequestChangeReply(
}
if (n != exp) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: requestChange reply with unexpected return value"
" received")),
@@ -796,7 +796,7 @@ void Bridge::handleRequestChangeRequest(
}
default:
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: unexpected requestChange request received")),
static_cast< cppu::OWeakObject * >(this));
@@ -824,7 +824,7 @@ void Bridge::handleCommitChangeRequest(
ret = mapCppToBinaryAny(
css::uno::makeAny(
css::bridge::InvalidProtocolChangeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"InvalidProtocolChangeException")),
css::uno::Reference< css::uno::XInterface >(), s[i],
@@ -853,7 +853,7 @@ void Bridge::handleCommitChangeRequest(
break;
default:
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: unexpected commitChange request received")),
static_cast< cppu::OWeakObject * >(this));
@@ -867,7 +867,7 @@ OutgoingRequest Bridge::lastOutgoingRequest(rtl::ByteSequence const & tid) {
}
bool Bridge::isProtocolPropertiesRequest(
- rtl::OUString const & oid, css::uno::TypeDescription const & type) const
+ OUString const & oid, css::uno::TypeDescription const & type) const
{
return oid == protPropOid_ && type.equals(protPropType_);
}
@@ -895,11 +895,11 @@ Bridge::~Bridge() {
}
css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
- rtl::OUString const & sInstanceName) throw (css::uno::RuntimeException)
+ OUString const & sInstanceName) throw (css::uno::RuntimeException)
{
if (sInstanceName.isEmpty()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"XBridge::getInstance sInstanceName must be non-empty")),
static_cast< cppu::OWeakObject * >(this));
@@ -907,7 +907,7 @@ 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(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"XBridge::getInstance sInstanceName contains non-ASCII"
" character")),
@@ -927,7 +927,7 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
bool exc = makeCall(
sInstanceName,
css::uno::TypeDescription(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.uno.XInterface::queryInterface"))),
false, inArgs, &ret, &outArgs);
@@ -940,12 +940,12 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
css::uno::UNO_REF_NO_ACQUIRE);
}
-rtl::OUString Bridge::getName() throw (css::uno::RuntimeException) {
+OUString Bridge::getName() throw (css::uno::RuntimeException) {
return name_;
}
-rtl::OUString Bridge::getDescription() throw (css::uno::RuntimeException) {
- rtl::OUStringBuffer b(name_);
+OUString Bridge::getDescription() throw (css::uno::RuntimeException) {
+ OUStringBuffer b(name_);
b.append(sal_Unicode(':'));
b.append(connection_->getDescription());
return b.makeStringAndClear();
@@ -996,7 +996,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 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentContext"));
+ s[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentContext"));
std::vector< BinaryAny > a;
a.push_back(mapCppToBinaryAny(css::uno::makeAny(s)));
sendProtPropRequest(OutgoingRequest::KIND_COMMIT_CHANGE, a);
@@ -1020,20 +1020,20 @@ void Bridge::sendProtPropRequest(
}
void Bridge::makeReleaseCall(
- rtl::OUString const & oid, css::uno::TypeDescription const & type)
+ OUString const & oid, css::uno::TypeDescription const & type)
{
AttachThread att(getThreadPool());
sendRequest(
att.getTid(), oid, type,
css::uno::TypeDescription(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.uno.XInterface::release"))),
std::vector< BinaryAny >());
}
void Bridge::sendRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
css::uno::TypeDescription const & type,
css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments)
@@ -1075,7 +1075,7 @@ void Bridge::checkDisposed() {
assert(state_ != STATE_INITIAL);
if (state_ != STATE_STARTED) {
throw css::lang::DisposedException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"Binary URP bridge already disposed")),
static_cast< cppu::OWeakObject * >(this));
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 03bb2b4..b5a4f9d 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -75,7 +75,7 @@ class Bridge:
public:
Bridge(
rtl::Reference< BridgeFactory > const & factory,
- rtl::OUString const & name,
+ OUString const & name,
com::sun::star::uno::Reference<
com::sun::star::connection::XConnection > const & connection,
com::sun::star::uno::Reference<
@@ -105,19 +105,19 @@ public:
rtl::Reference< Writer > getWriter();
com::sun::star::uno::UnoInterfaceReference registerIncomingInterface(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & type);
- rtl::OUString registerOutgoingInterface(
+ OUString registerOutgoingInterface(
com::sun::star::uno::UnoInterfaceReference const & object,
com::sun::star::uno::TypeDescription const & type);
com::sun::star::uno::UnoInterfaceReference findStub(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & type);
void releaseStub(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & type);
void resurrectProxy(Proxy & proxy);
@@ -135,7 +135,7 @@ public:
void decrementActiveCalls() throw ();
bool makeCall(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & member, bool setter,
std::vector< BinaryAny > const & inArguments, BinaryAny * returnValue,
std::vector< BinaryAny > * outArguments);
@@ -163,7 +163,7 @@ public:
OutgoingRequest lastOutgoingRequest(rtl::ByteSequence const & tid);
bool isProtocolPropertiesRequest(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & type) const;
void setCurrentContextMode();
@@ -174,13 +174,13 @@ private:
virtual ~Bridge();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- SAL_CALL getInstance(rtl::OUString const & sInstanceName)
+ SAL_CALL getInstance(OUString const & sInstanceName)
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getDescription()
+ virtual OUString SAL_CALL getDescription()
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL dispose()
@@ -205,11 +205,11 @@ private:
std::vector< BinaryAny > const & inArguments);
void makeReleaseCall(
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::TypeDescription const & type);
void sendRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
com::sun::star::uno::TypeDescription const & type,
com::sun::star::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments);
@@ -235,7 +235,7 @@ private:
typedef std::map< com::sun::star::uno::TypeDescription, SubStub > Stub;
- typedef std::map< rtl::OUString, Stub > Stubs;
+ typedef std::map< OUString, Stub > Stubs;
enum State { STATE_INITIAL, STATE_STARTED, STATE_TERMINATED, STATE_FINAL };
@@ -244,7 +244,7 @@ private:
MODE_WAIT, MODE_NORMAL, MODE_NORMAL_WAIT };
rtl::Reference< BridgeFactory > factory_;
- rtl::OUString name_;
+ OUString name_;
com::sun::star::uno::Reference< com::sun::star::connection::XConnection >
connection_;
com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider >
@@ -253,7 +253,7 @@ private:
com::sun::star::uno::Mapping cppToBinaryMapping_;
com::sun::star::uno::Mapping binaryToCppMapping_;
rtl::ByteSequence protPropTid_;
- rtl::OUString protPropOid_;
+ OUString protPropOid_;
com::sun::star::uno::TypeDescription protPropType_;
com::sun::star::uno::TypeDescription protPropRequest_;
com::sun::star::uno::TypeDescription protPropCommit_;
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 5054f15..2830f26 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -51,24 +51,24 @@ css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
return static_cast< cppu::OWeakObject * >(new BridgeFactory(xContext));
}
-rtl::OUString BridgeFactory::static_getImplementationName() {
- return rtl::OUString(
+OUString BridgeFactory::static_getImplementationName() {
+ return OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.bridge.BridgeFactory"));
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
BridgeFactory::static_getSupportedServiceNames() {
- rtl::OUString name(
+ OUString name(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory"));
- return css::uno::Sequence< rtl::OUString >(&name, 1);
+ return css::uno::Sequence< OUString >(&name, 1);
}
void BridgeFactory::removeBridge(
css::uno::Reference< css::bridge::XBridge > const & bridge)
{
assert(bridge.is());
- rtl::OUString n(bridge->getName());
+ OUString n(bridge->getName());
osl::MutexGuard g(*this);
if (n.isEmpty()) {
BridgeList::iterator i(
@@ -93,16 +93,16 @@ BridgeFactory::BridgeFactory(
BridgeFactory::~BridgeFactory() {}
-rtl::OUString BridgeFactory::getImplementationName()
+OUString BridgeFactory::getImplementationName()
throw (css::uno::RuntimeException)
{
return static_getImplementationName();
}
-sal_Bool BridgeFactory::supportsService(rtl::OUString const & ServiceName)
+sal_Bool BridgeFactory::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< rtl::OUString > s(getSupportedServiceNames());
+ css::uno::Sequence< OUString > s(getSupportedServiceNames());
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
if (ServiceName == s[i]) {
return true;
@@ -111,14 +111,14 @@ sal_Bool BridgeFactory::supportsService(rtl::OUString const & ServiceName)
return false;
}
-css::uno::Sequence< rtl::OUString > BridgeFactory::getSupportedServiceNames()
+css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
return static_getSupportedServiceNames();
}
css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
- rtl::OUString const & sName, rtl::OUString const & sProtocol,
+ OUString const & sName, OUString const & sProtocol,
css::uno::Reference< css::connection::XConnection > const & aConnection,
css::uno::Reference< css::bridge::XInstanceProvider > const &
anInstanceProvider)
@@ -136,7 +136,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
if ( sProtocol != "urp" || !aConnection.is() )
{
throw css::lang::IllegalArgumentException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"BridgeFactory::createBridge: sProtocol != urp ||"
" aConnection == null")),
@@ -155,7 +155,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
}
css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
- rtl::OUString const & sName) throw (css::uno::RuntimeException)
+ OUString const & sName) throw (css::uno::RuntimeException)
{
osl::MutexGuard g(*this);
BridgeMap::iterator i(named_.find(sName));
@@ -168,7 +168,7 @@ BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException) {
osl::MutexGuard g(*this);
if (unnamed_.size() > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"BridgeFactory::getExistingBridges: too many")),
static_cast< cppu::OWeakObject * >(this));
@@ -176,7 +176,7 @@ BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException) {
sal_Int32 n = static_cast< sal_Int32 >(unnamed_.size());
if (named_.size() > static_cast< sal_uInt32 >(SAL_MAX_INT32 - n)) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"BridgeFactory::getExistingBridges: too many")),
static_cast< cppu::OWeakObject * >(this));
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 6853f0d..c082092 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -63,9 +63,9 @@ public:
const & xContext)
SAL_THROW((com::sun::star::uno::Exception));
- static rtl::OUString SAL_CALL static_getImplementationName();
+ static OUString SAL_CALL static_getImplementationName();
- static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ static com::sun::star::uno::Sequence< OUString > SAL_CALL
static_getSupportedServiceNames();
void removeBridge(
@@ -82,18 +82,18 @@ private:
virtual ~BridgeFactory();
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL createBridge(
- rtl::OUString const & sName, rtl::OUString const & sProtocol,
+ OUString const & sName, OUString const & sProtocol,
com::sun::star::uno::Reference<
com::sun::star::connection::XConnection > const & aConnection,
com::sun::star::uno::Reference<
@@ -106,7 +106,7 @@ private:
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL getBridge(
- rtl::OUString const & sName)
+ OUString const & sName)
throw (com::sun::star::uno::RuntimeException);
virtual
@@ -121,7 +121,7 @@ private:
typedef
std::map<
- rtl::OUString,
+ OUString,
com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
BridgeMap;
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index 3e8e0f5..6fead06 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -44,10 +44,10 @@ css::uno::UnoInterfaceReference get() {
css::uno::UnoInterfaceReference cc;
if (!uno_getCurrentContext(
reinterpret_cast< void ** >(&cc.m_pUnoI),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
{
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("uno_getCurrentContext failed")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -58,10 +58,10 @@ void set(css::uno::UnoInterfaceReference const & value) {
css::uno::UnoInterfaceReference cc(value);
if (!uno_setCurrentContext(
cc.m_pUnoI,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)).pData, 0))
{
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("uno_setCurrentContext failed")),
css::uno::Reference< css::uno::XInterface >());
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 28402b4..391b0e4 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -48,7 +48,7 @@ namespace css = com::sun::star;
IncomingRequest::IncomingRequest(
rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
- rtl::OUString const & oid, css::uno::UnoInterfaceReference const & object,
+ OUString const & oid, css::uno::UnoInterfaceReference const & object,
css::uno::TypeDescription const & type, sal_uInt16 functionId,
bool synchronous, css::uno::TypeDescription const & member, bool setter,
std::vector< BinaryAny > const & inArguments, bool currentContextMode,
@@ -80,7 +80,7 @@ void IncomingRequest::execute() const {
isExc = !execute_throw(&ret, &outArgs);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
+ (OUString(
RTL_CONSTASCII_USTRINGPARAM("caught C++ exception: ")) +
rtl::OStringToOUString(
rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
@@ -109,7 +109,7 @@ void IncomingRequest::execute() const {
} catch (const css::uno::RuntimeException & e) {
OSL_TRACE(
OSL_LOG_PREFIX "caught UNO runtime exception '%s'",
- (rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
+ (OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
getStr()));
} catch (const std::exception & e) {
OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
@@ -157,9 +157,9 @@ bool IncomingRequest::execute_throw(
OSL_TRACE(
(OSL_LOG_PREFIX "initial element '%s':"
" NoSuchElementException '%s'"),
- (rtl::OUStringToOString(oid_, RTL_TEXTENCODING_UTF8).
+ (OUStringToOString(oid_, RTL_TEXTENCODING_UTF8).
getStr()),
- (rtl::OUStringToOString(
+ (OUStringToOString(
e.Message, RTL_TEXTENCODING_UTF8).
getStr()));
}
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index 598bb6a..a14c295 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -43,7 +43,7 @@ class IncomingRequest: private boost::noncopyable {
public:
IncomingRequest(
rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
- rtl::OUString const & oid,
+ OUString const & oid,
com::sun::star::uno::UnoInterfaceReference const & object,
com::sun::star::uno::TypeDescription const & type,
sal_uInt16 functionId, bool synchronous,
@@ -61,7 +61,7 @@ private:
rtl::Reference< Bridge > bridge_;
rtl::ByteSequence tid_;
- rtl::OUString oid_; // initial object queryInterface; release
+ OUString oid_; // initial object queryInterface; release
com::sun::star::uno::UnoInterfaceReference object_;
com::sun::star::uno::TypeDescription type_;
sal_uInt16 functionId_;
diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx
index 3cdc716..b0031e7 100644
--- a/binaryurp/source/lessoperators.cxx
+++ b/binaryurp/source/lessoperators.cxx
@@ -38,8 +38,8 @@ bool operator <(TypeDescription const & left, TypeDescription const & right) {
typelib_TypeClass tc2 = right.get()->eTypeClass;
return tc1 < tc2 ||
(tc1 == tc2 &&
- (rtl::OUString(left.get()->pTypeName) <
- rtl::OUString(right.get()->pTypeName)));
+ (OUString(left.get()->pTypeName) <
+ OUString(right.get()->pTypeName)));
}
} } } }
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index f9f5031..8027176 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -73,7 +73,7 @@ void writeCompressed(std::vector< unsigned char > * buffer, sal_uInt32 value) {
}
void writeString(
- std::vector< unsigned char > * buffer, rtl::OUString const & value)
+ std::vector< unsigned char > * buffer, OUString const & value)
{
assert(buffer != 0);
rtl::OString v;
@@ -83,7 +83,7 @@ void writeString(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"UNO string contains invalid UTF-16 sequence")),
css::uno::Reference< css::uno::XInterface >());
@@ -148,13 +148,13 @@ void Marshal::writeType(
} else {
write8(buffer, static_cast< sal_uInt8 >(tc) | 0x80);
write16(buffer, idx);
- writeString(buffer, rtl::OUString(value.get()->pTypeName));
+ writeString(buffer, OUString(value.get()->pTypeName));
}
}
}
void Marshal::writeOid(
- std::vector< unsigned char > * buffer, rtl::OUString const & oid)
+ std::vector< unsigned char > * buffer, OUString const & oid)
{
bool found;
sal_uInt16 idx;
@@ -223,7 +223,7 @@ void Marshal::writeValue(
case typelib_TypeClass_STRING:
writeString(
buffer,
- rtl::OUString(*static_cast< rtl_uString * const * >(value)));
+ OUString(*static_cast< rtl_uString * const * >(value)));
break;
case typelib_TypeClass_TYPE:
writeType(
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index ad0bf61..953b3ff 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -63,7 +63,7 @@ public:
com::sun::star::uno::TypeDescription const & value);
void writeOid(
- std::vector< unsigned char > * buffer, rtl::OUString const & oid);
+ std::vector< unsigned char > * buffer, OUString const & oid);
void writeTid(
std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid);
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index 0cbfa5b..6969664 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -51,7 +51,7 @@ OutgoingRequest OutgoingRequests::top(rtl::ByteSequence const & tid) {
Map::iterator i(map_.find(tid));
if (i == map_.end()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("URP: reply for unknown TID")),
css::uno::Reference< css::uno::XInterface >());
}
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 9c99218..955c614 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -65,7 +65,7 @@ extern "C" void SAL_CALL proxy_dispatchInterface(
}
Proxy::Proxy(
- rtl::Reference< Bridge > const & bridge, rtl::OUString const & oid,
+ rtl::Reference< Bridge > const & bridge, OUString const & oid,
css::uno::TypeDescription const & type):
bridge_(bridge), oid_(oid), type_(type), references_(1)
{
@@ -75,7 +75,7 @@ Proxy::Proxy(
pDispatcher = &proxy_dispatchInterface;
}
-rtl::OUString Proxy::getOid() const {
+OUString Proxy::getOid() const {
return oid_;
}
@@ -109,7 +109,7 @@ void Proxy::do_dispatch(
do_dispatch_throw(member, returnValue, arguments, exception);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
+ (OUString(
RTL_CONSTASCII_USTRINGPARAM("caught C++ exception: ")) +
rtl::OStringToOUString(
rtl::OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
@@ -128,7 +128,7 @@ void Proxy::do_dispatch(
bool Proxy::isProxy(
rtl::Reference< Bridge > const & bridge,
- css::uno::UnoInterfaceReference const & object, rtl::OUString * oid)
+ css::uno::UnoInterfaceReference const & object, OUString * oid)
{
assert(object.is());
return object.m_pUnoI->acquire == &proxy_acquireInterface &&
@@ -237,7 +237,7 @@ void Proxy::do_dispatch_throw(
}
bool Proxy::isProxy(
- rtl::Reference< Bridge > const & bridge, rtl::OUString * oid) const
+ rtl::Reference< Bridge > const & bridge, OUString * oid) const
{
assert(oid != 0);
if (bridge == bridge_) {
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index 188c564..b3bd4b5 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -41,10 +41,10 @@ namespace binaryurp {
class Proxy: public uno_Interface, private boost::noncopyable {
public:
Proxy(
- rtl::Reference< Bridge > const & bridge, rtl::OUString const & oid,
+ rtl::Reference< Bridge > const & bridge, OUString const & oid,
com::sun::star::uno::TypeDescription const & type);
- rtl::OUString getOid() const;
+ OUString getOid() const;
com::sun::star::uno::TypeDescription getType() const;
@@ -61,7 +61,7 @@ public:
static bool isProxy(
rtl::Reference< Bridge > const & bridge,
com::sun::star::uno::UnoInterfaceReference const & object,
- rtl::OUString * oid);
+ OUString * oid);
private:
~Proxy();
@@ -70,11 +70,11 @@ private:
typelib_TypeDescription const * member, void * returnValue,
void ** arguments, uno_Any ** exception) const;
- bool isProxy(rtl::Reference< Bridge > const & bridge, rtl::OUString * oid)
+ bool isProxy(rtl::Reference< Bridge > const & bridge, OUString * oid)
const;
rtl::Reference< Bridge > bridge_;
- rtl::OUString oid_;
+ OUString oid_;
com::sun::star::uno::TypeDescription type_;
oslInterlockedCount references_;
};
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index cb58367..7db83a1 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -69,7 +69,7 @@ css::uno::Sequence< sal_Int8 > read(
assert(connection.is());
if (size > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Reader: block size too large")),
css::uno::Reference< css::uno::XInterface >());
@@ -81,7 +81,7 @@ css::uno::Sequence< sal_Int8 > read(
}
if (n != static_cast< sal_Int32 >(size)) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Reader: premature end of input")),
css::uno::Reference< css::uno::XInterface >());
@@ -123,7 +123,7 @@ void Reader::execute() {
header.done();
if (count == 0) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Reader: block with zero message count"
" received")),
@@ -164,7 +164,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
if (((flags2 & 0x40) != 0) != forceSynchronous) {
// bit 6: SYNCHRONOUS
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with MUSTREPLY != SYNCHRONOUS"
" received")),
@@ -190,7 +190,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (!lastType_.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with NEWTYPE received when last"
" interface type has not yet been set")),
@@ -198,12 +198,12 @@ void Reader::readMessage(Unmarshal & unmarshal) {
}
type = lastType_;
}
- rtl::OUString oid;
+ OUString oid;
if (newOid) {
oid = unmarshal.readOid();
if (oid.isEmpty()) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: emtpy OID")),
css::uno::Reference< css::uno::XInterface >());
@@ -212,7 +212,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (lastOid_.isEmpty()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with NEWOID received when last"
" OID has not yet been set")),
@@ -225,7 +225,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
type.makeComplete();
if (type.get()->eTypeClass != typelib_TypeClass_INTERFACE) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with non-interface interface type"
" received")),
@@ -235,7 +235,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
reinterpret_cast< typelib_InterfaceTypeDescription * >(type.get());
if (functionId >= itd->nMapFunctionIndexToMemberIndex) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with unknown function ID received")),
css::uno::Reference< css::uno::XInterface >());
@@ -266,7 +266,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (forceSynchronous) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: synchronous request message with non-oneway"
" function ID received")),
@@ -322,7 +322,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
break;
default:
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with UrpProtocolProperties OID"
" and unknown function ID received")),
@@ -355,7 +355,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
css::uno::XInterface > >::get())))))
{
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: queryInterface request message with"
" unknown OID received")),
@@ -365,7 +365,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
break;
case SPECIAL_FUNCTION_ID_RESERVED:
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with unknown function ID 1"
" received")),
@@ -376,7 +376,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
obj = bridge_->findStub(oid, type);
if (!obj.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: request message with unknown OID received")),
css::uno::Reference< css::uno::XInterface >());
@@ -457,7 +457,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
}
if (!ok) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: reply message with bad exception type"
" received")),
@@ -532,7 +532,7 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
}
if (lastTid_.getLength() == 0) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"URP: message with NEWTID received when last TID has not"
" yet been set")),
diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx
index eeadc22..1b4e81d 100644
--- a/binaryurp/source/reader.hxx
+++ b/binaryurp/source/reader.hxx
@@ -55,7 +55,7 @@ private:
rtl::Reference< Bridge > bridge_;
com::sun::star::uno::TypeDescription lastType_;
- rtl::OUString lastOid_;
+ OUString lastOid_;
rtl::ByteSequence lastTid_;
ReaderState state_;
};
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index b744bcb..21ba850 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -34,7 +34,7 @@ namespace binaryurp {
struct ReaderState: private boost::noncopyable {
com::sun::star::uno::TypeDescription typeCache[cache::size];
- rtl::OUString oidCache[cache::size];
+ OUString oidCache[cache::size];
rtl::ByteSequence tidCache[cache::size];
};
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index 462efad..13cd07c 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -146,7 +146,7 @@ css::uno::TypeDescription Unmarshal::readType() {
case typelib_TypeClass_ANY:
if ((flags & 0x80) != 0) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: cache flag of simple type is"
" set")),
@@ -165,7 +165,7 @@ css::uno::TypeDescription Unmarshal::readType() {
if ((flags & 0x80) == 0) {
if (idx == cache::ignore || !state_.typeCache[idx].is()) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: unknown type cache"
" index")),
@@ -173,14 +173,14 @@ css::uno::TypeDescription Unmarshal::readType() {
}
return state_.typeCache[idx];
} else {
- rtl::OUString const str(readString());
+ OUString const str(readString());
css::uno::TypeDescription t(str);
if (!t.is() ||
t.get()->eTypeClass != static_cast< typelib_TypeClass >(tc))
{
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: type with unknown"
" name: ")) + str,
@@ -195,7 +195,7 @@ css::uno::TypeDescription Unmarshal::readType() {
t2.get())->pType);
if (!t2.is()) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: sequence type with"
" unknown component type")),
@@ -205,7 +205,7 @@ css::uno::TypeDescription Unmarshal::readType() {
case typelib_TypeClass_VOID:
case typelib_TypeClass_EXCEPTION:
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: sequence type with"
" bad component type")),
@@ -222,19 +222,19 @@ css::uno::TypeDescription Unmarshal::readType() {
}
default:
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: type of unknown type class")),
css::uno::Reference< css::uno::XInterface >());
}
}
-rtl::OUString Unmarshal::readOid() {
- rtl::OUString oid(readString());
+OUString Unmarshal::readOid() {
+ OUString oid(readString());
for (sal_Int32 i = 0; i != oid.getLength(); ++i) {
if (oid[i] > 0x7F) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: OID contains non-ASCII"
" character")),
@@ -245,7 +245,7 @@ rtl::OUString Unmarshal::readOid() {
if (oid.isEmpty() && idx != cache::ignore) {
if (state_.oidCache[idx].isEmpty()) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: unknown OID cache index")),
css::uno::Reference< css::uno::XInterface >());
@@ -271,7 +271,7 @@ rtl::ByteSequence Unmarshal::readTid() {
if (tid.getLength() == 0) {
if (idx == cache::ignore || state_.tidCache[idx].getLength() == 0) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: unknown TID cache index")),
css::uno::Reference< css::uno::XInterface >());
@@ -297,7 +297,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
sal_uInt8 v = read8();
if (v > 1) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: boolean of unknown value")),
css::uno::Reference< css::uno::XInterface >());
@@ -332,7 +332,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
}
case typelib_TypeClass_STRING:
{
- rtl::OUString v(readString());
+ OUString v(readString());
return BinaryAny(type, &v.pData);
}
case typelib_TypeClass_TYPE:
@@ -346,7 +346,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(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: any of type ANY")),
css::uno::Reference< css::uno::XInterface >());
@@ -371,7 +371,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
}
if (!found) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: unknown enum value")),
css::uno::Reference< css::uno::XInterface >());
@@ -404,7 +404,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
void Unmarshal::done() const {
if (data_ != end_) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: block contains excess data")),
css::uno::Reference< css::uno::XInterface >());
@@ -414,7 +414,7 @@ void Unmarshal::done() const {
void Unmarshal::check(sal_Int32 size) const {
if (end_ - data_ < size) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: trying to read past end of block")),
css::uno::Reference< css::uno::XInterface >());
@@ -430,7 +430,7 @@ sal_uInt16 Unmarshal::readCacheIndex() {
sal_uInt16 idx = read16();
if (idx >= cache::size && idx != cache::ignore) {
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: cache index out of range")),
css::uno::Reference< css::uno::XInterface >());
@@ -450,17 +450,17 @@ sal_uInt64 Unmarshal::read64() {
return n | *data_++;
}
-rtl::OUString Unmarshal::readString() {
+OUString Unmarshal::readString() {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: string size too large")),
css::uno::Reference< css::uno::XInterface >());
}
check(static_cast< sal_Int32 >(n));
- rtl::OUString s;
+ OUString s;
if (!rtl_convertStringToUString(
&s.pData, reinterpret_cast< char const * >(data_),
static_cast< sal_Int32 >(n), RTL_TEXTENCODING_UTF8,
@@ -469,7 +469,7 @@ rtl::OUString Unmarshal::readString() {
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
{
throw css::io::IOException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: string does not contain UTF-8")),
css::uno::Reference< css::uno::XInterface >());
@@ -483,7 +483,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: sequence size too large")),
css::uno::Reference< css::uno::XInterface >());
@@ -513,7 +513,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(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"binaryurp::Unmarshal: sequence size too large")),
css::uno::Reference< css::uno::XInterface >());
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 491ff04..4d8447e 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -60,7 +60,7 @@ public:
com::sun::star::uno::TypeDescription readType();
- rtl::OUString readOid();
+ OUString readOid();
rtl::ByteSequence readTid();
@@ -77,7 +77,7 @@ private:
sal_uInt64 read64();
- rtl::OUString readString();
+ OUString readString();
BinaryAny readSequence(com::sun::star::uno::TypeDescription const & type);
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 4fe7105..a8091a9 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -47,7 +47,7 @@ namespace css = com::sun::star;
Writer::Item::Item() {}
Writer::Item::Item(
- rtl::ByteSequence const & theTid, rtl::OUString const & theOid,
+ rtl::ByteSequence const & theTid, OUString const & theOid,
css::uno::TypeDescription const & theType,
css::uno::TypeDescription const & theMember,
std::vector< BinaryAny > const & inArguments,
@@ -75,7 +75,7 @@ Writer::Writer(rtl::Reference< Bridge > const & bridge):
}
void Writer::sendDirectRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
css::uno::TypeDescription const & type,
css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments)
@@ -96,7 +96,7 @@ void Writer::sendDirectReply(
}
void Writer::queueRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
css::uno::TypeDescription const & type,
css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments)
@@ -163,7 +163,7 @@ void Writer::execute() {
(item.oid != "UrpProtocolProperties" &&
!item.member.equals(
css::uno::TypeDescription(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.uno.XInterface::"
"release")))) &&
@@ -181,7 +181,7 @@ void Writer::execute() {
} catch (const css::uno::Exception & e) {
OSL_TRACE(
OSL_LOG_PREFIX "caught UNO exception '%s'",
- rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
} catch (const std::exception & e) {
OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
}
@@ -189,7 +189,7 @@ void Writer::execute() {
}
void Writer::sendRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
css::uno::TypeDescription const & type,
css::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments, bool currentContextMode,
@@ -241,7 +241,7 @@ void Writer::sendRequest(
OSL_ASSERT(functionId >= 0);
if (functionId > SAL_MAX_UINT16) {
throw css::uno::RuntimeException(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("function ID too large for URP")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -409,7 +409,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(
- rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM("message too large for URP")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -435,7 +435,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(
- (rtl::OUString(
+ (OUString(
RTL_CONSTASCII_USTRINGPARAM(
"Binary URP write raised IO exception: ")) +
e.Message),
diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx
index 442ae9d..09af4d0 100644
--- a/binaryurp/source/writer.hxx
+++ b/binaryurp/source/writer.hxx
@@ -50,7 +50,7 @@ public:
// Only called from Bridge::reader_ thread, and only before Bridge::writer_
// thread is unblocked:
void sendDirectRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
com::sun::star::uno::TypeDescription const & type,
com::sun::star::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments);
@@ -64,7 +64,7 @@ public:
std::vector< BinaryAny > const & outArguments);
void queueRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
com::sun::star::uno::TypeDescription const & type,
com::sun::star::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments);
@@ -86,7 +86,7 @@ private:
virtual void execute();
void sendRequest(
- rtl::ByteSequence const & tid, rtl::OUString const & oid,
+ rtl::ByteSequence const & tid, OUString const & oid,
com::sun::star::uno::TypeDescription const & type,
com::sun::star::uno::TypeDescription const & member,
std::vector< BinaryAny > const & inArguments, bool currentContextMode,
@@ -105,7 +105,7 @@ private:
// Request:
Item(
- rtl::ByteSequence const & theTid, rtl::OUString const & theOid,
+ rtl::ByteSequence const & theTid, OUString const & theOid,
com::sun::star::uno::TypeDescription const & theType,
com::sun::star::uno::TypeDescription const & theMember,
std::vector< BinaryAny > const & inArguments,
@@ -124,7 +124,7 @@ private:
rtl::ByteSequence tid; // request + reply
- rtl::OUString oid; // request
+ OUString oid; // request
com::sun::star::uno::TypeDescription type; // request
@@ -148,7 +148,7 @@ private:
WriterState state_;
Marshal marshal_;
com::sun::star::uno::TypeDescription lastType_;
- rtl::OUString lastOid_;
+ OUString lastOid_;
rtl::ByteSequence lastTid_;
osl::Condition unblocked_;
osl::Condition items_;
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index d731138..859a092 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -37,7 +37,7 @@ struct WriterState: private boost::noncopyable {
Cache< com::sun::star::uno::TypeDescription > typeCache;
- Cache< rtl::OUString > oidCache;
+ Cache< OUString > oidCache;
Cache< rtl::ByteSequence > tidCache;
};
More information about the Libreoffice-commits
mailing list