clang:optin.performance.Padding in vcl

Excessive padding in 'class ImplAccelEntry' (13 padding bytes, where 5
is optimal).
Excessive padding in 'struct SalQueryCharPositionEvent' (14 padding
bytes, where 6 is optimal).
Excessive padding in 'struct SalFrameState' (8 padding bytes, where 0 is
optimal).
Excessive padding in 'struct BitmapBuffer' (10 padding bytes, where 2 is
optimal).
Excessive padding in 'class GraphicAttr' (10 padding bytes, where 2 is
optimal).
Excessive padding in 'struct ImplPostEventData' (12 padding bytes, where
4 is optimal).
Excessive padding in 'class TETextPortion' (10 padding bytes, where 2 is
optimal).
Excessive padding in 'struct MapMode::ImplMapMode' (11 padding bytes,
where 3 is optimal).

Change-Id: I41801e0fd676981cc9f386d814fe2f0ea670a673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121925
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 12 insertions, 12 deletions

diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx
index d67e42ac6cad..54efeea5e1bc 100644
--- a/include/vcl/BitmapBuffer.hxx
+++ b/include/vcl/BitmapBuffer.hxx
@@ -35,14 +35,14 @@ struct SalTwoRect;
 
 struct VCL_DLLPUBLIC BitmapBuffer
 {
-    ScanlineFormat       mnFormat;
-    tools::Long            mnWidth;
-    tools::Long            mnHeight;
-    tools::Long            mnScanlineSize;
-    sal_uInt16      mnBitCount;
-    ColorMask       maColorMask;
+    tools::Long     mnWidth;
+    tools::Long     mnHeight;
+    tools::Long     mnScanlineSize;
     BitmapPalette   maPalette;
     sal_uInt8*      mpBits;
+    ScanlineFormat  mnFormat;
+    ColorMask       maColorMask;
+    sal_uInt16      mnBitCount;
 };
 
 VCL_DLLPUBLIC std::unique_ptr<BitmapBuffer> StretchAndConvert(
diff --git a/include/vcl/GraphicAttributes.hxx b/include/vcl/GraphicAttributes.hxx
index b5e73625c467..442158cda2e9 100644
--- a/include/vcl/GraphicAttributes.hxx
+++ b/include/vcl/GraphicAttributes.hxx
@@ -35,38 +35,38 @@ class VCL_DLLPUBLIC GraphicAttr
 {
 private:
     double mfGamma;
-    BmpMirrorFlags mnMirrFlags;
     tools::Long mnLeftCrop;
     tools::Long mnTopCrop;
     tools::Long mnRightCrop;
     tools::Long mnBottomCrop;
+    BmpMirrorFlags mnMirrFlags;
+    GraphicDrawMode meDrawMode;
     Degree10 mnRotate10;
     short mnContPercent;
     short mnLumPercent;
     short mnRPercent;
     short mnGPercent;
     short mnBPercent;
-    bool mbInvert;
     sal_uInt8 mcAlpha;
-    GraphicDrawMode meDrawMode;
+    bool mbInvert;
 
 public:
     GraphicAttr()
         : mfGamma(1.0)
-        , mnMirrFlags(BmpMirrorFlags::NONE)
         , mnLeftCrop(0)
         , mnTopCrop(0)
         , mnRightCrop(0)
         , mnBottomCrop(0)
+        , mnMirrFlags(BmpMirrorFlags::NONE)
+        , meDrawMode(GraphicDrawMode::Standard)
         , mnRotate10(0)
         , mnContPercent(0)
         , mnLumPercent(0)
         , mnRPercent(0)
         , mnGPercent(0)
         , mnBPercent(0)
-        , mbInvert(false)
         , mcAlpha(255)
-        , meDrawMode(GraphicDrawMode::Standard)
+        , mbInvert(false)
     {
     }