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 | |
| parent | db79f11eaa47a31541d033a5c90d43cac014b265 (diff) | |
mav60: fix rebase problems
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/EncryptionData.hxx | 3 | ||||
| -rw-r--r-- | package/inc/ZipFile.hxx | 2 | ||||
| -rw-r--r-- | package/inc/ZipPackageFolder.hxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx index 549669b3feb1..5d49ae2b7b0f 100644 --- a/package/inc/EncryptionData.hxx +++ b/package/inc/EncryptionData.hxx @@ -42,7 +42,8 @@ public: : m_nIterationCount ( 0 ){} BaseEncryptionData( const BaseEncryptionData& aData ) - : m_aSalt( aData.m_aSalt ) + : cppu::OWeakObject() + , m_aSalt( aData.m_aSalt ) , m_aInitVector( aData.m_aInitVector ) , m_aDigest( aData.m_aDigest ) , m_nIterationCount( aData.m_nIterationCount ) diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index a6fc36bb0dfb..2be52615c90b 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -153,7 +153,7 @@ public: sal_Int32 &rStartKeyGenID, sal_Int32 &rSize, ::rtl::OUString& aMediaType, - ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream > &rStream ); + const ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream ); static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StaticGetDataFromRawStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, 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) |