summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-08-06 11:35:49 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2021-08-06 14:14:20 +0200
commitb791974837a99ead793b4ead6760b2f4e5237de2 (patch)
treec479e0fb9cbb0a23da57505e1e399eb90cc3d446 /oox
parent6c487d2d7e8aa5cdef55cbd7bc78058184671d82 (diff)
Move ActionLockGuard up a bit
Change-Id: Iaa1f3a5e2b9ad0605c53efa6a17d467159597927 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119991 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b0e2ddef30e7..64878fc772f4 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -978,6 +978,8 @@ Reference< XShape > const & Shape::createAndInsert(
Reference< XPropertySet > xSet( mxShape, UNO_QUERY );
if (xSet.is())
{
+ ActionLockGuard const alg(mxShape);
+
if( !msName.isEmpty() )
{
Reference< container::XNamed > xNamed( mxShape, UNO_QUERY );
@@ -1005,8 +1007,6 @@ Reference< XShape > const & Shape::createAndInsert(
xSet->setPropertyValue("SizeProtect", Any(true));
}
- ActionLockGuard const alg(mxShape);
-
// sj: removing default text of placeholder objects such as SlideNumberShape or HeaderShape
if ( bClearText )
{