diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-11-03 14:14:08 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-11-04 08:16:13 +0000 |
| commit | f57a6593e21d45008173352fc29ededdbc2c8878 (patch) | |
| tree | 4fad08a21a7cbbd391b266c2b8e607a02efeece8 | |
| parent | 2e6327e4e8c35678a7a52b8b1a78c99caff1f73f (diff) | |
editeng: Eliminate unecessary padding in classes
Edit the order of SvxLRSpaceItem and PaintFirstLineInfo members to
remove unecessary padding due to data alignment.
Change-Id: Icf2c92ef86a32384e51d1cb6f1a079b10995dfd5
Reviewed-on: https://gerrit.libreoffice.org/19763
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 4 | ||||
| -rw-r--r-- | include/editeng/lrspitem.hxx | 6 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 11cbfe2825c9..3aa5888af877 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -399,13 +399,13 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - nFirstLineOfst ( 0 ), nTxtLeft ( 0 ), nLeftMargin ( 0 ), nRightMargin ( 0 ), nPropFirstLineOfst( 100 ), nPropLeftMargin( 100 ), nPropRightMargin( 100 ), + nFirstLineOfst ( 0 ), bAutoFirst ( false ), bExplicitZeroMarginValRight(false), bExplicitZeroMarginValLeft(false) @@ -420,13 +420,13 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight, SfxPoolItem( nId ), - nFirstLineOfst ( nOfset ), nTxtLeft ( nTLeft ), nLeftMargin ( nLeft ), nRightMargin ( nRight ), nPropFirstLineOfst( 100 ), nPropLeftMargin( 100 ), nPropRightMargin( 100 ), + nFirstLineOfst ( nOfset ), bAutoFirst ( false ), bExplicitZeroMarginValRight(false), bExplicitZeroMarginValLeft(false) diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 40da999d88b3..94daed838586 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -50,15 +50,15 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem { - short nFirstLineOfst; // First-line indent _always_ relative to nTxtLeft long nTxtLeft; // We spend a sal_uInt16 long nLeftMargin; // nLeft or the negative first-line indent long nRightMargin; // The unproblematic right edge sal_uInt16 nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin; + short nFirstLineOfst; // First-line indent _always_ relative to nTxtLeft bool bAutoFirst : 1; // Automatic calculation of the first line indent - bool bExplicitZeroMarginValRight; - bool bExplicitZeroMarginValLeft; + bool bExplicitZeroMarginValRight : 1; + bool bExplicitZeroMarginValLeft : 1; void AdjustLeft(); // nLeftMargin and nTxtLeft are being adjusted. diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 517c80a848e9..50df0a939a92 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -479,14 +479,14 @@ public: struct EDITENG_DLLPUBLIC PaintFirstLineInfo { sal_Int32 mnPara; + short mnOrientation; const Point& mrStartPos; long mnBaseLineY; const Point& mrOrigin; - short mnOrientation; VclPtr<OutputDevice> mpOutDev; PaintFirstLineInfo( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) - : mnPara( nPara ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mnOrientation( nOrientation ), mpOutDev( pOutDev ) + : mnPara( nPara ), mnOrientation( nOrientation ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mpOutDev( pOutDev ) {} }; |