diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-09 11:32:56 +0200 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2019-05-20 10:36:30 +0200 |
| commit | b359e4816a9d40beb79f1f87be1c0d12a59555f7 (patch) | |
| tree | c2bcf4dab3c71d21e4c31f6114a269a255430721 /svx | |
| parent | 516c3385dece94247ebf3f3e50e6ca7ff1a82b08 (diff) | |
svx lok: fix crash on select all when there is no mpMarkedObj yet
Fixes the online.git HTTPWSTest::testRenderShapeSelectionImpress()
testcase by reverting one hunk of commit
3fb298f673db169a38c1258d66ec24821386eb40 (lok: writer: svg export
transformed images, 2019-03-26).
This was probably meant to be a cleanup, but getting the sdr mark,
followed by getting the sdr object of the mark always gives us a shape,
while directly accessing mpMarkedObj does not.
Change-Id: Id733ba5c6fdf6fc86a3e9f7de62b4bdcbf9b06db
Reviewed-on: https://gerrit.libreoffice.org/72039
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72566
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index e95195cbd6ea..8cf33dbb628f 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -841,7 +841,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) { if (GetMarkedObjectCount()) { - SdrObject* pO = mpMarkedObj; + SdrMark* pM = GetSdrMarkByIndex(0); + SdrObject* pO = pM->GetMarkedSdrObj(); long nRotAngle = pO->GetRotateAngle(); // true if we are delaing with a RotGrfFlyFrame // (SwVirtFlyDrawObj with a SwGrfNode) |