Resolves: fdo#71527 make presenter console not crash/useless

Basically reverts the pieces of
21ec9beae2 to make XSpriteCanvas a
XBitmapCanvas again

Otherwise PresenterHelper::loadBitmap is not an XBitmapCanvas
and so VclFactory::createBitmap cannot succeed

Change-Id: I197adf98e915102f383ee050a8ea16d1e41cecf2
This commit is contained in:
Caolán McNamara
2013-11-28 15:27:30 +00:00
parent 3c10c9ec66
commit 639aa8e726
4 changed files with 14 additions and 9 deletions

View File

@@ -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() )
{