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 /bridges | |
| parent | 96692c301d67bd74f9a97f6b998bec6314be1b44 (diff) | |
Fix for fdo43460 Part IV getLength to isEmpty
Part IV
Module
basic (small fix per demand from Ivan Timofeev)
binaryurp
bridges
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 | ||||
| -rw-r--r-- | bridges/source/jni_uno/jni_data.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index fd84a73ba675..2703ac0c0fb6 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -241,9 +241,9 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const if (aSecurity.getHomeDir(strURLDirectory)) osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory); - for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i) + for (int i = strDirectory.isEmpty() ? 1 : 0; i < 2; ++i) { - if (!strDirectory.getLength()) + if (strDirectory.isEmpty()) strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" )); strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" )); diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index c6ea28af8ba1..9d77812ada04 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1817,7 +1817,7 @@ void Bridge::map_to_java( // polymorphic struct types: rtl::OUString const & name = rtl::OUString::unacquired( &pAny->pType->pTypeName); - OSL_ASSERT(name.getLength() > 0); + OSL_ASSERT(!name.isEmpty()); if (name[name.getLength() - 1] == '>') { // Box up in com.sun.star.uno.Any: |