[Libreoffice-commits] core.git: oox/source

[Mike Kaganski (via logerrit)]

 oox/source/drawingml/shape.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b791974837a99ead793b4ead6760b2f4e5237de2
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Aug 6 11:35:49 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Aug 6 14:14:20 2021 +0200

    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 at collabora.com>

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 )
         {