canvas/source/opengl/ogl_spritecanvas.hxx | 13 ------------- 1 file changed, 13 deletions(-)
New commits: commit 8840cdc97740253902bf89d84c1f36b4cb7b8413 Author: Thorsten Behrens <t...@documentfoundation.org> Date: Fri Nov 29 18:38:16 2013 +0100 Revert "add dummy oglcanvas::SpriteCanvas::copyRect so this compiles..." With the XCanvas / XBitmapCanvas revert in, this can go, too. This reverts commit f0d93fab3eaad5865feb5895e542e8947c866aef. diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 9e79853..f4bc534 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -88,19 +88,6 @@ namespace oglcanvas virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); - // XBitmapCanvas - virtual void SAL_CALL copyRect( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& /*sourceCanvas*/, - const ::com::sun::star::geometry::RealRectangle2D& /*sourceRect*/, - const ::com::sun::star::rendering::ViewState& /*sourceViewState*/, - const ::com::sun::star::rendering::RenderState& /*sourceRenderState*/, - const ::com::sun::star::geometry::RealRectangle2D& /*destRect*/, - const ::com::sun::star::rendering::ViewState& /*destViewState*/, - const ::com::sun::star::rendering::RenderState& /*destRenderState*/) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) - { assert(false); } - // XSpriteCanvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits