pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 927062 from LibreOffice:7.2

Browse Source 
- Fix bsc#1187982: LO-L3: PPTX: one column becomes two within one text frame
  * bsc1187982.patch

OBS-URL: https://build.opensuse.org/request/show/927062
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=982
This commit is contained in:
Danilo Spinella 2021-10-25 09:23:21 +00:00 committed by Git OBS Bridge
parent 736e82f358
commit e51d1f3e2f
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bsc1187982.patch Normal file
View File

@ -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();
}
}

6
libreoffice.changes
View File

@ -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> Tue Oct 12 14:59:50 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

3
libreoffice.spec
View File

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