diff --git a/0001-tdf-138727-help-browser-didn-t-flow-text.patch b/0001-tdf-138727-help-browser-didn-t-flow-text.patch new file mode 100644 index 0000000..a63d283 --- /dev/null +++ b/0001-tdf-138727-help-browser-didn-t-flow-text.patch @@ -0,0 +1,62 @@ +From 96e5a291775c9a0e04bbc5dd7ed8d5a494279470 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 27 Jan 2021 12:43:25 +0000 +Subject: [PATCH] tdf#138727 help browser didn't flow text + +because of its size request, while the paned shrink lets the pane shrink +below the size request the contents stay at a min of the size request +and aren't really shrunk, just clipped. Instead don't let the pane +shrink but don't set a size.request letting it shrink to its natural +min of its contents which are then truly resized so the text flow works. + +Change-Id: Iaf6738ace28c82379ac6322310de9a22f9653473 +--- + sfx2/source/appl/newhelp.cxx | 1 - + sfx2/uiconfig/ui/helpwindow.ui | 5 ++--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx +index 9160c231f7e3..fb3ed8d5b78b 100644 +--- a/sfx2/source/appl/newhelp.cxx ++++ b/sfx2/source/appl/newhelp.cxx +@@ -2467,7 +2467,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( + m_xContainer->connect_size_allocate(LINK(this, SfxHelpWindow_Impl, ResizeHdl)); + m_xHelpPaneWindow = m_xBuilder->weld_container("helppanewindow"); + m_xHelpTextWindow = m_xBuilder->weld_container("helptextwindow"); +- m_xHelpTextWindow->set_size_request(m_xHelpTextWindow->get_approximate_digit_width() * 120, -1); + m_xHelpTextXWindow = m_xHelpTextWindow->CreateChildFrame(); + + pHelpInterceptor->InitWaiter( this ); +diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui +index 6c9fae044c45..f35acaf06bf7 100644 +--- a/sfx2/uiconfig/ui/helpwindow.ui ++++ b/sfx2/uiconfig/ui/helpwindow.ui +@@ -20,7 +20,7 @@ + + + +- True ++ False + False + + +@@ -43,7 +43,6 @@ + True + False + icons +- False + + + True +@@ -196,7 +195,7 @@ + + + True +- True ++ False + + + +-- +2.28.0 + diff --git a/libreoffice.spec b/libreoffice.spec index af4c4b9..a741510 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 6%{?libo_prerelease}%{?dist} +Release: 7%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -255,6 +255,7 @@ Patch10: 0001-gcc11.patch Patch11: 0001-disable-tests-that-don-t-work-without-pdfium.patch Patch12: 0001-rhbz-1913828-SfxViewFrame-Current-can-return-null.patch Patch13: 0001-rhbz-1918152-fix-FTBFS.patch +Patch14: 0001-tdf-138727-help-browser-didn-t-flow-text.patch # Patches with numbers above 100 are applied conditionally Patch101: 0001-Upgrade-liborcus-to-0.16.0.patch @@ -2273,6 +2274,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Wed Jan 27 2021 Caolán McNamara - 1:7.0.4.2-7 +- Resolves: rhbz#1916539 text not wrapping in right hand help brower pane + * Mon Jan 25 2021 Caolán McNamara - 1:7.0.4.2-6 - really rebuild for Boost 1.75