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

[Michael Meeks]

 sd/source/ui/unoidl/unomodel.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1abcf1bcbfa90ee1714b4d37fb38b639dabbcdfe
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 19 09:23:30 2016 +0100

    tdf#99387 - protect LOK document size API from corner-cases.
    
    Change-Id: I5dd1d37ea783a65f0c8f3ad9c3c9cabf72ae036d
    Reviewed-on: https://gerrit.libreoffice.org/24239
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 449b54a..604d076 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2352,7 +2352,13 @@ Size SdXImpressDocument::getDocumentSize()
     if (!pViewSh)
         return Size();
 
-    SdrPageView* pCurPageView = pViewSh->GetView()->GetSdrPageView();
+    SdrView *pSdrView = pViewSh->GetView();
+    if (!pSdrView)
+        return Size();
+
+    SdrPageView* pCurPageView = pSdrView->GetSdrPageView();
+    if (!pCurPageView)
+        return Size();
 
     Size aSize = pCurPageView->GetPageRect().GetSize();
     // Convert the size in 100th mm to TWIP