core.git: svx/source

[Noel Grandin (via logerrit)]

 svx/source/sdr/properties/textproperties.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ac41bc3c908c815cf9725b6316d0537d43401ddb
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Jul 27 12:51:47 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 29 10:25:17 2024 +0200

    tdf#161846 remove one layout operations (ii)
    
    of the 6 we perform per caption object
    
    Change-Id: Ib062a7cc0b4691ec0badb759893b737f6f2c4a86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171171
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/sdr/properties/textproperties.cxx 
b/svx/source/sdr/properties/textproperties.cxx
index 38aa230832ab..c1e7a2f6e0c6 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -354,10 +354,8 @@ namespace sdr::properties
                 }
             }
 
-            if(rObj.IsTextFrame())
-            {
+            if(rObj.IsTextFrame() && 
!rObj.getSdrModelFromSdrObject().isLocked())
                 rObj.NbcAdjustTextFrameWidthAndHeight();
-            }
         }
 
         void TextProperties::ForceDefaultAttributes()