sw/source/core/unocore/unoframe.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 40f6e84b402409faf62d09f34e834b901dd6f716
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Jul 17 17:40:50 2019 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Jul 18 12:06:55 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.st...@cib.de>
(cherry picked from commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8)
Reviewed-on: https://gerrit.libreoffice.org/75826
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index ea377f2e058e..9f68ab2d8046 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3078,6 +3078,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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
