diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 08:37:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 08:17:11 +0100 |
| commit | b5da97197bd3d0de0e5cb737da96ceab1146f679 (patch) | |
| tree | fc877af67f059e42125c1d02ad24755edf2b6c11 /package/inc | |
| parent | 2e74fdc559eb1b7bab1a6661203400017f93b234 (diff) | |
Revert "loplugin:constfields in package..registry"
This reverts commit 31138ff7729cbf179079a5e635d3a823e2971f08.
Now that we know that making fields has negative side effects
like disabling assignment operator generation.
Change-Id: I3f1ae65532f441c8be5ebca5866b8a1e1c69318c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90363
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/EncryptionData.hxx | 10 | ||||
| -rw-r--r-- | package/inc/ZipFile.hxx | 2 | ||||
| -rw-r--r-- | package/inc/ZipOutputEntry.hxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx index 0eae28d3422a..73408a090faf 100644 --- a/package/inc/EncryptionData.hxx +++ b/package/inc/EncryptionData.hxx @@ -46,11 +46,11 @@ class EncryptionData final : public BaseEncryptionData { public: css::uno::Sequence < sal_Int8 > m_aKey; - sal_Int32 const m_nEncAlg; - sal_Int32 const m_nCheckAlg; - sal_Int32 const m_nDerivedKeySize; - sal_Int32 const m_nStartKeyGenID; - bool const m_bTryWrongSHA1; + sal_Int32 m_nEncAlg; + sal_Int32 m_nCheckAlg; + sal_Int32 m_nDerivedKeySize; + sal_Int32 m_nStartKeyGenID; + bool m_bTryWrongSHA1; EncryptionData(const BaseEncryptionData& aData, const css::uno::Sequence< sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32 nCheckAlg, sal_Int32 nDerivedKeySize, sal_Int32 nStartKeyGenID, bool const bTryWrongSHA1) : BaseEncryptionData( aData ) diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 58755d4ad2c7..3dceb036c3bd 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -62,7 +62,7 @@ class ZipFile css::uno::Reference < css::io::XInputStream > xStream; const css::uno::Reference < css::uno::XComponentContext > m_xContext; - bool const bRecoveryMode; + bool bRecoveryMode; // aMediaType parameter is used only for raw stream header creation css::uno::Reference < css::io::XInputStream > createStreamForZipEntry( diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index a8fbf1563c16..b7720a5009d8 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -48,7 +48,7 @@ protected: ZipEntry *m_pCurrentEntry; sal_Int16 m_nDigested; ZipPackageStream* m_pCurrentStream; - bool const m_bEncryptCurrentEntry; + bool m_bEncryptCurrentEntry; public: virtual ~ZipOutputEntryBase() = default; |