From 67e1040a7093a872195d0099bf15f5d0b3c2e164 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 4 Jan 2013 22:27:22 +0100
Subject: rhbz#890080: crash in SwXTextDocument::getRendererCount

No idea how to reproduce it; pSwView is checked before use except here.
(possibly regression from 2f9f480b22f2fff59d9c48b4b46706c3d5223e66)

Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0
(cherry picked from commit 1c52268a5bc6d79c6ee1344e4e341c7e3820d4e0)
Reviewed-on: https://gerrit.libreoffice.org/1546
Reviewed-by: Ivan Timofeev <timofeev.i.s@gmail.com>
Tested-by: Ivan Timofeev <timofeev.i.s@gmail.com>
---
 sw/source/ui/uno/unotxdoc.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sw/source')

diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 69e524dd93b6..e6d25e366d9f 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2556,7 +2556,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
                 SwViewOption aOpt( *pViewShell->GetViewOptions() );
                 aOpt.setBrowseMode( false );
                 pViewShell->ApplyViewOptions( aOpt );
-                pSwView->RecheckBrowseMode();
+                if (pSwView)
+                {
+                    pSwView->RecheckBrowseMode();
+                }
             }
 
             // reformating the document for printing will show the changes in the view
-- 
cgit