svx/source/svdraw/svdmrkv.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a81b7eba6617d49767815c12347a881ce717207b
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu May 9 11:32:56 2019 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri May 10 18:13:21 2019 +0200
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.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 08afd9d091df..abb25f5ffbe5 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -862,7 +862,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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
