diff options
Diffstat (limited to 'canvas/inc/canvas/base')
| -rw-r--r-- | canvas/inc/canvas/base/basemutexhelper.hxx | 4 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/bitmapcanvasbase.hxx | 52 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx | 24 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/cachedprimitivebase.hxx | 28 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/canvasbase.hxx | 180 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/canvascustomspritebase.hxx | 46 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/canvascustomspritehelper.hxx | 66 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/doublebitmapbase.hxx | 38 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/floatbitmapbase.hxx | 46 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/graphicdevicebase.hxx | 80 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/integerbitmapbase.hxx | 32 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/sprite.hxx | 10 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/spritecanvasbase.hxx | 58 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/spritesurface.hxx | 20 |
14 files changed, 342 insertions, 342 deletions
diff --git a/canvas/inc/canvas/base/basemutexhelper.hxx b/canvas/inc/canvas/base/basemutexhelper.hxx index c1c7eed8455e..d53cd927aae2 100644 --- a/canvas/inc/canvas/base/basemutexhelper.hxx +++ b/canvas/inc/canvas/base/basemutexhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ namespace canvas } protected: - mutable ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; }; } diff --git a/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/canvas/inc/canvas/base/bitmapcanvasbase.hxx index 2761b5b09f3a..234de95b62bd 100644 --- a/canvas/inc/canvas/base/bitmapcanvasbase.hxx +++ b/canvas/inc/canvas/base/bitmapcanvasbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,42 +67,42 @@ namespace canvas @see CanvasBase for further contractual requirements towards the CanvasHelper type, and some examples. */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase : public CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // 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, + 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) { - tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, - destRect, destViewState, destRenderState, + tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, + destRect, destViewState, destRenderState, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - + BaseType::mbSurfaceDirty = true; BaseType::maCanvasHelper.modifying(); - BaseType::maCanvasHelper.copyRect( this, - sourceCanvas, - sourceRect, - sourceViewState, - sourceRenderState, - destRect, - destViewState, + BaseType::maCanvasHelper.copyRect( this, + sourceCanvas, + sourceRect, + sourceViewState, + sourceRenderState, + destRect, + destViewState, destRenderState ); } @@ -111,7 +111,7 @@ namespace canvas { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - return BaseType::maCanvasHelper.getSize(); + return BaseType::maCanvasHelper.getSize(); } virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) @@ -121,8 +121,8 @@ namespace canvas return BaseType::maCanvasHelper.hasAlpha(); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, + sal_Bool beFast ) throw (::com::sun::star::uno::RuntimeException) { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx index 9e31473ba589..daaf985967fd 100644 --- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx +++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace canvas { /** Helper template base class for XGraphicDevice implementations on windows. - + Use this base class if your target device is a window. Additionally to GraphicDeviceBase, this template provides an implementation of the awt::XWindowListener @@ -79,14 +79,14 @@ namespace canvas derives from multiple UNO interface (were each provides its own version of XInterface, making the conversion ambiguous) */ - template< class Base, - class DeviceHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class BufferedGraphicDeviceBase : + template< class Base, + class DeviceHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class BufferedGraphicDeviceBase : public GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase > { public: - typedef GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase > BaseType; + typedef GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase > BaseType; typedef BufferedGraphicDeviceBase OurType; typedef Mutex MutexType; @@ -109,7 +109,7 @@ namespace canvas } // XBufferController - virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { tools::verifyRange( nBuffers, (sal_Int32)1 ); @@ -152,7 +152,7 @@ namespace canvas is called, with rBounds the window bound rect relative to the frame window. */ - void setWindow( const ::com::sun::star::uno::Reference< + void setWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& rWindow ) { if( mxWindow.is() ) @@ -163,7 +163,7 @@ namespace canvas if( mxWindow.is() ) { mbIsVisible = mxWindow->isVisible(); - mbIsTopLevel = + mbIsTopLevel = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >( mxWindow, ::com::sun::star::uno::UNO_QUERY ).is(); @@ -177,7 +177,7 @@ namespace canvas { return mxWindow; } - + ::com::sun::star::uno::Any getXWindow() const { return ::com::sun::star::uno::makeAny(mxWindow); @@ -201,7 +201,7 @@ namespace canvas } ::com::sun::star::awt::Rectangle transformBounds( const ::com::sun::star::awt::Rectangle& rBounds ) - { + { // notifySizeUpdate's bounds are relative to the toplevel // window if( !mbIsTopLevel ) diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx index 3d7a22cb4940..e9ef09dff3f2 100644 --- a/canvas/inc/canvas/base/cachedprimitivebase.hxx +++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,17 +61,17 @@ namespace canvas @param rTarget The target canvas the repaint should happen on. - @param bFailForChangedViewTransform + @param bFailForChangedViewTransform When true, derived classes will never receive doRedraw() calls with dissimilar view transformations and bSameViewTransform set to false. This is useful for cached objects where re-transforming the generated output is not desirable, e.g. for hinted font output. */ - CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState& rUsedViewState, - const ::com::sun::star::uno::Reference< + CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState& rUsedViewState, + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& rTarget, - bool bFailForChangedViewTransform ); + bool bFailForChangedViewTransform ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -108,15 +108,15 @@ namespace canvas @param bSameViewTransform When true, rNewState and rOldState have the same transformation. */ - virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState& rNewState, - const ::com::sun::star::rendering::ViewState& rOldState, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas >& rTargetCanvas, - bool bSameViewTransform ) = 0; - - ::com::sun::star::rendering::ViewState maUsedViewState; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxTarget; - const bool mbFailForChangedViewTransform; + virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState& rNewState, + const ::com::sun::star::rendering::ViewState& rOldState, + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCanvas >& rTargetCanvas, + bool bSameViewTransform ) = 0; + + ::com::sun::star::rendering::ViewState maUsedViewState; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxTarget; + const bool mbFailForChangedViewTransform; }; } diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/canvas/inc/canvas/base/canvasbase.hxx index 204355da93c3..5af2201ab2b3 100644 --- a/canvas/inc/canvas/base/canvasbase.hxx +++ b/canvas/inc/canvas/base/canvasbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,17 +100,17 @@ namespace canvas derives from multiple UNO interface (were each provides its own version of XInterface, making the conversion ambiguous) */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasBase : public Base { public: - typedef Base BaseType; - typedef CanvasHelper HelperType; - typedef Mutex MutexType; - typedef UnambiguousBase UnambiguousBaseType; + typedef Base BaseType; + typedef CanvasHelper HelperType; + typedef Mutex MutexType; + typedef UnambiguousBase UnambiguousBaseType; /** Create CanvasBase */ @@ -144,12 +144,12 @@ namespace canvas maCanvasHelper.clear(); } - virtual void SAL_CALL drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aPoint, viewState, renderState, + tools::verifyArgs(aPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -161,13 +161,13 @@ namespace canvas maCanvasHelper.drawPoint( this, aPoint, viewState, renderState ); } - virtual void SAL_CALL drawLine( const ::com::sun::star::geometry::RealPoint2D& aStartPoint, - const ::com::sun::star::geometry::RealPoint2D& aEndPoint, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL drawLine( const ::com::sun::star::geometry::RealPoint2D& aStartPoint, + const ::com::sun::star::geometry::RealPoint2D& aEndPoint, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, + tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -179,13 +179,13 @@ namespace canvas maCanvasHelper.drawLine( this, aStartPoint, aEndPoint, viewState, renderState ); } - virtual void SAL_CALL drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment, - const ::com::sun::star::geometry::RealPoint2D& aEndPoint, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment, + const ::com::sun::star::geometry::RealPoint2D& aEndPoint, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, + tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -199,11 +199,11 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL drawPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, + tools::verifyArgs(xPolyPolygon, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -216,13 +216,13 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - strokePolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, + strokePolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, + tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -235,14 +235,14 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - strokeTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, + strokeTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, + const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, + tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -255,15 +255,15 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - strokeTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping, - const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, + strokeTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, + const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping, + const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, + tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -276,13 +276,13 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL - queryStrokeShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, + queryStrokeShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, + tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -296,11 +296,11 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL fillPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, + tools::verifyArgs(xPolyPolygon, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -314,12 +314,12 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL fillTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures ) throw (::com::sun::star::lang::IllegalArgumentException, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, + tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -332,13 +332,13 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - fillTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + fillTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, + const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, + tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -352,15 +352,15 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL - createFont( const ::com::sun::star::rendering::FontRequest& fontRequest, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, - const ::com::sun::star::geometry::Matrix2D& fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException, + createFont( const ::com::sun::star::rendering::FontRequest& fontRequest, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, + const ::com::sun::star::geometry::Matrix2D& fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(fontRequest, + tools::verifyArgs(fontRequest, // dummy, to keep argPos in sync - fontRequest, - fontMatrix, + fontRequest, + fontMatrix, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -371,11 +371,11 @@ namespace canvas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > SAL_CALL - queryAvailableFonts( const ::com::sun::star::rendering::FontInfo& aFilter, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException, + queryAvailableFonts( const ::com::sun::star::rendering::FontInfo& aFilter, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aFilter, + tools::verifyArgs(aFilter, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -386,17 +386,17 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - drawText( const ::com::sun::star::rendering::StringContext& text, - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - sal_Int8 textDirection ) throw (::com::sun::star::lang::IllegalArgumentException, + drawText( const ::com::sun::star::rendering::StringContext& text, + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + sal_Int8 textDirection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xFont, viewState, renderState, + tools::verifyArgs(xFont, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); - tools::verifyRange( textDirection, + tools::verifyRange( textDirection, ::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, ::com::sun::star::rendering::TextDirection::STRONG_RIGHT_TO_LEFT ); @@ -411,10 +411,10 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL drawTextLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout >& layoutetText, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(layoutetText, viewState, renderState, + tools::verifyArgs(layoutetText, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -429,10 +429,10 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xBitmap, viewState, renderState, + tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -445,11 +445,11 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xBitmap, viewState, renderState, + tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -472,8 +472,8 @@ namespace canvas protected: ~CanvasBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves. - HelperType maCanvasHelper; - mutable bool mbSurfaceDirty; + HelperType maCanvasHelper; + mutable bool mbSurfaceDirty; private: CanvasBase( const CanvasBase& ); diff --git a/canvas/inc/canvas/base/canvascustomspritebase.hxx b/canvas/inc/canvas/base/canvascustomspritebase.hxx index ec4477ab9cc9..4d00e7b7a206 100644 --- a/canvas/inc/canvas/base/canvascustomspritebase.hxx +++ b/canvas/inc/canvas/base/canvascustomspritebase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,16 +79,16 @@ namespace canvas @see CanvasCustomSpriteHelper for further contractual requirements towards the SpriteHelper type, and some examples. */ - template< class Base, - class SpriteHelper, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasCustomSpriteBase : + template< class Base, + class SpriteHelper, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasCustomSpriteBase : public IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; - typedef SpriteHelper SpriteHelperType; + typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef SpriteHelper SpriteHelperType; CanvasCustomSpriteBase() : maSpriteHelper() @@ -124,16 +124,16 @@ namespace canvas return BaseType::clear(); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL - drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL + drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(xBitmap, viewState, renderState, + tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); - + typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.checkDrawBitmap( this, xBitmap, viewState, renderState ); @@ -152,22 +152,22 @@ namespace canvas // functionality provided at the baseclass. // XSprite - virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { tools::verifyRange( alpha, 0.0, 1.0 ); - + typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.setAlpha( this, alpha ); } - virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aNewPos, viewState, renderState, + tools::verifyArgs(aNewPos, viewState, renderState, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); @@ -176,10 +176,10 @@ namespace canvas maSpriteHelper.move( this, aNewPos, viewState, renderState ); } - virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(aTransformation, + tools::verifyArgs(aTransformation, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); @@ -219,7 +219,7 @@ namespace canvas } // XCustomSprite - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL getContentCanvas() throw (::com::sun::star::uno::RuntimeException) { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx index 222be8503ac6..e37e77c5ec61 100644 --- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx +++ b/canvas/inc/canvas/base/canvascustomspritehelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ namespace canvas @param rOwningSpriteCanvas The XSpriteCanvas this sprite is displayed on */ - void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, - const SpriteSurface::Reference& rOwningSpriteCanvas ); + void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, + const SpriteSurface::Reference& rOwningSpriteCanvas ); /** Object is being disposed, release all internal references @@ -75,24 +75,24 @@ namespace canvas void clearingContent( const Sprite::Reference& rSprite ); /// need to call this method for XCanvas::drawBitmap(), for opacity tracking - void checkDrawBitmap( const Sprite::Reference& rSprite, - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + void checkDrawBitmap( const Sprite::Reference& rSprite, + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); // XSprite void setAlpha( const Sprite::Reference& rSprite, - double alpha ); - void move( const Sprite::Reference& rSprite, - const ::com::sun::star::geometry::RealPoint2D& aNewPos, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); - void transform( const Sprite::Reference& rSprite, - const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ); - void clip( const Sprite::Reference& rSprite, - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ); - void setPriority( const Sprite::Reference& rSprite, - double nPriority ); + double alpha ); + void move( const Sprite::Reference& rSprite, + const ::com::sun::star::geometry::RealPoint2D& aNewPos, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); + void transform( const Sprite::Reference& rSprite, + const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ); + void clip( const Sprite::Reference& rSprite, + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ); + void setPriority( const Sprite::Reference& rSprite, + double nPriority ); void show( const Sprite::Reference& rSprite ); void hide( const Sprite::Reference& rSprite ); @@ -105,7 +105,7 @@ namespace canvas // redraw must be implemented by derived - non sensible default implementation // void redraw( const Sprite::Reference& rSprite, - // const ::basegfx::B2DPoint& rPos ) const; + // const ::basegfx::B2DPoint& rPos ) const; // Helper methods for derived classes @@ -147,7 +147,7 @@ namespace canvas double getAlpha() const { return mfAlpha; } /// Retrieve current clip - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; } const ::basegfx::B2DHomMatrix& getTransformation() const { return maTransform; } @@ -212,7 +212,7 @@ namespace canvas @derive Needs to be provided by backend-specific code */ - virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( + virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const = 0; /** Update clip information from current state @@ -231,7 +231,7 @@ namespace canvas // -------------------------------------------------------------------- /// Owning sprite canvas - SpriteSurface::Reference mpSpriteCanvas; + SpriteSurface::Reference mpSpriteCanvas; /** Currently active clip area. @@ -239,20 +239,20 @@ namespace canvas clip shows the full sprite content, or contains a rectangular subarea of the sprite, outside of which the sprite content is fully clipped. - + @see mbIsCurrClipRectangle */ - ::basegfx::B2DRange maCurrClipBounds; + ::basegfx::B2DRange maCurrClipBounds; // sprite state - ::basegfx::B2DPoint maPosition; - ::basegfx::B2DVector maSize; - ::basegfx::B2DHomMatrix maTransform; - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly; + ::basegfx::B2DPoint maPosition; + ::basegfx::B2DVector maSize; + ::basegfx::B2DHomMatrix maTransform; + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly; double mfPriority; - double mfAlpha; - bool mbActive; // true, if not hidden + double mfAlpha; + bool mbActive; // true, if not hidden /** If true, denotes that the current sprite clip is a true rectangle, i.e. maCurrClipBounds <em>exactly</em> @@ -260,7 +260,7 @@ namespace canvas @see maCurrClipBounds */ - bool mbIsCurrClipRectangle; + bool mbIsCurrClipRectangle; /** Redraw speedup. @@ -269,7 +269,7 @@ namespace canvas neither have to take alpha into account, nor prepare any background for the sprite area. */ - mutable bool mbIsContentFullyOpaque; + mutable bool mbIsContentFullyOpaque; /// True, iff mfAlpha has changed mutable bool mbAlphaDirty; diff --git a/canvas/inc/canvas/base/doublebitmapbase.hxx b/canvas/inc/canvas/base/doublebitmapbase.hxx index 7059a6e63623..912ef2c193b4 100644 --- a/canvas/inc/canvas/base/doublebitmapbase.hxx +++ b/canvas/inc/canvas/base/doublebitmapbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,19 +68,19 @@ namespace canvas @see CanvasBase for further contractual requirements towards the CanvasHelper type, and some examples. */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class DoubleBitmapBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class DoubleBitmapBase : public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // XIeeeDoubleBitmap - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::rendering::VolatileContentDestroyedException, + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { verifyInput(rect, this); @@ -92,9 +92,9 @@ namespace canvas rect ); } - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< double >& data, - const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< double >& data, + const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { @@ -109,10 +109,10 @@ namespace canvas BaseType::maCanvasHelper.setData( data, bitmapLayout, rect ); } - virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< double >& color, - const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IndexOutOfBoundsException, + virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< double >& color, + const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { verifyInput(bitmapLayout, pos, this); @@ -126,9 +126,9 @@ namespace canvas BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos ); } - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::rendering::VolatileContentDestroyedException, + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { verifyInput(pos, this); diff --git a/canvas/inc/canvas/base/floatbitmapbase.hxx b/canvas/inc/canvas/base/floatbitmapbase.hxx index cafcdf5dc8b6..b566697f87a3 100644 --- a/canvas/inc/canvas/base/floatbitmapbase.hxx +++ b/canvas/inc/canvas/base/floatbitmapbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,22 +68,22 @@ namespace canvas @see CanvasBase for further contractual requirements towards the CanvasHelper type, and some examples. */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class FloatBitmapBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class FloatBitmapBase : public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // XIeeeFloatBitmap - virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::rendering::VolatileContentDestroyedException, + virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getData( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { - verifyInput(rect, + verifyInput(rect, static_cast< typename BaseType::UnambiguousBaseType* >(this)); verifyIndexRange(rect, getSize() ); @@ -93,13 +93,13 @@ namespace canvas rect ); } - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< float >& data, - const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< float >& data, + const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - verifyInput(bitmapLayout, rect, + verifyInput(bitmapLayout, rect, static_cast< typename BaseType::UnambiguousBaseType* >(this)); verifyIndexRange(rect, getSize() ); @@ -111,13 +111,13 @@ namespace canvas BaseType::maCanvasHelper.setData( data, bitmapLayout, rect ); } - virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< float >& color, - const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IndexOutOfBoundsException, + virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< float >& color, + const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - verifyInput(bitmapLayout, pos, + verifyInput(bitmapLayout, pos, static_cast< typename BaseType::UnambiguousBaseType* >(this)); verifyIndexRange(pos, getSize() ); @@ -129,12 +129,12 @@ namespace canvas BaseType::maCanvasHelper.setPixel( color, bitmapLayout, pos ); } - virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::rendering::VolatileContentDestroyedException, + virtual ::com::sun::star::uno::Sequence< float > SAL_CALL getPixel( ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { - verifyInput(pos, + verifyInput(pos, static_cast< typename BaseType::UnambiguousBaseType* >(this)); verifyIndexRange(pos, getSize() ); diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx index 62424e4cdabd..54c8fcde0665 100644 --- a/canvas/inc/canvas/base/graphicdevicebase.hxx +++ b/canvas/inc/canvas/base/graphicdevicebase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace canvas { /** Helper template base class for XGraphicDevice implementations. - + This base class provides partial implementations of the XGraphicDevice-related interface, such as XColorSpace. @@ -106,17 +106,17 @@ namespace canvas derives from multiple UNO interface (were each provides its own version of XInterface, making the conversion ambiguous) */ - template< class Base, + template< class Base, class DeviceHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class GraphicDeviceBase : + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class GraphicDeviceBase : public Base { public: - typedef Base BaseType; - typedef DeviceHelper DeviceHelperType; - typedef Mutex MutexType; - typedef UnambiguousBase UnambiguousBaseType; + typedef Base BaseType; + typedef DeviceHelper DeviceHelperType; + typedef Mutex MutexType; + typedef UnambiguousBase UnambiguousBaseType; typedef GraphicDeviceBase ThisType; typedef ::rtl::Reference< GraphicDeviceBase > Reference; @@ -133,15 +133,15 @@ namespace canvas ("DeviceHandle", boost::bind(&DeviceHelper::getDeviceHandle, boost::ref(maDeviceHelper))) - ("SurfaceHandle", + ("SurfaceHandle", boost::bind(&DeviceHelper::getSurfaceHandle, boost::ref(maDeviceHelper))) - ("DumpScreenContent", + ("DumpScreenContent", boost::bind(&ThisType::getDumpScreenContent, this), boost::bind(&ThisType::setDumpScreenContent, this, - _1))); + _1))); } #if defined __SUNPRO_CC @@ -198,10 +198,10 @@ namespace canvas return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyBitmapSize(size, + tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -210,10 +210,10 @@ namespace canvas return maDeviceHelper.createCompatibleBitmap( this, size ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyBitmapSize(size, + tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -222,10 +222,10 @@ namespace canvas return maDeviceHelper.createVolatileBitmap( this, size ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyBitmapSize(size, + tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -234,10 +234,10 @@ namespace canvas return maDeviceHelper.createCompatibleAlphaBitmap( this, size ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyBitmapSize(size, + tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); @@ -278,7 +278,7 @@ namespace canvas { return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, - aServiceSpecifier, + aServiceSpecifier, Arguments)); } @@ -305,28 +305,28 @@ namespace canvas return maPropHelper.getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.setPropertyValue( aPropertyName, aValue ); } - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); return maPropHelper.getPropertyValue( aPropertyName ); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); @@ -334,9 +334,9 @@ namespace canvas xListener ); } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); @@ -344,9 +344,9 @@ namespace canvas xListener ); } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); @@ -354,9 +354,9 @@ namespace canvas xListener ); } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { MutexType aGuard( BaseType::m_aMutex ); diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/canvas/inc/canvas/base/integerbitmapbase.hxx index bf5476c2085f..761ebcfb4d61 100644 --- a/canvas/inc/canvas/base/integerbitmapbase.hxx +++ b/canvas/inc/canvas/base/integerbitmapbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,20 +68,20 @@ namespace canvas @see CanvasBase for further contractual requirements towards the CanvasHelper type, and some examples. */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class IntegerBitmapBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class IntegerBitmapBase : public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // XIntegerBitmap - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(rect, + tools::verifyArgs(rect, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); tools::verifyIndexRange(rect, BaseType::getSize() ); @@ -92,11 +92,11 @@ namespace canvas rect ); } - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data, - const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data, + const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(bitmapLayout, rect, + tools::verifyArgs(bitmapLayout, rect, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); tools::verifyIndexRange(rect, BaseType::getSize() ); @@ -109,11 +109,11 @@ namespace canvas BaseType::maCanvasHelper.setData( data, bitmapLayout, rect ); } - virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color, - const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color, + const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(bitmapLayout, pos, + tools::verifyArgs(bitmapLayout, pos, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); tools::verifyIndexRange(pos, BaseType::getSize() ); @@ -129,7 +129,7 @@ namespace canvas virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(pos, + tools::verifyArgs(pos, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); tools::verifyIndexRange(pos, BaseType::getSize() ); diff --git a/canvas/inc/canvas/base/sprite.hxx b/canvas/inc/canvas/base/sprite.hxx index bb3d655bb2e7..28c9be6a5d59 100644 --- a/canvas/inc/canvas/base/sprite.hxx +++ b/canvas/inc/canvas/base/sprite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ namespace canvas be XInterface - reference holders to a Sprite must be able to control lifetime of reference target) */ - + /** Helper interface to connect SpriteCanvas with various - sprite implementations. + sprite implementations. This interface should be implemented from every sprite class, as it provides essential repaint and update area facilitates. @@ -110,8 +110,8 @@ namespace canvas { const double nPrioL( rLHS->getPriority() ); const double nPrioR( rRHS->getPriority() ); - - // if prios are equal, tie-break on ptr value + + // if prios are equal, tie-break on ptr value return nPrioL == nPrioR ? rLHS.get() < rRHS.get() : nPrioL < nPrioR; } }; diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/canvas/inc/canvas/base/spritecanvasbase.hxx index 1cf255fe5579..d44bf425d4de 100644 --- a/canvas/inc/canvas/base/spritecanvasbase.hxx +++ b/canvas/inc/canvas/base/spritecanvasbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,15 +71,15 @@ namespace canvas @see CanvasBase for further contractual requirements towards the CanvasHelper type, and some examples. */ - template< class Base, - class CanvasHelper, - class Mutex=::osl::MutexGuard, - class UnambiguousBase=::com::sun::star::uno::XInterface > class SpriteCanvasBase : + template< class Base, + class CanvasHelper, + class Mutex=::osl::MutexGuard, + class UnambiguousBase=::com::sun::star::uno::XInterface > class SpriteCanvasBase : public IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > { public: - typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; - typedef ::rtl::Reference< SpriteCanvasBase > Reference; + typedef IntegerBitmapBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; + typedef ::rtl::Reference< SpriteCanvasBase > Reference; SpriteCanvasBase() : maRedrawManager() @@ -100,56 +100,56 @@ namespace canvas } // 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, + 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) { - tools::verifyArgs(animation, + tools::verifyArgs(animation, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - + return BaseType::maCanvasHelper.createSpriteFromAnimation(animation); } - 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, + 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) { - tools::verifyArgs(animationBitmaps, + tools::verifyArgs(animationBitmaps, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); - tools::verifyRange( interpolationMode, + tools::verifyRange( interpolationMode, ::com::sun::star::rendering::InterpolationMode::NEAREST_NEIGHBOR, ::com::sun::star::rendering::InterpolationMode::BEZIERSPLINE4 ); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - + return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifySpriteSize(spriteSize, + tools::verifySpriteSize(spriteSize, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - + return BaseType::maCanvasHelper.createCustomSprite(spriteSize); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - tools::verifyArgs(original, + tools::verifyArgs(original, BOOST_CURRENT_FUNCTION, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - + return BaseType::maCanvasHelper.createClonedSprite(original); } @@ -172,10 +172,10 @@ namespace canvas maRedrawManager.hideSprite( rSprite ); } - virtual void moveSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rOldPos, - const ::basegfx::B2DPoint& rNewPos, - const ::basegfx::B2DVector& rSpriteSize ) + virtual void moveSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rOldPos, + const ::basegfx::B2DPoint& rNewPos, + const ::basegfx::B2DVector& rSpriteSize ) { OSL_ASSERT( rSprite.is() ); @@ -184,9 +184,9 @@ namespace canvas maRedrawManager.moveSprite( rSprite, rOldPos, rNewPos, rSpriteSize ); } - virtual void updateSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rUpdateArea ) + virtual void updateSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rPos, + const ::basegfx::B2DRange& rUpdateArea ) { OSL_ASSERT( rSprite.is() ); diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/canvas/inc/canvas/base/spritesurface.hxx index c60099f1563b..cd66f4369581 100644 --- a/canvas/inc/canvas/base/spritesurface.hxx +++ b/canvas/inc/canvas/base/spritesurface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace canvas { /* Definition of the SpriteSurface interface */ - + /** Canvas surface containing sprites Every canvas surface that contains sprites must implement this @@ -54,20 +54,20 @@ namespace canvas virtual void hideSprite( const Sprite::Reference& rSprite ) = 0; /// Sprites should call this from XSprite::move() - virtual void moveSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rOldPos, - const ::basegfx::B2DPoint& rNewPos, - const ::basegfx::B2DVector& rSpriteSize ) = 0; + virtual void moveSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rOldPos, + const ::basegfx::B2DPoint& rNewPos, + const ::basegfx::B2DVector& rSpriteSize ) = 0; /** Sprites should call this when some part of the content has - changed. + changed. That includes show/hide, i.e. for show, both showSprite() and updateSprite() must be called. */ - virtual void updateSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rUpdateArea ) = 0; + virtual void updateSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rPos, + const ::basegfx::B2DRange& rUpdateArea ) = 0; }; } |