diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-01-05 11:36:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-01-05 11:36:40 +0000 |
| commit | e59af78a7f95790a5d1d4bd14540d46b2727efef (patch) | |
| tree | ae60328f2c262306db8615a0db76c8c45f20334f /package | |
| parent | f8b78bc74c46fe2b2528c865b034a0b1b205dcbb (diff) | |
INTEGRATION: CWS scriptingf2 (1.3.6); FILE MERGED
2003/12/12 14:44:12 mav 1.3.6.1: #114358# fix commit of changed storage
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 590ad41ca79b..3d5ed259531e 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xstorage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2003-10-30 09:48:27 $ + * last change: $Author: rt $ $Date: 2004-01-05 12:36:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -738,7 +738,10 @@ void OStorage_Impl::Commit() // it's temporary PackageFolder should be inserted instead of current one // also the new copy of PackageFolder should be used by the children storages - xNewPackageFolder->removeByName( (*pElementIter)->m_aOriginalName ); + // the renamed elements are not in new temporary storage + if ( m_bCommited || m_bIsRoot ) + xNewPackageFolder->removeByName( (*pElementIter)->m_aOriginalName ); + (*pElementIter)->m_pStorage->InsertIntoPackageFolder( (*pElementIter)->m_aName, xNewPackageFolder ); } else if ( !(*pElementIter)->m_bIsStorage && (*pElementIter)->m_pStream ) @@ -750,7 +753,10 @@ void OStorage_Impl::Commit() (*pElementIter)->m_pStream->Commit(); - xNewPackageFolder->removeByName( (*pElementIter)->m_aOriginalName ); + // the renamed elements are not in new temporary storage + if ( m_bCommited || m_bIsRoot ) + xNewPackageFolder->removeByName( (*pElementIter)->m_aOriginalName ); + (*pElementIter)->m_pStream->InsertIntoPackageFolder( (*pElementIter)->m_aName, xNewPackageFolder ); } else if ( !m_bCommited && !m_bIsRoot ) |