diff options
| author | Eike Rathke <erack@redhat.com> | 2012-01-26 14:03:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-02-08 14:20:53 +0100 |
| commit | 4078a190d3b957577bc1d96c895dcdc19f4ed263 (patch) | |
| tree | a1aaf79cc9f467a6442c16756b0ae20c722065f8 | |
| parent | f7adca07343b804efc4e42bed2b4a8d789e58db3 (diff) | |
resolved fdo#38595 border width lost in ODF import
backported 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index f4b7d6b47..08a867ff2 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -173,12 +173,14 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& pBorders[i]->maValue >>= aBorderLine; if( pBorderWidths[i] ) { + // Merge style:border-line-width values to fo:border values. Do + // not override fo:border line width or line style with an + // empty value! table::BorderLine2 aBorderLineWidth; pBorderWidths[i]->maValue >>= aBorderLineWidth; aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; aBorderLine.LineDistance = aBorderLineWidth.LineDistance; - aBorderLine.LineWidth = aBorderLineWidth.LineWidth; pBorders[i]->maValue <<= aBorderLine; } } @@ -197,7 +199,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; aBorderLine.LineDistance = aBorderLineWidth.LineDistance; - aBorderLine.LineWidth = aBorderLineWidth.LineWidth; pDiagBorders[i]->maValue <<= aBorderLine; if (pDiagBorderWidths[i]) pDiagBorderWidths[i]->mnIndex = -1; |