Move Rectangle,Point,Size serialization to GenericTypeSerializer

Change-Id: Iae489fc31b13b836e1df5327ba2fa07e0325907a
Reviewed-on: https://gerrit.libreoffice.org/79793
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index d83ef10cc3da..4d4215b51f7d 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -233,9 +233,9 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
         ReadFont( rStream, *pBulletFont );
     }
     else pBulletFont = nullptr;
-    ReadPair( rStream, aGraphicSize );
 
     tools::GenericTypeSerializer aSerializer(rStream);
+    aSerializer.readSize(aGraphicSize);
     aSerializer.readColor(nBulletColor);
 
     rStream.ReadUInt16( nBulletRelSize );
@@ -261,6 +261,8 @@ void SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverte
         pBulletFont->SetFamilyName(sFontName);
     }
 
+    tools::GenericTypeSerializer aSerializer(rStream);
+
     rStream.WriteUInt16( NUMITEM_VERSION_04 );
 
     rStream.WriteUInt16( GetNumberingType() );
@@ -307,13 +309,13 @@ void SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverte
     }
     else
         rStream.WriteUInt16( 0 );
-    WritePair( rStream, aGraphicSize );
+
+    aSerializer.writeSize(aGraphicSize);
 
     Color nTempColor = nBulletColor;
     if(COL_AUTO == nBulletColor)
         nTempColor = COL_BLACK;
 
-    tools::GenericTypeSerializer aSerializer(rStream);
     aSerializer.writeColor(nTempColor);
     rStream.WriteUInt16( nBulletRelSize );
     rStream.WriteUInt16( sal_uInt16(IsShowSymbol()) );