INTEGRATION: CWS mav18 (1.73.8); FILE MERGED
2005/05/27 14:52:23 mav 1.73.8.1: #i49755# fix incoplete commit problem
This commit is contained in:
parent
ab2b480a71
commit
1894cece31
1 changed files with 6 additions and 3 deletions
|
@ -2,9 +2,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: ZipPackageFolder.cxx,v $
|
* $RCSfile: ZipPackageFolder.cxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.73 $
|
* $Revision: 1.74 $
|
||||||
*
|
*
|
||||||
* last change: $Author: obo $ $Date: 2005-04-18 12:21:09 $
|
* last change: $Author: kz $ $Date: 2005-07-12 12:31:33 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to the terms of
|
* The Contents of this file are made available subject to the terms of
|
||||||
* either of the following licenses
|
* either of the following licenses
|
||||||
|
@ -121,12 +121,15 @@ using vos::ORef;
|
||||||
Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
|
Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
|
||||||
|
|
||||||
ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
|
ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
|
||||||
sal_Bool bPackageFormat )
|
sal_Bool bPackageFormat,
|
||||||
|
sal_Bool bAllowRemoveOnInsert )
|
||||||
: m_xFactory( xFactory )
|
: m_xFactory( xFactory )
|
||||||
, m_bPackageFormat( bPackageFormat )
|
, m_bPackageFormat( bPackageFormat )
|
||||||
{
|
{
|
||||||
OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package folder!" );
|
OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package folder!" );
|
||||||
|
|
||||||
|
ZipPackageEntry::mbAllowRemoveOnInsert = bAllowRemoveOnInsert;
|
||||||
|
|
||||||
SetFolder ( sal_True );
|
SetFolder ( sal_True );
|
||||||
aEntry.nVersion = -1;
|
aEntry.nVersion = -1;
|
||||||
aEntry.nFlag = 0;
|
aEntry.nFlag = 0;
|
||||||
|
|
Loading…
Reference in a new issue