diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-12-22 11:52:32 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-23 10:58:58 +0100 |
| commit | 169bca576f743950da3467829c892961ad1cc3b6 (patch) | |
| tree | 3a8d4728835951d1d565e02f89ebde5d9058362d /svx | |
| parent | 8155efc399f12bffbbab23a2efc67e172bf08e9c (diff) | |
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 <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit aaff8a5cde6b3df9efdf4cf18157c9318c463e1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127255
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 0cc7cc0019a8..3af57b7da229 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1539,7 +1539,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; @@ -1751,6 +1750,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)) { |