diff --git a/0001-Resolves-tdf-92275-impress-grinds-to-a-halt-constant.patch b/0001-Resolves-tdf-92275-impress-grinds-to-a-halt-constant.patch new file mode 100644 index 0000000..38912be --- /dev/null +++ b/0001-Resolves-tdf-92275-impress-grinds-to-a-halt-constant.patch @@ -0,0 +1,69 @@ +From fcd5bf6aa0ab30c9b969de573ef53559f976e3a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 29 Jun 2015 11:26:41 +0100 +Subject: [PATCH] Resolves: tdf#92275 impress grinds to a halt constant + swapping images + +This reverts commit 6c84442f99de109b585d3ba8964deb8dcf261c0f. +"tdf#87820 Images not displayed properly in Calc" + +and replaces it with an alternative solution + +Change-Id: Iecb560d43767f0e41e442a307eefcdcecb7589ef +--- + .../sdr/contact/viewobjectcontactofgraphic.cxx | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +index 53fc85d..ebca769 100644 +--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx ++++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +@@ -134,22 +134,30 @@ namespace sdr + rGrafObj.mbInsidePaint = false; + } + +- // Invalidate paint areas. +- GetViewContact().ActionChanged(); +- + bRetval = true; + } + } + } + else + { +- // it is not swapped out, somehow it was loaded. In that case, forget ++ // it is not swapped out, somehow[1] it was loaded. In that case, forget + // about an existing triggered event +- if(mpAsynchLoadEvent) ++ if (mpAsynchLoadEvent) + { + // just delete it, this will remove it from the EventHandler and + // will trigger forgetAsynchGraphicLoadingEvent from the destructor + delete mpAsynchLoadEvent; ++ ++ // Invalidate paint areas. ++ // [1] If a calc document with graphics is loaded then OnLoad will ++ // be emitted before the graphic are due to be swapped in asynchronously ++ // In sfx2 we generate a preview on receiving onload, which forces ++ // the graphics to be swapped in to generate the preview. When ++ // the timer triggers it find the graphics already swapped in. So ++ // we should still invalidate the paint area on finding the graphic ++ // swapped in seeing as we're still waiting in calc to draw the ++ // graphics on receipt of their contents. ++ GetViewContact().ActionChanged(); + } + } + +@@ -189,9 +197,6 @@ namespace sdr + rGrafObj.mbInsidePaint = false; + } + +- // Invalidate paint areas. +- GetViewContact().ActionChanged(); +- + bRetval = true; + } + } +-- +2.4.0 + diff --git a/libreoffice.spec b/libreoffice.spec index fa14f31..94456c6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -396,6 +396,7 @@ Patch84: 0001-Resolves-tdf-83365-push-proper-references-in-INDIREC.patch Patch85: 0001-rhbz-1233420-handle-inexistent-cond.-format.patch Patch86: 0001-a-singleton-must-be-fully-parsed-to-be-valid-tdf-444.patch Patch87: 0001-tdf-44419-in-second-reference-part-stop-number-parsi.patch +Patch88: 0001-Resolves-tdf-92275-impress-grinds-to-a-halt-constant.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2372,10 +2373,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Thu Jun 25 2015 Eike Rathke - 1:4.3.7.2-8-UNBUILT +* Mon Jun 29 2015 Eike Rathke - 1:4.3.7.2-8 - Resolves: tdf#83365 push proper references in INDIRECT - Resolves: rhbz#1233420 crash on auto-fill - Related: tdf#44419 in second reference part stop number parsing at separator +- Resolves: tdf#92275 impress grinds to a halt swapping in images * Wed Jun 17 2015 Eike Rathke - 1:4.3.7.2-7 - Resolves: tdf#91420 "Jan1, 2015" is a valid date