[libreoffice/f16] Resolves: fdo#38595 border width lost in ODF import

[Michael Stahl]

commit aad38cd074c98a17f7cfcc1cce389691b19b3ce6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 8 15:08:45 2012 +0100

    Resolves: fdo#38595 border width lost in ODF import

 ...fdo-38595-border-width-lost-in-ODF-import.patch |   40 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch b/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch
new file mode 100644
index 0000000..c158556
--- /dev/null
+++ b/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch
@@ -0,0 +1,40 @@
+From 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack at redhat.com>
+Date: Thu, 26 Jan 2012 14:03:13 +0100
+Subject: [PATCH] resolved fdo#38595 border width lost in ODF import
+
+---
+ 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 7691c4b..72155e6 100644
+--- a/sc/source/filter/xml/xmlstyli.cxx
++++ b/sc/source/filter/xml/xmlstyli.cxx
+@@ -170,12 +170,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;
+             }
+         }
+@@ -194,7 +196,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;
+-- 
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 1e2a95a..cc2643f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -33,7 +33,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -201,6 +201,7 @@ Patch82: 0001-fdo-45115-SwXTextTable-fix-setting-borders.patch
 Patch83: 0002-fdo-45115-sc-fix-setting-borders.patch
 Patch84: 0001-rhbz-701152-ignore-hidden-objects.patch
 Patch85: 0001-fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch
+Patch86: 0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1074,6 +1075,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch83 -p1 -b .fdo-45115-sc-fix-setting-borders.patch
 %patch84 -p1 -b .rhbz-701152-ignore-hidden-objects.patch
 %patch85 -p1 -b .fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch
+%patch86 -p1 -b .resolved-fdo-38595-border-width-lost-in-ODF-import.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2384,6 +2386,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Feb 07 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-5.UNBUILT
+- Resolves: fdo#38595 border width lost in ODF import
+
 * Tue Feb 07 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-4
 - Resolves: rhbz#701152 scrolling does not work as expected while
   viewing specific .doc file