diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-26 09:38:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-26 09:41:35 +0200 |
| commit | ccea3b6721da2dbf7a319c6e3e24428429cdf3ba (patch) | |
| tree | 0fec552fa0f0cb951a62779022dac7fc5640605a /include | |
| parent | 871740210e5608e619b37297b47362f534f7ed8d (diff) | |
the valid flags in SvxBulletItem are unused
Change-Id: Ifd06179e42edc916002e8b0feaabd888852f1aa6
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/bulletitem.hxx | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index a9a1f6872f20..68c5b6942422 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -20,10 +20,10 @@ #define INCLUDED_EDITENG_BULLETITEM_HXX #include <editeng/editengdllapi.h> -#include <o3tl/typed_flags_set.hxx> - +#include <svl/poolitem.hxx> +#include <svtools/grfmgr.hxx> +#include <vcl/font.hxx> -// define ---------------------------------------------------------------- // Styles enum class SvxBulletStyle @@ -38,21 +38,6 @@ enum class SvxBulletStyle BMP = 128 }; -// Valid-Bits -// First, only the values that are changed by the dialogue ... -#define VALID_FONTCOLOR 0x0001 -#define VALID_FONTNAME 0x0002 -#define VALID_SYMBOL 0x0004 -#define VALID_BITMAP 0x0008 -#define VALID_SCALE 0x0010 -#define VALID_START 0x0020 -#define VALID_STYLE 0x0040 -#define VALID_PREVTEXT 0x0080 -#define VALID_FOLLOWTEXT 0x0100 -#include <svl/poolitem.hxx> -#include <vcl/font.hxx> -#include <svtools/grfmgr.hxx> - // class SvxBulletItem --------------------------------------------------- class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem @@ -66,8 +51,6 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem long nWidth; sal_uInt16 nScale; sal_Unicode cSymbol; - sal_uInt16 nValidMask; // Only temporary for GetAttribs / setAttribs, - // because of the large Bullets void SetDefaultFont_Impl(); void SetDefaults_Impl(); @@ -108,9 +91,9 @@ public: void SetFont( const vcl::Font& rNew) { aFont = rNew; } void SetScale( sal_uInt16 nNew ) { nScale = nNew; } - virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual bool GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -118,16 +101,6 @@ public: static void StoreFont( SvStream&, const vcl::Font& ); static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); - sal_uInt16& GetValidMask() { return nValidMask; } - sal_uInt16 GetValidMask() const { return nValidMask; } - sal_uInt16 IsValid( sal_uInt16 nFlag ) const { return nValidMask & nFlag; } - void SetValid( sal_uInt16 nFlag, bool bValid ) - { - if ( bValid ) - nValidMask |= nFlag; - else - nValidMask &= ~nFlag; - } void CopyValidProperties( const SvxBulletItem& rCopyFrom ); }; |