Kaydet (Commit) 23515e81 authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst 34302202
...@@ -50,6 +50,8 @@ class SvxWeightItem; ...@@ -50,6 +50,8 @@ class SvxWeightItem;
class SvxAutoKernItem; class SvxAutoKernItem;
class SvxBlinkItem; class SvxBlinkItem;
class SvxBrushItem; class SvxBrushItem;
class XFillStyleItem;
class XFillGradientItem;
class SvxFontItem; class SvxFontItem;
class SvxFontHeightItem; class SvxFontHeightItem;
class SvxLanguageItem; class SvxLanguageItem;
...@@ -528,6 +530,12 @@ protected: ...@@ -528,6 +530,12 @@ protected:
/// Sfx item RES_BACKGROUND /// Sfx item RES_BACKGROUND
virtual void FormatBackground( const SvxBrushItem& ) = 0; 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 /// Sfx item RES_BOX
virtual void FormatBox( const SvxBoxItem& ) = 0; virtual void FormatBox( const SvxBoxItem& ) = 0;
......
...@@ -4547,6 +4547,14 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) ...@@ -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 ) void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{ {
if (m_bTextFrameSyntax) if (m_bTextFrameSyntax)
......
...@@ -496,6 +496,12 @@ protected: ...@@ -496,6 +496,12 @@ protected:
/// Sfx item RES_BACKGROUND /// Sfx item RES_BACKGROUND
virtual void FormatBackground( const SvxBrushItem& ); 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 /// Sfx item RES_BOX
virtual void FormatBox( const SvxBoxItem& ); virtual void FormatBox( const SvxBoxItem& );
......
...@@ -2873,6 +2873,14 @@ void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) ...@@ -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 ) void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{ {
SAL_INFO("sw.rtf", OSL_THIS_FUNC); SAL_INFO("sw.rtf", OSL_THIS_FUNC);
......
...@@ -374,6 +374,12 @@ protected: ...@@ -374,6 +374,12 @@ protected:
/// Sfx item RES_BACKGROUND /// Sfx item RES_BACKGROUND
virtual void FormatBackground( const SvxBrushItem& ); 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 /// Sfx item RES_BOX
virtual void FormatBox( const SvxBoxItem& ); virtual void FormatBox( const SvxBoxItem& );
......
...@@ -70,6 +70,8 @@ ...@@ -70,6 +70,8 @@
#include <editeng/blnkitem.hxx> #include <editeng/blnkitem.hxx>
#include <editeng/charhiddenitem.hxx> #include <editeng/charhiddenitem.hxx>
#include <editeng/paperinf.hxx> #include <editeng/paperinf.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflgrit.hxx>
#include <fmtfld.hxx> #include <fmtfld.hxx>
#include <fchrfmt.hxx> #include <fchrfmt.hxx>
#include <fmtfsize.hxx> #include <fmtfsize.hxx>
...@@ -4020,6 +4022,14 @@ void WW8AttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) ...@@ -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, WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
sal_uInt16 nDist, bool bShadow) sal_uInt16 nDist, bool bShadow)
{ {
...@@ -5167,6 +5177,12 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt ) ...@@ -5167,6 +5177,12 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
case RES_BACKGROUND: case RES_BACKGROUND:
FormatBackground( static_cast< const SvxBrushItem& >( rHt ) ); FormatBackground( static_cast< const SvxBrushItem& >( rHt ) );
break; 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: case RES_BOX:
FormatBox( static_cast< const SvxBoxItem& >( rHt ) ); FormatBox( static_cast< const SvxBoxItem& >( rHt ) );
break; break;
...@@ -5187,7 +5203,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt ) ...@@ -5187,7 +5203,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
break; break;
default: default:
OSL_TRACE("Unhandled SfxPoolItem with id %d.", rHt.Which() ); SAL_INFO("sw.ww8", "Unhandled SfxPoolItem with id " << rHt.Which() );
break; break;
} }
} }
......
...@@ -358,6 +358,12 @@ protected: ...@@ -358,6 +358,12 @@ protected:
/// Sfx item RES_BACKGROUND /// Sfx item RES_BACKGROUND
virtual void FormatBackground( const SvxBrushItem& ); 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 /// Sfx item RES_BOX
virtual void FormatBox( const SvxBoxItem& ); virtual void FormatBox( const SvxBoxItem& );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment