|
 |
aad38cd |
From 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e Mon Sep 17 00:00:00 2001
|
|
|
aad38cd |
From: Eike Rathke <erack@redhat.com>
|
|
|
aad38cd |
Date: Thu, 26 Jan 2012 14:03:13 +0100
|
|
|
aad38cd |
Subject: [PATCH] resolved fdo#38595 border width lost in ODF import
|
|
|
aad38cd |
|
|
|
aad38cd |
---
|
|
|
aad38cd |
sc/source/filter/xml/xmlstyli.cxx | 5 +++--
|
|
|
aad38cd |
1 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
aad38cd |
|
|
|
aad38cd |
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
|
|
|
aad38cd |
index 7691c4b..72155e6 100644
|
|
|
aad38cd |
--- a/sc/source/filter/xml/xmlstyli.cxx
|
|
|
aad38cd |
+++ b/sc/source/filter/xml/xmlstyli.cxx
|
|
|
aad38cd |
@@ -170,12 +170,14 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
|
|
|
aad38cd |
pBorders[i]->maValue >>= aBorderLine;
|
|
|
aad38cd |
if( pBorderWidths[i] )
|
|
|
aad38cd |
{
|
|
|
aad38cd |
+ // Merge style:border-line-width values to fo:border values. Do
|
|
|
aad38cd |
+ // not override fo:border line width or line style with an
|
|
|
aad38cd |
+ // empty value!
|
|
|
aad38cd |
table::BorderLine2 aBorderLineWidth;
|
|
|
aad38cd |
pBorderWidths[i]->maValue >>= aBorderLineWidth;
|
|
|
aad38cd |
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
|
|
|
aad38cd |
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
|
|
|
aad38cd |
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
|
|
|
aad38cd |
- aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
|
|
|
aad38cd |
pBorders[i]->maValue <<= aBorderLine;
|
|
|
aad38cd |
}
|
|
|
aad38cd |
}
|
|
|
aad38cd |
@@ -194,7 +196,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
|
|
|
aad38cd |
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
|
|
|
aad38cd |
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
|
|
|
aad38cd |
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
|
|
|
aad38cd |
- aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
|
|
|
aad38cd |
pDiagBorders[i]->maValue <<= aBorderLine;
|
|
|
aad38cd |
if (pDiagBorderWidths[i])
|
|
|
aad38cd |
pDiagBorderWidths[i]->mnIndex = -1;
|
|
|
aad38cd |
--
|
|
|
aad38cd |
1.7.7.6
|
|
|
aad38cd |
|