diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 19:39:35 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 19:39:35 +0100 |
| commit | b7460db35b7a6d556b40c0e9cde8b808b0029352 (patch) | |
| tree | d035adcbbde422744c3d51455f73d44bfa7f36c7 /package/inc/ZipPackageFolder.hxx | |
| parent | db79f11eaa47a31541d033a5c90d43cac014b265 (diff) | |
mav60: fix rebase problems
Diffstat (limited to 'package/inc/ZipPackageFolder.hxx')
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 505c057a7696..6a80f0effdaa 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -90,7 +90,7 @@ public: void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; } void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; } - bool saveChild(const rtl::OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, com::sun::star::uno::Sequence < sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool); + bool saveChild(const rtl::OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool); // Recursive functions void saveContents(rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool) |