diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 16:50:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 19:43:04 +0100 |
commit | 819e76dc6082a21fd9c4f8866e4fc4cd20cd90f1 (patch) | |
tree | 818946d65af4a80d1599c1d5d70001e4fbed848a /sot | |
parent | 503e0173bf1e207b05a33cc17e03d8b9dbcbc56b (diff) |
Revert "loplugin:constfields in smoketest..sot"
This reverts commit 1de7e818a417a412678013c100b4bf73fd8858ac.
Change-Id: Ie1100fd1af636a0538f589845b9391ba40dbf12a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90417
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
-rw-r--r-- | sot/inc/sysformats.hxx | 8 | ||||
-rw-r--r-- | sot/source/base/formats.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgcache.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx index a34375df3d8b..7bca96ef425c 100644 --- a/sot/inc/sysformats.hxx +++ b/sot/inc/sysformats.hxx @@ -30,10 +30,10 @@ struct SotAction_Impl { - SotClipboardFormatId const nFormatId; // Clipboard Id - sal_uInt16 const nAction; // Action Id - SotExchangeActionFlags const nFlags; // Action Id - sal_uInt8 const nContextCheckId; // additional check of content in clipboard + SotClipboardFormatId nFormatId; // Clipboard Id + sal_uInt16 nAction; // Action Id + SotExchangeActionFlags nFlags; // Action Id + sal_uInt8 nContextCheckId; // additional check of content in clipboard constexpr SotAction_Impl(SotClipboardFormatId _nFormatId, sal_uInt16 _nAction, SotExchangeActionFlags _nFlags, sal_uInt8 _nContextCheckId) : nFormatId(_nFormatId), nAction(_nAction), nFlags(_nFlags), nContextCheckId(_nContextCheckId) {} diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index f911b0b89c0c..ac1f5e5c550d 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -53,7 +53,7 @@ namespace { struct SotDestinationEntry_Impl { - SotExchangeDest const nDestination; + SotExchangeDest nDestination; const SotAction_Impl* aDefaultActions; const SotAction_Impl* aMoveActions; const SotAction_Impl* aCopyActions; diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 17ae1a9d4b88..c9b123c17f9d 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -97,7 +97,7 @@ class StgPage : public salhelper::SimpleReferenceObject const sal_Int32 mnPage; // page index std::unique_ptr<sal_uInt8[]> mpData; // nSize bytes - short const mnSize; // size of this page + short mnSize; // size of this page StgPage( short nData, sal_Int32 nPage ); virtual ~StgPage() override; public: diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 9edd26aae4eb..c97a02fb2e35 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -400,7 +400,7 @@ public: OUString m_aURL; // the full path name to create the content OUString m_aContentType; OUString m_aOriginalContentType; - OString const m_aKey; + OString m_aKey; ::ucbhelper::Content* m_pContent; // the content that provides the data Reference<XInputStream> m_rSource; // the stream covering the original data of the content std::unique_ptr<SvStream> m_pStream; // the stream worked on; for readonly streams it is the original stream of the content @@ -411,7 +411,7 @@ public: bool m_bSourceRead; // Source still contains useful information bool m_bModified; // only modified streams will be sent to the original content bool m_bCommited; // sending the streams is coordinated by the root storage of the package - bool const m_bDirect; // the storage and its streams are opened in direct mode; for UCBStorages + bool m_bDirect; // the storage and its streams are opened in direct mode; for UCBStorages // this means that the root storage does an autocommit when its external // reference is destroyed bool m_bIsOLEStorage;// an OLEStorage on a UCBStorageStream makes this an Autocommit-stream @@ -460,7 +460,7 @@ public: ErrCode m_nError; StreamMode m_nMode; // open mode ( read/write/trunc/nocreate/sharing ) bool m_bCommited; // sending the streams is coordinated by the root storage of the package - bool const m_bDirect; // the storage and its streams are opened in direct mode; for UCBStorages + bool m_bDirect; // the storage and its streams are opened in direct mode; for UCBStorages // this means that the root storage does an autocommit when its external // reference is destroyed bool m_bIsRoot; // marks this storage as root storages that manages all commits and reverts @@ -472,7 +472,7 @@ public: UCBStorageElementList_Impl m_aChildrenList; - bool const m_bRepairPackage; + bool m_bRepairPackage; Reference< XProgressHandler > m_xProgressHandler; UCBStorage_Impl( const ::ucbhelper::Content&, const OUString&, StreamMode, UCBStorage*, bool, @@ -523,7 +523,7 @@ struct UCBStorageElement_Impl { OUString m_aName; // the actual URL relative to the root "folder" OUString m_aOriginalName;// the original name in the content - sal_uLong const m_nSize; + sal_uLong m_nSize; bool m_bIsFolder; // Only true when it is a UCBStorage ! bool m_bIsStorage; // Also true when it is an OLEStorage ! bool m_bIsRemoved; // element will be removed on commit |