summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-04-09 09:36:45 +0200
committerAndras Timar <andras.timar@collabora.com>2016-05-02 18:12:15 +0200
commitd2f262ba4105d7c6d8c30e46f64fc4949e7884fe (patch)
tree2592da6879fde8cb0e52bd925d51eb6d2fa371e2 /sc
parent9e65f1bfa3407f234fba9f82c53ca650ca218c88 (diff)
import all formatting properties for column style, tdf#96549
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) Change-Id: I782f3ea7cfa9af335bd117b9f4ad6ac9c719115b
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx2
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx19
2 files changed, 4 insertions, 17 deletions
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 5701244767b9..6b78bc08b37e 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -678,7 +678,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 bf63786e9725..88a4a868c813 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
}
}
- boost::scoped_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&