diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-01-31 01:04:10 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-10-07 17:33:45 +0200 |
| commit | 21ec9beae29b19b8ec6f0a16fd0e708e4f210208 (patch) | |
| tree | 84b5d635ba0c39282665dea33f40348a1ca73178 /sd | |
| parent | 3e2dba1accbd018f7dac362a2636bed135f1b5bb (diff) | |
XCanvas does no longer imply XBitmapCanvas
Remove the implication that XCanvas IS-A XBitmapCanvas, i.e. one can
access underlying pixels. That's a preparation for display-list based
canvas implementations, and was a rather silly assumption in the first
place.
Also fixes up all client sites.
Change-Id: I7a3d6f68ef46fe94b23cce7759cc0b8b6ca4dae9
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/presenter/SlideRenderer.cxx | 1 |
4 files changed, 3 insertions, 14 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index f93cade9dec4..415c339026ec 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -790,17 +790,6 @@ sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) -Reference<rendering::XBitmapCanvas> SAL_CALL PresenterCanvas::queryBitmapCanvas (void) - throw (RuntimeException) -{ - ThrowIfDisposed(); - - return this; -} - - - - Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index b2447d1bec62..46d637eabf05 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> +#include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/VolatileContentDestroyedException.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase4.hxx> @@ -373,9 +374,6 @@ public: virtual sal_Bool SAL_CALL hasAlpha (void) throw (css::uno::RuntimeException); - virtual css::uno::Reference<css::rendering::XBitmapCanvas> SAL_CALL queryBitmapCanvas (void) - throw (css::uno::RuntimeException); - virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index f7704986852d..9498212b90a5 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> +#include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/util/Color.hpp> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 6bf192a70baa..9cdfcf8cc19d 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -21,6 +21,7 @@ #include "SlideRenderer.hxx" #include "sdpage.hxx" #include <toolkit/helper/vclunohelper.hxx> +#include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <cppcanvas/vclfactory.hxx> |