[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/weldeditview.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 94b73fb5e206a8718e5127cf58c826099ae92f5a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 5 20:27:30 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 6 12:01:26 2020 +0200

    let a subclass defer creating its EditView
    
    Change-Id: I0d182db0658ff5e0ab3d7164de000ed76460eef5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104008
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 12c6a94cd740..d29316f9c9a9 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -75,11 +75,14 @@ void WeldEditView::makeEditEngine()
 
 void WeldEditView::Resize()
 {
-    OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
-    Size aOutputSize(rDevice.PixelToLogic(GetOutputSizePixel()));
-    Size aSize(aOutputSize);
-    m_xEditEngine->SetPaperSize(aSize);
-    m_xEditView->SetOutputArea(tools::Rectangle(Point(0, 0), aOutputSize));
+    if (m_xEditView)
+    {
+        OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
+        Size aOutputSize(rDevice.PixelToLogic(GetOutputSizePixel()));
+        Size aSize(aOutputSize);
+        m_xEditEngine->SetPaperSize(aSize);
+        m_xEditView->SetOutputArea(tools::Rectangle(Point(0, 0), aOutputSize));
+    }
     weld::CustomWidgetController::Resize();
 }