SwXTextFrame: use XFillStyleItem instead of extending SvxBrushItem

Change-Id: I03b841ed703503425c9f1a2045d6399c8899815f

2 files changed, 1 insertions, 23 deletions

diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 44354b4fc1f7..b35df0e1b0d2 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -23,7 +23,6 @@
 #include <vcl/wall.hxx>
 #include <tools/link.hxx>
 #include <editeng/editengdllapi.h>
-#include <com/sun/star/drawing/FillStyle.hpp>
 
 // class SvxBrushItem ----------------------------------------------------
 
@@ -113,7 +112,6 @@ public:
     const GraphicObject*    GetGraphicObject() const;
     const String*           GetGraphicLink() const      { return pStrLink; }
     const String*           GetGraphicFilter() const    { return pStrFilter; }
-    com::sun::star::drawing::FillStyle GetFillStyle() const;
     const Gradient& GetGradient() const;
 
     void                SetGraphicPos( SvxGraphicPosition eNew );
@@ -121,7 +119,6 @@ public:
     void                SetGraphicObject( const GraphicObject& rNewObj );
     void                SetGraphicLink( const String& rNew );
     void                SetGraphicFilter( const String& rNew );
-    void                SetFillStyle(com::sun::star::drawing::FillStyle eNew);
     void                SetGradient(Gradient& rNew);
 
     SvxBrushItem&       operator=( const SvxBrushItem& rItem);
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;