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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 28 14:58:16 UTC 2021


 vcl/source/uitest/uno/uiobject_uno.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 2cc76ffcbe1f11f3b10a1a86b00f51e5ef179ac3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 28 15:54:51 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jun 28 16:57:42 2021 +0200

    Remove dubious lone mutex lock
    
    ...introduced with 70f89e6b9f89177fc60f9cc9b55a87fdc5c6017f "uitest: move the
    processing of actions into the idle handler", for no apparent reason.  (This
    change will allow to get rid of mMutex as a member of UIObjectUnoObj in a later
    commit.)
    
    Change-Id: I1964eb1c4a1b4f790e689e55d4af8a0390cb4d5d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118024
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index fe7a3d9901d7..fd75b892d0c4 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -29,9 +29,6 @@ UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj):
 
 UIObjectUnoObj::~UIObjectUnoObj()
 {
-    {
-        std::scoped_lock<std::mutex> lk3(mMutex);
-    }
     SolarMutexGuard aGuard;
     mpObj.reset();
 }


More information about the Libreoffice-commits mailing list