diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-06-23 20:03:27 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-06-27 11:07:49 +0200 |
| commit | 28e9f2bc390e10339859306ad5f733d377134ca8 (patch) | |
| tree | caa40c59084b26183d36eac2b353923b36992752 /sc/source/filter/oox | |
| parent | 22ab4f30ac2125579c43ad889f7b8b45b1dda3e3 (diff) | |
sc: import and prop. theme color support for cell borders
Adds import for theme colors for cell borders and UNO properties
for the cell border theme (complex) colors.
Change-Id: I9d8dd7e71f74a623f916e19d59964058f43440bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153502
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc/source/filter/oox')
| -rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index e0c99ccb7a65..f53681521ad6 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1499,6 +1499,11 @@ void Border::finalizeImport( bool bRTL ) convertBorderLine( maApiData.maTop, maModel.maTop ); convertBorderLine( maApiData.maBottom, maModel.maBottom ); + maApiData.maComplexColorLeft = maModel.maLeft.maColor.createComplexColor(getBaseFilter().getGraphicHelper(), -1); + maApiData.maComplexColorRight = maModel.maRight.maColor.createComplexColor(getBaseFilter().getGraphicHelper(), -1); + maApiData.maComplexColorTop = maModel.maTop.maColor.createComplexColor(getBaseFilter().getGraphicHelper(), -1); + maApiData.maComplexColorBottom = maModel.maBottom.maColor.createComplexColor(getBaseFilter().getGraphicHelper(), -1); + if( maModel.mbDiagTLtoBR ) convertBorderLine( maApiData.maTLtoBR, maModel.maDiagonal ); if( maModel.mbDiagBLtoTR ) @@ -1510,22 +1515,26 @@ void Border::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const if( maApiData.mbBorderUsed ) { SvxBoxItem aBoxItem( ATTR_BORDER ); - ::editeng::SvxBorderLine aLine; + editeng::SvxBorderLine aLine; if (SvxBoxItem::LineToSvxLine(maApiData.maLeft, aLine, false)) { + aLine.setComplexColor(maApiData.maComplexColorLeft); aBoxItem.SetLine( &aLine, SvxBoxItemLine::LEFT ); } if (SvxBoxItem::LineToSvxLine(maApiData.maRight, aLine, false)) { + aLine.setComplexColor(maApiData.maComplexColorRight); aBoxItem.SetLine( &aLine, SvxBoxItemLine::RIGHT ); } if (SvxBoxItem::LineToSvxLine(maApiData.maTop, aLine, false)) { + aLine.setComplexColor(maApiData.maComplexColorTop); aBoxItem.SetLine( &aLine, SvxBoxItemLine::TOP ); } if (SvxBoxItem::LineToSvxLine(maApiData.maBottom, aLine, false)) { + aLine.setComplexColor(maApiData.maComplexColorBottom); aBoxItem.SetLine( &aLine, SvxBoxItemLine::BOTTOM ); } ScfTools::PutItem( rItemSet, aBoxItem, bSkipPoolDefs ); |