From 05d2994c136650deca2d80fedf6b14d10109986e Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <thb@documentfoundation.org>
Date: Fri, 29 Nov 2013 18:26:48 +0100
Subject: Further XCanvas != XBitmapCanvas cleanup.

It seems I missed a few places in
21ec9beae29b19b8ec6f0a16fd0e708e4f210208, getting that straight
now hopefully.

Change-Id: I34fc8df2d1ee65bef0639b3de9487ff311bed89a
---
 sd/source/ui/presenter/PresenterHelper.cxx       | 2 +-
 sd/source/ui/presenter/PresenterPreviewCache.cxx | 6 ++----
 sd/source/ui/presenter/PresenterTextView.cxx     | 2 +-
 sd/source/ui/presenter/SlideRenderer.cxx         | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'sd/source/ui/presenter')

diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index eb5b18520a75..52cce1468653 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -452,7 +452,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
 
     const cppcanvas::CanvasSharedPtr pCanvas (
         cppcanvas::VCLFactory::getInstance().createCanvas(
-            Reference<css::rendering::XBitmapCanvas>(rxCanvas,UNO_QUERY)));
+            Reference<css::rendering::XCanvas>(rxCanvas,UNO_QUERY)));
 
     if (pCanvas.get() != NULL)
     {
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 48101513c30e..162ca5539a38 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -25,7 +25,6 @@
 #include "sdpage.hxx"
 #include <cppcanvas/vclfactory.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -189,9 +188,8 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview (
     ThrowIfDisposed();
     OSL_ASSERT(mpCacheContext.get()!=NULL);
 
-    cppcanvas::BitmapCanvasSharedPtr pCanvas (
-        cppcanvas::VCLFactory::getInstance().createCanvas(
-            Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
+    cppcanvas::CanvasSharedPtr pCanvas (
+        cppcanvas::VCLFactory::getInstance().createCanvas(rxCanvas));
 
     const SdrPage* pPage = mpCacheContext->GetPage(nSlideIndex);
     if (pPage == NULL)
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 9498212b90a5..c26d5aab2de9 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -167,7 +167,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
     {
         try
         {
-            Reference<rendering::XBitmapCanvas> xCanvas (rArguments[0], UNO_QUERY_THROW);
+            Reference<rendering::XCanvas> xCanvas (rArguments[0], UNO_QUERY_THROW);
             if (xCanvas.is())
             {
                 mpImplementation->SetCanvas(
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index 9cdfcf8cc19d..bb3e3f528c63 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -131,8 +131,8 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
 
-    cppcanvas::BitmapCanvasSharedPtr pCanvas (cppcanvas::VCLFactory::getInstance().createCanvas(
-        Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
+    cppcanvas::CanvasSharedPtr pCanvas (
+        cppcanvas::VCLFactory::getInstance().createCanvas(rxCanvas));
     if (pCanvas.get() != NULL)
         return cppcanvas::VCLFactory::getInstance().createBitmap(
             pCanvas,
-- 
cgit