[PATCH] Change in core[libreoffice-3-6]: rhbz#890080: crash in SwXTextDocument::getRendererCount

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1546

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1546/1

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)
---
M sw/source/ui/uno/unotxdoc.cxx
1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 69e524d..e6d25e3 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2556,7 +2556,10 @@
                 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

-- 
To view, visit https://gerrit.libreoffice.org/1546
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>