Kaydet (Commit) 0beb64bf authored tarafından Noel Grandin's avatar Noel Grandin

cid#736789 dereference before null check

Change-Id: I657880e7ed37f9933efcfc110daae8b4c4791497
üst 4d15e903
...@@ -1171,8 +1171,6 @@ SdrPage* ScShapeChildren::GetDrawPage() const ...@@ -1171,8 +1171,6 @@ SdrPage* ScShapeChildren::GetDrawPage() const
{ {
SCTAB nTab( mpViewShell->GetLocationData().GetPrintTab() ); SCTAB nTab( mpViewShell->GetLocationData().GetPrintTab() );
SdrPage* pDrawPage = NULL; SdrPage* pDrawPage = NULL;
if (mpViewShell)
{
ScDocument* pDoc = mpViewShell->GetDocument(); ScDocument* pDoc = mpViewShell->GetDocument();
if (pDoc && pDoc->GetDrawLayer()) if (pDoc && pDoc->GetDrawLayer())
{ {
...@@ -1180,7 +1178,6 @@ SdrPage* ScShapeChildren::GetDrawPage() const ...@@ -1180,7 +1178,6 @@ SdrPage* ScShapeChildren::GetDrawPage() const
if (pDrawLayer->HasObjects() && (pDrawLayer->GetPageCount() > nTab)) if (pDrawLayer->HasObjects() && (pDrawLayer->GetPageCount() > nTab))
pDrawPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(static_cast<sal_Int16>(nTab))); pDrawPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(static_cast<sal_Int16>(nTab)));
} }
}
return pDrawPage; return pDrawPage;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment