[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - starmath/inc starmath/source

[Caolán McNamara (via logerrit)]

 starmath/inc/edit.hxx|1 +
 starmath/source/edit.cxx |   24 
 2 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit f7243a465fc75f8c29c1decb7628f7a8f6d1d769
Author: Caolán McNamara 
AuthorDate: Wed Feb 24 14:32:21 2021 +
Commit: Michael Stahl 
CommitDate: Thu Feb 25 10:52:46 2021 +0100

Resolves: rhbz#1931423 start update timer in IM events as well as keyevents

Change-Id: I5a72adebd34c3983e7a414110c3192d05b725e45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111490
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 300a414d382b..60d0ad2bbb04 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -88,6 +88,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 64d1fc34757e..99ce7c008622 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -365,7 +365,10 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 if (bForwardEvt)
 {
 if (pEditView)
-pEditView->Command( rCEvt );
+{
+pEditView->Command(rCEvt);
+UserPossiblyChangedText();
+}
 else
 Window::Command (rCEvt);
 }
@@ -476,13 +479,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
@@ -510,6 +507,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)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - starmath/inc starmath/source

[Ming Hua (via logerrit)]

 starmath/inc/strings.hrc  |2 +-
 starmath/source/ElementsDockingWindow.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 56196fed4e644dcb1f86ae575b635fcb7b901985
Author: Ming Hua 
AuthorDate: Thu Nov 26 01:08:33 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 27 01:09:03 2020 +0100

Fix typo in code: caos -> chaos

Change-Id: I8894d83d0131f5bc49d6be7b158cf90401174bab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106671
Tested-by: Jenkins
Reviewed-by: Dante DM 
Reviewed-by: Andrea Gelmini 
(cherry picked from commit 2b5d320630aaa89fc3857f2926b82d116910f905)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106684
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index 9ecaaf1baae4..01dc7b864ee4 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -325,7 +325,7 @@
 #define RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP 
NC_("RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP", "Gauss distribution" )
 #define RID_EXAMPLE_EULER_LAGRANGE_HELP 
NC_("RID_EXAMPLE_EULER_LAGRANGE_HELP", "Euler-Lagrange equation" )
 #define RID_EXAMPLE_FTC_HELPNC_("RID_EXAMPLE_FTC_HELP", 
"Fundamental theorem of calculus" )
-#define RID_EXAMPLE_CAOS_HELP   NC_("RID_EXAMPLE_CAOS_HELP", 
"Chaos equation" )
+#define RID_EXAMPLE_CHAOS_HELP  NC_("RID_EXAMPLE_CHAOS_HELP", 
"Chaos equation" )
 #define RID_EXAMPLE_EULER_IDENTITY_HELP 
NC_("RID_EXAMPLE_EULER_IDENTITY_HELP", "Euler's identity" )
 #define RID_EXAMPLE_2NEWTON NC_("RID_EXAMPLE_2NEWTON", 
"Newton's second law" )
 #define RID_EXAMPLE_GENERAL_RELATIVITY_HELP 
NC_("RID_EXAMPLE_GENERAL_RELATIVITY_HELP", "General relativity")
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index da7a6c10b343..5083d94ff010 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -262,7 +262,7 @@ const SmElementDescr SmElementsControl::m_aExamplesList[] =
 {" %DELTA t' = { %DELTA T } over sqrt{ 1 - v^2 over c^2 } ", 
RID_EXAMPLE_SPECIAL_RELATIVITY_HELP },
 { "d over dt left( {partial L}over{partial dot q} = {partial 
L}over{partial q} right)", RID_EXAMPLE_EULER_LAGRANGE_HELP },
 {"int from a to b f'(x) dx = f(a) - f(b)", RID_EXAMPLE_FTC_HELP},
-{ "abs{ %delta Z(t) } approx e^{%lambda t} abs{ %delta Z(0) }", 
RID_EXAMPLE_CAOS_HELP},
+{ "abs{ %delta Z(t) } approx e^{%lambda t} abs{ %delta Z(0) }", 
RID_EXAMPLE_CHAOS_HELP},
 {"f ( x ) = sum from { { n = 0 } } to { infinity } { {f^{(n)}(x_0)} over 
{n!} (x-x_0)^n}", RID_EXAMPLE_A_TAYLOR_SERIES_HELP},
 {"f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over 
{2%sigma^2}}", RID_EXAMPLE_GAUSS_DISTRIBUTION_HELP},
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits