diff --git a/bsc1187982.patch b/bsc1187982.patch new file mode 100644 index 0000000..bb3317c --- /dev/null +++ b/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(); + } + } diff --git a/libreoffice.changes b/libreoffice.changes index 31c80e2..9179d59 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 22 20:04:38 UTC 2021 - Andras Timar + +- 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 diff --git a/libreoffice.spec b/libreoffice.spec index 805ec51..7a50a85 100644 --- a/libreoffice.spec +++ b/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