diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:31:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:31:07 +0000 |
| commit | 0e832078a533278cc5a6e444f9c9d310e993d367 (patch) | |
| tree | 6ed81ec28cb4ce11a1e31ab023815cd0fec046b8 /package/source/zippackage/ZipPackageEntry.cxx | |
| parent | fc0048560887168a36e19a9abf94ed0bd5cbb000 (diff) | |
INTEGRATION: CWS mav18 (1.25.44); FILE MERGED
2005/05/27 14:52:21 mav 1.25.44.1: #i49755# fix incoplete commit problem
Diffstat (limited to 'package/source/zippackage/ZipPackageEntry.cxx')
| -rw-r--r-- | package/source/zippackage/ZipPackageEntry.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index bca0c35a4111..a3aac02ba2cd 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageEntry.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: kz $ $Date: 2004-10-04 21:09:49 $ + * last change: $Author: kz $ $Date: 2005-07-12 12:31:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,7 @@ using namespace com::sun::star::packages::zip::ZipConstants; ZipPackageEntry::ZipPackageEntry ( bool bNewFolder ) : pParent ( NULL ) , mbIsFolder ( bNewFolder ) +, mbAllowRemoveOnInsert( sal_True ) { } @@ -147,7 +148,7 @@ void SAL_CALL ZipPackageEntry::setParent( const Reference< XInterface >& xNewPar if ( pNewParent != pParent ) { - if ( pParent && pParent->hasByName ( aEntry.sName ) ) + if ( pParent && pParent->hasByName ( aEntry.sName ) && mbAllowRemoveOnInsert ) pParent->removeByName( aEntry.sName ); doSetParent ( pNewParent, sal_True ); } |