diff --git a/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch b/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch new file mode 100644 index 0000000..5c56321 --- /dev/null +++ b/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch @@ -0,0 +1,30 @@ +From 0497864bd4f603605997938d504ef9598623e713 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Fri, 25 Jul 2014 15:40:27 +0200 +Subject: [PATCH] rhbz#1121254 reload font list from shell on change + +Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb +--- + svx/source/tbxctrls/tbcontrl.cxx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx +index 816afbe..5728791 100644 +--- a/svx/source/tbxctrls/tbcontrl.cxx ++++ b/svx/source/tbxctrls/tbcontrl.cxx +@@ -891,6 +891,12 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) + Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); + SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); + } ++ else if ( rDCEvt.GetType() == DATACHANGED_FONTS ) ++ { ++ // The old font list in shell has likely been destroyed at this point, so we need to get ++ // the new one before doing anything further. ++ lcl_GetDocFontList( &pFontList, this ); ++ } + + FontNameBox::DataChanged( rDCEvt ); + } +-- +1.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 117ffaf..a93dcf6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?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 Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -310,6 +310,7 @@ Patch19: 0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch Patch20: 0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch Patch21: 0001-fdo-81113-always-run-the-actual-detection.patch Patch22: 0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch +Patch23: 0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2282,6 +2283,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri Jul 25 2014 David Tardon - 1:4.3.0.3-4 +- Resolves: rhbz#1121254 crash when using font selector after adding new font + * Fri Jul 25 2014 Caolán McNamara - 1:4.3.0.3-3 - Resolves: rhbz#1122868 landscape printing is broken