Kaydet (Commit) f86c07af authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1326381 Dereference null return value

Change-Id: I86f5fee9bd77b741536816b6b4d1b6b520acba9e
üst c4e1857d
...@@ -285,9 +285,12 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener ...@@ -285,9 +285,12 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
} }
for (int i = 0; i < m_aButtons.length; i++) for (int i = 0; i < m_aButtons.length; i++)
{ {
Object[] oResources = renderer.getImageUrls(getObjectFor(i)); Object oObj = getObjectFor(i);
if (oResources != null) if (oObj == null)
{ continue;
Object[] oResources = renderer.getImageUrls(oObj);
if (oResources == null)
continue;
if (oResources.length == 1) if (oResources.length == 1)
{ {
Helper.setUnoPropertyValue(m_aButtons[i].getModel(), PropertyNames.PROPERTY_IMAGEURL, oResources[0]); Helper.setUnoPropertyValue(m_aButtons[i].getModel(), PropertyNames.PROPERTY_IMAGEURL, oResources[0]);
...@@ -304,7 +307,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener ...@@ -304,7 +307,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener
} }
} }
} }
}
private void refreshCounterText() private void refreshCounterText()
{ {
......
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