diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-26 08:59:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-26 09:41:35 +0200 |
commit | 871740210e5608e619b37297b47362f534f7ed8d (patch) | |
tree | f584b00a107950bad4248d78964440f76400b6bf | |
parent | ce46c98dbeb3364684843daa5b269c74fce2af64 (diff) |
bullet justification in SvxBulletItem is unused
Change-Id: Ib303c89f84a95eed96cfccfc947c2b4d6919ab95
-rw-r--r-- | editeng/source/items/bulitem.cxx | 9 | ||||
-rw-r--r-- | include/editeng/bulletitem.hxx | 12 |
2 files changed, 4 insertions, 17 deletions
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 592c87820b83..a7bd2e22c346 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -114,7 +114,6 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) , nStart(0) , nStyle(SvxBulletStyle::ABC_BIG) , nScale(0) - , nJustify(0) { sal_uInt16 nTmp1; rStrm.ReadUInt16( nTmp1 ); @@ -149,7 +148,8 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) sal_Int32 nTmp(0); rStrm.ReadInt32( nTmp ); nWidth = nTmp; rStrm.ReadUInt16( nStart ); - rStrm.ReadUChar( nJustify ); + sal_uInt8 nTmpInt8(0); + rStrm.ReadUChar( nTmpInt8 ); // used to be nJustify char cTmpSymbol(0); rStrm.ReadChar( cTmpSymbol ); @@ -178,7 +178,6 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) nWidth = rItem.nWidth; nScale = rItem.nScale; cSymbol = rItem.cSymbol; - nJustify = rItem.nJustify; nValidMask = rItem.nValidMask; } @@ -221,7 +220,6 @@ void SvxBulletItem::SetDefaults_Impl() nWidth = 1200; // 1.2cm nStart = 1; nStyle = SvxBulletStyle::N123; - nJustify = BJ_HLEFT | BJ_VCENTER; cSymbol = ' '; nScale = 75; } @@ -277,7 +275,6 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const if( nValidMask != rBullet.nValidMask || nStyle != rBullet.nStyle || nScale != rBullet.nScale || - nJustify != rBullet.nJustify || nWidth != rBullet.nWidth || nStart != rBullet.nStart || cSymbol != rBullet.cSymbol || @@ -353,7 +350,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c } rStrm.WriteInt32( nWidth ); rStrm.WriteUInt16( nStart ); - rStrm.WriteUChar( nJustify ); + rStrm.WriteUChar( 0 ); // used to be nJustify rStrm.WriteChar( OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar() ); rStrm.WriteUInt16( nScale ); diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index f3ae1bee1a93..a9a1f6872f20 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -20,6 +20,7 @@ #define INCLUDED_EDITENG_BULLETITEM_HXX #include <editeng/editengdllapi.h> +#include <o3tl/typed_flags_set.hxx> // define ---------------------------------------------------------------- @@ -37,14 +38,6 @@ enum class SvxBulletStyle BMP = 128 }; -// Justification -#define BJ_HLEFT 0x01 -#define BJ_HRIGHT 0x02 -#define BJ_HCENTER 0x04 -#define BJ_VTOP 0x08 -#define BJ_VBOTTOM 0x10 -#define BJ_VCENTER 0x20 - // Valid-Bits // First, only the values that are changed by the dialogue ... #define VALID_FONTCOLOR 0x0001 @@ -73,7 +66,6 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem long nWidth; sal_uInt16 nScale; sal_Unicode cSymbol; - sal_uInt8 nJustify; sal_uInt16 nValidMask; // Only temporary for GetAttribs / setAttribs, // because of the large Bullets @@ -100,7 +92,6 @@ public: sal_uInt16 GetStart() const { return nStart; } long GetWidth() const { return nWidth; } SvxBulletStyle GetStyle() const { return nStyle; } - sal_uInt8 GetJustification() const { return nJustify; } vcl::Font GetFont() const { return aFont; } sal_uInt16 GetScale() const { return nScale; } @@ -114,7 +105,6 @@ public: void SetStart( sal_uInt16 nNew ) { nStart = nNew; } void SetWidth( long nNew ) { nWidth = 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; } |