coverity#1000605 Dereference after null check

Change-Id: I1b7404e04fd2a6c7100d663054a91da63edd0652

coverity#1000605 Dereference after null check
Change-Id: I1b7404e04fd2a6c7100d663054a91da63edd0652
53d879aa · Caolán McNamara · 1fca856a · 53d879aa
Kaydet (Commit) 53d879aa authored Mar 15, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

viewport.cxx sw/source/core/uibase/uiview/viewport.cxx +7 -2

No files found.
--- a/sw/source/core/uibase/uiview/viewport.cxx
+++ b/sw/source/core/uibase/uiview/viewport.cxx
@@ -62,8 +62,13 @@ static sal_uInt16 nPgNum = 0;

 bool SwView::IsDocumentBorder()
 {
-    return GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ||
-           m_pWrtShell->GetViewOptions()->getBrowseMode() ||
+    if (GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
+        return true;
+
+    if (!m_pWrtShell)
+        return false;
+
+    return m_pWrtShell->GetViewOptions()->getBrowseMode() ||
           SVX_ZOOM_PAGEWIDTH_NOBORDER == (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType();
 }