[Libreoffice-commits] core.git: 2 commits - cui/source vcl/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/cuigaldlg.cxx |    7 +------
 vcl/source/app/salvtables.cxx    |    4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c0038f61aff45595c962911f16dfdef93f41924e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 3 10:28:44 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 3 13:38:32 2019 +0200

    Resolves: tdf#125080 crashing adding a ref to a non-VclPtr
    
    Change-Id: I72a0deaab3d86ac0772092ab5f60bcace7632847
    Reviewed-on: https://gerrit.libreoffice.org/71729
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f54c1b3cf727..d9ea30e9ff20 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -217,8 +217,6 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void)
         m_aSearchThread->join();
 
     m_xDialog->response(RET_OK);
-
-    m_xDialog.reset();
 }
 
 void SearchProgress::LaunchThread()
@@ -245,7 +243,6 @@ TakeThread::~TakeThread()
 {
 }
 
-
 void TakeThread::execute()
 {
     sal_Int32           nEntries;
@@ -290,10 +287,9 @@ void TakeThread::execute()
         pStatusProgress.reset();
     }
 
-    Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), nullptr, true );
+    Application::PostUserEvent(LINK(mpProgress, TakeProgress, CleanUpHdl));
 }
 
-
 TakeProgress::TakeProgress(weld::Window* pParent, TPGalleryThemeProperties* pTabPage)
     : GenericDialogController(pParent, "cui/ui/galleryapplyprogress.ui",
                               "GalleryApplyProgress")
@@ -365,7 +361,6 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
     xWait.reset();
 
     m_xDialog->response(RET_OK);
-    m_xDialog.reset();
 }
 
 void TakeProgress::LaunchThread()
commit b329d6f4ce4a594c35125fbe180aed876a66c454
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 3 10:29:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 3 13:38:20 2019 +0200

    block/unblock notify events for TextView text/selection change
    
    Change-Id: I7745c04b9331b98c9c405544fe262c24ed066ddd
    Reviewed-on: https://gerrit.libreoffice.org/71731
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 72011c1667cf..4ed1d96158e4 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3940,12 +3940,16 @@ public:
 
     virtual void set_text(const OUString& rText) override
     {
+        disable_notify_events();
         m_xTextView->SetText(rText);
+        enable_notify_events();
     }
 
     virtual void replace_selection(const OUString& rText) override
     {
+        disable_notify_events();
         m_xTextView->ReplaceSelected(rText);
+        enable_notify_events();
     }
 
     virtual OUString get_text() const override