Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2021-10-30 23:13:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Sat Oct 30 23:13:09 2021 rev:238 rq:927268 version:7.2.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2021-10-16
22:47:13.700671094 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.1890/libreoffice.changes
2021-10-30 23:14:12.579078305 +0200
@@ -1,0 +2,6 @@
+Fri Oct 22 20:04:38 UTC 2021 - Andras Timar <andras.ti...@collabora.com>
+
+- Fix bsc#1187982: LO-L3: PPTX: one column becomes two within one text frame
+ * bsc1187982.patch
+
+-------------------------------------------------------------------
New:
----
bsc1187982.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.GGudjF/_old 2021-10-30 23:14:16.983081849 +0200
+++ /var/tmp/diff_new_pack.GGudjF/_new 2021-10-30 23:14:16.987081852 +0200
@@ -107,6 +107,8 @@
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 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif
++++++ bsc1187982.patch ++++++
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();
}
}
