Kaydet (Commit) ce46c98d authored tarafından Noel Grandin's avatar Noel Grandin

convert BS_ constants to SvxBulletStyle enum class

Change-Id: I8d68394c29b7602b21f8d972552aa7226778d3ff
üst 701343b1
......@@ -112,13 +112,15 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
: SfxPoolItem(_nWhich)
, pGraphicObject(NULL)
, nStart(0)
, nStyle(0)
, nStyle(SvxBulletStyle::ABC_BIG)
, nScale(0)
, nJustify(0)
{
rStrm.ReadUInt16( nStyle );
sal_uInt16 nTmp1;
rStrm.ReadUInt16( nTmp1 );
nStyle = static_cast<SvxBulletStyle>(nTmp1);
if( nStyle != BS_BMP )
if( nStyle != SvxBulletStyle::BMP )
aFont = CreateFont( rStrm, BULITEM_VERSION );
else
{
......@@ -138,7 +140,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
if( aBmp.IsEmpty() )
{
rStrm.Seek( nOldPos );
nStyle = BS_NONE;
nStyle = SvxBulletStyle::NONE;
}
else
pGraphicObject = new GraphicObject( aBmp );
......@@ -218,7 +220,7 @@ void SvxBulletItem::SetDefaults_Impl()
pGraphicObject = NULL;
nWidth = 1200; // 1.2cm
nStart = 1;
nStyle = BS_123;
nStyle = SvxBulletStyle::N123;
nJustify = BJ_HLEFT | BJ_VCENTER;
cSymbol = ' ';
nScale = 75;
......@@ -283,10 +285,10 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
aFollowText != rBullet.aFollowText )
return false;
if( ( nStyle != BS_BMP ) && ( aFont != rBullet.aFont ) )
if( ( nStyle != SvxBulletStyle::BMP ) && ( aFont != rBullet.aFont ) )
return false;
if( nStyle == BS_BMP )
if( nStyle == SvxBulletStyle::BMP )
{
if( ( pGraphicObject && !rBullet.pGraphicObject ) || ( !pGraphicObject && rBullet.pGraphicObject ) )
return false;
......@@ -307,7 +309,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
// Correction for empty bitmap
if( ( nStyle == BS_BMP ) &&
if( ( nStyle == SvxBulletStyle::BMP ) &&
( !pGraphicObject || ( GRAPHIC_NONE == pGraphicObject->GetType() ) || ( GRAPHIC_DEFAULT == pGraphicObject->GetType() ) ) )
{
if( pGraphicObject )
......@@ -316,12 +318,12 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
const_cast< SvxBulletItem* >( this )->pGraphicObject = NULL;
}
const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE;
const_cast< SvxBulletItem* >( this )->nStyle = SvxBulletStyle::NONE;
}
rStrm.WriteUInt16( nStyle );
rStrm.WriteUInt16( static_cast<sal_uInt16>(nStyle) );
if( nStyle != BS_BMP )
if( nStyle != SvxBulletStyle::BMP )
StoreFont( rStrm, aFont );
else
{
......
......@@ -25,14 +25,17 @@
// define ----------------------------------------------------------------
// Styles
#define BS_ABC_BIG 0
#define BS_ABC_SMALL 1
#define BS_ROMAN_BIG 2
#define BS_ROMAN_SMALL 3
#define BS_123 4
#define BS_NONE 5
#define BS_BULLET 6
#define BS_BMP 128
enum class SvxBulletStyle
{
ABC_BIG = 0,
ABC_SMALL = 1,
ROMAN_BIG = 2,
ROMAN_SMALL = 3,
N123 = 4,
NONE = 5,
BULLET = 6,
BMP = 128
};
// Justification
#define BJ_HLEFT 0x01
......@@ -66,7 +69,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
OUString aPrevText;
OUString aFollowText;
sal_uInt16 nStart;
sal_uInt16 nStyle;
SvxBulletStyle nStyle;
long nWidth;
sal_uInt16 nScale;
sal_Unicode cSymbol;
......@@ -96,7 +99,7 @@ public:
sal_uInt16 GetStart() const { return nStart; }
long GetWidth() const { return nWidth; }
sal_uInt16 GetStyle() const { return nStyle; }
SvxBulletStyle GetStyle() const { return nStyle; }
sal_uInt8 GetJustification() const { return nJustify; }
vcl::Font GetFont() const { return aFont; }
sal_uInt16 GetScale() const { return nScale; }
......@@ -110,7 +113,7 @@ public:
void SetStart( sal_uInt16 nNew ) { nStart = nNew; }
void SetWidth( long nNew ) { nWidth = nNew; }
void SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
void SetStyle( SvxBulletStyle nNew ) { nStyle = nNew; }
void SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
void SetFont( const vcl::Font& rNew) { aFont = rNew; }
void SetScale( sal_uInt16 nNew ) { nScale = nNew; }
......
......@@ -238,7 +238,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// BulletItem and BulletFont for title and outline
SvxBulletItem aBulletItem(EE_PARA_BULLET);
// Identical in all layers
aBulletItem.SetStyle(BS_BULLET);
aBulletItem.SetStyle(SvxBulletStyle::BULLET);
aBulletItem.SetStart(1);
aBulletItem.SetScale(45); // In percent
......@@ -1206,7 +1206,7 @@ void SdDrawDocument::SetTextDefaults() const
vcl::Font aBulletFont( SdStyleSheetPool::GetBulletFont() );
aBulletFont.SetSize(Size(0,846)); // 24 pt
aBulletItem.SetFont(aBulletFont);
aBulletItem.SetStyle(BS_BULLET);
aBulletItem.SetStyle(SvxBulletStyle::BULLET);
aBulletItem.SetStart(1);
aBulletItem.SetScale(45); // In percent
aBulletItem.SetSymbol( 0x25CF ); // In points
......
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