From 8581d880f8aa8c2be15c875db291cebbb42841c7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 29 May 2020 10:43:28 +0200 Subject: pack a few more classes Change-Id: Ia7870d1d0d91de213727116ccda5b41913223866 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95097 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/core/doc/docredln.cxx | 8 ++++---- sw/source/core/fields/fldbas.cxx | 6 +++--- sw/source/core/inc/acorrect.hxx | 4 ++-- sw/source/core/inc/anchoredobjectposition.hxx | 5 ++--- sw/source/core/inc/docfld.hxx | 2 +- sw/source/core/inc/mvsave.hxx | 6 +++--- sw/source/core/objectpositioning/anchoredobjectposition.cxx | 2 +- sw/source/uibase/inc/numfmtlb.hxx | 6 +++--- sw/source/uibase/utlui/numfmtlb.cxx | 8 ++++---- 9 files changed, 23 insertions(+), 24 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index b98e89caf48f..552f92e70087 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -890,7 +890,7 @@ bool SwRedlineExtraData_Format::operator == ( const SwRedlineExtraData& rCmp ) c SwRedlineData::SwRedlineData( RedlineType eT, std::size_t nAut ) : m_pNext( nullptr ), m_pExtraData( nullptr ), m_aStamp( DateTime::SYSTEM ), - m_eType( eT ), m_bAutoFormat(false), m_nAuthor( nAut ), m_nSeqNo( 0 ) + m_nAuthor( nAut ), m_eType( eT ), m_nSeqNo( 0 ), m_bAutoFormat(false) { m_aStamp.SetNanoSec( 0 ); } @@ -902,10 +902,10 @@ SwRedlineData::SwRedlineData( , m_pExtraData( rCpy.m_pExtraData ? rCpy.m_pExtraData->CreateNew() : nullptr ) , m_sComment( rCpy.m_sComment ) , m_aStamp( rCpy.m_aStamp ) - , m_eType( rCpy.m_eType ) - , m_bAutoFormat(false) , m_nAuthor( rCpy.m_nAuthor ) + , m_eType( rCpy.m_eType ) , m_nSeqNo( rCpy.m_nSeqNo ) + , m_bAutoFormat(false) { } @@ -913,7 +913,7 @@ SwRedlineData::SwRedlineData( SwRedlineData::SwRedlineData(RedlineType eT, std::size_t nAut, const DateTime& rDT, const OUString& rCmnt, SwRedlineData *pNxt) : m_pNext(pNxt), m_pExtraData(nullptr), m_sComment(rCmnt), m_aStamp(rDT), - m_eType(eT), m_bAutoFormat(false), m_nAuthor(nAut), m_nSeqNo(0) + m_nAuthor(nAut), m_eType(eT), m_nSeqNo(0), m_bAutoFormat(false) { } diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 382880ecd8f4..39605e4786c2 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -212,11 +212,11 @@ SwField::SwField( LanguageType nLang, bool bUseFieldValueCache) : m_Cache() - , m_bUseFieldValueCache( bUseFieldValueCache ) + , m_pType( pType ) + , m_nFormat( nFormat ) , m_nLang( nLang ) + , m_bUseFieldValueCache( bUseFieldValueCache ) , m_bIsAutomaticLanguage( true ) - , m_nFormat( nFormat ) - , m_pType( pType ) { assert(m_pType); } diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index f1d8c045bd3d..8c4c5a5cb91d 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -93,8 +93,8 @@ public: class SwAutoCorrExceptWord { OUString m_sWord; - ACFlags m_nFlags; sal_uLong m_nNode; + ACFlags m_nFlags; sal_Int32 m_nContent; sal_Unicode m_cChar; LanguageType m_eLanguage; @@ -104,7 +104,7 @@ public: SwAutoCorrExceptWord(ACFlags nAFlags, sal_uLong nNd, sal_Int32 nContent, const OUString& rWord, sal_Unicode cChr, LanguageType eLang) - : m_sWord(rWord), m_nFlags(nAFlags), m_nNode(nNd), m_nContent(nContent), + : m_sWord(rWord), m_nNode(nNd), m_nFlags(nAFlags), m_nContent(nContent), m_cChar(cChr), m_eLanguage(eLang), m_bDeleted(false) {} diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index b2afe2c47f10..2a30da4d6c1c 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -42,9 +42,6 @@ namespace objectpositioning private: // object to be positioned SdrObject& mrDrawObj; - - // does the object represents a Writer fly frame - bool mbIsObjFly; // #i26791# - anchored object the object belongs to; SwAnchoredObject* mpAnchoredObj; // frame the object is anchored at @@ -53,6 +50,8 @@ namespace objectpositioning SwContact* mpContact; // frame format const SwFrameFormat* mpFrameFormat; + // does the object represents a Writer fly frame + bool mbIsObjFly; // #i62875# bool mbFollowTextFlow; // #i62875# diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 36cf3d86eba0..93d68cb01ec9 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -44,7 +44,6 @@ enum class SwFieldIds : sal_uInt16; class SetGetExpField { sal_uLong m_nNode; - sal_Int32 m_nContent; union { const SwTextField* pTextField; const SwSection* pSection; @@ -54,6 +53,7 @@ class SetGetExpField const SwTextINetFormat* pTextINet; const SwFlyFrameFormat* pFlyFormat; } m_CNTNT; + sal_Int32 m_nContent; enum SetGetExpFieldType { TEXTFIELD, TEXTTOXMARK, SECTIONNODE, CRSRPOS, TABLEBOX, diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 73e74d7d1fe9..64064a858023 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -98,15 +98,15 @@ void DelBookmarks(const SwNodeIndex& rStt, * location. */ struct SaveFly { + SwFrameFormat* pFrameFormat; /// the fly's frame format sal_uLong nNdDiff; /// relative node difference sal_Int32 nContentIndex; ///< index in node - SwFrameFormat* pFrameFormat; /// the fly's frame format bool isAtInsertNode; ///< if true, anchor _at_ insert node index SaveFly( sal_uLong nNodeDiff, sal_Int32 const nCntntIdx, SwFrameFormat* pFormat, bool bInsert ) - : nNdDiff(nNodeDiff) + : pFrameFormat(pFormat) + , nNdDiff(nNodeDiff) , nContentIndex(nCntntIdx) - , pFrameFormat(pFormat) , isAtInsertNode(bInsert) { } }; diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 5ac2514bb6d0..09b616edb507 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -44,10 +44,10 @@ using namespace objectpositioning; SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj ) : mrDrawObj( _rDrawObj ), - mbIsObjFly( false ), mpAnchoredObj( nullptr ), mpAnchorFrame( nullptr ), mpContact( nullptr ), + mbIsObjFly( false ), // #i62875# mbFollowTextFlow( false ), mbDoNotCaptureAnchoredObj( false ) diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index f4f75e32d1d4..1fedd19c1157 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -28,12 +28,12 @@ class SwView; class SW_DLLPUBLIC SwNumFormatBase { protected: - SvNumFormatType nCurrFormatType; - bool mbCurrFormatTypeNeedsInit; sal_Int32 nStdEntry; - bool bOneArea; sal_uInt32 nDefFormat; + SvNumFormatType nCurrFormatType; LanguageType eCurLanguage; + bool bOneArea; + bool mbCurrFormatTypeNeedsInit; bool bShowLanguageControl; //determine whether the language control has //to be shown in the number format dialog bool bUseAutomaticLanguage;//determine whether language is automatically assigned diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 4b4b6acb799a..a46bf67e9187 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -114,11 +114,11 @@ double SwNumFormatBase::GetDefValue(const SvNumFormatType nFormatType) } SwNumFormatBase::SwNumFormatBase() - : nCurrFormatType(SvNumFormatType::ALL) - , mbCurrFormatTypeNeedsInit(true) - , nStdEntry(0) - , bOneArea(false) + : nStdEntry(0) , nDefFormat(0) + , nCurrFormatType(SvNumFormatType::ALL) + , bOneArea(false) + , mbCurrFormatTypeNeedsInit(true) , bShowLanguageControl(false) , bUseAutomaticLanguage(true) { -- cgit v1.2.3