Kaydet (Commit) a5090ccf authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Related: #i123862# use O*String's isEmpty() method...

to check for emptiness in modules starting with 'b'

Patch-by: j.nitschke@ok.de
Review-by: hdu@apache.org
(cherry picked from commit 87204b0f)

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
üst 3f4a461c
...@@ -499,7 +499,7 @@ void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChan ...@@ -499,7 +499,7 @@ void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChan
Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY); Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) ) 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 // 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 ); Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );
......
...@@ -594,7 +594,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl ) ...@@ -594,7 +594,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
const TraceTextData& rTraceTextData = itInner->second; const TraceTextData& rTraceTextData = itInner->second;
const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT; const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
bool bSTMT = false; bool bSTMT = false;
if( rStr_STMNT.getLength() ) if( !rStr_STMNT.isEmpty() )
{ {
bSTMT = true; bSTMT = true;
} }
...@@ -628,7 +628,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl ) ...@@ -628,7 +628,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
nIndent += GnIndentForPCode; nIndent += GnIndentForPCode;
const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode; const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
if( rStr_PCode.getLength() ) if( !rStr_PCode.isEmpty() )
{ {
lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ), lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
bPrintTimeStamp ? TimeBuffer : NULL ); bPrintTimeStamp ? TimeBuffer : NULL );
......
...@@ -572,7 +572,7 @@ SbError call( ...@@ -572,7 +572,7 @@ SbError call(
SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc) SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
{ {
OSL_ASSERT(proc != 0); 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 sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
if (n <= 0 || n > 0xFFFF) { if (n <= 0 || n > 0xFFFF) {
return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode? return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode?
......
...@@ -154,7 +154,7 @@ void Marshal::writeOid( ...@@ -154,7 +154,7 @@ void Marshal::writeOid(
{ {
bool found; bool found;
sal_uInt16 idx; sal_uInt16 idx;
if (oid.getLength() == 0) { if ( oid.isEmpty() ) {
found = true; found = true;
idx = cache::ignore; idx = cache::ignore;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment