From 31bf558349d9ab2634e9a866edf79bc115d649ce Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 11 Mar 2020 13:43:39 +0200 Subject: Revert "loplugin:constfields in oox" This reverts commit a84e3df74eecc8778e3d5be5dd80ad4ddb511edf. Now that we know that making fields has negative side effects like disabling assignment operator generation. Change-Id: I7b45b7ead281cf3a9202ca6aabc55ee5033e5331 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90332 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- include/oox/helper/binaryinputstream.hxx | 2 +- include/oox/helper/modelobjecthelper.hxx | 2 +- include/oox/helper/storagebase.hxx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include/oox/helper') diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index c73a5978db0a..af6a6240fffc 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -372,7 +372,7 @@ private: private: BinaryInputStream* mpInStrm; - sal_Int64 const mnStartPos; + sal_Int64 mnStartPos; sal_Int64 mnRelPos; sal_Int64 mnSize; }; diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index a946a5c6aa78..2b9e1d2cfd51 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -69,7 +69,7 @@ private: mxModelFactory; ///< Factory to create the container. mutable css::uno::Reference< css::container::XNameContainer > mxContainer; ///< Container for the objects. - OUString const maServiceName; ///< Service name to create the container. + OUString maServiceName; ///< Service name to create the container. sal_Int32 mnIndex; ///< Index to create unique identifiers. }; diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 71ee2ddf3de7..537517fbff73 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -178,10 +178,10 @@ private: mxInStream; ///< Cached base input stream (to keep it alive). css::uno::Reference< css::io::XStream > mxOutStream; ///< Cached base output stream (to keep it alive). - OUString const maParentPath; ///< Full path of parent storage. - OUString const maStorageName; ///< Name of this storage, if it is a substorage. - bool const mbBaseStreamAccess; ///< True = access base streams with empty stream name. - bool const mbReadOnly; ///< True = storage opened read-only (based on input stream). + OUString maParentPath; ///< Full path of parent storage. + OUString maStorageName; ///< Name of this storage, if it is a substorage. + bool mbBaseStreamAccess; ///< True = access base streams with empty stream name. + bool mbReadOnly; ///< True = storage opened read-only (based on input stream). }; -- cgit