strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bnc#480256: OOXML import: Respect table background properties a bit more

Browse source 
Only getBackgroundFillProperties() (fill) was used.
Use also getBackgroundFillStyleRef() (fillRef).
Also, do not replace table background color value with cell color,
we have to interpolate the two colors (if cell color is transparent).

Unfortunately, we don't use background table property in LibreOffice, so
this seems to be a best workaround.

Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2
This commit is contained in:
Matúš Kukan 2014-09-09 10:37:23 +02:00
parent 24077ffc06
commit 43efd9b40d
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
oox/source/drawingml/fillproperties.cxx
View file

@ -222,7 +222,13 @@ Color FillProperties::getBestSolidColor() const
break;
case XML_gradFill:
if( !maGradientProps.maGradientStops.empty() )
aSolidColor = maGradientProps.maGradientStops.begin()->second;
{
GradientFillProperties::GradientStopMap::const_iterator aGradientStop =
maGradientProps.maGradientStops.begin();
if (maGradientProps.maGradientStops.size() > 2)
++aGradientStop;
aSolidColor = aGradientStop->second;
}
break;
case XML_pattFill:
aSolidColor = maPatternProps.maPattBgColor.isUsed() ? maPatternProps.maPattBgColor : maPatternProps.maPattFgColor;

1
oox/source/drawingml/table/tablebackgroundstylecontext.cxx
View file

@ -34,6 +34,7 @@ TableBackgroundStyleContext::TableBackgroundStyleContext( ContextHandler2Helper&
: ContextHandler2( rParent )
, mrTableStyle( rTableStyle )
{
mrTableStyle.getBackgroundFillStyleRef().mnThemedIdx = 0;
}
TableBackgroundStyleContext::~TableBackgroundStyleContext()

34
oox/source/drawingml/table/tablecell.cxx
View file

@ -19,10 +19,13 @@
#include "drawingml/table/tablecell.hxx"
#include "drawingml/table/tableproperties.hxx"
#include <basegfx/color/bcolor.hxx>
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/textbody.hxx"
#include "oox/drawingml/theme.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/propertyset.hxx"
#include <tools/color.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/table/XTable.hpp>
@ -99,7 +102,7 @@ void applyTableStylePart( oox::drawingml::FillProperties& rFillProperties,
oox::drawingml::LineProperties& rBottomLeftToTopRightBorder,
TableStylePart& rTableStylePart )
{
boost::shared_ptr< ::oox::drawingml::FillProperties >& rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
if ( rPartFillPropertiesPtr.get() )
rFillProperties.assignUsed( *rPartFillPropertiesPtr );
@ -168,10 +171,6 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
if ( rBackgroundFillPropertiesPtr.get() )
aFillProperties.assignUsed( *rBackgroundFillPropertiesPtr );
applyTableStylePart( aFillProperties, aTextStyleProps,
aLinePropertiesLeft,
aLinePropertiesRight,
@ -352,6 +351,31 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
aFillProperties.assignUsed( maFillProperties );
ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
Color aBgColor;
sal_Int32 nPhClr = API_RGB_TRANSPARENT;
boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( rTable.getBackgroundFillStyleRef() );
if (rBackgroundFillPropertiesPtr.get())
aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor();
else if (rBackgroundFillStyle.mnThemedIdx != 0)
if (const Theme* pTheme = rFilterBase.getCurrentTheme())
{
aBgColor = pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx)->getBestSolidColor();
nPhClr = rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
}
if (aBgColor.isUsed())
{
const Color& rCellColor = aFillProperties.getBestSolidColor();
const double fTransparency = rCellColor.isUsed() ? 0.01 * rCellColor.getTransparency() : 1.0;
::Color nBgColor( aBgColor.getColor(rFilterBase.getGraphicHelper(), nPhClr) );
::Color nCellColor( rCellColor.getColor(rFilterBase.getGraphicHelper()) );
::Color aResult( basegfx::interpolate(nBgColor.getBColor(), nCellColor.getBColor(), 1.0 - fTransparency) );
aFillProperties.maFillColor.clearTransformations();
aFillProperties.maFillColor.setSrgbClr(aResult.GetRGBColor());
aFillProperties.moFillType.set(XML_solidFill);
}
// TODO: phClr?
aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
PropertySet( xPropSet ).setProperties( aPropMap );