diff options
author | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-03 21:20:00 +0100 |
---|---|---|
committer | Thorsten Behrens <thb@documentfoundation.org> | 2014-01-27 00:36:18 +0100 |
commit | 2017bbdf90a22627d5d85b151795df09c5c44d16 (patch) | |
tree | de81368d9841b3b212fab7f6daaff7f34d21dc22 /slideshow/source/engine/slide/userpaintoverlay.cxx | |
parent | 9fa9ea0423d97c39293b1788940bda93dbf99ec9 (diff) |
Wrap up plain XCanvas with view-specific render state.feature/slideshowprimitives
Since XCanvas is stateless, we'd need to convey some state around,
e.g. transformations and clips. Done via struct Canvas, that we pass
on to functions, and sometimes keep as local state for stateful
objects like Views.
WIP for now.
Change-Id: I96ce2f4f1ab97c139e09938555d53f4f1edd2c02
Diffstat (limited to 'slideshow/source/engine/slide/userpaintoverlay.cxx')
-rw-r--r-- | slideshow/source/engine/slide/userpaintoverlay.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 788a9bd28cf4..d19bd7a3056e 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -145,7 +145,7 @@ namespace slideshow //get via SlideImpl instance the bitmap of the slide unmodified to redraw it SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); - css::uno::Reference< css::rendering::XCanvas > pCanvas( (*aIter)->getCanvas() ); + css::uno::Reference< css::rendering::XCanvas > pCanvas( (*aIter)->getCanvas().mxCanvas ); const ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); @@ -374,7 +374,7 @@ namespace slideshow //get via SlideImpl instance the bitmap of the slide unmodified to redraw it SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); - css::uno::Reference< css::rendering::XCanvas > pCanvas( (*aIter)->getCanvas() ); + css::uno::Reference< css::rendering::XCanvas > pCanvas( (*aIter)->getCanvas().mxCanvas ); ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); @@ -425,7 +425,7 @@ namespace slideshow { uno::Reference< rendering::XPolyPolygon2D > pPolyPoly( basegfx::unotools::xPolyPolygonFromB2DPolygon( - (*aIter)->getCanvas()->getDevice(), + (*aIter)->getCanvas().mxCanvas->getDevice(), aPoly ) ); if( pPolyPoly.is() ) |