diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-28 11:12:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-28 13:08:28 +0200 |
commit | 50bd2ca20618ba9c9f512716d8de7521a9fde0f6 (patch) | |
tree | 14919ffb3f947cf396873a0e013a09bcd57a6124 | |
parent | 913ed3e5673c2d70e2c4e519eb65368b0606d7f0 (diff) |
sal_uLong->sal_uInt32 in CommandStruct
we are already using sal_uInt32 for this in some places
Change-Id: I69ed8f6c29215fcedcafc403861cdd0e06c034ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140701
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | sw/inc/ccoll.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtcol.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 978b8c698a83..4052d4f0afdd 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -31,7 +31,7 @@ enum class Master_CollCondition; struct CommandStruct { Master_CollCondition nCnd; - sal_uLong nSubCond; + sal_uInt32 nSubCond; }; sal_Int16 GetCommandContextIndex( std::u16string_view rContextName ); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 1b1bd7d2e46d..b5706dc0761b 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -207,12 +207,12 @@ enum class Master_CollCondition class SW_DLLPUBLIC SwCollCondition final : public SwClient { Master_CollCondition m_nCondition; - sal_uLong m_nSubCondition; + sal_uInt32 m_nSubCondition; public: SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition nMasterCond, - sal_uLong nSubCond ); + sal_uInt32 nSubCond ); virtual ~SwCollCondition() override; /// @@@ public copy ctor, but no copy assignment? @@ -225,9 +225,9 @@ public: bool operator==( const SwCollCondition& rCmp ) const; Master_CollCondition GetCondition() const { return m_nCondition; } - sal_uLong GetSubCondition() const { return m_nSubCondition; } + sal_uInt32 GetSubCondition() const { return m_nSubCondition; } - void SetCondition( Master_CollCondition nCond, sal_uLong nSubCond ); + void SetCondition( Master_CollCondition nCond, sal_uInt32 nSubCond ); SwTextFormatColl* GetTextFormatColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } void RegisterToFormat( SwFormat& ); }; diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 9cc951b52a0c..b2e66b7c4d31 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -495,7 +495,7 @@ void SwTextFormatColls::dumpAsXml(xmlTextWriterPtr pWriter) const //FEATURE::CONDCOLL SwCollCondition::SwCollCondition( SwTextFormatColl* pColl, Master_CollCondition nMasterCond, - sal_uLong nSubCond ) + sal_uInt32 nSubCond ) : SwClient( pColl ), m_nCondition( nMasterCond ), m_nSubCondition( nSubCond ) { @@ -523,7 +523,7 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const && ( m_nSubCondition == rCmp.m_nSubCondition ); } -void SwCollCondition::SetCondition( Master_CollCondition nCond, sal_uLong nSubCond ) +void SwCollCondition::SetCondition( Master_CollCondition nCond, sal_uInt32 nSubCond ) { m_nCondition = nCond; m_nSubCondition = nSubCond; |