[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 2 commits - editeng/source sc/source

[Aron Budea (via logerrit)]

 editeng/source/editeng/editdoc.cxx |    2 --
 sc/source/ui/app/inputwin.cxx      |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit eded36bd0260c5b7e39131492aeb8e06e458ba68
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Thu Jun 9 13:16:44 2022 +0200
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Jun 9 13:17:57 2022 +0200

    Revert "tdf#132740 don't broadcast if modified status has not changed"
    
    Causes regression when drag&dropping in formula bar.
    
    This reverts commit 60d35f767781de4b8f1e7b264b12015f655c647d.
    
    Change-Id: If01534c17cf19f457b993ec9f8e48e6495b29b8c

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 3e4e636648e7..59e7b4de5a19 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2217,8 +2217,6 @@ void EditDoc::ClearSpellErrors()
 
 void EditDoc::SetModified( bool b )
 {
-    if (bModified == b)
-        return;
     bModified = b;
     if ( bModified )
     {
commit 95d2de71e442ff64f979ec11e3dc6bd75302ae92
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 24 16:30:00 2022 +0100
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Jun 9 13:16:26 2022 +0200

    tdf#145248 don't start a drag if actively selecting
    
    Change-Id: I00565adbb32a6d9109a75548a544e79ba1951650
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134896
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 298815eab4724a9ac9a11f865d9b04edfd73ac66)

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5a9a59659b12..938f1440cd39 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1755,7 +1755,8 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt )
 
 bool ScTextWnd::StartDrag()
 {
-    if (m_xEditView)
+    // tdf#145248 don't start a drag if actively selecting
+    if (m_xEditView && !m_xEditEngine->IsInSelectionMode())
     {
         OUString sSelection = m_xEditView->GetSelected();
         m_xHelper->SetData(sSelection);