diff options
author | Herbert Dürr <hdu@apache.org> | 2014-02-04 08:48:47 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 12:47:59 +0000 |
commit | a5090ccf756aac2365fd52d7cf9b423f54c5c6f6 (patch) | |
tree | eec6b5c4c2263c2a0cf7eac96d8cf9a066367bb8 /basctl | |
parent | clean up now that pGraphic ==NULL is an early return (diff) | |
download | core-a5090ccf756aac2365fd52d7cf9b423f54c5c6f6.tar.gz core-a5090ccf756aac2365fd52d7cf9b423f54c5c6f6.zip |
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 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
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 3645142c3b39..35c41cf73072 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 ); |