diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-10 17:29:21 -0200 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-13 00:11:25 +0400 |
commit | 9201704ede70498a850bee6d15f0340d58f3889c (patch) | |
tree | 56a01cff17d5f5c707d113c9fd2081fd4a640ac9 /binaryurp/source | |
parent | Revert "remove lazy init of edit view to fix strange core ( open insert|formu... (diff) | |
download | core-9201704ede70498a850bee6d15f0340d58f3889c.tar.gz core-9201704ede70498a850bee6d15f0340d58f3889c.zip |
Fix for fdo43460 Part IV getLength to isEmpty
Part IV
Module
basic (small fix per demand from Ivan Timofeev)
binaryurp
bridges
Diffstat (limited to 'binaryurp/source')
-rw-r--r-- | binaryurp/source/bridge.cxx | 8 | ||||
-rw-r--r-- | binaryurp/source/bridgefactory.cxx | 4 | ||||
-rw-r--r-- | binaryurp/source/reader.cxx | 4 | ||||
-rw-r--r-- | binaryurp/source/unmarshal.cxx | 4 | ||||
-rw-r--r-- | binaryurp/source/writer.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index b491a2adc77f..389284d96b7e 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -345,7 +345,7 @@ css::uno::UnoInterfaceReference Bridge::registerIncomingInterface( rtl::OUString const & oid, css::uno::TypeDescription const & type) { assert(type.is()); - if (oid.getLength() == 0) { + if (oid.isEmpty()) { return css::uno::UnoInterfaceReference(); } css::uno::UnoInterfaceReference obj(findStub(oid, type)); @@ -427,7 +427,7 @@ rtl::OUString Bridge::registerOutgoingInterface( css::uno::UnoInterfaceReference Bridge::findStub( rtl::OUString const & oid, css::uno::TypeDescription const & type) { - assert(oid.getLength() != 0 && type.is()); + assert(!oid.isEmpty() && type.is()); osl::MutexGuard g(mutex_); Stubs::iterator i(stubs_.find(oid)); if (i != stubs_.end()) { @@ -449,7 +449,7 @@ css::uno::UnoInterfaceReference Bridge::findStub( void Bridge::releaseStub( rtl::OUString const & oid, css::uno::TypeDescription const & type) { - assert(oid.getLength() != 0 && type.is()); + assert(!oid.isEmpty() && type.is()); css::uno::UnoInterfaceReference obj; bool unused; { @@ -814,7 +814,7 @@ Bridge::~Bridge() { css::uno::Reference< css::uno::XInterface > Bridge::getInstance( rtl::OUString const & sInstanceName) throw (css::uno::RuntimeException) { - if (sInstanceName.getLength() == 0) { + if (sInstanceName.isEmpty()) { throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 5c9105585916..0edbaa0c19cc 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -80,7 +80,7 @@ void BridgeFactory::removeBridge( assert(bridge.is()); rtl::OUString n(bridge->getName()); osl::MutexGuard g(*this); - if (n.getLength() == 0) { + if (n.isEmpty()) { BridgeList::iterator i( std::find(unnamed_.begin(), unnamed_.end(), bridge)); if (i != unnamed_.end()) { @@ -154,7 +154,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( static_cast< cppu::OWeakObject * >(this), -1); } b.set(new Bridge(this, sName, aConnection, anInstanceProvider)); - if (sName.getLength() == 0) { + if (sName.isEmpty()) { unnamed_.push_back( css::uno::Reference< css::bridge::XBridge >(b.get())); } else { diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index c052fadc5629..e6b6f06797d9 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -215,7 +215,7 @@ void Reader::readMessage(Unmarshal & unmarshal) { rtl::OUString oid; if (newOid) { oid = unmarshal.readOid(); - if (oid.getLength() == 0) { + if (oid.isEmpty()) { throw css::io::IOException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -224,7 +224,7 @@ void Reader::readMessage(Unmarshal & unmarshal) { } lastOid_ = oid; } else { - if (lastOid_.getLength() == 0) { + if (lastOid_.isEmpty()) { throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx index df91fa8bf294..a2ac6c309cfd 100644 --- a/binaryurp/source/unmarshal.cxx +++ b/binaryurp/source/unmarshal.cxx @@ -249,8 +249,8 @@ rtl::OUString Unmarshal::readOid() { } } sal_uInt16 idx = readCacheIndex(); - if (oid.getLength() == 0 && idx != cache::ignore) { - if (state_.oidCache[idx].getLength() == 0) { + if (oid.isEmpty() && idx != cache::ignore) { + if (state_.oidCache[idx].isEmpty()) { throw css::io::IOException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index 5aca57b108eb..843f667cfcbd 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -210,7 +210,7 @@ void Writer::sendRequest( std::vector< BinaryAny > const & inArguments, bool currentContextMode, css::uno::UnoInterfaceReference const & currentContext) { - OSL_ASSERT(tid.getLength() != 0 && oid.getLength() != 0 && member.is()); + OSL_ASSERT(tid.getLength() != 0 && !oid.isEmpty() && member.is()); css::uno::TypeDescription t(type); sal_Int32 functionId = 0; bool forceSynchronous = false; |