diff options
Diffstat (limited to 'canvas/inc')
33 files changed, 879 insertions, 879 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; }; } diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 215209f4b0da..bd1b20edda8d 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.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 @@ -53,7 +53,7 @@ namespace basegfx class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace geometry +namespace com { namespace sun { namespace star { namespace geometry { struct RealSize2D; struct IntegerSize2D; @@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star { namespace geometry struct Matrix2D; } } } } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { struct RenderState; struct ViewState; @@ -71,14 +71,14 @@ namespace com { namespace sun { namespace star { namespace rendering class XIntegerBitmapColorSpace; class XPolyPolygon2D; - bool operator==( const RenderState& rLHS, + bool operator==( const RenderState& rLHS, const RenderState& rRHS ); - + bool operator==( const ViewState& rLHS, - const ViewState& rRHS ); + const ViewState& rRHS ); } } } } -namespace com { namespace sun { namespace star { namespace awt +namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; class XWindow2; @@ -160,65 +160,65 @@ namespace canvas // View- and RenderState utilities // =================================================================== - ::com::sun::star::rendering::RenderState& - initRenderState( ::com::sun::star::rendering::RenderState& renderState ); - - ::com::sun::star::rendering::ViewState& - initViewState( ::com::sun::star::rendering::ViewState& viewState ); - - ::basegfx::B2DHomMatrix& - getViewStateTransform( ::basegfx::B2DHomMatrix& transform, - const ::com::sun::star::rendering::ViewState& viewState ); - - ::com::sun::star::rendering::ViewState& - setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); - - ::basegfx::B2DHomMatrix& - getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, - const ::com::sun::star::rendering::RenderState& renderState ); - - ::com::sun::star::rendering::RenderState& - setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); - - ::com::sun::star::rendering::ViewState& - appendToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); - - ::com::sun::star::rendering::RenderState& - appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); - - ::com::sun::star::rendering::ViewState& - prependToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); - - ::com::sun::star::rendering::RenderState& - prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, - const ::basegfx::B2DHomMatrix& transform ); + ::com::sun::star::rendering::RenderState& + initRenderState( ::com::sun::star::rendering::RenderState& renderState ); - ::basegfx::B2DHomMatrix& - mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + ::com::sun::star::rendering::ViewState& + initViewState( ::com::sun::star::rendering::ViewState& viewState ); + ::basegfx::B2DHomMatrix& + getViewStateTransform( ::basegfx::B2DHomMatrix& transform, + const ::com::sun::star::rendering::ViewState& viewState ); + ::com::sun::star::rendering::ViewState& - mergeViewAndRenderState( ::com::sun::star::rendering::ViewState& resultViewState, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas >& xCanvas ); + setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, + const ::basegfx::B2DHomMatrix& transform ); + + ::basegfx::B2DHomMatrix& + getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, + const ::com::sun::star::rendering::RenderState& renderState ); + + ::com::sun::star::rendering::RenderState& + setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, + const ::basegfx::B2DHomMatrix& transform ); + + ::com::sun::star::rendering::ViewState& + appendToViewState( ::com::sun::star::rendering::ViewState& viewState, + const ::basegfx::B2DHomMatrix& transform ); + + ::com::sun::star::rendering::RenderState& + appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, + const ::basegfx::B2DHomMatrix& transform ); + + ::com::sun::star::rendering::ViewState& + prependToViewState( ::com::sun::star::rendering::ViewState& viewState, + const ::basegfx::B2DHomMatrix& transform ); + + ::com::sun::star::rendering::RenderState& + prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, + const ::basegfx::B2DHomMatrix& transform ); + + ::basegfx::B2DHomMatrix& + mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); + + ::com::sun::star::rendering::ViewState& + mergeViewAndRenderState( ::com::sun::star::rendering::ViewState& resultViewState, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCanvas >& xCanvas ); // Matrix utilities // =================================================================== - ::com::sun::star::geometry::AffineMatrix2D& - setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); + ::com::sun::star::geometry::AffineMatrix2D& + setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::com::sun::star::geometry::Matrix2D& - setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix ); + ::com::sun::star::geometry::Matrix2D& + setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix ); // Special utilities @@ -243,9 +243,9 @@ namespace canvas @return a reference to the resulting rectangle */ - ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, - const ::basegfx::B2DRange& i_Rect, - const ::basegfx::B2DHomMatrix& i_Transformation ); + ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, + const ::basegfx::B2DRange& i_Rect, + const ::basegfx::B2DHomMatrix& i_Transformation ); /** Calc a transform that maps one rectangle on top of another. @@ -283,11 +283,11 @@ namespace canvas @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, - const ::basegfx::B2DRange& i_destRect, - const ::basegfx::B2DRange& i_srcRect, - const ::basegfx::B2DHomMatrix& i_transformation ); - + ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, + const ::basegfx::B2DRange& i_destRect, + const ::basegfx::B2DRange& i_srcRect, + const ::basegfx::B2DHomMatrix& i_transformation ); + /** Calc a transform that maps the upper, left corner of a rectangle to the origin. @@ -315,10 +315,10 @@ namespace canvas @see calcRectToRectTransform() @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, - const ::basegfx::B2DRange& i_srcRect, - const ::basegfx::B2DHomMatrix& i_transformation ); - + ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, + const ::basegfx::B2DRange& i_srcRect, + const ::basegfx::B2DHomMatrix& i_transformation ); + /** Check whether a given rectangle is within another transformed rectangle. @@ -339,9 +339,9 @@ namespace canvas @param rTransformation This transformation is applied to rTransformRect */ - bool isInside( const ::basegfx::B2DRange& rContainedRect, - const ::basegfx::B2DRange& rTransformRect, - const ::basegfx::B2DHomMatrix& rTransformation ); + bool isInside( const ::basegfx::B2DRange& rContainedRect, + const ::basegfx::B2DRange& rTransformRect, + const ::basegfx::B2DHomMatrix& rTransformation ); /** Clip a scroll to the given bound rect @@ -417,14 +417,14 @@ namespace canvas ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange ); /** Retrieve various internal properties of the actual canvas implementation. - + This method retrieves a bunch of internal, implementation- and platform-dependent values from the canvas implementation. Among them are for example operating system window handles. The actual layout and content of the returned sequence is dependent on the component implementation, undocumented and subject to change. - + @param i_rxCanvas Input parameter, the canvas representation for which the device information is to be retrieveds @@ -434,7 +434,7 @@ namespace canvas @return A reference to the resulting sequence of parameters */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams ); @@ -450,7 +450,7 @@ namespace canvas Use this method for dead-simple bitmap implementations, that map all their formats to 8888 RGBA color. */ - ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( + ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize ); /// Convert standard 8888 RGBA color to vcl color @@ -475,14 +475,14 @@ namespace canvas typedef ::std::numeric_limits< Source > SourceLimits; typedef ::std::numeric_limits< Target > TargetLimits; - if( ( arg<0 && !TargetLimits::is_signed) || // loosing the sign here - ( SourceLimits::is_signed && arg<TargetLimits::min()) || // underflow will happen - ( arg>TargetLimits::max() ) ) // overflow will happen + if( ( arg<0 && !TargetLimits::is_signed) || // loosing the sign here + ( SourceLimits::is_signed && arg<TargetLimits::min()) || // underflow will happen + ( arg>TargetLimits::max() ) ) // overflow will happen { #if defined(VERBOSE) && defined(DBG_UTIL) OSL_TRACE("numeric_cast detected data loss"); #endif - throw ::com::sun::star::uno::RuntimeException( + throw ::com::sun::star::uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "numeric_cast detected data loss" )), NULL ); } @@ -490,7 +490,7 @@ namespace canvas return static_cast<Target>(arg); } - ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( + ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( const ::com::sun::star::awt::Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin ); @@ -506,7 +506,7 @@ namespace canvas for smooth gradient color differences */ int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, - const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::rendering::Texture& texture, int nColorSteps ); @@ -528,8 +528,8 @@ namespace canvas public: struct MapEntry { - const char* maKey; - ValueType maValue; + const char* maKey; + ValueType maValue; }; /** Create a ValueMap for the given array of MapEntries. @@ -549,18 +549,18 @@ namespace canvas or not. When bCaseSensitive is false, all MapEntry strings must be lowercase! */ - ValueMap( const MapEntry* pMap, - ::std::size_t nEntries, - bool bCaseSensitive ) : + ValueMap( const MapEntry* pMap, + ::std::size_t nEntries, + bool bCaseSensitive ) : mpMap( pMap ), mnEntries( nEntries ), mbCaseSensitive( bCaseSensitive ) { -#ifdef DBG_UTIL +#ifdef DBG_UTIL // Ensure that map entries are sorted (and all lowercase, if this // map is case insensitive) const ::rtl::OString aStr( pMap->maKey ); - if( !mbCaseSensitive && + if( !mbCaseSensitive && aStr != aStr.toAsciiLowerCase() ) { OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", @@ -581,9 +581,9 @@ namespace canvas OSL_ENSURE( false, "ValueMap::ValueMap(): Map is not sorted" ); } - + const ::rtl::OString aStr2( pMap[1].maKey ); - if( !mbCaseSensitive && + if( !mbCaseSensitive && aStr2 != aStr2.toAsciiLowerCase() ) { OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", @@ -610,21 +610,21 @@ namespace canvas @return true, if a matching entry was found. */ bool lookup( const ::rtl::OUString& rName, - ValueType& o_rResult ) const + ValueType& o_rResult ) const { // rName is required to contain only ASCII characters. // TODO(Q1): Enforce this at upper layers ::rtl::OString aKey( ::rtl::OUStringToOString( mbCaseSensitive ? rName : rName.toAsciiLowerCase(), RTL_TEXTENCODING_ASCII_US ) ); - MapEntry aSearchKey = - { - aKey.getStr(), + MapEntry aSearchKey = + { + aKey.getStr(), ValueType() }; const MapEntry* pRes; const MapEntry* pEnd = mpMap+mnEntries; - if( (pRes=::std::lower_bound( mpMap, + if( (pRes=::std::lower_bound( mpMap, pEnd, aSearchKey, &mapComparator )) != pEnd ) @@ -650,10 +650,10 @@ namespace canvas return strcmp( rLHS.maKey, rRHS.maKey ) < 0; } - - const MapEntry* mpMap; - ::std::size_t mnEntries; - bool mbCaseSensitive; + + const MapEntry* mpMap; + ::std::size_t mnEntries; + bool mbCaseSensitive; }; } } diff --git a/canvas/inc/canvas/debug.hxx b/canvas/inc/canvas/debug.hxx index 62bee8e7ce38..5e81c6290c81 100644 --- a/canvas/inc/canvas/debug.hxx +++ b/canvas/inc/canvas/debug.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 diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx index d48f6127fd52..2e8a9b69d202 100644 --- a/canvas/inc/canvas/elapsedtime.hxx +++ b/canvas/inc/canvas/elapsedtime.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 @@ -70,14 +70,14 @@ namespace canvas /** Gets this timer's base timer. */ ::boost::shared_ptr<ElapsedTime> const & getTimeBase() const; - + /** Reset the time The instance of the reset() call starts the time measurement from scratch. That means, a subsequent getElapsedTime() call will return the time difference between reset() and getElapsedTime() call. - */ + */ void reset(); /** Query the elapsed time @@ -89,9 +89,9 @@ namespace canvas continuous flow of time). @return the elapsed time in seconds. - */ + */ double getElapsedTime() const; - + /** Pauses the running timer. This method stops the time, as returned by this @@ -101,8 +101,8 @@ namespace canvas called). */ void pauseTimer(); - - /** Continues the paused timer. + + /** Continues the paused timer. This method re-enables the time flow, that is, time starts running again for clients calling @@ -114,7 +114,7 @@ namespace canvas pauseTimer(). */ void continueTimer(); - + /** Adjusts the timer, hold and pause times. This method modifies the time as returned by this @@ -122,18 +122,18 @@ namespace canvas as returned by getElapsedTime(), regardless of the mode (e.g. paused, or on hold). - @param fOffset + @param fOffset This value will be added to the current time, i.e. the next call to getElapsedTime() (when performed immediately) will be adjusted by fOffset. - @param bLimitToLastQueriedTime + @param bLimitToLastQueriedTime Limits the given offset to the time that has been taken via getElapsedTime() */ void adjustTimer( double fOffset, bool bLimitToLastQueriedTime = true ); - + /** Holds the current time. This call makes the timer hold the current time @@ -146,35 +146,35 @@ namespace canvas clock keeps running internally. */ void holdTimer(); - + /** Releases a held timer. After this call, the timer again returns the running time on getElapsedTime(). */ void releaseTimer(); - + private: static double getSystemTime(); double getCurrentTime() const; double getElapsedTimeImpl() const; // does not set m_fLastQueriedTime - const ::boost::shared_ptr<ElapsedTime> m_pTimeBase; - + const ::boost::shared_ptr<ElapsedTime> m_pTimeBase; + /// To validate adjustTimer() calls with bLimitToLastQueriedTime=true - mutable double m_fLastQueriedTime; + mutable double m_fLastQueriedTime; /// Start time, from which the difference to the time base is returned - double m_fStartTime; + double m_fStartTime; - /// Instant, when last pause or hold started, relative to m_fStartTime - double m_fFrozenTime; + /// Instant, when last pause or hold started, relative to m_fStartTime + double m_fFrozenTime; /// True, when in pause mode - bool m_bInPauseMode; + bool m_bInPauseMode; /// True, when in hold mode - bool m_bInHoldMode; + bool m_bInHoldMode; }; } diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx index e8d723dbc0e3..97598ac46996 100644 --- a/canvas/inc/canvas/parametricpolypolygon.hxx +++ b/canvas/inc/canvas/parametricpolypolygon.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 @@ -52,7 +52,7 @@ namespace canvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D, ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base; - class ParametricPolyPolygon : public ::comphelper::OBaseMutex, + class ParametricPolyPolygon : public ::comphelper::OBaseMutex, public ParametricPolyPolygon_Base, private ::boost::noncopyable { @@ -72,8 +72,8 @@ namespace canvas struct Values { Values( const ::basegfx::B2DPolygon& rGradientPoly, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rColors, - const ::com::sun::star::uno::Sequence< double >& rStops, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rColors, + const ::com::sun::star::uno::Sequence< double >& rStops, double nAspectRatio, GradientType eType ) : maGradientPoly( rGradientPoly ), @@ -85,23 +85,23 @@ namespace canvas } /// Polygonal gradient shape (ignored for linear and axial gradient) - const ::basegfx::B2DPolygon maGradientPoly; + const ::basegfx::B2DPolygon maGradientPoly; /// Aspect ratio of gradient, affects scaling of innermost gradient polygon - const double mnAspectRatio; + const double mnAspectRatio; /// Gradient colors - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > maColors; + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > maColors; /// Gradient color stops - const ::com::sun::star::uno::Sequence< double > maStops; + const ::com::sun::star::uno::Sequence< double > maStops; /// Type of gradient to render (as e.g. linear grads are not represented by maGradientPoly) - const GradientType meType; + const GradientType meType; }; static ::com::sun::star::uno::Sequence< ::rtl::OUString > getAvailableServiceNames(); - static ParametricPolyPolygon* create( + static ParametricPolyPolygon* create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::rtl::OUString& rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ); @@ -122,49 +122,49 @@ namespace canvas /// Query all defining values of this object atomically Values getValues() const; - + protected: ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves. private: - static ParametricPolyPolygon* createLinearHorizontalGradient( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, + static ParametricPolyPolygon* createLinearHorizontalGradient( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const ::com::sun::star::uno::Sequence< double >& stops ); - static ParametricPolyPolygon* createEllipticalGradient( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, + static ParametricPolyPolygon* createEllipticalGradient( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const ::com::sun::star::uno::Sequence< double >& stops, double fAspect ); - static ParametricPolyPolygon* createRectangularGradient( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, + static ParametricPolyPolygon* createRectangularGradient( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const ::com::sun::star::uno::Sequence< double >& stops, double fAspect ); /// Private, because objects can only be created from the static factories - ParametricPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::basegfx::B2DPolygon& rGradientPoly, - GradientType eType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, - const ::com::sun::star::uno::Sequence< double >& stops ); - ParametricPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::basegfx::B2DPolygon& rGradientPoly, - GradientType eType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, - const ::com::sun::star::uno::Sequence< double >& stops, - double nAspectRatio ); - ParametricPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& rDevice, - GradientType eType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, - const ::com::sun::star::uno::Sequence< double >& stops ); - - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice > mxDevice; - + ParametricPolyPolygon( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::basegfx::B2DPolygon& rGradientPoly, + GradientType eType, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, + const ::com::sun::star::uno::Sequence< double >& stops ); + ParametricPolyPolygon( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::basegfx::B2DPolygon& rGradientPoly, + GradientType eType, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, + const ::com::sun::star::uno::Sequence< double >& stops, + double nAspectRatio ); + ParametricPolyPolygon( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& rDevice, + GradientType eType, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, + const ::com::sun::star::uno::Sequence< double >& stops ); + + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice > mxDevice; + /// All defining values of this object const Values maValues; }; diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx index 7411a950ffd2..1839c015f75a 100644 --- a/canvas/inc/canvas/prioritybooster.hxx +++ b/canvas/inc/canvas/prioritybooster.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 diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx index d11a9ba66588..9daac32482c7 100644 --- a/canvas/inc/canvas/propertysethelper.hxx +++ b/canvas/inc/canvas/propertysethelper.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 @@ -141,16 +141,16 @@ namespace canvas // XPropertySet implementation ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; - void setPropertyValue( const ::rtl::OUString& aPropertyName, + void setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); ::com::sun::star::uno::Any getPropertyValue( const ::rtl::OUString& PropertyName ) const; - void addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + void addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ); - void removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + void removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ); - void addVetoableChangeListener( const ::rtl::OUString& aPropertyName, + void addVetoableChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); - void removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, + void removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); private: diff --git a/canvas/inc/canvas/rendering/bitmap.hxx b/canvas/inc/canvas/rendering/bitmap.hxx index 92c965c7133f..5fdb3ec8ecf4 100644 --- a/canvas/inc/canvas/rendering/bitmap.hxx +++ b/canvas/inc/canvas/rendering/bitmap.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 @@ -88,22 +88,22 @@ namespace canvas ::basegfx::B2IVector getSize() const; ::com::sun::star::uno::Sequence< sal_Int8 > getData( - ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ); + ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerRectangle2D& rect ); void setData( - const ::com::sun::star::uno::Sequence< sal_Int8 >& data, + const ::com::sun::star::uno::Sequence< sal_Int8 >& data, const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ); + const ::com::sun::star::geometry::IntegerRectangle2D& rect ); void setPixel( - const ::com::sun::star::uno::Sequence< sal_Int8 >& color, + const ::com::sun::star::uno::Sequence< sal_Int8 >& color, const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ); + const ::com::sun::star::geometry::IntegerPoint2D& pos ); ::com::sun::star::uno::Sequence< sal_Int8 > getPixel( - ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ); + ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const ::com::sun::star::geometry::IntegerPoint2D& pos ); /** Render the bitmap content to associated SurfaceProxyManager's screen. @@ -113,7 +113,7 @@ namespace canvas @param rPos Output position - + @param rTransform Output transformation (does not affect output position) */ @@ -129,12 +129,12 @@ namespace canvas @param rPos Output position - + @param rArea Subset of the surface to render. Coordinate system are surface area pixel, given area will be clipped to the surface bounds. - + @param rTransform Output transformation (does not affect output position) */ @@ -142,7 +142,7 @@ namespace canvas const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DRange& rArea, const ::basegfx::B2DHomMatrix& rTransform ); - + /** Render the bitmap content to associated SurfaceProxyManager's screen. @@ -151,11 +151,11 @@ namespace canvas @param rPos Output position - + @param rClipPoly Clip polygon for the surface. The clip polygon is also subject to the output transformation. - + @param rTransform Output transformation (does not affect output position) */ @@ -171,42 +171,42 @@ namespace canvas */ void clear( const ::com::sun::star::uno::Sequence< double >& color ); - void fillB2DPolyPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + void fillB2DPolyPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolygon, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); // High-level drawing operations (from the XCanvas interface) // ========================================================== /// See XCanvas interface - void drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + void drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); /// See XCanvas interface - void 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 ); + void 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 ); /// See XCanvas interface - void 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 ); + void 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 ); /// See XCanvas interface - ICachedPrimitiveSharedPtr drawPolyPolygon( - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, - const ::com::sun::star::rendering::ViewState& viewState, + ICachedPrimitiveSharedPtr 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 ); /// See XCanvas interface - ICachedPrimitiveSharedPtr 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, + ICachedPrimitiveSharedPtr 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 ); /** See XCanvas interface @@ -216,14 +216,14 @@ namespace canvas sequence. This is to decouple this interface from the client's XBitmap-implementation class. */ - ICachedPrimitiveSharedPtr 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< + ICachedPrimitiveSharedPtr 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 ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, + const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); /** See XCanvas interface @@ -233,23 +233,23 @@ namespace canvas sequence. This is to decouple this interface from the client's XBitmap-implementation class. */ - ICachedPrimitiveSharedPtr 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< + ICachedPrimitiveSharedPtr 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 ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, - const ::com::sun::star::uno::Reference< - ::com::sun::star::geometry::XMapping2D >& xMapping, - const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); + const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, + const ::com::sun::star::uno::Reference< + ::com::sun::star::geometry::XMapping2D >& xMapping, + const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); /// See XCanvas interface - ICachedPrimitiveSharedPtr 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 ); + ICachedPrimitiveSharedPtr 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 ); /** See XCanvas interface @param textureAnnotations @@ -258,14 +258,14 @@ namespace canvas sequence. This is to decouple this interface from the client's XBitmap-implementation class. */ - ICachedPrimitiveSharedPtr 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< + ICachedPrimitiveSharedPtr 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, - const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations ); + const ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations ); /** See XCanvas interface @param textureAnnotations @@ -274,39 +274,39 @@ namespace canvas sequence. This is to decouple this interface from the client's XBitmap-implementation class. */ - ICachedPrimitiveSharedPtr 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< + ICachedPrimitiveSharedPtr 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 ::std::vector< ::boost::shared_ptr<Bitmap> >& textureAnnotations, - const ::com::sun::star::uno::Reference< - ::com::sun::star::geometry::XMapping2D >& xMapping ); + const ::com::sun::star::uno::Reference< + ::com::sun::star::geometry::XMapping2D >& xMapping ); /// See XCanvas interface - ICachedPrimitiveSharedPtr drawBitmap( - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, + ICachedPrimitiveSharedPtr 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 ); /// See XCanvas interface - ICachedPrimitiveSharedPtr drawBitmap( - const ::boost::shared_ptr<Bitmap>& rImage, - const ::com::sun::star::rendering::ViewState& viewState, + ICachedPrimitiveSharedPtr drawBitmap( + const ::boost::shared_ptr<Bitmap>& rImage, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); /// See XCanvas interface - ICachedPrimitiveSharedPtr drawBitmapModulated( - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, + ICachedPrimitiveSharedPtr 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 ); /// See XCanvas interface - ICachedPrimitiveSharedPtr drawBitmapModulated( - const ::boost::shared_ptr<Bitmap>& rImage, - const ::com::sun::star::rendering::ViewState& viewState, + ICachedPrimitiveSharedPtr drawBitmapModulated( + const ::boost::shared_ptr<Bitmap>& rImage, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); private: diff --git a/canvas/inc/canvas/rendering/icachedprimitive.hxx b/canvas/inc/canvas/rendering/icachedprimitive.hxx index ce50d9daff8b..ff4a6c207f08 100644 --- a/canvas/inc/canvas/rendering/icachedprimitive.hxx +++ b/canvas/inc/canvas/rendering/icachedprimitive.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 diff --git a/canvas/inc/canvas/rendering/icolorbuffer.hxx b/canvas/inc/canvas/rendering/icolorbuffer.hxx index 72d0fca272d1..cdb58c304a70 100644 --- a/canvas/inc/canvas/rendering/icolorbuffer.hxx +++ b/canvas/inc/canvas/rendering/icolorbuffer.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 @@ -41,23 +41,23 @@ namespace canvas Use this interface to represent a surface of raw pixel (e.g. a bitmap) to the canvas rendering framework. */ - struct IColorBuffer + struct IColorBuffer { /// The underlying pixel format for this buffer enum Format { - // 24-bit RGB pixel format, 8 bits per channel. + // 24-bit RGB pixel format, 8 bits per channel. FMT_R8G8B8, - - // 32-bit ARGB pixel format with alpha, 8 bits per channel. + + // 32-bit ARGB pixel format with alpha, 8 bits per channel. FMT_A8R8G8B8, - - // 32-bit RGB pixel format, 8 bits per channel. + + // 32-bit RGB pixel format, 8 bits per channel. FMT_X8R8G8B8, - - // for enum to 32bit + + // for enum to 32bit FMT_UNKNOWN = static_cast<sal_uInt32>(-1) - }; + }; virtual ~IColorBuffer() {} diff --git a/canvas/inc/canvas/rendering/irendermodule.hxx b/canvas/inc/canvas/rendering/irendermodule.hxx index e17908209bad..b3e470005e45 100644 --- a/canvas/inc/canvas/rendering/irendermodule.hxx +++ b/canvas/inc/canvas/rendering/irendermodule.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 diff --git a/canvas/inc/canvas/rendering/isurface.hxx b/canvas/inc/canvas/rendering/isurface.hxx index adad313d46f3..7b08e2985fbc 100644 --- a/canvas/inc/canvas/rendering/isurface.hxx +++ b/canvas/inc/canvas/rendering/isurface.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 diff --git a/canvas/inc/canvas/rendering/isurfaceproxy.hxx b/canvas/inc/canvas/rendering/isurfaceproxy.hxx index 43e31f564269..998278a897f7 100644 --- a/canvas/inc/canvas/rendering/isurfaceproxy.hxx +++ b/canvas/inc/canvas/rendering/isurfaceproxy.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 @@ -47,7 +47,7 @@ namespace canvas { virtual ~ISurfaceProxy() {} - /** Notify the proxy that the color buffer has changed + /** Notify the proxy that the color buffer has changed */ virtual void setColorBufferDirty() = 0; @@ -58,7 +58,7 @@ namespace canvas @param rPos Output position - + @param rTransform Output transformation (does not affect output position) */ @@ -73,12 +73,12 @@ namespace canvas @param rPos Output position - + @param rArea Subset of the surface to render. Coordinate system are surface area pixel, given area will be clipped to the surface bounds. - + @param rTransform Output transformation (does not affect output position) */ @@ -86,7 +86,7 @@ namespace canvas const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DRange& rArea, const ::basegfx::B2DHomMatrix& rTransform ) = 0; - + /** Render the surface content to screen. @param fAlpha @@ -94,11 +94,11 @@ namespace canvas @param rPos Output position - + @param rClipPoly Clip polygon for the surface. The clip polygon is also subject to the output transformation. - + @param rTransform Output transformation (does not affect output position) */ diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx index 0d63e804d485..773592cd2d47 100644 --- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx +++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.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 @@ -65,7 +65,7 @@ namespace canvas Internally this texture may even be distributed to several real hardware surfaces. */ - virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy( + virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy( const IColorBufferSharedPtr& pBuffer ) const = 0; }; diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx index 4a66b5c09acd..c2eed8e0cf3a 100644 --- a/canvas/inc/canvas/spriteredrawmanager.hxx +++ b/canvas/inc/canvas/spriteredrawmanager.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 @@ -56,7 +56,7 @@ namespace canvas events are later grouped by connected areas (i.e. all sprites that somehow overlap over a rectangular area are grouped together); the forEachSpriteArea() method calls the passed - functor for each of those connected areas. + functor for each of those connected areas. Note that, although this class generally works with IEEE doubles, the calculation of connected areas happens in the @@ -65,7 +65,7 @@ namespace canvas artifacts. Therefore, sprites that touch the same pixel (but don't necessarily have the same floating point coordinates there) will reside in a common sprite area and handled - together in the forEachSpriteArea functor call. + together in the forEachSpriteArea functor call. */ class SpriteRedrawManager : private ::boost::noncopyable { @@ -92,9 +92,9 @@ namespace canvas @internal */ - SpriteInfo( const Sprite::Reference& rRef, - const ::basegfx::B2DRange& rTrueUpdateArea, - bool bNeedsUpdate ) : + SpriteInfo( const Sprite::Reference& rRef, + const ::basegfx::B2DRange& rTrueUpdateArea, + bool bNeedsUpdate ) : mpSprite( rRef ), maTrueUpdateArea( rTrueUpdateArea ), mbNeedsUpdate( bNeedsUpdate ), @@ -121,10 +121,10 @@ namespace canvas @internal */ - SpriteInfo( const Sprite::Reference& rRef, - const ::basegfx::B2DRange& rTrueUpdateArea, - bool bNeedsUpdate, - bool bIsPureMove ) : + SpriteInfo( const Sprite::Reference& rRef, + const ::basegfx::B2DRange& rTrueUpdateArea, + bool bNeedsUpdate, + bool bIsPureMove ) : mpSprite( rRef ), maTrueUpdateArea( rTrueUpdateArea ), mbNeedsUpdate( bNeedsUpdate ), @@ -132,18 +132,18 @@ namespace canvas { } - const Sprite::Reference& getSprite() const { return mpSprite; } + const Sprite::Reference& getSprite() const { return mpSprite; } // #i61843# need to return by value here, to be used safely from bind ::basegfx::B2DRange getUpdateArea() const { return maTrueUpdateArea; } - bool needsUpdate() const { return mbNeedsUpdate; } - bool isPureMove() const { return mbIsPureMove; } + bool needsUpdate() const { return mbNeedsUpdate; } + bool isPureMove() const { return mbIsPureMove; } private: - Sprite::Reference mpSprite; - ::basegfx::B2DRange maTrueUpdateArea; - bool mbNeedsUpdate; - bool mbIsPureMove; + Sprite::Reference mpSprite; + ::basegfx::B2DRange maTrueUpdateArea; + bool mbNeedsUpdate; + bool mbIsPureMove; }; @@ -164,10 +164,10 @@ namespace canvas { } - SpriteChangeRecord( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rOldPos, - const ::basegfx::B2DPoint& rNewPos, - const ::basegfx::B2DVector& rSpriteSize ) : + SpriteChangeRecord( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rOldPos, + const ::basegfx::B2DPoint& rNewPos, + const ::basegfx::B2DVector& rSpriteSize ) : meChangeType( move ), mpAffectedSprite( rSprite ), maOldPos( rOldPos ), @@ -178,9 +178,9 @@ namespace canvas { } - SpriteChangeRecord( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rUpdateArea ) : + SpriteChangeRecord( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rPos, + const ::basegfx::B2DRange& rUpdateArea ) : meChangeType( update ), mpAffectedSprite( rSprite ), maOldPos( rPos ), @@ -190,17 +190,17 @@ namespace canvas Sprite::Reference getSprite() const { return mpAffectedSprite; } - ChangeType meChangeType; - Sprite::Reference mpAffectedSprite; - ::basegfx::B2DPoint maOldPos; - ::basegfx::B2DRange maUpdateArea; + ChangeType meChangeType; + Sprite::Reference mpAffectedSprite; + ::basegfx::B2DPoint maOldPos; + ::basegfx::B2DRange maUpdateArea; }; - typedef ::std::vector< SpriteChangeRecord > VectorOfChangeRecords; - typedef ::std::list< Sprite::Reference > ListOfSprites; - typedef ::basegfx::B2DConnectedRanges< SpriteInfo > SpriteConnectedRanges; - typedef SpriteConnectedRanges::ComponentType AreaComponent; - typedef SpriteConnectedRanges::ConnectedComponents UpdateArea; + typedef ::std::vector< SpriteChangeRecord > VectorOfChangeRecords; + typedef ::std::list< Sprite::Reference > ListOfSprites; + typedef ::basegfx::B2DConnectedRanges< SpriteInfo > SpriteConnectedRanges; + typedef SpriteConnectedRanges::ComponentType AreaComponent; + typedef SpriteConnectedRanges::ConnectedComponents UpdateArea; typedef ::std::vector< Sprite::Reference > VectorOfSprites; SpriteRedrawManager(); @@ -214,8 +214,8 @@ namespace canvas */ template< typename Functor > struct AreaUpdateCaller { - AreaUpdateCaller( Functor& rFunc, - const SpriteRedrawManager& rManager ) : + AreaUpdateCaller( Functor& rFunc, + const SpriteRedrawManager& rManager ) : mrFunc( rFunc ), mrManager( rManager ) { @@ -226,8 +226,8 @@ namespace canvas mrManager.handleArea( mrFunc, rUpdateArea ); } - Functor& mrFunc; - const SpriteRedrawManager& mrManager; + Functor& mrFunc; + const SpriteRedrawManager& mrManager; }; /** Call given functor for each sprite area that needs an @@ -242,7 +242,7 @@ namespace canvas void backgroundPaint( ::basegfx::B2DRange aUpdateRect ); void scrollUpdate( ::basegfx::B2DRange& o_rMoveStart, ::basegfx::B2DRange& o_rMoveEnd, - UpdateArea aUpdateArea ); + UpdateArea aUpdateArea ); void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea, const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); void genericUpdate( const ::basegfx::B2DRange& rTotalArea, @@ -263,7 +263,7 @@ namespace canvas setupUpdateAreas( aUpdateAreas ); - aUpdateAreas.forEachAggregate( + aUpdateAreas.forEachAggregate( AreaUpdateCaller< Functor >( rFunc, *this ) ); } @@ -289,13 +289,13 @@ namespace canvas // SpriteSurface interface, is delegated to e.g. from SpriteCanvas void showSprite( const Sprite::Reference& rSprite ); void hideSprite( const Sprite::Reference& rSprite ); - void moveSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rOldPos, - const ::basegfx::B2DPoint& rNewPos, - const ::basegfx::B2DVector& rSpriteSize ); - void updateSprite( const Sprite::Reference& rSprite, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rUpdateArea ); + void moveSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rOldPos, + const ::basegfx::B2DPoint& rNewPos, + const ::basegfx::B2DVector& rSpriteSize ); + void updateSprite( const Sprite::Reference& rSprite, + const ::basegfx::B2DPoint& rPos, + const ::basegfx::B2DRange& rUpdateArea ); /** Internal, handles each distinct component for forEachAggregate() @@ -304,8 +304,8 @@ namespace canvas @internal */ - template< typename Functor > void handleArea( Functor& rFunc, - const UpdateArea& rUpdateArea ) const + template< typename Functor > void handleArea( Functor& rFunc, + const UpdateArea& rUpdateArea ) const { // check whether this area contains changed sprites at all // (if not, just ignore it) @@ -327,7 +327,7 @@ namespace canvas // cache number of sprites in this area (it's a // list, and both isAreaUpdateScroll() and // isAreaUpdateOpaque() need it). - const ::std::size_t nNumSprites( + const ::std::size_t nNumSprites( rUpdateArea.maComponentList.size() ); if( isAreaUpdateScroll( aMoveStart, @@ -335,15 +335,15 @@ namespace canvas rUpdateArea, nNumSprites ) ) { - rFunc.scrollUpdate( aMoveStart, + rFunc.scrollUpdate( aMoveStart, aMoveEnd, rUpdateArea ); } - else + else { - // potentially, more than a single sprite - // involved. Have to sort component lists for - // sprite prio. + // potentially, more than a single sprite + // involved. Have to sort component lists for + // sprite prio. VectorOfSprites aSortedUpdateSprites; SpriteConnectedRanges::ComponentListType::const_iterator aCurr( rUpdateArea.maComponentList.begin() ); @@ -361,12 +361,12 @@ namespace canvas ::std::sort( aSortedUpdateSprites.begin(), aSortedUpdateSprites.end(), SpriteComparator() ); - + if( isAreaUpdateOpaque( rUpdateArea, nNumSprites ) ) { rFunc.opaqueUpdate( rUpdateArea.maTotalBounds, - aSortedUpdateSprites ); + aSortedUpdateSprites ); } else { @@ -386,11 +386,11 @@ namespace canvas bool areSpritesChanged( const UpdateArea& rUpdateArea ) const; - bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange& rUpdateRect, - const AreaComponent& rComponent ) const; + bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange& rUpdateRect, + const AreaComponent& rComponent ) const; - bool isAreaUpdateOpaque( const UpdateArea& rUpdateArea, - ::std::size_t nNumSprites ) const; + bool isAreaUpdateOpaque( const UpdateArea& rUpdateArea, + ::std::size_t nNumSprites ) const; /** Check whether given update area can be handled by a simple scroll @@ -405,13 +405,13 @@ namespace canvas @param rUpdateArea Area to check for scroll update optimization */ - bool isAreaUpdateScroll( ::basegfx::B2DRange& o_rMoveStart, - ::basegfx::B2DRange& o_rMoveEnd, - const UpdateArea& rUpdateArea, - ::std::size_t nNumSprites ) const; + bool isAreaUpdateScroll( ::basegfx::B2DRange& o_rMoveStart, + ::basegfx::B2DRange& o_rMoveEnd, + const UpdateArea& rUpdateArea, + ::std::size_t nNumSprites ) const; - ListOfSprites maSprites; // list of active + ListOfSprites maSprites; // list of active // sprite // objects. this // list is only @@ -423,7 +423,7 @@ namespace canvas // itself to notify // us. - VectorOfChangeRecords maChangeRecords; // vector of + VectorOfChangeRecords maChangeRecords; // vector of // sprites // changes // since last diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx index cf42e15e2ef3..d30667479f62 100644 --- a/canvas/inc/canvas/vclwrapper.hxx +++ b/canvas/inc/canvas/vclwrapper.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 @@ -120,19 +120,19 @@ namespace canvas // This here is the whole purpose of the template: // protecting object deletion with the solar mutex SolarMutexGuard aGuard; - + if( mpWrappee ) delete mpWrappee; } - Wrappee* operator->() { return mpWrappee; } - const Wrappee* operator->() const { return mpWrappee; } + Wrappee* operator->() { return mpWrappee; } + const Wrappee* operator->() const { return mpWrappee; } - Wrappee& operator*() { return *mpWrappee; } - const Wrappee& operator*() const { return *mpWrappee; } + Wrappee& operator*() { return *mpWrappee; } + const Wrappee& operator*() const { return *mpWrappee; } - Wrappee& get() { return *mpWrappee; } - const Wrappee& get() const { return *mpWrappee; } + Wrappee& get() { return *mpWrappee; } + const Wrappee& get() const { return *mpWrappee; } void swap( VCLObject& rOther ) { @@ -140,8 +140,8 @@ namespace canvas } private: - - Wrappee* mpWrappee; + + Wrappee* mpWrappee; }; } diff --git a/canvas/inc/canvas/verbosetrace.hxx b/canvas/inc/canvas/verbosetrace.hxx index 2a7fbd469066..aadfa0a40a53 100644 --- a/canvas/inc/canvas/verbosetrace.hxx +++ b/canvas/inc/canvas/verbosetrace.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 @@ -33,7 +33,7 @@ /// Wrap OSL_TRACE with a verbosity switch #define VERBOSE_TRACE OSL_TRACE #else -#define VERBOSE_TRACE 1 ? ((void)0) : OSL_TRACE +#define VERBOSE_TRACE 1 ? ((void)0) : OSL_TRACE #endif #endif /* INCLUDED_CANVAS_VERBOSETRACE_HXX */ diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx index 1e8549792bdb..748868ddba2b 100644 --- a/canvas/inc/canvas/verifyinput.hxx +++ b/canvas/inc/canvas/verifyinput.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 @@ -40,7 +40,7 @@ #include <boost/current_function.hpp> -namespace com { namespace sun { namespace star { namespace geometry +namespace com { namespace sun { namespace star { namespace geometry { struct RealPoint2D; struct RealSize2D; @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace geometry struct IntegerRectangle2D; } } } } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { struct RenderState; struct StrokeAttributes; @@ -96,11 +96,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given transformation contains valid floating point values. @@ -119,11 +119,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given point contains valid floating point values. @@ -142,11 +142,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given size contains valid floating point values. @@ -165,11 +165,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given bezier segment contains valid floating point values. @@ -188,11 +188,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given point contains valid floating point values. @@ -211,11 +211,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Verify that the given rectangle contains valid floating point values. @@ -234,11 +234,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for view state validity. @@ -256,11 +256,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for render state validity. @@ -282,12 +282,12 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos, - sal_Int32 nMinColorComponents=0 ); + void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos, + sal_Int32 nMinColorComponents=0 ); /** Basic check for stroke attributes validity. @@ -305,11 +305,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for texture validity. @@ -327,11 +327,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::Texture& texture, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::Texture& texture, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for bitmap layout validity. @@ -349,11 +349,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for bitmap layout validity. @@ -372,10 +372,10 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for font info validity. @@ -393,11 +393,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Basic check for font request validity. @@ -415,11 +415,11 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); + void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ); /** Templatized check for uno::Reference validity. @@ -437,12 +437,12 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - template< class Interface > void verifyInput( - const ::com::sun::star::uno::Reference< Interface >& rRef, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ) + template< class Interface > void verifyInput( + const ::com::sun::star::uno::Reference< Interface >& rRef, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ) { (void)pStr; (void)xIf; (void)nArgPos; @@ -476,12 +476,12 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - template< typename SequenceContent > void verifyInput( - const ::com::sun::star::uno::Sequence< SequenceContent >& rSequence, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ) + template< typename SequenceContent > void verifyInput( + const ::com::sun::star::uno::Sequence< SequenceContent >& rSequence, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf, + ::sal_Int16 nArgPos ) { const SequenceContent* pCurr = rSequence.getConstArray(); const SequenceContent* pEnd = pCurr + rSequence.getLength(); @@ -490,60 +490,60 @@ namespace canvas } /// Catch-all, to handle cases that DON'T need input checking (i.e. the Integer geometry ones) - template< typename T > void verifyInput( const T& /*rDummy*/, - const char* /*pStr*/, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& /*xIf*/, - ::sal_Int16 /*nArgPos*/ ) + template< typename T > void verifyInput( const T& /*rDummy*/, + const char* /*pStr*/, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& /*xIf*/, + ::sal_Int16 /*nArgPos*/ ) { } // TODO(Q2): Employ some template arglist magic here, to avoid // this duplication of code... - template< typename Arg0 > void verifyArgs( const Arg0& rArg0, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0 > void verifyArgs( const Arg0& rArg0, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); } - template< typename Arg0, - typename Arg1 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); } - template< typename Arg0, - typename Arg1, - typename Arg2 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const Arg2& rArg2, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1, + typename Arg2 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const Arg2& rArg2, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg2, pStr, xIf, 2 ); } - template< typename Arg0, - typename Arg1, - typename Arg2, - typename Arg3 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const Arg2& rArg2, - const Arg3& rArg3, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1, + typename Arg2, + typename Arg3 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const Arg2& rArg2, + const Arg3& rArg3, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); @@ -551,18 +551,18 @@ namespace canvas verifyInput( rArg3, pStr, xIf, 3 ); } - template< typename Arg0, - typename Arg1, - typename Arg2, - typename Arg3, - typename Arg4 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const Arg2& rArg2, - const Arg3& rArg3, - const Arg4& rArg4, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1, + typename Arg2, + typename Arg3, + typename Arg4 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const Arg2& rArg2, + const Arg3& rArg3, + const Arg4& rArg4, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); @@ -571,20 +571,20 @@ namespace canvas verifyInput( rArg4, pStr, xIf, 4 ); } - template< typename Arg0, - typename Arg1, - typename Arg2, - typename Arg3, - typename Arg4, - typename Arg5 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const Arg2& rArg2, - const Arg3& rArg3, - const Arg4& rArg4, - const Arg5& rArg5, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1, + typename Arg2, + typename Arg3, + typename Arg4, + typename Arg5 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const Arg2& rArg2, + const Arg3& rArg3, + const Arg4& rArg4, + const Arg5& rArg5, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); @@ -594,22 +594,22 @@ namespace canvas verifyInput( rArg5, pStr, xIf, 5 ); } - template< typename Arg0, - typename Arg1, - typename Arg2, - typename Arg3, - typename Arg4, - typename Arg5, - typename Arg6 > void verifyArgs( const Arg0& rArg0, - const Arg1& rArg1, - const Arg2& rArg2, - const Arg3& rArg3, - const Arg4& rArg4, - const Arg5& rArg5, - const Arg6& rArg6, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ) + template< typename Arg0, + typename Arg1, + typename Arg2, + typename Arg3, + typename Arg4, + typename Arg5, + typename Arg6 > void verifyArgs( const Arg0& rArg0, + const Arg1& rArg1, + const Arg2& rArg2, + const Arg3& rArg3, + const Arg4& rArg4, + const Arg5& rArg5, + const Arg6& rArg6, + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ) { verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg1, pStr, xIf, 1 ); @@ -671,7 +671,7 @@ namespace canvas /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when index range is violated - + @param rect Rect to verify @@ -679,11 +679,11 @@ namespace canvas Given rectangle must be within ((0,0), (size.Width, size.Height)) */ void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, - const ::com::sun::star::geometry::IntegerSize2D& size ); + const ::com::sun::star::geometry::IntegerSize2D& size ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when index range is violated - + @param pos Position to verify @@ -695,24 +695,24 @@ namespace canvas /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when the size is negative or null - + @param size Size to verify */ void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf ); + const char* pStr, + const ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface >& xIf ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when the size is negative or null - + @param size Size to verify */ void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, - const char* pStr, - const ::com::sun::star::uno::Reference< + const char* pStr, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf ); } } diff --git a/canvas/inc/pch/precompiled_canvas.cxx b/canvas/inc/pch/precompiled_canvas.cxx index 6d4286d95206..ad3b242d4c3c 100644 --- a/canvas/inc/pch/precompiled_canvas.cxx +++ b/canvas/inc/pch/precompiled_canvas.cxx @@ -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 diff --git a/canvas/inc/pch/precompiled_canvas.hxx b/canvas/inc/pch/precompiled_canvas.hxx index 3959cfe8f911..06d61119c733 100644 --- a/canvas/inc/pch/precompiled_canvas.hxx +++ b/canvas/inc/pch/precompiled_canvas.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 |