debf3ffb87
Problems were with those table styles which used color themes to define cell fill color. Change-Id: Ibde90df81ff253ba65618dde4038093d1caabfe8 Reviewed-on: https://gerrit.libreoffice.org/15089 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
418 lines
18 KiB
C++
418 lines
18 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include "drawingml/table/tablecell.hxx"
|
|
#include "drawingml/table/tableproperties.hxx"
|
|
#include <basegfx/color/bcolor.hxx>
|
|
#include "oox/drawingml/shapepropertymap.hxx"
|
|
#include "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>
|
|
#include <com/sun/star/table/XMergeableCellRange.hpp>
|
|
#include <com/sun/star/table/BorderLine2.hpp>
|
|
#include <com/sun/star/drawing/LineStyle.hpp>
|
|
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
|
|
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
|
|
#include <com/sun/star/text/XText.hpp>
|
|
#include <com/sun/star/text/WritingMode.hpp>
|
|
|
|
using namespace ::oox::core;
|
|
using namespace ::com::sun::star;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::beans;
|
|
using ::com::sun::star::table::BorderLine2;
|
|
|
|
namespace oox { namespace drawingml { namespace table {
|
|
|
|
TableCell::TableCell()
|
|
: mpTextBody( new TextBody() )
|
|
, mnRowSpan ( 1 )
|
|
, mnGridSpan( 1 )
|
|
, mbhMerge( false )
|
|
, mbvMerge( false )
|
|
, mnMarL( 91440 )
|
|
, mnMarR( 91440 )
|
|
, mnMarT( 45720 )
|
|
, mnMarB( 45720 )
|
|
, mnVertToken( XML_horz )
|
|
, mnAnchorToken( XML_t )
|
|
, mbAnchorCtr( false )
|
|
, mnHorzOverflowToken( XML_clip )
|
|
{
|
|
}
|
|
TableCell::~TableCell()
|
|
{
|
|
}
|
|
|
|
void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
|
|
Reference< XPropertySet >& rxPropSet, oox::drawingml::LineProperties& rLineProperties,
|
|
sal_Int32 nPropId )
|
|
{
|
|
BorderLine2 aBorderLine;
|
|
if( rLineProperties.maLineFill.moFillType.differsFrom( XML_noFill ) )
|
|
{
|
|
Color aColor = rLineProperties.maLineFill.getBestSolidColor();
|
|
aBorderLine.Color = aColor.getColor( rFilterBase.getGraphicHelper() );
|
|
aBorderLine.OuterLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
|
|
aBorderLine.InnerLineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 );
|
|
aBorderLine.LineWidth = static_cast< sal_Int16 >( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 );
|
|
aBorderLine.LineDistance = 0;
|
|
}
|
|
|
|
PropertySet aPropSet( rxPropSet );
|
|
aPropSet.setProperty( nPropId, aBorderLine );
|
|
}
|
|
|
|
void applyBorder( const ::oox::core::XmlFilterBase& rFilterBase, TableStylePart& rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties& rLineProperties )
|
|
{
|
|
std::map < sal_Int32, ::oox::drawingml::LinePropertiesPtr >& rPartLineBorders( rTableStylePart.getLineBorders() );
|
|
::oox::drawingml::ShapeStyleRef& rLineStyleRef = rTableStylePart.getStyleRefs()[ nLineType ];
|
|
std::map < sal_Int32, ::oox::drawingml::LinePropertiesPtr >::const_iterator aIter( rPartLineBorders.find( nLineType ) );
|
|
if ( ( aIter != rPartLineBorders.end() ) && aIter->second.get() )
|
|
rLineProperties.assignUsed( *aIter->second );
|
|
else if (rLineStyleRef.mnThemedIdx != 0)
|
|
{
|
|
if (const Theme* pTheme = rFilterBase.getCurrentTheme())
|
|
{
|
|
rLineProperties.assignUsed( *pTheme->getLineStyle(rLineStyleRef.mnThemedIdx) );
|
|
sal_Int32 nPhClr = rLineStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() );
|
|
rLineProperties.maLineFill.maFillColor.setSrgbClr( nPhClr );
|
|
}
|
|
}
|
|
}
|
|
|
|
void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
|
|
oox::drawingml::FillProperties& rFillProperties,
|
|
TextCharacterProperties& aTextCharProps,
|
|
oox::drawingml::LineProperties& rLeftBorder,
|
|
oox::drawingml::LineProperties& rRightBorder,
|
|
oox::drawingml::LineProperties& rTopBorder,
|
|
oox::drawingml::LineProperties& rBottomBorder,
|
|
oox::drawingml::LineProperties& rTopLeftToBottomRightBorder,
|
|
oox::drawingml::LineProperties& rBottomLeftToTopRightBorder,
|
|
TableStylePart& rTableStylePart )
|
|
{
|
|
::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
|
|
if ( rPartFillPropertiesPtr.get() )
|
|
rFillProperties.assignUsed( *rPartFillPropertiesPtr );
|
|
else
|
|
{
|
|
::oox::drawingml::ShapeStyleRef& rFillStyleRef = rTableStylePart.getStyleRefs()[ XML_fillRef ];
|
|
const Theme* pTheme = rFilterBase.getCurrentTheme();
|
|
if (pTheme && rFillStyleRef.mnThemedIdx != 0 )
|
|
{
|
|
rFillProperties.assignUsed( *pTheme->getFillStyle( rFillStyleRef.mnThemedIdx ) );
|
|
sal_Int32 nPhClr = rFillStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() );
|
|
rFillProperties.maFillColor.setSrgbClr( nPhClr );
|
|
}
|
|
}
|
|
|
|
applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder );
|
|
applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder );
|
|
applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder );
|
|
applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder );
|
|
applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder );
|
|
applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder );
|
|
|
|
aTextCharProps.maLatinFont = rTableStylePart.getLatinFont();
|
|
aTextCharProps.maAsianFont = rTableStylePart.getAsianFont();
|
|
aTextCharProps.maComplexFont = rTableStylePart.getComplexFont();
|
|
aTextCharProps.maSymbolFont = rTableStylePart.getSymbolFont();
|
|
if (rTableStylePart.getTextColor().isUsed())
|
|
aTextCharProps.maCharColor = rTableStylePart.getTextColor();
|
|
if( rTableStylePart.getTextBoldStyle().is_initialized() )
|
|
aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
|
|
if( rTableStylePart.getTextItalicStyle().is_initialized() )
|
|
aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
|
|
}
|
|
|
|
void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
|
|
{
|
|
Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
|
|
xPropSet->setPropertyValue( "TextUpperDistance", Any( static_cast< sal_Int32 >( rTableCell.getTopMargin() / 360 ) ) );
|
|
xPropSet->setPropertyValue( "TextRightDistance", Any( static_cast< sal_Int32 >( rTableCell.getRightMargin() / 360 ) ) );
|
|
xPropSet->setPropertyValue( "TextLeftDistance", Any( static_cast< sal_Int32 >( rTableCell.getLeftMargin() / 360 ) ) );
|
|
xPropSet->setPropertyValue( "TextLowerDistance", Any( static_cast< sal_Int32 >( rTableCell.getBottomMargin() / 360 ) ) );
|
|
|
|
drawing::TextVerticalAdjust eVA;
|
|
switch( rTableCell.getAnchorToken() )
|
|
{
|
|
case XML_ctr: eVA = drawing::TextVerticalAdjust_CENTER; break;
|
|
case XML_b: eVA = drawing::TextVerticalAdjust_BOTTOM; break;
|
|
case XML_just:
|
|
case XML_dist:
|
|
default:
|
|
case XML_t: eVA = drawing::TextVerticalAdjust_TOP; break;
|
|
}
|
|
xPropSet->setPropertyValue( "TextVerticalAdjust", Any( eVA ) );
|
|
}
|
|
|
|
void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::TextListStylePtr pMasterTextListStyle,
|
|
const ::com::sun::star::uno::Reference < ::com::sun::star::table::XCell >& rxCell, const TableProperties& rTableProperties,
|
|
const TableStyle& rTableStyle, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow )
|
|
{
|
|
TableStyle& rTable( const_cast< TableStyle& >( rTableStyle ) );
|
|
TableProperties& rProperties( const_cast< TableProperties& >( rTableProperties ) );
|
|
|
|
Reference< text::XText > xText( rxCell, UNO_QUERY_THROW );
|
|
Reference< text::XTextCursor > xAt = xText->createTextCursor();
|
|
|
|
applyTableCellProperties( rxCell, *this );
|
|
TextCharacterProperties aTextStyleProps;
|
|
xAt->gotoStart( sal_True );
|
|
Reference< text::XTextRange > xStart( xAt, UNO_QUERY );
|
|
xAt->gotoEnd( sal_True );
|
|
|
|
Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
|
|
oox::drawingml::FillProperties aFillProperties;
|
|
oox::drawingml::LineProperties aLinePropertiesLeft;
|
|
oox::drawingml::LineProperties aLinePropertiesRight;
|
|
oox::drawingml::LineProperties aLinePropertiesTop;
|
|
oox::drawingml::LineProperties aLinePropertiesBottom;
|
|
oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
|
|
oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
|
|
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getWholeTbl() );
|
|
|
|
if ( rProperties.isFirstRow() && ( nRow == 0 ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getFirstRow() );
|
|
}
|
|
if ( rProperties.isLastRow() && ( nRow == nMaxRow ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getLastRow() );
|
|
}
|
|
if ( rProperties.isFirstCol() && ( nColumn == 0 ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getFirstCol() );
|
|
}
|
|
if ( rProperties.isLastCol() && ( nColumn == nMaxColumn ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getLastCol() );
|
|
}
|
|
if ( rProperties.isBandRow() )
|
|
{
|
|
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
|
|
( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
|
|
( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
|
|
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
|
|
{
|
|
sal_Int32 nBand = nRow;
|
|
if ( rProperties.isFirstRow() )
|
|
nBand++;
|
|
if ( nBand & 1 )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getBand2H() );
|
|
}
|
|
else
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getBand1H() );
|
|
}
|
|
}
|
|
}
|
|
if ( ( nRow == 0 ) && ( nColumn == 0 ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getNwCell() );
|
|
}
|
|
if ( ( nRow == nMaxRow ) && ( nColumn == 0 ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getSwCell() );
|
|
}
|
|
if ( ( nRow == 0 ) && ( nColumn == nMaxColumn ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getNeCell() );
|
|
}
|
|
if ( ( nRow == nMaxRow ) && ( nColumn == nMaxColumn ) )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getSeCell() );
|
|
}
|
|
if ( rProperties.isBandCol() )
|
|
{
|
|
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
|
|
( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
|
|
( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
|
|
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
|
|
{
|
|
sal_Int32 nBand = nColumn;
|
|
if ( rProperties.isFirstCol() )
|
|
nBand++;
|
|
if ( nBand & 1 )
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getBand2V() );
|
|
}
|
|
else
|
|
{
|
|
applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
|
|
aLinePropertiesLeft,
|
|
aLinePropertiesRight,
|
|
aLinePropertiesTop,
|
|
aLinePropertiesBottom,
|
|
aLinePropertiesTopLeftToBottomRight,
|
|
aLinePropertiesBottomLeftToTopRight,
|
|
rTable.getBand1V() );
|
|
}
|
|
}
|
|
}
|
|
aLinePropertiesLeft.assignUsed( maLinePropertiesLeft );
|
|
aLinePropertiesRight.assignUsed( maLinePropertiesRight );
|
|
aLinePropertiesTop.assignUsed( maLinePropertiesTop );
|
|
aLinePropertiesBottom.assignUsed( maLinePropertiesBottom );
|
|
aLinePropertiesTopLeftToBottomRight.assignUsed( maLinePropertiesTopLeftToBottomRight );
|
|
aLinePropertiesBottomLeftToTopRight.assignUsed( maLinePropertiesBottomLeftToTopRight );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesLeft, PROP_LeftBorder );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesRight, PROP_RightBorder );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTop, PROP_TopBorder );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottom, PROP_BottomBorder );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTopLeftToBottomRight, PROP_DiagonalTLBR );
|
|
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottomLeftToTopRight, PROP_DiagonalBLTR );
|
|
|
|
aFillProperties.assignUsed( maFillProperties );
|
|
ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
|
|
|
|
Color aBgColor;
|
|
sal_Int32 nPhClr = API_RGB_TRANSPARENT;
|
|
std::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 );
|
|
|
|
if ( getVertToken() == XML_eaVert )
|
|
{
|
|
xPropSet->setPropertyValue("TextWritingMode", Any(com::sun::star::text::WritingMode_TB_RL));
|
|
}
|
|
|
|
getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
|
|
}
|
|
|
|
} } }
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|