diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-15 17:10:48 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:56:24 +0100 |
| commit | dc78b9160944086a670785cd9592484c74d14488 (patch) | |
| tree | bb6f19df10f2c930fa88a9ff7f62147ba04db47e /sc/source/filter/xml/xmlstyli.cxx | |
| parent | Added the new border types to the HTML export (diff) | |
| download | core-dc78b9160944086a670785cd9592484c74d14488.tar.gz core-dc78b9160944086a670785cd9592484c74d14488.zip | |
Fixed the odf import of border in calc: style was missing
Diffstat (limited to 'sc/source/filter/xml/xmlstyli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 6c724e9304a3..19dc029e4efb 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -171,14 +171,14 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& { table::BorderLine2 aBorderLine; pBorders[i]->maValue >>= aBorderLine; - if( pBorderWidths[i] ) + if( pBorderWidths[i] ) { table::BorderLine2 aBorderLineWidth; pBorderWidths[i]->maValue >>= aBorderLineWidth; aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; aBorderLine.LineDistance = aBorderLineWidth.LineDistance; - aBorderLine.LineStyle = aBorderLineWidth.LineStyle; + aBorderLine.LineWidth = aBorderLineWidth.LineWidth; pBorders[i]->maValue <<= aBorderLine; } } @@ -197,7 +197,7 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; aBorderLine.LineDistance = aBorderLineWidth.LineDistance; - aBorderLine.LineStyle = aBorderLineWidth.LineStyle; + aBorderLine.LineWidth = aBorderLineWidth.LineWidth; pDiagBorders[i]->maValue <<= aBorderLine; if (pDiagBorderWidths[i]) pDiagBorderWidths[i]->mnIndex = -1; |