[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-5' - svx/source

[Julien Nabet (via logerrit)]

 svx/source/svdraw/svdedtv1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3088fbcdc33195cbf7f46df2ae2696315f579c98
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Dec 22 11:52:32 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Dec 28 18:03:58 2021 +0100

    tdf#146363: fix crash when changing width/height of text box
    
    Regression from e6c7a018a0cfee395ce2886d41c908a2447ef5cc
    tdf#126180: EndTextEdit on all views before delete/cut slide
    
    Just declare and initialize nMarkCount later since calls
    to methods like ResizeMultMarkedObj or RotateMarkedObj may change the result
    
    Change-Id: Ic2a07a6f41b8052dcc3c2736205e1b9c6d538233
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127308
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit aaff8a5cde6b3df9efdf4cf18157c9318c463e1a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127256
    (cherry picked from commit 0dea9b17c6e1207de783ef7fdef8ea67ce4c1516)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127265
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index e5b7ac5d2fc6..694e55d21dc0 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1533,7 +1533,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& 
rAttr, bool addPageMargin
     Degree100 nOldRotateAngle=GetMarkedObjRotate();
     Degree100 nOldShearAngle=GetMarkedObjShear();
     const SdrMarkList& rMarkList=GetMarkedObjectList();
-    const size_t nMarkCount=rMarkList.GetMarkCount();
     SdrObject* pObj=nullptr;
 
     RectPoint eSizePoint=RectPoint::MM;
@@ -1745,6 +1744,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& 
rAttr, bool addPageMargin
         MoveMarkedObj(Size(nPosDX,nPosDY));
     }
 
+    const size_t nMarkCount=rMarkList.GetMarkCount();
     // protect position
     if(SfxItemState::SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, 
true, &pPoolItem))
     {