diff options
author | Olivier Hallot <olivier.hallot@documentfoundation.org> | 2012-01-01 19:03:17 -0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-01-02 19:17:17 +0100 |
commit | 829db12d7e3e93b4a44f79b39a0a9f0630439109 (patch) | |
tree | 8afe2c55ddb2846fc1e7a35c0212ca2304c6f3d5 /package/source/zippackage/ZipPackageEntry.cxx | |
parent | 6af59644d6508049409a03d1c4a598ea2bef521e (diff) |
Fix for fdo43460 Part XXVI getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXVI
Module
package
Diffstat (limited to 'package/source/zippackage/ZipPackageEntry.cxx')
-rw-r--r-- | package/source/zippackage/ZipPackageEntry.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index 9a0e62c48515..1740f2e7472b 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -67,7 +67,7 @@ OUString SAL_CALL ZipPackageEntry::getName( ) void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) throw(RuntimeException) { - if ( pParent && msName.getLength() && pParent->hasByName ( msName ) ) + if ( pParent && !msName.isEmpty() && pParent->hasByName ( msName ) ) pParent->removeByName ( msName ); // unfortunately no other exception than RuntimeException can be thrown here @@ -91,7 +91,7 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bIns { // xParent = pParent = pNewParent; pParent = pNewParent; - if ( bInsert && msName.getLength() && !pNewParent->hasByName ( msName ) ) + if ( bInsert && !msName.isEmpty() && !pNewParent->hasByName ( msName ) ) pNewParent->doInsertByName ( this, sal_False ); } @@ -107,7 +107,7 @@ void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xN if ( pNewParent != pParent ) { - if ( pParent && msName.getLength() && pParent->hasByName ( msName ) && mbAllowRemoveOnInsert ) + if ( pParent && !msName.isEmpty() && pParent->hasByName ( msName ) && mbAllowRemoveOnInsert ) pParent->removeByName( msName ); doSetParent ( pNewParent, sal_True ); } |