Accepting request 927268 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/927268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=238

bsc1187982.patch

@@ -0,0 +1,23 @@
+diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
+index ea304ef..8681935 100644
+--- a/svx/source/svdraw/svdoashp.cxx
++++ b/svx/source/svdraw/svdoashp.cxx
+@@ -2331,7 +2331,18 @@
+                             nHgt=aSiz2.Height()+1; // a little more tolerance
+                     }
+                     else
++                    {
+                         nHgt = rOutliner.GetTextHeight()+1; // a little more tolerance
++
++                        sal_Int16 nColumns = GetMergedItem(SDRATTR_TEXTCOLUMNS_NUMBER).GetValue();
++                        if (bHgtGrow && nColumns > 1)
++                        {
++                            // Both 'resize shape to fix text' and multiple columns are enabled. The
++                            // first means a dynamic height, the second expects a fixed height.
++                            // Resolve this conflict by going with the original height.
++                            nHgt = rR.getHeight();
++                        }
++                    }
+                     rOutliner.Clear();
+                 }
+             }

libreoffice.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 22 20:04:38 UTC 2021 - Andras Timar <andras.timar@collabora.com>
+
+- Fix bsc#1187982: LO-L3: PPTX: one column becomes two within one text frame
+  * bsc1187982.patch
+
 -------------------------------------------------------------------
 Tue Oct 12 14:59:50 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 

libreoffice.spec

@@ -107,6 +107,8 @@ Patch6:         gcc11-fix-error.patch
 Patch7:         pld-skia-patches.patch
 # bsc#1189813 LO-L3: Shadow effect for tables in PPTX partly incorrect
 Patch8:         bsc1189813.patch
+# bsc#1187982 LO-L3: PPTX: one column becomes two within one text frame
+Patch9:         bsc1187982.patch
 # Build with java 8
 Patch101:       0001-Revert-java-9-changes.patch
 # try to save space by using hardlinks
@@ -987,6 +989,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %if 0%{?suse_version} < 1500
 %patch101 -p1
 %endif