[Libreoffice-commits] core.git: include/svl

[Noel Grandin (via logerrit)]

 include/svl/itemprop.hxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit cd811a7abcf32920843fc03f90a72f90bc052761
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed May 27 21:10:58 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 28 09:53:50 2020 +0200

    pack SfxItemPropertyMapEntry and SfxItemPropertySimpleEntry
    
    SfxItemPropertyMapEntry reduces size from 32 bytes
    to 24 bytes on x64 machines.
    
    SfxItemPropertySimpleEntry goes from 24 bytes to 16 bytes.
    
    Change-Id: I3b4b0fce93e666ad9880b53eede96b3150b30e66
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95003
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 6892f7b195f1..a66650381d05 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -35,8 +35,8 @@
 struct SfxItemPropertyMapEntry
 {
     OUString                            aName; ///< name of property
-    sal_uInt16                          nWID;  ///< WhichId of SfxPoolItem
     css::uno::Type                      aType; ///< UNO type of property
+    sal_uInt16                          nWID;  ///< WhichId of SfxPoolItem
     /// flag bitmap, @see css::beans::PropertyAttribute
     sal_Int16                           nFlags;
     /// "member ID" to tell QueryValue/PutValue which property it is
@@ -47,8 +47,8 @@ struct SfxItemPropertyMapEntry
     SfxItemPropertyMapEntry(OUString _aName, sal_uInt16 _nWID, css::uno::Type const & _rType,
                                sal_Int16 _nFlags, sal_uInt8 const _nMemberId, PropertyMoreFlags _nMoreFlags = PropertyMoreFlags::NONE)
         : aName(      _aName )
-        , nWID(      _nWID )
         , aType(     _rType )
+        , nWID(      _nWID )
         , nFlags(    _nFlags )
         , nMemberId( _nMemberId )
         , nMoreFlags( _nMoreFlags )
@@ -69,8 +69,8 @@ struct SfxItemPropertyMapEntry
 
 struct SfxItemPropertySimpleEntry
 {
-    sal_uInt16                          nWID;
     css::uno::Type                      aType;
+    sal_uInt16                          nWID;
     /// flag bitmap, @see css::beans::PropertyAttribute
     sal_Int16                           nFlags;
     sal_uInt8                           nMemberId;
@@ -85,8 +85,8 @@ struct SfxItemPropertySimpleEntry
 
     SfxItemPropertySimpleEntry(sal_uInt16 _nWID, css::uno::Type const & _rType,
                                sal_Int16 _nFlags)
-        : nWID(      _nWID )
-        , aType(     _rType )
+        : aType(     _rType )
+        , nWID(      _nWID )
         , nFlags(    _nFlags )
         , nMemberId( 0 )
         {
@@ -94,8 +94,8 @@ struct SfxItemPropertySimpleEntry
         }
 
     SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry )
-        : nWID( pMapEntry->nWID )
-        , aType( pMapEntry->aType )
+        : aType( pMapEntry->aType )
+        , nWID( pMapEntry->nWID )
         , nFlags( pMapEntry->nFlags )
         , nMemberId( pMapEntry->nMemberId )
         , nMoreFlags( pMapEntry->nMoreFlags )