[libreoffice/f16] Resolves: fdo#45115: SwXTextTable, sc: fix setting borders

[Michael Stahl]

commit 1476f3cec482b3890873cdc8df887542313e7a5b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 7 20:06:08 2012 +0100

    Resolves: fdo#45115: SwXTextTable, sc: fix setting borders

 ...do-45115-SwXTextTable-fix-setting-borders.patch |   26 +++++++++++++++++++
 0002-fdo-45115-sc-fix-setting-borders.patch        |   27 ++++++++++++++++++++
 libreoffice.spec                                   |    5 +++
 3 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch b/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch
new file mode 100644
index 0000000..6b0d6f4
--- /dev/null
+++ b/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch
@@ -0,0 +1,26 @@
+From ef9881001e4ddfa6bfbe7d83f482393bb76d926a Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Fri, 3 Feb 2012 18:49:56 +0100
+Subject: [PATCH 1/2] fdo#45115: SwXTextTable: fix setting borders
+
+This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem.
+---
+ sw/source/core/unocore/unotbl.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
+index a928d15..9526160 100644
+--- a/sw/source/core/unocore/unotbl.cxx
++++ b/sw/source/core/unocore/unotbl.cxx
+@@ -136,7 +136,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi
+ {
+     rSvxLine.SetColor(Color(rLine.Color));
+ 
+-    rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle(table::BorderLineStyle::SOLID),
++    rSvxLine.GuessLinesWidths( editeng::NO_STYLE,
+                                 MM100_TO_TWIP( rLine.OuterLineWidth ),
+                                 MM100_TO_TWIP( rLine.InnerLineWidth ),
+                                 MM100_TO_TWIP( rLine.LineDistance ) );
+-- 
+1.7.7.6
+
diff --git a/0002-fdo-45115-sc-fix-setting-borders.patch b/0002-fdo-45115-sc-fix-setting-borders.patch
new file mode 100644
index 0000000..64f29f3
--- /dev/null
+++ b/0002-fdo-45115-sc-fix-setting-borders.patch
@@ -0,0 +1,27 @@
+From 697743161a6047902ee880851b23c9aef1bfa392 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Fri, 3 Feb 2012 21:06:18 +0100
+Subject: [PATCH 2/2] fdo#45115: sc: fix setting borders
+
+Same problem in ScHelperFunctions::GetBorderLine.
+---
+ sc/source/ui/unoobj/cellsuno.cxx |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
+index 1bddc21..7844d9f 100644
+--- a/sc/source/ui/unoobj/cellsuno.cxx
++++ b/sc/source/ui/unoobj/cellsuno.cxx
+@@ -953,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary )
+ const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( ::editeng::SvxBorderLine& rLine, const table::BorderLine& rStruct )
+ {
+     //  Calc needs Twips, and there are 1/100mm in the Uno structure
+-    rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) );
+-    rLine.GuessLinesWidths( rLine.GetStyle(),
++    rLine.GuessLinesWidths( editeng::NO_STYLE,
+         (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
+         (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
+         (sal_uInt16)HMMToTwips( rStruct.LineDistance ) );
+-- 
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index ceb822a..b211c57 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -197,6 +197,8 @@ Patch78: 0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch
 Patch79: 0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch
 Patch80: 0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch
 Patch81: 0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch
+Patch82: 0001-fdo-45115-SwXTextTable-fix-setting-borders.patch
+Patch83: 0002-fdo-45115-sc-fix-setting-borders.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1066,6 +1068,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch79 -p1 -b .fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch
 %patch80 -p1 -b .fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch
 %patch81 -p1 -b .fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch
+%patch82 -p1 -b .fdo-45115-SwXTextTable-fix-setting-borders.patch
+%patch83 -p1 -b .fdo-45115-sc-fix-setting-borders.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2386,6 +2390,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 - Resolves: fdo#37024: SwView::SwView: fix BROWSE_MODE setting
 - Resolves: fdo#35661
 - Resolves: i#117545
+- Resolves: fdo#45115: SwXTextTable, sc: fix setting borders
 
 * Tue Feb 07 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-2
 - Resolves: fdo#44040 VIEWING: Crash when page preview after <f4>