Markéta Machová
aaf5919a9a
OBS-URL: https://build.opensuse.org/request/show/890236 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=955
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
From 40b4b2f530787cdf23414df99b4e6591ad5e1d5c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <meggy.calabkova@gmail.com>
|
|
Date: Mon, 3 May 2021 14:52:34 +0200
|
|
Subject: [PATCH] Revert "Resolves: rhbz#1931423 start update timer in IM
|
|
events as well as keyevents"
|
|
|
|
This reverts commit f7243a465fc75f8c29c1decb7628f7a8f6d1d769.
|
|
---
|
|
starmath/inc/edit.hxx | 1 -
|
|
starmath/source/edit.cxx | 24 ++++++++----------------
|
|
2 files changed, 8 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
|
|
index 60d0ad2bbb04..300a414d382b 100644
|
|
--- a/starmath/inc/edit.hxx
|
|
+++ b/starmath/inc/edit.hxx
|
|
@@ -88,7 +88,6 @@ 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 99ce7c008622..64d1fc34757e 100644
|
|
--- a/starmath/source/edit.cxx
|
|
+++ b/starmath/source/edit.cxx
|
|
@@ -365,10 +365,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
|
|
if (bForwardEvt)
|
|
{
|
|
if (pEditView)
|
|
- {
|
|
- pEditView->Command(rCEvt);
|
|
- UserPossiblyChangedText();
|
|
- }
|
|
+ pEditView->Command( rCEvt );
|
|
else
|
|
Window::Command (rCEvt);
|
|
}
|
|
@@ -479,7 +476,13 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
|
|
}
|
|
else
|
|
{
|
|
- 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();
|
|
}
|
|
|
|
// get the current char of the key event
|
|
@@ -507,17 +510,6 @@ 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.31.1
|
|
|