sc/source/filter/xml/xmlstyli.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 4078a190d3b957577bc1d96c895dcdc19f4ed263 Author: Eike Rathke <er...@redhat.com> Date: Thu Jan 26 14:03:13 2012 +0100 resolved fdo#38595 border width lost in ODF import backported 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index f4b7d6b..08a867f 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; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits