diff options
| -rw-r--r-- | sd/source/ui/presenter/SlideRenderer.cxx | 10 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterPaneContainer.cxx | 3 |
2 files changed, 3 insertions, 10 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; } diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index c8de7bfbdab3..105c1240f760 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -192,8 +192,7 @@ PresenterPaneContainer::SharedPaneDescriptor { pDescriptor->mxView = rxView; pDescriptor->mpViewBackground = rpViewBackground; - if (pDescriptor->mxPane.is()) - pDescriptor->mxPane->SetBackground(rpViewBackground); + pDescriptor->mxPane->SetBackground(rpViewBackground); try { if ( ! pDescriptor->maViewInitialization.empty()) |