From 8236f4b0b1c758092a365b310c765d3183eebe30 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Feb 24 2021 15:25:34 +0000 Subject: Resolves: rhbz#1931423 start update timer on IM command --- diff --git a/0001-Resolves-rhbz-1931423-start-update-timer-in-IM-event.patch b/0001-Resolves-rhbz-1931423-start-update-timer-in-IM-event.patch new file mode 100644 index 0000000..10cf406 --- /dev/null +++ b/0001-Resolves-rhbz-1931423-start-update-timer-in-IM-event.patch @@ -0,0 +1,76 @@ +From bb8e30a66556a486d0fdc3330d93b5123eeeaa11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 24 Feb 2021 14:32:21 +0000 +Subject: [PATCH] Resolves: rhbz#1931423 start update timer in IM events as + well as keyevents + +Change-Id: I5a72adebd34c3983e7a414110c3192d05b725e45 +--- + starmath/inc/edit.hxx | 1 + + starmath/source/edit.cxx | 24 ++++++++++++++++-------- + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx +index c1ce769ab1c6..08ef2c716cbe 100644 +--- a/starmath/inc/edit.hxx ++++ b/starmath/inc/edit.hxx +@@ -81,6 +81,7 @@ class SmEditWindow final : public vcl::Window, public DropTargetHelper + void InitScrollBars(); + void InvalidateSlots(); + void UpdateStatus(bool bSetDocModified); ++ void UserPossiblyChangedText(); + + public: + explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); +diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx +index 755bb3b5c667..ae01f4144611 100644 +--- a/starmath/source/edit.cxx ++++ b/starmath/source/edit.cxx +@@ -341,7 +341,10 @@ void SmEditWindow::Command(const CommandEvent& rCEvt) + if (bForwardEvt) + { + if (pEditView) +- pEditView->Command( rCEvt ); ++ { ++ pEditView->Command(rCEvt); ++ UserPossiblyChangedText(); ++ } + else + Window::Command (rCEvt); + } +@@ -452,13 +455,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt) + } + else + { +- // have doc-shell modified only for formula input/change and not +- // cursor travelling and such things... +- SmDocShell *pDocShell = GetDoc(); +- EditEngine *pEditEngine = GetEditEngine(); +- if (pDocShell && pEditEngine) +- pDocShell->SetModified(pEditEngine->IsModified()); +- aModifyIdle.Start(); ++ UserPossiblyChangedText(); + } + + // get the current char of the key event +@@ -486,6 +483,17 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt) + } + } + ++void SmEditWindow::UserPossiblyChangedText() ++{ ++ // have doc-shell modified only for formula input/change and not ++ // cursor travelling and such things... ++ SmDocShell *pDocShell = GetDoc(); ++ EditEngine *pEditEngine = GetEditEngine(); ++ if (pDocShell && pEditEngine) ++ pDocShell->SetModified(pEditEngine->IsModified()); ++ aModifyIdle.Start(); ++} ++ + void SmEditWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) + { + if (!pEditView) +-- +2.29.2 + diff --git a/libreoffice.spec b/libreoffice.spec index b4a162a..0b832a0 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: 8%{?libo_prerelease}%{?dist} +Release: 9%{?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/ @@ -256,6 +256,7 @@ 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 +Patch15: 0001-Resolves-rhbz-1931423-start-update-timer-in-IM-event.patch # Patches with numbers above 100 are applied conditionally Patch101: 0001-Upgrade-liborcus-to-0.16.0.patch @@ -2276,7 +2277,10 @@ done %{_includedir}/LibreOfficeKit %changelog -* Thu Jan 28 2021 Stephan Bergmann - 1:7.0.4.2-8-UNBUILT +* Wed Feb 24 2021 Caolán McNamara - 1:7.0.4.2-9 +- Resolves: rhbz#1931423 start update timer on IM command + +* Thu Jan 28 2021 Stephan Bergmann - 1:7.0.4.2-8 - Make libreoffice-bsh, libreoffice-rhino depend on full java * Wed Jan 27 2021 Caolán McNamara - 1:7.0.4.2-7