summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-27 15:17:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-27 15:18:27 +0000
commit5a7ded8d90c725d209969c2aa8b16b8cb109318b (patch)
treeea80a597178d75ce6ccc148623239e7c8fdb4a8c /svx
parentdd7cc8bfe9375ef6e9a3a0bb6e828455443b4f19 (diff)
Resolves: rhbz#1301346 crash with null ObjList
Change-Id: Ia9446b06087907a2d9d1889ba7d4ccd1f78697d9
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedtv2.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 42248be8ecae..2868408eb405 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -484,8 +484,9 @@ void SdrEditView::ImpCheckToTopBtmPossible()
{ // special-casing for single selection
SdrObject* pObj=GetMarkedObjectByIndex(0);
SdrObjList* pOL=pObj->GetObjList();
- size_t nMax=pOL->GetObjCount();
- size_t nMin=0;
+ SAL_WARN_IF(!pOL, "svx", "Object somehow has no ObjList");
+ size_t nMax = pOL ? pOL->GetObjCount() : 0;
+ size_t nMin = 0;
const size_t nObjNum=pObj->GetOrdNum();
SdrObject* pRestrict=GetMaxToTopObj(pObj);
if (pRestrict!=nullptr) {