svx/source/items/numinf.cxx | 50 ++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 8e65f21b286a7de1c459761243432e4bbbcd4713
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 10 10:57:07 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 10 11:20:08 2021 +0100
inline INIT macro
which is not adding to readability at all
Change-Id: Ib52ff43790a72adb9229d648472a91ee1ef48563
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 5df9470ce4b1..a59d00b42074 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -20,45 +20,45 @@
#include <svx/numinf.hxx>
-#define INIT(pNum,eVal,nDouble,rStr) \
- SfxPoolItem ( nId ), \
- \
- pFormatter ( pNum ), \
- eValueType ( eVal ), \
- aStringVal ( rStr ), \
- nDoubleVal ( nDouble ) \
-
SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) :
-
- INIT( nullptr, SvxNumberValueType::Undefined, 0, "" )
-
+ SfxPoolItem ( nId ),
+ pFormatter ( nullptr ),
+ eValueType ( SvxNumberValueType::Undefined ),
+ aStringVal ( "" ),
+ nDoubleVal ( 0 )
{
}
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
const sal_uInt16 nId ) :
-
- INIT( pNumFormatter, SvxNumberValueType::Undefined, 0, "" )
-
+ SfxPoolItem ( nId ),
+ pFormatter ( pNumFormatter ),
+ eValueType ( SvxNumberValueType::Undefined ),
+ aStringVal ( "" ),
+ nDoubleVal ( 0 )
{
}
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
const OUString& rVal, const sal_uInt16
nId ) :
-
- INIT( pNumFormatter, SvxNumberValueType::String, 0, rVal )
-
+ SfxPoolItem ( nId ),
+ pFormatter ( pNumFormatter ),
+ eValueType ( SvxNumberValueType::String ),
+ aStringVal ( rVal ),
+ nDoubleVal ( 0 )
{
}
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
const double& rVal, const sal_uInt16 nId
) :
-
- INIT( pNumFormatter, SvxNumberValueType::Number, rVal, "" )
-
+ SfxPoolItem ( nId ),
+ pFormatter ( pNumFormatter ),
+ eValueType ( SvxNumberValueType::Number ),
+ aStringVal ( "" ),
+ nDoubleVal ( rVal )
{
}
@@ -66,14 +66,14 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter*
pNumFormatter,
SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
const double& rVal, const OUString&
rValueStr,
const sal_uInt16 nId ) :
-
- INIT( pNumFormatter, SvxNumberValueType::Number, rVal, rValueStr )
-
+ SfxPoolItem ( nId ),
+ pFormatter ( pNumFormatter ),
+ eValueType ( SvxNumberValueType::Number ),
+ aStringVal ( rValueStr ),
+ nDoubleVal ( rVal )
{
}
-#undef INIT
-
SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
SfxPoolItem ( rItem ),
