summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-07-17 17:40:50 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-07-28 00:23:41 +0200
commit2bc538cc081f252cfe3832f074b3620e80b438de (patch)
treeeb788a8abd01538e85fd0f8f7f31679ce6c32ce5 /sw/source/core/unocore
parent195feed8fa78d84793a6212079fe84d46e551465 (diff)
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@cib.de> (cherry picked from commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8) Reviewed-on: https://gerrit.libreoffice.org/75827 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 922aacddc86a5ae6cc3eeab9d47219bcb45ef1bc) Reviewed-on: https://gerrit.libreoffice.org/76307 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/unoframe.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index b0de9f773463..03003683e2d3 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3000,6 +3000,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);