summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-01 21:50:19 +0200
committerMichael Stahl <mstahl@redhat.com>2017-09-01 23:55:11 +0200
commit5ec9882e650c7c3bb39e8cc90341a844bbd18772 (patch)
treea46e8a168c4464fbe95d65dacc113750a4386ca3
parenta871dbed8abfeaeb4faf44129b8983c26f7a9cb3 (diff)
svx: add mutex guards to SvxFmDrawPage
These trigger asserts that were added in previous commit. Change-Id: I78f0768c0dc9e035f3bff633560be936a2a1e487
-rw-r--r--svx/source/form/fmdpage.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 8d87f611b368..bcdd906f83f5 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -22,6 +22,7 @@
#include <svx/fmglob.hxx>
#include <svx/fmdpage.hxx>
#include <svx/unoshape.hxx>
+#include <vcl/svapp.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -92,6 +93,8 @@ css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObje
// XFormsSupplier
css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms()
{
+ SolarMutexGuard g;
+
css::uno::Reference< css::container::XNameContainer > xForms;
FmFormPage *pFmPage = dynamic_cast<FmFormPage*>( GetSdrPage() );
@@ -104,6 +107,8 @@ css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::ge
// XFormsSupplier2
sal_Bool SAL_CALL SvxFmDrawPage::hasForms()
{
+ SolarMutexGuard g;
+
bool bHas = false;
FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage() );
if ( pFormPage )