[Libreoffice-commits] core.git: compilerplugins/clang i18npool/inc i18npool/source sc/inc sc/source sw/inc sw/source vcl/inc
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 29 10:28:20 UTC 2020
compilerplugins/clang/pahole-all-classes.py | 2 +-
i18npool/inc/xdictionary.hxx | 2 +-
i18npool/source/breakiterator/xdictionary.cxx | 2 +-
sc/inc/formularesult.hxx | 5 ++---
sc/source/core/tool/formularesult.cxx | 8 ++++----
sc/source/ui/inc/acredlin.hxx | 4 ++--
sw/inc/fldbas.hxx | 6 +++---
sw/inc/redline.hxx | 4 ++--
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 ++++----
vcl/inc/schedulerimpl.hxx | 2 +-
18 files changed, 40 insertions(+), 42 deletions(-)
New commits:
commit 8581d880f8aa8c2be15c875db291cebbb42841c7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 29 10:43:28 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri May 29 12:27:43 2020 +0200
pack a few more classes
Change-Id: Ia7870d1d0d91de213727116ccda5b41913223866
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95097
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/pahole-all-classes.py b/compilerplugins/clang/pahole-all-classes.py
index 16e851d82c7a..9f9ca86a237c 100755
--- a/compilerplugins/clang/pahole-all-classes.py
+++ b/compilerplugins/clang/pahole-all-classes.py
@@ -72,7 +72,7 @@ def read_generator(gdbOutput):
sortedLocs = sorted(locToClassDict.keys())
classList = list()
for src in sortedLocs:
- if "include/" in src:
+ if "/inc/" in src or "include/" in src:
classList.append(locToClassDict[src])
with open("compilerplugins/clang/pahole.results", "wt") as f:
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index dbb07f75652b..6d6e20f10240 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -30,9 +30,9 @@ namespace i18npool {
// cache structure.
struct WordBreakCache {
- sal_Int32 length; // contents length saved here.
sal_Unicode *contents; // separated segment contents.
sal_Int32* wordboundary; // word boundaries in segments.
+ sal_Int32 length; // contents length saved here.
sal_Int32 size; // size of wordboundary
WordBreakCache();
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 3e1398422f77..a57a3b0d4a4d 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -243,9 +243,9 @@ sal_Int32 xdictionary::getLongestMatch(const sal_Unicode* str, sal_Int32 sLen)
*/
WordBreakCache::WordBreakCache() :
- length( 0 ),
contents( nullptr ),
wordboundary( nullptr ),
+ length( 0 ),
size( 0 )
{
}
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index a52be96c3832..c17f1e083c4c 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -33,12 +33,11 @@ namespace sc {
struct FormulaResultValue
{
- enum Type { Invalid, Value, String, Error };
-
- Type meType;
+ enum Type : sal_uInt8 { Invalid, Value, String, Error };
double mfValue;
svl::SharedString maString;
+ Type meType;
FormulaError mnError;
FormulaResultValue();
diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
index c81bb1e54d22..f25d4c9a67fb 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -15,10 +15,10 @@
namespace sc {
-FormulaResultValue::FormulaResultValue() : meType(Invalid), mfValue(0.0), mnError(FormulaError::NONE) {}
-FormulaResultValue::FormulaResultValue( double fValue ) : meType(Value), mfValue(fValue), mnError(FormulaError::NONE) {}
-FormulaResultValue::FormulaResultValue( const svl::SharedString& rStr ) : meType(String), mfValue(0.0), maString(rStr), mnError(FormulaError::NONE) {}
-FormulaResultValue::FormulaResultValue( FormulaError nErr ) : meType(Error), mfValue(0.0), mnError(nErr) {}
+FormulaResultValue::FormulaResultValue() : mfValue(0.0), meType(Invalid), mnError(FormulaError::NONE) {}
+FormulaResultValue::FormulaResultValue( double fValue ) : mfValue(fValue), meType(Value), mnError(FormulaError::NONE) {}
+FormulaResultValue::FormulaResultValue( const svl::SharedString& rStr ) : mfValue(0.0), maString(rStr), meType(String), mnError(FormulaError::NONE) {}
+FormulaResultValue::FormulaResultValue( FormulaError nErr ) : mfValue(0.0), meType(Error), mnError(nErr) {}
}
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index a8d18b18507b..24ac56361a0b 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -35,11 +35,11 @@ class ScRedlinData : public RedlinData
public:
ScRedlinData();
virtual ~ScRedlinData() override;
+ sal_uLong nActionNo;
+ sal_uLong nInfo;
SCTAB nTable;
SCCOL nCol;
SCROW nRow;
- sal_uLong nActionNo;
- sal_uLong nInfo;
bool bIsRejectable;
bool bIsAcceptable;
};
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 4f275e792fb9..c3b252f7c3b3 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -294,11 +294,11 @@ class SW_DLLPUBLIC SwField
{
private:
mutable OUString m_Cache; ///< Cached expansion (for clipboard).
- bool m_bUseFieldValueCache; /// control the usage of the cached field value
+ SwFieldType* m_pType;
+ sal_uInt32 m_nFormat; /// this can be either SvxNumType or SwChapterFormat depending on the subtype
LanguageType m_nLang; ///< Always change via SetLanguage!
+ bool m_bUseFieldValueCache; /// control the usage of the cached field value
bool m_bIsAutomaticLanguage;
- sal_uInt32 m_nFormat; /// this can be either SvxNumType or SwChapterFormat depending on the subtype
- SwFieldType* m_pType;
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const = 0;
virtual std::unique_ptr<SwField> Copy() const = 0;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index e75ad1aaa28d..e00c769fd118 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -92,10 +92,10 @@ class SW_DLLPUBLIC SwRedlineData
OUString m_sComment;
DateTime m_aStamp;
- RedlineType m_eType;
- bool m_bAutoFormat;
std::size_t m_nAuthor;
+ RedlineType m_eType;
sal_uInt16 m_nSeqNo;
+ bool m_bAutoFormat;
public:
SwRedlineData( RedlineType eT, std::size_t nAut );
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)
{
diff --git a/vcl/inc/schedulerimpl.hxx b/vcl/inc/schedulerimpl.hxx
index 38f27a665186..ffb08084252c 100644
--- a/vcl/inc/schedulerimpl.hxx
+++ b/vcl/inc/schedulerimpl.hxx
@@ -31,9 +31,9 @@ struct ImplSchedulerData final
{
ImplSchedulerData* mpNext; ///< Pointer to the next element in list
Task* mpTask; ///< Pointer to VCL Task instance
- bool mbInScheduler; ///< Task currently processed?
sal_uInt64 mnUpdateTime; ///< Last Update Time
TaskPriority mePriority; ///< Task priority
+ bool mbInScheduler; ///< Task currently processed?
const char *GetDebugName() const;
};
More information about the Libreoffice-commits
mailing list