diff options
| author | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-29 18:25:55 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-29 18:25:55 +0100 |
| commit | 72aa51185fb7b1ff2ad9006f2067a680b70ab66d (patch) | |
| tree | be7e5d40e2ba1d0b2c85f634b69974766c1f94f5 /cppcanvas/source/wrapper | |
| parent | 8539039e0c108da7d0306c37962415ce7e271c84 (diff) | |
Revert "Resolves: fdo#71527 make presenter console not crash/useless"
This reverts commit 639aa8e72639fd01e9004977f1cfaafc13b1e45f.
Change-Id: I0ac1a7ada530791e2d34d2f0802213c869ea48a1
Diffstat (limited to 'cppcanvas/source/wrapper')
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index c6b43a6a9af1..78701786fe15 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -51,8 +51,6 @@ 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() ) { @@ -61,10 +59,8 @@ 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 2e70b9aa42f1..1999c5630ff0 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -29,14 +29,14 @@ #include <cppcanvas/spritecanvas.hxx> -#include <implbitmapcanvas.hxx> +#include <implcanvas.hxx> namespace cppcanvas { namespace internal { - class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas + class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas { public: ImplSpriteCanvas( const ::com::sun::star::uno::Reference< |