[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source

[Miklos Vajna (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 03e2d2a906288f520a4b046d5b96dfba759b27b0
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 9 11:32:56 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Aug 23 15:48:29 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.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/72566
    Tested-by: Jenkins
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    (cherry picked from commit b359e4816a9d40beb79f1f87be1c0d12a59555f7)

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b6cd8a3426ef..5ce4ccc84518 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -847,7 +847,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)