diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-04-09 09:36:45 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-04-12 11:37:58 +0000 |
| commit | 3ced9d208d3eb8fefa4e5b3e06e2c3884eef591a (patch) | |
| tree | 8bd390aa048ccd2836d70ebf7449e2d12ed98365 /sc | |
| parent | 62fdce393276a8f5ad86a41dc49719c61581ce63 (diff) | |
import all formatting properties for column style, tdf#96549
Change-Id: I782f3ea7cfa9af335bd117b9f4ad6ac9c719115b
Reviewed-on: https://gerrit.libreoffice.org/23932
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit e8322dffb4dfc7015ee0842f133b79080eb2b0d8)
Reviewed-on: https://gerrit.libreoffice.org/23943
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/stylesbuffer.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 19 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index b14007958c23..f8fc2fd5a522 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -659,7 +659,7 @@ public: /** Writes all formatting attributes to the passed property set. */ void writeToPropertySet( PropertySet& rPropSet ) const; - void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange ) const; + void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange ); const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index ce909ad4367e..48fc50177010 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2252,7 +2252,7 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) const rPropSet.setProperties( aPropMap ); } -void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange ) const +void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange ) { const StylesBuffer& rStyles = getStyles(); @@ -2273,22 +2273,9 @@ void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRan } } - std::unique_ptr<ScPatternAttr> pAttr(new ScPatternAttr(rDoc.getDoc().GetPool())); - - { - SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD; - - if (maModel.mbBorderUsed && rStyles.hasBorder(maModel.mnBorderId) && maAlignment.getApiData().mnRotation) - eRotateMode = SVX_ROTATE_MODE_BOTTOM; - - SvxRotateModeItem aItem(eRotateMode, ATTR_ROTATE_MODE); - ScfTools::PutItem(pAttr->GetItemSet(), aItem, false); - } - - // TODO : Move more properties from writeToPropertyMap(). - + const ScPatternAttr& rAttr = createPattern(); rDoc.getDoc().ApplyPatternAreaTab( - rRange.StartColumn, rRange.StartRow, rRange.EndColumn, rRange.EndRow, rRange.Sheet, *pAttr); + rRange.StartColumn, rRange.StartRow, rRange.EndColumn, rRange.EndRow, rRange.Sheet, rAttr); } const ::ScPatternAttr& |