summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorThorsten Behrens <thb@documentfoundation.org>2013-11-29 18:26:17 +0100
committerThorsten Behrens <thb@documentfoundation.org>2013-11-29 18:26:17 +0100
commitb807b2d9291a2328a55de55d67c4874803d8b7fd (patch)
tree61600b2c570d397ce003b857b07523099680bbce /sd
parent72aa51185fb7b1ff2ad9006f2067a680b70ab66d (diff)
Revert "Resolves: fdo#71527 don't crash in presenter console"
This reverts commit bae01385c895a100b5371879889e606927cff877. Change-Id: Id149bae0904fd6c2120209d69490d0b257ac3f64
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index 98db0b119a02..9cdfcf8cc19d 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -134,15 +134,9 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
cppcanvas::BitmapCanvasSharedPtr pCanvas (cppcanvas::VCLFactory::getInstance().createCanvas(
Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
if (pCanvas.get() != NULL)
- {
- cppcanvas::BitmapSharedPtr xBitmap(
- cppcanvas::VCLFactory::getInstance().createBitmap(
+ return cppcanvas::VCLFactory::getInstance().createBitmap(
pCanvas,
- CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor)));
- if (xBitmap.get() == NULL)
- return NULL;
- return xBitmap->getUNOBitmap();
- }
+ CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor))->getUNOBitmap();
else
return NULL;
}