mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS fwk20 (1.74.4); FILE MERGED

Browse Source 
2005/08/03 08:38:08 mav 1.74.4.2: #i51806# close used streams in time
2005/08/02 09:32:48 mav 1.74.4.1: #i51352# handle empty folders more correct
This commit is contained in:
Jens-Heiner Rechtien
2005-09-23 14:55:50 +00:00
parent 8e8062a115
commit 8673fb4894
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/source/zippackage/ZipPackageFolder.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: ZipPackageFolder.cxx,v $ * $RCSfile: ZipPackageFolder.cxx,v $
* *
* $Revision: 1.76 $ * $Revision: 1.77 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 16:18:08 $ * last change: $Author: hr $ $Date: 2005-09-23 15:55:50 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -269,9 +269,9 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() ? sal_True : sal_False; sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() ? sal_True : sal_False;
if ( maContents.begin() == maContents.end() ) if ( maContents.begin() == maContents.end() && rPath.getLength() )
{ {
// it is an empty folder, use workaround to store it // it is an empty subfolder, use workaround to store it
ZipEntry* pTempEntry = new ZipEntry(); ZipEntry* pTempEntry = new ZipEntry();
ZipPackageFolder::copyZipEntry ( *pTempEntry, aEntry ); ZipPackageFolder::copyZipEntry ( *pTempEntry, aEntry );
pTempEntry->nNameLen = (sal_Int16)rPath.getLength(); pTempEntry->nNameLen = (sal_Int16)rPath.getLength();
@@ -583,7 +583,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
{ {
if ( !pStream->IsPackageMember() ) if ( !pStream->IsPackageMember() )
{ {
xStream->closeInput(); pStream->CloseOwnStreamIfAny();
pStream->SetPackageMember ( sal_True ); pStream->SetPackageMember ( sal_True );
} }