[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 a6ade09983dd95d6ebbd1ecfda564f645629ce34
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Aug 13 10:57:52 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Aug 13 16:10:51 2021 +0200

    tdf#143852: Revert "Move ActionLockGuard up a bit"
    
    This reverts commit b791974837a99ead793b4ead6760b2f4e5237de2.
    
    Change-Id: I4bb95c915aa27b509ea2a41602ba2198c2f20cea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120370
    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 077fe1f8c939..f4d5a7c576ec 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -993,8 +993,6 @@ 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 );
@@ -1022,6 +1020,8 @@ 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 )
         {