diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-27 20:52:55 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-28 13:49:40 +0100 |
| commit | 06de72bea24a83e4a4efbc235853a40781bce168 (patch) | |
| tree | 3351637a0b50509ebfabd65120cccfc3500b3375 /editeng/source/items | |
| parent | 7d35334ed4941a230ab804b7505171459ee9000f (diff) | |
SwXTextFrame: use XFillStyleItem instead of extending SvxBrushItem
Change-Id: I03b841ed703503425c9f1a2045d6399c8899815f
Diffstat (limited to 'editeng/source/items')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 077bcd27e018..9bcafd61fa1a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3328,9 +3328,8 @@ public: Link aDoneLink; SvStream* pStream; Gradient aGradient; - drawing::FillStyle eFillStyle; - SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0), eFillStyle(drawing::FillStyle_NONE) {} + SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} }; // ----------------------------------------------------------------------- @@ -3643,9 +3642,6 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_GRAPHIC_TRANSPARENCY : rVal <<= pImpl->nGraphicTransparency; break; - case MID_FILL_STYLE: - rVal <<= pImpl->eFillStyle; - break; case MID_FILL_GRADIENT: { awt::Gradient aGradient; @@ -3777,9 +3773,6 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } } break; - case MID_FILL_STYLE: - rVal >>= pImpl->eFillStyle; - break; case MID_FILL_GRADIENT: { awt::Gradient aGradient; @@ -3867,7 +3860,6 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem ) } } pImpl->nGraphicTransparency = rItem.pImpl->nGraphicTransparency; - pImpl->eFillStyle = rItem.pImpl->eFillStyle; pImpl->aGradient = rItem.pImpl->aGradient; return *this; } @@ -3881,7 +3873,6 @@ int SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const SvxBrushItem& rCmp = (SvxBrushItem&)rAttr; sal_Bool bEqual = ( aColor == rCmp.aColor && eGraphicPos == rCmp.eGraphicPos && pImpl->nGraphicTransparency == rCmp.pImpl->nGraphicTransparency && - pImpl->eFillStyle == rCmp.pImpl->eFillStyle && pImpl->aGradient == rCmp.pImpl->aGradient); if ( bEqual ) @@ -4194,21 +4185,11 @@ void SvxBrushItem::ApplyGraphicTransparency_Impl() } } -drawing::FillStyle SvxBrushItem::GetFillStyle() const -{ - return pImpl->eFillStyle; -} - const Gradient& SvxBrushItem::GetGradient() const { return pImpl->aGradient; } -void SvxBrushItem::SetFillStyle(drawing::FillStyle eNew) -{ - pImpl->eFillStyle = eNew; -} - void SvxBrushItem::SetGradient(Gradient& rNew) { pImpl->aGradient = rNew; |