Kaydet (Commit) f1e910c5 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

inline SvxBulletItem::SetDefaultFont_Impl and SetDefaults_Impl

use initializer lists in constructors

Change-Id: Ib3b836ba96046a5f3bca12ea7702247afe8eac3b
Reviewed-on: https://gerrit.libreoffice.org/48803Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 8010abe4
......@@ -29,25 +29,32 @@
#define BULITEM_VERSION (sal_uInt16(2))
SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich )
: SfxPoolItem(_nWhich)
, aFont(OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ))
, nStart(1)
, nStyle(SvxBulletStyle::N123)
, nWidth(1200) // 1.2cm
, nScale(75)
, cSymbol(' ')
{
SetDefaultFont_Impl();
SetDefaults_Impl();
aFont.SetAlignment(ALIGN_BOTTOM);
aFont.SetTransparent( true );
}
SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem )
SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem )
: SfxPoolItem(rItem)
, aFont(rItem.aFont)
, pGraphicObject(rItem.pGraphicObject ? new GraphicObject( *rItem.pGraphicObject ) : nullptr)
, aPrevText(rItem.aPrevText)
, aFollowText(rItem.aFollowText)
, nStart(rItem.nStart)
, nStyle(rItem.nStyle)
, nWidth(rItem.nWidth)
, nScale(rItem.nScale)
, cSymbol(rItem.cSymbol)
{
aFont = rItem.aFont;
if (rItem.pGraphicObject)
pGraphicObject.reset( new GraphicObject( *rItem.pGraphicObject ) );
aPrevText = rItem.aPrevText;
aFollowText = rItem.aFollowText;
nStart = rItem.nStart;
nStyle = rItem.nStyle;
nWidth = rItem.nWidth;
nScale = rItem.nScale;
cSymbol = rItem.cSymbol;
}
......@@ -62,25 +69,6 @@ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
}
void SvxBulletItem::SetDefaultFont_Impl()
{
aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE );
aFont.SetAlignment( ALIGN_BOTTOM);
aFont.SetTransparent( true );
}
void SvxBulletItem::SetDefaults_Impl()
{
pGraphicObject = nullptr;
nWidth = 1200; // 1.2cm
nStart = 1;
nStyle = SvxBulletStyle::N123;
cSymbol = ' ';
nScale = 75;
}
sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
{
return BULITEM_VERSION;
......
......@@ -56,9 +56,6 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
sal_uInt16 nScale;
sal_Unicode cSymbol;
void SetDefaultFont_Impl();
void SetDefaults_Impl();
public:
explicit SvxBulletItem( sal_uInt16 nWhich );
SvxBulletItem( const SvxBulletItem& );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment