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

[Jan-Marek Glogowski]

 sw/source/uibase/uno/unotxdoc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1296f9dc9e502abd8422dfeee1ac7747a82aee17
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Sat Jan 30 00:28:26 2016 +0100

    tdf#89708 Fix crash on printing from print preview
    
    Prevents crash when previewing merged documents with page ranges
    from a view shell without a SwWrtShell, as the print preview.
    
    Change-Id: Ifa5f3de4c006da3ea8f61a56ab499843432f3203

diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 2ebaf0e..972edd9 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -204,7 +204,7 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
     }
 
     // If blanks are skipped, account for them in initial page range value
-    if (!rPrintData.IsPrintEmptyPages())
+    if (pSh && !rPrintData.IsPrintEmptyPages())
     {
         sal_uInt16 nMax = nCurrentPage;
         SwPageFrame *pPage = dynamic_cast<SwPageFrame*>(pSh->GetLayout()->Lower());