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/EncryptionData.hxx | |
| parent | db79f11eaa47a31541d033a5c90d43cac014b265 (diff) | |
mav60: fix rebase problems
Diffstat (limited to 'package/inc/EncryptionData.hxx')
| -rw-r--r-- | package/inc/EncryptionData.hxx | 3 |
1 files changed, 2 insertions, 1 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 ) |