[Libreoffice-commits] core.git: smoketest/smoketest.cxx soltools/cpp sot/inc sot/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 18:43:39 UTC 2020
smoketest/smoketest.cxx | 4 ++--
soltools/cpp/_eval.c | 6 +++---
soltools/cpp/_lex.c | 2 +-
soltools/cpp/_nlist.c | 6 +++---
sot/inc/sysformats.hxx | 8 ++++----
sot/source/base/formats.cxx | 2 +-
sot/source/sdstor/stgcache.hxx | 2 +-
sot/source/sdstor/ucbstorage.cxx | 10 +++++-----
8 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 819e76dc6082a21fd9c4f8866e4fc4cd20cd90f1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 16:50:59 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 19:43:04 2020 +0100
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 at collabora.co.uk>
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 69913b1fcde8..b463218ae9fb 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -106,8 +106,8 @@ private:
{ dispatch_->dispatchWithNotification(url_, arguments_, listener_); }
css::uno::Reference< css::frame::XNotifyingDispatch > dispatch_;
- css::util::URL const url_;
- css::uno::Sequence< css::beans::PropertyValue > const arguments_;
+ css::util::URL url_;
+ css::uno::Sequence< css::beans::PropertyValue > arguments_;
css::uno::Reference< css::frame::XDispatchResultListener > listener_;
};
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index 3d19974da825..7efdd82715d9 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -43,9 +43,9 @@ struct value
/* operator priority, arity, and conversion type, indexed by tokentype */
struct pri
{
- char const pri;
- char const arity;
- char const ctype;
+ char pri;
+ char arity;
+ char ctype;
};
static const struct pri priority[] =
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index dfd8605a3950..135c36ca4f93 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -68,7 +68,7 @@ struct fsm
{
int state; /* if in this state */
uchar ch[4]; /* and see one of these characters */
- int const nextstate; /* enter this state if +ve */
+ int nextstate; /* enter this state if +ve */
};
static const struct fsm fsm[] = {
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 557de6c1fc80..096cc525fd40 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -38,9 +38,9 @@ static Nlist *nlist[NLSIZE];
struct kwtab
{
- char * const kw;
- int const val;
- int const flag;
+ char *kw;
+ int val;
+ int flag;
};
static const struct kwtab kwtab[] =
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
More information about the Libreoffice-commits
mailing list