summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index d1180ccfe8bc..eb5b18520a75 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -454,11 +454,15 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
cppcanvas::VCLFactory::getInstance().createCanvas(
Reference<css::rendering::XBitmapCanvas>(rxCanvas,UNO_QUERY)));
- if (pCanvas.get()!=NULL)
+ if (pCanvas.get() != NULL)
{
BitmapEx aBitmapEx = SdResId(nid);
- return cppcanvas::VCLFactory::getInstance().createBitmap(
- pCanvas, aBitmapEx)->getUNOBitmap();
+ cppcanvas::BitmapSharedPtr xBitmap(
+ cppcanvas::VCLFactory::getInstance().createBitmap(pCanvas,
+ aBitmapEx));
+ if (xBitmap.get() == NULL)
+ return NULL;
+ return xBitmap->getUNOBitmap();
}
return NULL;