sw: handle RES_FILL_STYLE/GRADIENT in AttributeOutputBase::OutputItem

So that later in doc/docx/rtf export gradient background of textframes
can be handled.

Change-Id: I8f79cd0b63231c0551fc85c5cd1c06f5511326f1

7 files changed, 59 insertions, 1 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 898acbbe640e..d340ddab30da 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -50,6 +50,8 @@ class SvxWeightItem;
 class SvxAutoKernItem;
 class SvxBlinkItem;
 class SvxBrushItem;
+class XFillStyleItem;
+class XFillGradientItem;
 class SvxFontItem;
 class SvxFontHeightItem;
 class SvxLanguageItem;
@@ -528,6 +530,12 @@ protected:
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& ) = 0;
 
+    /// Sfx item RES_FILL_STYLE
+    virtual void FormatFillStyle( const XFillStyleItem& ) = 0;
+
+    /// Sfx item RES_FILL_GRADIENT
+    virtual void FormatFillGradient( const XFillGradientItem& ) = 0;
+
     /// Sfx item RES_BOX
     virtual void FormatBox( const SvxBoxItem& ) = 0;
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6300dddef952..42e488e8663d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4547,6 +4547,14 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
     }
 }
 
+void DocxAttributeOutput::FormatFillStyle( const XFillStyleItem& /*rFillStyle*/ )
+{
+}
+
+void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& /*rFillGradient*/ )
+{
+}
+
 void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
 {
     if (m_bTextFrameSyntax)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 91539b5459c6..6508d0b62747 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -496,6 +496,12 @@ protected:
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& );
 
+    /// Sfx item RES_FILL_STYLE
+    virtual void FormatFillStyle( const XFillStyleItem& );
+
+    /// Sfx item RES_FILL_GRADIENT
+    virtual void FormatFillGradient( const XFillGradientItem& );
+
     /// Sfx item RES_BOX
     virtual void FormatBox( const SvxBoxItem& );
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 867d6c290522..902c00c1abb4 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2873,6 +2873,14 @@ void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
     }
 }
 
+void RtfAttributeOutput::FormatFillStyle( const XFillStyleItem& /*rFillStyle*/ )
+{
+}
+
+void RtfAttributeOutput::FormatFillGradient( const XFillGradientItem& /*rFillGradient*/ )
+{
+}
+
 void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 65e493c41d10..aefa7244e87e 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -374,6 +374,12 @@ protected:
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& );
 
+    /// Sfx item RES_FILL_STYLE
+    virtual void FormatFillStyle( const XFillStyleItem& );
+
+    /// Sfx item RES_FILL_GRADIENT
+    virtual void FormatFillGradient( const XFillGradientItem& );
+
     /// Sfx item RES_BOX
     virtual void FormatBox( const SvxBoxItem& );
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3d3bcf4ed0ee..003bde16b230 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -70,6 +70,8 @@
 #include <editeng/blnkitem.hxx>
 #include <editeng/charhiddenitem.hxx>
 #include <editeng/paperinf.hxx>
+#include <svx/xfillit0.hxx>
+#include <svx/xflgrit.hxx>
 #include <fmtfld.hxx>
 #include <fchrfmt.hxx>
 #include <fmtfsize.hxx>
@@ -4020,6 +4022,14 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
     }
 }
 
+void WW8AttributeOutput::FormatFillStyle( const XFillStyleItem& /*rFillStyle*/ )
+{
+}
+
+void WW8AttributeOutput::FormatFillGradient( const XFillGradientItem& /*rFillGradient*/ )
+{
+}
+
 WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
     sal_uInt16 nDist, bool bShadow)
 {
@@ -5167,6 +5177,12 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
         case RES_BACKGROUND:
             FormatBackground( static_cast< const SvxBrushItem& >( rHt ) );
             break;
+        case RES_FILL_STYLE:
+            FormatFillStyle( static_cast< const XFillStyleItem& >( rHt ) );
+            break;
+        case RES_FILL_GRADIENT:
+            FormatFillGradient( static_cast< const XFillGradientItem& >( rHt ) );
+            break;
         case RES_BOX:
             FormatBox( static_cast< const SvxBoxItem& >( rHt ) );
             break;
@@ -5187,7 +5203,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
             break;
 
         default:
-            OSL_TRACE("Unhandled SfxPoolItem with id %d.", rHt.Which() );
+            SAL_INFO("sw.ww8", "Unhandled SfxPoolItem with id " << rHt.Which() );
             break;
     }
 }
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index d1e17bb86a63..8d1661f1ed53 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -358,6 +358,12 @@ protected:
     /// Sfx item RES_BACKGROUND
     virtual void FormatBackground( const SvxBrushItem& );
 
+    /// Sfx item RES_FILL_STYLE
+    virtual void FormatFillStyle( const XFillStyleItem& );
+
+    /// Sfx item RES_FILL_GRADIENT
+    virtual void FormatFillGradient( const XFillGradientItem& );
+
     /// Sfx item RES_BOX
     virtual void FormatBox( const SvxBoxItem& );