diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 15:27:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 17:02:53 +0000 |
| commit | 639aa8e72639fd01e9004977f1cfaafc13b1e45f (patch) | |
| tree | 0c823511176bc3913ef04cb4edb1fe0cb0270c12 /cppcanvas | |
| parent | 3c10c9ec665a218ff331994ea3fa35cf2f4cd60e (diff) | |
Resolves: fdo#71527 make presenter console not crash/useless
Basically reverts the pieces of
21ec9beae29b19b8ec6f0a16fd0e708e4f210208 to make XSpriteCanvas a
XBitmapCanvas again
Otherwise PresenterHelper::loadBitmap is not an XBitmapCanvas
and so VclFactory::createBitmap cannot succeed
Change-Id: I197adf98e915102f383ee050a8ea16d1e41cecf2
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index 78701786fe15..c6b43a6a9af1 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -51,6 +51,8 @@ namespace cppcanvas ImplSpriteCanvas::ImplSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : ImplCanvas( uno::Reference< rendering::XCanvas >(rCanvas, uno::UNO_QUERY) ), + ImplBitmapCanvas( uno::Reference< rendering::XBitmapCanvas >(rCanvas, + uno::UNO_QUERY) ), mxSpriteCanvas( rCanvas ), mpTransformArbiter( new TransformationArbiter() ) { @@ -59,8 +61,10 @@ namespace cppcanvas ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) : Canvas(), + BitmapCanvas(), SpriteCanvas(), ImplCanvas( rOrig ), + ImplBitmapCanvas( rOrig ), mxSpriteCanvas( rOrig.getUNOSpriteCanvas() ), mpTransformArbiter( new TransformationArbiter() ) { diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 1999c5630ff0..2e70b9aa42f1 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -29,14 +29,14 @@ #include <cppcanvas/spritecanvas.hxx> -#include <implcanvas.hxx> +#include <implbitmapcanvas.hxx> namespace cppcanvas { namespace internal { - class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas + class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas { public: ImplSpriteCanvas( const ::com::sun::star::uno::Reference< |