pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 890351 from LibreOffice:7.1

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/890351
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=956
This commit is contained in:
Markéta Machová 2021-05-04 13:08:22 +00:00 committed by Git OBS Bridge
parent aaf5919a9a
commit 391eec6621
4 changed files with 50 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
0001-Revert-rhbz-1931423.patch
View File

@ -1,76 +0,0 @@
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

42
bsc1184961.patch Normal file
View File

@ -0,0 +1,42 @@
From 9fed7b07af44792012028eb57900640a5ee833cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 4 May 2021 09:15:25 +0100
Subject: [PATCH] tdf#141930 document set as unmodified if editengine didn't
modify on keyevent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
this appears to have always happened for cursor keys, and since
commit 0154f04e8c64df937b793c73ac58d553637f324f
Author: Caolán McNamara <caolanm@redhat.com>
Date: Wed Feb 24 14:32:21 2021 +0000
Resolves: rhbz#1931423 start update timer in IM events as well as keyevents
also happens on Input Engine events which don't cause changes
Change-Id: Ic5cdd9ef4f1bed1cc2b2c17fc847f196a9c6e23a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115055
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
starmath/source/edit.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: libreoffice-7.1.3.2/starmath/source/edit.cxx
===================================================================
--- libreoffice-7.1.3.2.orig/starmath/source/edit.cxx
+++ libreoffice-7.1.3.2/starmath/source/edit.cxx
@@ -513,8 +513,8 @@ void SmEditWindow::UserPossiblyChangedTe
// cursor travelling and such things...
SmDocShell *pDocShell = GetDoc();
EditEngine *pEditEngine = GetEditEngine();
- if (pDocShell && pEditEngine)
- pDocShell->SetModified(pEditEngine->IsModified());
+ if (pDocShell && pEditEngine && pEditEngine->IsModified())
+ pDocShell->SetModified(true);
aModifyIdle.Start();
}

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 4 11:31:27 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Add bsc1184961.patch to fix bsc#1184961 more cleanly
- Drop 0001-Revert-rhbz-1931423.patch
-------------------------------------------------------------------
Mon May 3 09:14:37 UTC 2021 - Markéta Machová <mmachova@suse.com>

4
libreoffice.spec
View File

@ -101,8 +101,8 @@ Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/f14b83b38d35a585976ef5d422754d8e0d0266a6 ucp: fix call to getComponentContext
Patch4: use-comphelper.patch
# temporary fix for bsc#1184961 and bsc#1184527 - libreoffice oomath does not ask to save changes when closing document
Patch5: 0001-Revert-rhbz-1931423.patch
# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/9fed7b07af44792012028eb57900640a5ee833cb tdf#141930 document set as unmodified if editengine didn't modify on keyevent
Patch5: bsc1184961.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks