[Libreoffice-commits] core.git: basctl/source basic/source binaryurp/source

[Herbert Dürr]

 basctl/source/dlged/dlgedobj.cxx    |    2 +-
 basic/source/comp/sbcomp.cxx        |    4 ++--
 basic/source/runtime/dllmgr-x86.cxx |    2 +-
 binaryurp/source/marshal.cxx        |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a5090ccf756aac2365fd52d7cf9b423f54c5c6f6
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Feb 4 08:48:47 2014 +0000

    Related: #i123862# use O*String's isEmpty() method...
    
    to check for emptiness in modules starting with 'b'
    
    Patch-by: j.nitschke at ok.de
    Review-by: hdu at apache.org
    (cherry picked from commit 87204b0f4062ef8fc8f138ad15f4378da609d4e2)
    
    Conflicts:
    	basctl/source/basicide/baside2.cxx
    	basctl/source/basicide/bastype2.cxx
    	basctl/source/basicide/localizationmgr.cxx
    	basctl/source/dlged/dlgedobj.cxx
    	basic/source/basmgr/basmgr.cxx
    	basic/source/basmgr/vbahelper.cxx
    	basic/source/classes/sbunoobj.cxx
    	basic/source/comp/sbcomp.cxx
    	basic/source/runtime/iosys.cxx
    	basic/source/runtime/methods.cxx
    	basic/source/runtime/methods1.cxx
    	basic/source/runtime/step2.cxx
    	basic/source/uno/namecont.cxx
    	basic/source/uno/scriptcont.cxx
    	binaryurp/source/bridge.cxx
    	binaryurp/source/bridgefactory.cxx
    	binaryurp/source/reader.cxx
    	binaryurp/source/unmarshal.cxx
    	bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
    	bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
    	bridges/source/cpp_uno/shared/vtablefactory.cxx
    	bridges/source/jni_uno/jni_data.cxx
    
    Change-Id: I37bd84e0a1d6426759dba81854faf32c88147fe1

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 3645142..35c41cf 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -499,7 +499,7 @@ void SAL_CALL DlgEdObj::NameChange( const  ::com::sun::star::beans::PropertyChan
         Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
         if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
         {
-            if ( !xNameAcc->hasByName(aNewName) && !aNewName.isEmpty())
+            if (!xNameAcc->hasByName(aNewName) && !aNewName.isEmpty())
             {
                 // remove the control by the old name and insert the control by the new name in the container
                 Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 043af20..e5f0ada 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -594,7 +594,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
     const TraceTextData& rTraceTextData = itInner->second;
     const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
     bool bSTMT = false;
-    if( rStr_STMNT.getLength() )
+    if( !rStr_STMNT.isEmpty() )
     {
         bSTMT = true;
     }
@@ -628,7 +628,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
 
     nIndent += GnIndentForPCode;
     const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
-    if( rStr_PCode.getLength() )
+    if( !rStr_PCode.isEmpty() )
     {
         lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
                      bPrintTimeStamp ? TimeBuffer : NULL );
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index a4fcbf3..d97f298 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -572,7 +572,7 @@ SbError call(
 SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
 {
     OSL_ASSERT(proc != 0);
-    if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
+    if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"???
         sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
         if (n <= 0 || n > 0xFFFF) {
             return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode?
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index 476fb19..241c2be 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -154,7 +154,7 @@ void Marshal::writeOid(
 {
     bool found;
     sal_uInt16 idx;
-    if (oid.getLength() == 0) {
+    if ( oid.isEmpty() ) {
         found = true;
         idx = cache::ignore;
     } else {