commit ea8a74ae6881f5ecacc6743b18c03ce3e759779a
author Kevin Suo <suokunlong@126.com> Thu Nov 10 10:19:08 2022 +0800
committer Caolán McNamara <caolanm@redhat.com> Sat Nov 12 12:04:49 2022 +0100
tree 531f38191c653e172b20b7b21c6fcb54a2880b99
parent d1080d500a6063345e887d9463c57ff0c9d61a78

tdf#151979: fix crash in Text Grid dialog when switching active view

GetActiveView() may return a nullptr when previously we are in Calc
window and then click the controls on the writer dialog.

Change-Id: Ia4dcd58b19c40a3e6cd0a791b7645d5fd2dcb9f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142508
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 9b80b2d6140d1aad240f10755105e49d678b98f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142529
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/misc/pggrid.cxx

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index f849f6d..263009f 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -152,10 +152,13 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)

    // draw ticks of ruler
    SwView * pView = ::GetActiveView();
    if ( m_bHRulerChanged )
        pView->GetHRuler().DrawTicks();
    if ( m_bVRulerChanged )
        pView->GetVRuler().DrawTicks();
    if (pView)
    {
        if ( m_bHRulerChanged )
            pView->GetHRuler().DrawTicks();
        if ( m_bVRulerChanged )
            pView->GetVRuler().DrawTicks();
    }
    return bRet;
}

@@ -247,7 +250,7 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
        rSet.Put(aGridItem);

        SwView * pView = ::GetActiveView();
        if ( aGridItem.GetGridType() != GRID_NONE )
        if (pView && aGridItem.GetGridType() != GRID_NONE)
        {
            if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
            {