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/source/xstor | |
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/source/xstor')
-rw-r--r-- | package/source/xstor/ocompinstream.hxx | 2 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.cxx | 2 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/selfterminatefilestream.hxx | 2 | ||||
-rw-r--r-- | package/source/xstor/switchpersistencestream.cxx | 2 | ||||
-rw-r--r-- | package/source/xstor/xstorage.cxx | 6 | ||||
-rw-r--r-- | package/source/xstor/xstorage.hxx | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 58d433d67bfc..c41c2c25f40a 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -48,7 +48,7 @@ protected: std::unique_ptr<::comphelper::OInterfaceContainerHelper2> m_pInterfaceContainer; css::uno::Sequence < css::beans::PropertyValue > m_aProperties; bool m_bDisposed; - sal_Int32 const m_nStorageType; + sal_Int32 m_nStorageType; public: OInputCompStream( OWriteStream_Impl& pImpl, diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index d953887748cd..e01108b59d91 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -68,7 +68,7 @@ struct WSInternalData_Impl rtl::Reference<comphelper::RefCountedMutex> m_xSharedMutex; ::std::unique_ptr< ::cppu::OTypeCollection> m_pTypeCollection; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners - sal_Int32 const m_nStorageType; + sal_Int32 m_nStorageType; // the mutex reference MUST NOT be empty WSInternalData_Impl( const rtl::Reference<comphelper::RefCountedMutex>& rMutexRef, sal_Int32 nStorageType ) diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index 718aea3ac77f..ff1a60ac0934 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -105,7 +105,7 @@ struct OWriteStream_Impl bool m_bHasInsertedStreamOptimization; - sal_Int32 const m_nStorageType; + sal_Int32 m_nStorageType; // Relations info related data, stored in *.rels file in OFOPXML format css::uno::Reference< css::io::XInputStream > m_xOrigRelInfoStream; @@ -249,7 +249,7 @@ protected: bool m_bInitOnDemand; sal_Int64 m_nInitPosition; - bool const m_bTransacted; + bool m_bTransacted; OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted ); OWriteStream( OWriteStream_Impl* pImpl, css::uno::Reference< css::io::XStream > const & xStream, bool bTransacted ); diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index b1954e2b2605..4aecd337d9eb 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -32,7 +32,7 @@ class OSelfTerminateFileStream final : public cppu::WeakImplHelper< css::io::XIn { css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xFileAccess; - OUString const m_aURL; + OUString m_aURL; css::uno::Reference< css::io::XInputStream > m_xInputStream; css::uno::Reference< css::io::XSeekable > m_xSeekable; diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index a62702c593cd..7eac83cbf708 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; struct SPStreamData_Impl { - bool const m_bInStreamBased; + bool m_bInStreamBased; // the streams below are not visible from outside so there is no need to remember position diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 3da6d24f55e7..f5afff414feb 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -79,9 +79,9 @@ struct StorInternalData_Impl rtl::Reference<comphelper::RefCountedMutex> m_xSharedMutex; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners ::std::unique_ptr< ::cppu::OTypeCollection> m_pTypeCollection; - bool const m_bIsRoot; - sal_Int32 const m_nStorageType; // the mode in which the storage is used - bool const m_bReadOnlyWrap; + bool m_bIsRoot; + sal_Int32 m_nStorageType; // the mode in which the storage is used + bool m_bReadOnlyWrap; ::rtl::Reference<OChildDispListener_Impl> m_pSubElDispListener; diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 0c6cc442acde..21f3131de2e2 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -83,7 +83,7 @@ struct SotElement_Impl OUString m_aOriginalName; bool m_bIsRemoved; bool m_bIsInserted; - bool const m_bIsStorage; + bool m_bIsStorage; std::unique_ptr<OStorage_Impl> m_xStorage; std::unique_ptr<OWriteStream_Impl, o3tl::default_delete<OWriteStream_Impl>> m_xStream; @@ -122,7 +122,7 @@ struct OStorage_Impl bool m_bCommited; // sending the streams is coordinated by the root storage of the package - bool const m_bIsRoot; // marks this storage as root storages that manages all commits and reverts + bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts bool m_bListCreated; /// Count of registered modification listeners @@ -159,7 +159,7 @@ struct OStorage_Impl SwitchablePersistenceStream* m_pSwitchStream; - sal_Int32 const m_nStorageType; // the mode in which the storage is used + sal_Int32 m_nStorageType; // the mode in which the storage is used // the _rels substorage that is handled in a special way in embed::StorageFormats::OFOPXML SotElement_Impl* m_pRelStorElement; |