[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/unocore/unoframe.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 08564eaa7346809f787d0ce6baa59c6faf5e3617
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jul 17 17:40:50 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 5 09:55:13 2019 +0200

    sw: missing SolarMutexGuard in SwXFrame::attach()
    
    Causes assert in a test i'm adding...
    
    Change-Id: I5be24aa9683ec0d31494c0c97270d1d58692f764
    Reviewed-on: https://gerrit.libreoffice.org/75796
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8)
    Reviewed-on: https://gerrit.libreoffice.org/75827
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 922aacddc86a5ae6cc3eeab9d47219bcb45ef1bc)
    Reviewed-on: https://gerrit.libreoffice.org/76935
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a7eede4e14e6..831d9dc7e41b 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3042,6 +3042,8 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
 
 void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
 {
+    SolarMutexGuard g;
+
     SwFrameFormat* pFormat;
     if(IsDescriptor())
         attachToRange(xTextRange);