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 | 6a0cc7552f0495a034552317fa501521465b8019 (patch) | |
| tree | 214041530ed2496fb0b56d2710f6e7d37f3c1cdb /sc/source | |
| parent | 930df665160f65e82f3a8dde4a279dda0748be80 (diff) | |
Fixed the odf import of border in calc: style was missing
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a2e040f45..bf5d8ec70 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -333,7 +333,8 @@ void ScXMLCellExportPropertyMapper::ContextFilter( aLeft.Color == aBottom.Color && aLeft.InnerLineWidth == aBottom.InnerLineWidth && aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance && aLeft.LineStyle == aRight.LineStyle && aLeft.LineStyle == aTop.LineStyle && - aLeft.LineStyle == aBottom.LineStyle ) + aLeft.LineStyle == aBottom.LineStyle && aLeft.LineWidth == aRight.LineWidth && + aLeft.LineWidth == aTop.LineWidth && aLeft.LineWidth == aBottom.LineWidth ) { pBorder_Left->mnIndex = -1; pBorder_Left->maValue.clear(); @@ -370,7 +371,8 @@ void ScXMLCellExportPropertyMapper::ContextFilter( aLeft.LineDistance == aRight.LineDistance && aLeft.InnerLineWidth == aTop.InnerLineWidth && aLeft.OuterLineWidth == aTop.OuterLineWidth && aLeft.LineDistance == aTop.LineDistance && aLeft.InnerLineWidth == aBottom.InnerLineWidth && aLeft.OuterLineWidth == aBottom.OuterLineWidth && - aLeft.LineDistance == aBottom.LineDistance ) + aLeft.LineDistance == aBottom.LineDistance && aLeft.LineWidth == aRight.LineWidth && + aLeft.LineWidth == aTop.LineWidth && aLeft.LineWidth == aBottom.LineWidth ) { pLeftBorderWidthState->mnIndex = -1; pLeftBorderWidthState->maValue.clear(); diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 715e7fc53..f4b7d6b47 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; |