diff options
Diffstat (limited to 'canvas/source/cairo')
39 files changed, 799 insertions, 799 deletions
diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx index 3ad8ec111ef3..8203211363c8 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.cxx +++ b/canvas/source/cairo/cairo_cachedbitmap.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 @@ -48,8 +48,8 @@ using namespace ::com::sun::star; namespace cairocanvas { CachedBitmap::CachedBitmap( const SurfaceSharedPtr& pSurface, - const rendering::ViewState& rUsedViewState, - const rendering::RenderState& rUsedRenderState, + const rendering::ViewState& rUsedViewState, + const rendering::RenderState& rUsedRenderState, const uno::Reference< rendering::XCanvas >& rTarget ) : CachedPrimitiveBase( rUsedViewState, rTarget, true ), mpSurface( pSurface ), @@ -64,10 +64,10 @@ namespace cairocanvas CachedPrimitiveBase::disposing(); } - ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState& rNewState, - const rendering::ViewState& /*rOldState*/, - const uno::Reference< rendering::XCanvas >& rTargetCanvas, - bool bSameViewTransform ) + ::sal_Int8 CachedBitmap::doRedraw( const rendering::ViewState& rNewState, + const rendering::ViewState& /*rOldState*/, + const uno::Reference< rendering::XCanvas >& rTargetCanvas, + bool bSameViewTransform ) { ENSURE_OR_THROW( bSameViewTransform, "CachedBitmap::doRedraw(): base called with changed view transform " diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx index cf33a3c22889..da945cb467b0 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.hxx +++ b/canvas/source/cairo/cairo_cachedbitmap.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 @@ -44,24 +44,24 @@ namespace cairocanvas /** Create an XCachedPrimitive for given GraphicObject */ CachedBitmap( const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& rUsedViewState, + const ::com::sun::star::rendering::ViewState& rUsedViewState, const ::com::sun::star::rendering::RenderState& rUsedRenderState, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas >& rTarget ); + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCanvas >& rTarget ); /// Dispose all internal references virtual void SAL_CALL disposing(); private: - 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 ); + 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 ); ::cairo::SurfaceSharedPtr mpSurface; - const ::com::sun::star::rendering::RenderState maRenderState; + const ::com::sun::star::rendering::RenderState maRenderState; }; } diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx index 3b6a3a86814c..71a9bb3f9b3e 100644 --- a/canvas/source/cairo/cairo_cairo.cxx +++ b/canvas/source/cairo/cairo_cairo.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 @@ -34,7 +34,7 @@ #ifdef WNT # include <tools/prewin.h> -# include <windows.h> +# include <windows.h> # include <tools/postwin.h> #endif @@ -45,7 +45,7 @@ namespace cairo { /**************************************************************************************** * Platform independent part of surface backends for OpenOffice.org Cairo Canvas * - * For the rest of the functions (and the platform-specific derived * + * For the rest of the functions (and the platform-specific derived * * Surface classes), see platform specific cairo_<platform>_cairo.cxx * ****************************************************************************************/ diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx index a14d107fcc3f..d468d28b4753 100644 --- a/canvas/source/cairo/cairo_cairo.hxx +++ b/canvas/source/cairo/cairo_cairo.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 @@ -59,7 +59,7 @@ namespace cairo { For each cairo-supported platform, there's an implementation of this interface */ - struct Surface + struct Surface { public: virtual ~Surface() {} @@ -84,11 +84,11 @@ namespace cairo { /// Create Surface from given cairo surface SurfaceSharedPtr createSurface( const CairoSurfaceSharedPtr& rSurface ); /// Create surface with given dimensions - SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice, + SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice, int x, int y, int width, int height ); /// Create Surface for given bitmap data - SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice, - const BitmapSystemData& rData, + SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice, + const BitmapSystemData& rData, const Size& rSize ); /// Check whether cairo will work on given window diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 52b947b2cb05..8798751ecde1 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_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 @@ -50,7 +50,7 @@ #ifdef WNT # include <tools/prewin.h> -# include <windows.h> +# include <windows.h> # include <tools/postwin.h> #endif @@ -88,16 +88,16 @@ namespace cairocanvas ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 && maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER && - maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE, + maArguments[5].getValueTypeClass() == uno::TypeClass_SEQUENCE, "Canvas::initialize: wrong number of arguments, or wrong types" ); // We expect a single Any here, containing a pointer to a valid // VCL output device, on which to output (mostly needed for text) sal_Int64 nPtr = 0; maArguments[0] >>= nPtr; - OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr); - - ENSURE_ARG_OR_THROW( pOutDev != NULL, + OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr); + + ENSURE_ARG_OR_THROW( pOutDev != NULL, "Canvas::initialize: invalid OutDev pointer" ); awt::Rectangle aBounds; @@ -111,10 +111,10 @@ namespace cairocanvas throw lang::NoSupportException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Passed SystemGraphicsData invalid!")), - NULL); + NULL); bool bHasXRender = IsCairoWorking(pOutDev); - ENSURE_ARG_OR_THROW( bHasXRender == true, + ENSURE_ARG_OR_THROW( bHasXRender == true, "SpriteCanvas::SpriteCanvas: No RENDER extension" ); // setup helper @@ -125,7 +125,7 @@ namespace cairocanvas *this, this ); // forward surface to render on to canvashelper - maCanvasHelper.setSurface( + maCanvasHelper.setSurface( maDeviceHelper.getSurface(), false ); @@ -154,7 +154,7 @@ namespace cairocanvas bool Canvas::repaint( const SurfaceSharedPtr& pSurface, const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + const rendering::RenderState& renderState ) { return maCanvasHelper.repaint( pSurface, viewState, renderState ); } diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 02837d03f6b6..163d2fc383aa 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_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 @@ -68,9 +68,9 @@ namespace cairocanvas ::com::sun::star::lang::XMultiServiceFactory, ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; + ::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >, - DeviceHelper, + DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase_Base; @@ -95,9 +95,9 @@ namespace cairocanvas }; typedef ::canvas::IntegerBitmapBase< CanvasBaseSurfaceProvider_Base, - CanvasHelper, + CanvasHelper, ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBaseT; + ::cppu::OWeakObject > CanvasBaseT; /** Product of this component's factory. @@ -112,9 +112,9 @@ namespace cairocanvas public RepaintTarget { public: - Canvas( const ::com::sun::star::uno::Sequence< + Canvas( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); void initialize(); @@ -134,15 +134,15 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceName virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); // RepaintTarget virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); // SurfaceProvider virtual SurfaceSharedPtr getSurface(); diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 33ee53ffcf2a..daad97cfa464 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.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 @@ -43,7 +43,7 @@ # include "cairo_win32_cairo.hxx" # include <cairo-win32.h> #else -# error Native API needed. +# error Native API needed. #endif using namespace ::cairo; @@ -56,15 +56,15 @@ namespace { // cant seem to retrieve HBITMAP from cairo. copy content then HDC hScreenDC=GetDC(NULL); - HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC, - rSize.getX(), + HBITMAP hBmpBitmap = CreateCompatibleBitmap( hScreenDC, + rSize.getX(), rSize.getY() ); - HDC hBmpDC = CreateCompatibleDC( 0 ); + HDC hBmpDC = CreateCompatibleDC( 0 ); HBITMAP hBmpOld = (HBITMAP) SelectObject( hBmpDC, hBmpBitmap ); - BitBlt( hBmpDC, 0, 0, rSize.getX(), rSize.getX(), - cairo_win32_surface_get_dc(rSurface->getCairoSurface().get()), + BitBlt( hBmpDC, 0, 0, rSize.getX(), rSize.getX(), + cairo_win32_surface_get_dc(rSurface->getCairoSurface().get()), 0, 0, SRCCOPY ); SelectObject( hBmpDC, hBmpOld ); @@ -140,7 +140,7 @@ namespace cairocanvas } bool CanvasBitmap::repaint( const SurfaceSharedPtr& pSurface, - const rendering::ViewState& viewState, + const rendering::ViewState& viewState, const rendering::RenderState& renderState ) { return maCanvasHelper.repaint( pSurface, viewState, renderState ); @@ -152,23 +152,23 @@ namespace cairocanvas // 0 ... get BitmapEx // 1 ... get Pixbuf with bitmap RGB content // 2 ... get Pixbuf with bitmap alpha mask - switch( nHandle ) + switch( nHandle ) { case 0: { aRV = uno::Any( reinterpret_cast<sal_Int64>( (BitmapEx*) NULL ) ); break; } - case 1: + case 1: { #ifdef CAIRO_HAS_XLIB_SURFACE X11Surface* pXlibSurface=dynamic_cast<X11Surface*>(mpBufferSurface.get()); OSL_ASSERT(pXlibSurface); uno::Sequence< uno::Any > args( 3 ); - args[0] = uno::Any( false ); // do not call XFreePixmap on it + args[0] = uno::Any( false ); // do not call XFreePixmap on it args[1] = uno::Any( pXlibSurface->getPixmap()->mhDrawable ); args[2] = uno::Any( sal_Int32( pXlibSurface->getDepth() ) ); - + aRV = uno::Any( args ); #elif defined CAIRO_HAS_QUARTZ_SURFACE QuartzSurface* pQuartzSurface = dynamic_cast<QuartzSurface*>(mpBufferSurface.get()); @@ -181,7 +181,7 @@ namespace cairocanvas // the alpha channel is ignored here. uno::Sequence< uno::Any > args( 1 ); args[1] = uno::Any( sal_Int64(surface2HBitmap(mpBufferSurface,maSize)) ); - + aRV = uno::Any( args ); // caller frees the bitmap #else @@ -189,7 +189,7 @@ namespace cairocanvas #endif break; } - case 2: + case 2: { #ifdef CAIRO_HAS_XLIB_SURFACE uno::Sequence< uno::Any > args( 3 ); @@ -197,8 +197,8 @@ namespace cairocanvas CairoSharedPtr pAlphaCairo = pAlphaSurface->getCairo(); X11Surface* pXlibSurface=dynamic_cast<X11Surface*>(pAlphaSurface.get()); OSL_ASSERT(pXlibSurface); - - // create RGB image (levels of gray) of alpha channel of original picture + + // create RGB image (levels of gray) of alpha channel of original picture cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 ); cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pAlphaCairo.get() ); @@ -206,22 +206,22 @@ namespace cairocanvas cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_XOR ); cairo_paint( pAlphaCairo.get() ); pAlphaCairo.reset(); - + X11PixmapSharedPtr pPixmap = pXlibSurface->getPixmap(); args[0] = uno::Any( true ); args[1] = ::com::sun::star::uno::Any( pPixmap->mhDrawable ); args[2] = ::com::sun::star::uno::Any( sal_Int32( pXlibSurface->getDepth () ) ); - pPixmap->clear(); // caller takes ownership of pixmap - - // return pixmap and alphachannel pixmap - it will be used in BitmapEx + pPixmap->clear(); // caller takes ownership of pixmap + + // return pixmap and alphachannel pixmap - it will be used in BitmapEx aRV = uno::Any( args ); #elif defined CAIRO_HAS_QUARTZ_SURFACE SurfaceSharedPtr pAlphaSurface = mpSurfaceProvider->createSurface( maSize, CAIRO_CONTENT_COLOR ); CairoSharedPtr pAlphaCairo = pAlphaSurface->getCairo(); QuartzSurface* pQuartzSurface=dynamic_cast<QuartzSurface*>(pAlphaSurface.get()); OSL_ASSERT(pQuartzSurface); - - // create RGB image (levels of gray) of alpha channel of original picture + + // create RGB image (levels of gray) of alpha channel of original picture cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 ); cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pAlphaCairo.get() ); @@ -229,16 +229,16 @@ namespace cairocanvas cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_XOR ); cairo_paint( pAlphaCairo.get() ); pAlphaCairo.reset(); - + uno::Sequence< uno::Any > args( 1 ); args[0] = uno::Any( sal_IntPtr (pQuartzSurface->getCGContext()) ); - // return ??? and alphachannel ??? - it will be used in BitmapEx + // return ??? and alphachannel ??? - it will be used in BitmapEx aRV = uno::Any( args ); #elif defined CAIRO_HAS_WIN32_SURFACE SurfaceSharedPtr pAlphaSurface = mpSurfaceProvider->createSurface( maSize, CAIRO_CONTENT_COLOR ); CairoSharedPtr pAlphaCairo = pAlphaSurface->getCairo(); - - // create RGB image (levels of gray) of alpha channel of original picture + + // create RGB image (levels of gray) of alpha channel of original picture cairo_set_source_rgba( pAlphaCairo.get(), 1, 1, 1, 1 ); cairo_set_operator( pAlphaCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pAlphaCairo.get() ); @@ -250,7 +250,7 @@ namespace cairocanvas // cant seem to retrieve HBITMAP from cairo. copy content then uno::Sequence< uno::Any > args( 1 ); args[1] = uno::Any( sal_Int64(surface2HBitmap(pAlphaSurface,maSize)) ); - + aRV = uno::Any( args ); // caller frees the bitmap #else @@ -280,7 +280,7 @@ namespace cairocanvas { uno::Sequence< ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); - + return aRet; } diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 532ce8d26b41..c61b6583bd91 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.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,18 +56,18 @@ namespace cairocanvas typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas, ::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; - class CanvasBitmapSpriteSurface_Base : + ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; + class CanvasBitmapSpriteSurface_Base : public ::canvas::BaseMutexHelper<CanvasBitmapBase_Base>, public SurfaceProvider { }; - typedef ::canvas::IntegerBitmapBase< + typedef ::canvas::IntegerBitmapBase< CanvasBitmapSpriteSurface_Base, - CanvasHelper, + CanvasHelper, ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + ::cppu::OWeakObject > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public RepaintTarget @@ -77,7 +77,7 @@ namespace cairocanvas @param rSize Size of the bitmap - + @param rDevice Reference device, with which bitmap should be compatible */ @@ -94,7 +94,7 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ namespace cairocanvas // RepaintTarget virtual bool repaint( const SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); // XFastPropertySet diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index b78bf44c3313..187c4d1c4462 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.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 @@ -50,7 +50,7 @@ using namespace ::com::sun::star; namespace cairocanvas { - CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, + CanvasCustomSprite::CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rRefDevice ) : mpSpriteCanvas( rRefDevice ), maSize( ::canvas::tools::roundUp( rSpriteSize.Width ), @@ -65,8 +65,8 @@ namespace cairocanvas mpBufferSurface = mpSpriteCanvas->createSurface( maSize ); - maCanvasHelper.init( maSize, - *rRefDevice, + maCanvasHelper.init( maSize, + *rRefDevice, rRefDevice.get() ); maCanvasHelper.setSurface( mpBufferSurface, true ); @@ -77,7 +77,7 @@ namespace cairocanvas // clear sprite to 100% transparent maCanvasHelper.clear(); } - + void SAL_CALL CanvasCustomSprite::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -104,16 +104,16 @@ namespace cairocanvas ::osl::MutexGuard aGuard( m_aMutex ); maSpriteHelper.redraw( pCairo, - rOrigOutputPos, - mbSurfaceDirty, + rOrigOutputPos, + mbSurfaceDirty, bBufferedUpdate ); mbSurfaceDirty = false; } bool CanvasCustomSprite::repaint( const SurfaceSharedPtr& pSurface, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { return maCanvasHelper.repaint( pSurface, viewState, renderState ); } @@ -170,7 +170,7 @@ namespace cairocanvas { uno::Sequence< ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); - + return aRet; } } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index d9b525716690..cad0eafc739f 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.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 @@ -58,7 +58,7 @@ namespace cairocanvas typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite, ::com::sun::star::rendering::XBitmapCanvas, ::com::sun::star::rendering::XIntegerBitmap, - ::com::sun::star::lang::XServiceInfo > CanvasCustomSpriteBase_Base; + ::com::sun::star::lang::XServiceInfo > CanvasCustomSpriteBase_Base; /** Mixin Sprite Have to mixin the Sprite interface before deriving from @@ -83,10 +83,10 @@ namespace cairocanvas }; typedef ::canvas::CanvasCustomSpriteBase< CanvasCustomSpriteSpriteBase_Base, - SpriteHelper, - CanvasHelper, + SpriteHelper, + CanvasHelper, ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasCustomSpriteBaseT; + ::cppu::OWeakObject > CanvasCustomSpriteBaseT; /* Definition of CanvasCustomSprite class */ @@ -108,7 +108,7 @@ namespace cairocanvas @param rDevice Target DX device */ - CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, + CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rRefDevice ); virtual void SAL_CALL disposing(); @@ -134,7 +134,7 @@ namespace cairocanvas // RepaintTarget virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); // SurfaceProvider @@ -146,7 +146,7 @@ namespace cairocanvas private: /** MUST hold here, too, since CanvasHelper only contains a - raw pointer (without refcounting) + raw pointer (without refcounting) */ SpriteCanvasRef mpSpriteCanvas; ::cairo::SurfaceSharedPtr mpBufferSurface; diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index b6d83413e113..780951f18cf4 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.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 @@ -47,10 +47,10 @@ using namespace ::com::sun::star; namespace cairocanvas { - CanvasFont::CanvasFont( const rendering::FontRequest& rFontRequest, - const uno::Sequence< beans::PropertyValue >& /*rExtraFontProperties*/, - const geometry::Matrix2D& rFontMatrix, - const SurfaceProviderRef& rDevice ) : + CanvasFont::CanvasFont( const rendering::FontRequest& rFontRequest, + const uno::Sequence< beans::PropertyValue >& /*rExtraFontProperties*/, + const geometry::Matrix2D& rFontMatrix, + const SurfaceProviderRef& rDevice ) : CanvasFont_Base( m_aMutex ), maFont( Font( rFontRequest.FontDescription.FamilyName, rFontRequest.FontDescription.StyleName, @@ -84,7 +84,7 @@ namespace cairocanvas const Size aSize = pOutDev->GetFontMetric( *maFont ).GetSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); - double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); + double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); if( !::basegfx::fTools::equalZero( fDividend) ) fStretch /= fDividend; @@ -112,9 +112,9 @@ namespace cairocanvas if( !mpRefDevice.is() ) return uno::Reference< rendering::XTextLayout >(); // we're disposed - return new TextLayout( aText, - nDirection, - nRandomSeed, + return new TextLayout( aText, + nDirection, + nRandomSeed, Reference( this ), mpRefDevice ); } diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index d471082c70ff..e9394c0640ea 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.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 @@ -55,7 +55,7 @@ namespace cairocanvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont, ::com::sun::star::lang::XServiceInfo > CanvasFont_Base; - class CanvasFont : public ::comphelper::OBaseMutex, + class CanvasFont : public ::comphelper::OBaseMutex, public CanvasFont_Base, private ::boost::noncopyable { @@ -64,10 +64,10 @@ namespace cairocanvas CanvasFont, ::com::sun::star::rendering::XCanvasFont > Reference; - CanvasFont( 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& rFontMatrix, - const SurfaceProviderRef& rDevice ); + CanvasFont( 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& rFontMatrix, + const SurfaceProviderRef& rDevice ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -87,9 +87,9 @@ namespace cairocanvas ::Font getVCLFont() const; private: - ::canvas::vcltools::VCLObject<Font> maFont; + ::canvas::vcltools::VCLObject<Font> maFont; ::com::sun::star::rendering::FontRequest maFontRequest; - SurfaceProviderRef mpRefDevice; + SurfaceProviderRef mpRefDevice; }; } diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index a5742685498c..0294780bc9dc 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.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 @@ -228,7 +228,7 @@ namespace cairocanvas compositingMode = CAIRO_OPERATOR_SATURATE; break; } - cairo_set_operator( mpCairo.get(), compositingMode ); + cairo_set_operator( mpCairo.get(), compositingMode ); } void CanvasHelper::clear() @@ -248,7 +248,7 @@ namespace cairocanvas else cairo_set_source_rgb( mpCairo.get(), 1.0, 1.0, 1.0 ); cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); - + cairo_rectangle( mpCairo.get(), 0, 0, maSize.getX(), maSize.getY() ); cairo_fill( mpCairo.get() ); @@ -256,18 +256,18 @@ namespace cairocanvas } } - void CanvasHelper::drawPoint( const rendering::XCanvas* , - const geometry::RealPoint2D& , - const rendering::ViewState& , - const rendering::RenderState& ) + void CanvasHelper::drawPoint( const rendering::XCanvas* , + const geometry::RealPoint2D& , + const rendering::ViewState& , + const rendering::RenderState& ) { } - void CanvasHelper::drawLine( const rendering::XCanvas* /*pCanvas*/, - const geometry::RealPoint2D& aStartPoint, - const geometry::RealPoint2D& aEndPoint, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + void CanvasHelper::drawLine( const rendering::XCanvas* /*pCanvas*/, + const geometry::RealPoint2D& aStartPoint, + const geometry::RealPoint2D& aEndPoint, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { if( mpCairo ) { cairo_save( mpCairo.get() ); @@ -284,11 +284,11 @@ namespace cairocanvas } } - void CanvasHelper::drawBezier( const rendering::XCanvas* , - const geometry::RealBezierSegment2D& aBezierSegment, - const geometry::RealPoint2D& aEndPoint, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + void CanvasHelper::drawBezier( const rendering::XCanvas* , + const geometry::RealBezierSegment2D& aBezierSegment, + const geometry::RealPoint2D& aEndPoint, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { if( mpCairo ) { cairo_save( mpCairo.get() ); @@ -298,7 +298,7 @@ namespace cairocanvas useStates( viewState, renderState, true ); cairo_move_to( mpCairo.get(), aBezierSegment.Px + 0.5, aBezierSegment.Py + 0.5 ); - cairo_curve_to( mpCairo.get(), + cairo_curve_to( mpCairo.get(), aBezierSegment.C1x + 0.5, aBezierSegment.C1y + 0.5, aBezierSegment.C2x + 0.5, aBezierSegment.C2y + 0.5, aEndPoint.X + 0.5, aEndPoint.Y + 0.5 ); @@ -326,7 +326,7 @@ namespace cairocanvas CanvasBitmap* pBitmapImpl = dynamic_cast< CanvasBitmap* >( xBitmap.get() ); if( pBitmapImpl ) return pBitmapImpl->getSurface(); - + SurfaceProvider* pSurfaceProvider = dynamic_cast<SurfaceProvider*>( xBitmap.get() ); if( pSurfaceProvider ) return pSurfaceProvider->getSurface(); @@ -337,16 +337,16 @@ namespace cairocanvas static ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap ) { // TODO(F1): Add support for floating point bitmap formats - uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, + uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp); if( !!aBmpEx ) return aBmpEx; // TODO(F1): extract pixel from XBitmap interface - ENSURE_OR_THROW( false, + ENSURE_OR_THROW( false, "bitmapExFromXBitmap(): could not extract BitmapEx" ); - + return ::BitmapEx(); } @@ -409,7 +409,7 @@ namespace cairocanvas SurfaceSharedPtr pSurface = surfaceFromXBitmap( xBitmap ); if( pSurface ) data = NULL; - else + else { ::BitmapEx aBmpEx = bitmapExFromXBitmap(xBitmap); ::Bitmap aBitmap = aBmpEx.GetBitmap(); @@ -426,10 +426,10 @@ namespace cairocanvas if( !pSurface ) { AlphaMask aAlpha = aBmpEx.GetAlpha(); - ::BitmapReadAccess* pBitmapReadAcc = aBitmap.AcquireReadAccess(); - ::BitmapReadAccess* pAlphaReadAcc = NULL; - const long nWidth = pBitmapReadAcc->Width(); - const long nHeight = pBitmapReadAcc->Height(); + ::BitmapReadAccess* pBitmapReadAcc = aBitmap.AcquireReadAccess(); + ::BitmapReadAccess* pAlphaReadAcc = NULL; + const long nWidth = pBitmapReadAcc->Width(); + const long nHeight = pBitmapReadAcc->Height(); long nX, nY; bool bIsAlpha = false; @@ -625,29 +625,29 @@ namespace cairocanvas } } } - + aBitmap.ReleaseAccess( pBitmapReadAcc ); if( pAlphaReadAcc ) aAlpha.ReleaseAccess( pAlphaReadAcc ); SurfaceSharedPtr pImageSurface = createSurface( CairoSurfaceSharedPtr( - cairo_image_surface_create_for_data( + cairo_image_surface_create_for_data( data, bIsAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, nWidth, nHeight, nWidth*4 ), &cairo_surface_destroy) ); + + // pSurface = rSurfaceProvider->getSurface( ::basegfx::B2ISize( nWidth, nHeight ), bIsAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR ); + // Cairo* pTargetCairo = cairo_create( pSurface ); + // cairo_set_source_surface( pTargetCairo, pImageSurface, 0, 0 ); - // pSurface = rSurfaceProvider->getSurface( ::basegfx::B2ISize( nWidth, nHeight ), bIsAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR ); - // Cairo* pTargetCairo = cairo_create( pSurface ); - // cairo_set_source_surface( pTargetCairo, pImageSurface, 0, 0 ); - - // //if( !bIsAlpha ) - // //cairo_set_operator( pTargetCairo, CAIRO_OPERATOR_SOURCE ); + // //if( !bIsAlpha ) + // //cairo_set_operator( pTargetCairo, CAIRO_OPERATOR_SOURCE ); - // cairo_paint( pTargetCairo ); - // cairo_destroy( pTargetCairo ); - // cairo_surface_destroy( pImageSurface ); + // cairo_paint( pTargetCairo ); + // cairo_destroy( pTargetCairo ); + // cairo_surface_destroy( pImageSurface ); pSurface = pImageSurface; bHasAlpha = bIsAlpha; @@ -811,10 +811,10 @@ namespace cairocanvas uno::Reference< lang::XServiceInfo > xRef( aTexture.Gradient, uno::UNO_QUERY ); OSL_TRACE( "gradient fill" ); - if( xRef.is() && + if( xRef.is() && xRef->getImplementationName().equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME ) ) ) ) { // TODO(Q1): Maybe use dynamic_cast here - + // TODO(E1): Return value // TODO(F1): FillRule OSL_TRACE( "known implementation" ); @@ -828,12 +828,12 @@ namespace cairocanvas aTransform.m11, aTransform.m02, aTransform.m12); if( pPolyImpl->getValues().meType == canvas::ParametricPolyPolygon::GRADIENT_RECTANGULAR ) { - // no general path gradient yet in cairo; emulate then + // no general path gradient yet in cairo; emulate then cairo_save( pCairo ); cairo_clip( pCairo ); // fill bound rect with start color - cairo_rectangle( pCairo, rBounds.getMinX(), rBounds.getMinY(), + cairo_rectangle( pCairo, rBounds.getMinX(), rBounds.getMinY(), rBounds.getWidth(), rBounds.getHeight() ); setColor(pCairo,pPolyImpl->getValues().maColors[0]); cairo_fill(pCairo); @@ -841,8 +841,8 @@ namespace cairocanvas cairo_transform( pCairo, &aTextureMatrix ); // longest line in gradient bound rect - const unsigned int nGradientSize( - static_cast<unsigned int>( + const unsigned int nGradientSize( + static_cast<unsigned int>( ::basegfx::B2DVector(rBounds.getMinimum() - rBounds.getMaximum()).getLength() + 1.0 ) ); // typical number for pixel of the same color (strip size) @@ -850,10 +850,10 @@ namespace cairocanvas // use at least three steps, and at utmost the number of color // steps - const unsigned int nStepCount( - ::std::max( + const unsigned int nStepCount( + ::std::max( 3U, - ::std::min( + ::std::min( nGradientSize / nStripSize, 128U )) + 1 ); @@ -861,7 +861,7 @@ namespace cairocanvas basegfx::tools::KeyStopLerp aLerper(pPolyImpl->getValues().maStops); for( unsigned int i=1; i<nStepCount; ++i ) { - const double fT( i/double(nStepCount) ); + const double fT( i/double(nStepCount) ); std::ptrdiff_t nIndex; double fAlpha; @@ -940,7 +940,7 @@ namespace cairocanvas rendering::FillRule eFillrule ) { if( pTextures ) - ENSURE_ARG_OR_THROW( pTextures->getLength(), + ENSURE_ARG_OR_THROW( pTextures->getLength(), "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence"); bool bOpToDo = false; @@ -951,8 +951,8 @@ namespace cairocanvas cairo_matrix_init_identity( &aIdentityMatrix ); cairo_set_matrix( pCairo, &aIdentityMatrix ); - cairo_set_fill_rule( pCairo, - eFillrule == rendering::FillRule_EVEN_ODD ? + cairo_set_fill_rule( pCairo, + eFillrule == rendering::FillRule_EVEN_ODD ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING ); for( sal_uInt32 nPolygonIndex = 0; nPolygonIndex < aPolyPolygon.count(); nPolygonIndex++ ) { @@ -960,7 +960,7 @@ namespace cairocanvas const sal_uInt32 nPointCount( aPolygon.count() ); // to correctly render closed curves, need to output first // point twice (so output one additional point) - const sal_uInt32 nExtendedPointCount( nPointCount + + const sal_uInt32 nExtendedPointCount( nPointCount + aPolygon.isClosed()*aPolygon.areControlPointsUsed() ); if( nPointCount > 1) { @@ -999,7 +999,7 @@ namespace cairocanvas nAY = aA.getY(); nBX = aB.getX(); nBY = aB.getY(); - + if( aOperation == Stroke ) { nAX += 0.5; nAY += 0.5; @@ -1008,7 +1008,7 @@ namespace cairocanvas } cairo_matrix_transform_point( &aOrigMatrix, &nAX, &nAY ); cairo_matrix_transform_point( &aOrigMatrix, &nBX, &nBY ); - cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY ); + cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY ); } else { cairo_line_to( pCairo, nX, nY ); OSL_TRACE( "line to %f,%f", nX, nY ); @@ -1049,7 +1049,7 @@ namespace cairocanvas const uno::Sequence< rendering::Texture >* pTextures, Cairo* pCairo ) const { - const ::basegfx::B2DPolyPolygon& rPolyPoly( + const ::basegfx::B2DPolyPolygon& rPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) ); if( !pCairo ) @@ -1076,7 +1076,7 @@ namespace cairocanvas aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex)); aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b)); aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex)); - + doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge), aOperation, pCairo, pTextures, @@ -1091,31 +1091,31 @@ namespace cairocanvas } else { - doPolyPolygonImplementation( rPolyPoly, aOperation, - pCairo, pTextures, + doPolyPolygonImplementation( rPolyPoly, aOperation, + pCairo, pTextures, mpSurfaceProvider, xPolyPolygon->getFillRule() ); } } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; mxDevice->startPerfTrace( &aTimer ); #endif - + if( mpCairo ) { cairo_save( mpCairo.get() ); - + cairo_set_line_width( mpCairo.get(), 1 ); - + useStates( viewState, renderState, true ); doPolyPolygonPath( xPolyPolygon, Stroke ); - + cairo_restore( mpCairo.get() ); } else OSL_TRACE ("CanvasHelper called after it was disposed"); @@ -1127,11 +1127,11 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const rendering::StrokeAttributes& strokeAttributes ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState, + const rendering::StrokeAttributes& strokeAttributes ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -1167,7 +1167,7 @@ namespace cairocanvas bool bNoLineJoin(false); switch( strokeAttributes.JoinType ) { - // cairo doesn't have join type NONE so we use MITER as it's pretty close + // cairo doesn't have join type NONE so we use MITER as it's pretty close case rendering::PathJoinType::NONE: bNoLineJoin = true; case rendering::PathJoinType::MITER: @@ -1205,43 +1205,43 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, - const rendering::ViewState& /*viewState*/, - const rendering::RenderState& /*renderState*/, - const uno::Sequence< rendering::Texture >& /*textures*/, - const rendering::StrokeAttributes& /*strokeAttributes*/ ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, + const rendering::ViewState& /*viewState*/, + const rendering::RenderState& /*renderState*/, + const uno::Sequence< rendering::Texture >& /*textures*/, + const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, - const rendering::ViewState& /*viewState*/, - const rendering::RenderState& /*renderState*/, - const uno::Sequence< rendering::Texture >& /*textures*/, - const uno::Reference< geometry::XMapping2D >& /*xMapping*/, - const rendering::StrokeAttributes& /*strokeAttributes*/ ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, + const rendering::ViewState& /*viewState*/, + const rendering::RenderState& /*renderState*/, + const uno::Sequence< rendering::Texture >& /*textures*/, + const uno::Reference< geometry::XMapping2D >& /*xMapping*/, + const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XPolyPolygon2D > CanvasHelper::queryStrokeShapes( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, - const rendering::ViewState& /*viewState*/, - const rendering::RenderState& /*renderState*/, - const rendering::StrokeAttributes& /*strokeAttributes*/ ) + uno::Reference< rendering::XPolyPolygon2D > CanvasHelper::queryStrokeShapes( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, + const rendering::ViewState& /*viewState*/, + const rendering::RenderState& /*renderState*/, + const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -1253,7 +1253,7 @@ namespace cairocanvas useStates( viewState, renderState, true ); doPolyPolygonPath( xPolyPolygon, Fill ); - + cairo_restore( mpCairo.get() ); } else OSL_TRACE ("CanvasHelper called after it was disposed"); @@ -1265,11 +1265,11 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* , + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* , const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const uno::Sequence< rendering::Texture >& textures ) + const rendering::ViewState& viewState, + const rendering::RenderState& renderState, + const uno::Sequence< rendering::Texture >& textures ) { if( mpCairo ) { cairo_save( mpCairo.get() ); @@ -1283,19 +1283,19 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* , - const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, - const rendering::ViewState& /*viewState*/, - const rendering::RenderState& /*renderState*/, - const uno::Sequence< rendering::Texture >& /*textures*/, - const uno::Reference< geometry::XMapping2D >& /*xMapping*/ ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* , + const uno::Reference< rendering::XPolyPolygon2D >& /*xPolyPolygon*/, + const rendering::ViewState& /*viewState*/, + const rendering::RenderState& /*renderState*/, + const uno::Sequence< rendering::Texture >& /*textures*/, + const uno::Reference< geometry::XMapping2D >& /*xMapping*/ ) { // TODO return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmapSurface( const rendering::XCanvas* pCanvas, - const SurfaceSharedPtr& pInputSurface, + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmapSurface( const rendering::XCanvas* pCanvas, + const SurfaceSharedPtr& pInputSurface, const rendering::ViewState& viewState, const rendering::RenderState& renderState, const geometry::IntegerSize2D& rSize, @@ -1314,8 +1314,8 @@ namespace cairocanvas useStates( viewState, renderState, true ); - // if( !bHasAlpha ) - // cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); + // if( !bHasAlpha ) + // cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); Matrix aMatrix; @@ -1334,7 +1334,7 @@ namespace cairocanvas aBitmapSize.Width = static_cast<sal_Int32>( dWidth ); aBitmapSize.Height = static_cast<sal_Int32>( dHeight ); - SurfaceSharedPtr pScaledSurface = mpSurfaceProvider->createSurface( + SurfaceSharedPtr pScaledSurface = mpSurfaceProvider->createSurface( ::basegfx::B2ISize( aBitmapSize.Width, aBitmapSize.Height ), bHasAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR ); CairoSharedPtr pCairo = pScaledSurface->getCairo(); @@ -1350,9 +1350,9 @@ namespace cairocanvas aMatrix.xx = aMatrix.yy = 1; cairo_set_matrix( mpCairo.get(), &aMatrix ); - rv = uno::Reference< rendering::XCachedPrimitive >( - new CachedBitmap( pSurface, viewState, renderState, - // cast away const, need to + rv = uno::Reference< rendering::XCachedPrimitive >( + new CachedBitmap( pSurface, viewState, renderState, + // cast away const, need to // change refcount (as this is // ~invisible to client code, // still logically const) @@ -1411,10 +1411,10 @@ namespace cairocanvas return rv; // uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* pCanvas, - const uno::Reference< rendering::XBitmap >& xBitmap, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmap( const rendering::XCanvas* pCanvas, + const uno::Reference< rendering::XBitmap >& xBitmap, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -1442,10 +1442,10 @@ namespace cairocanvas return rv; } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* pCanvas, - const uno::Reference< rendering::XBitmap >& xBitmap, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawBitmapModulated( const rendering::XCanvas* pCanvas, + const uno::Reference< rendering::XBitmap >& xBitmap, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -1478,14 +1478,14 @@ namespace cairocanvas return uno::Reference< rendering::XGraphicDevice >(mpDevice); } - void CanvasHelper::copyRect( const rendering::XCanvas* , - const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/, - const geometry::RealRectangle2D& /*sourceRect*/, - const rendering::ViewState& /*sourceViewState*/, - const rendering::RenderState& /*sourceRenderState*/, - const geometry::RealRectangle2D& /*destRect*/, - const rendering::ViewState& /*destViewState*/, - const rendering::RenderState& /*destRenderState*/ ) + void CanvasHelper::copyRect( const rendering::XCanvas* , + const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/, + const geometry::RealRectangle2D& /*sourceRect*/, + const rendering::ViewState& /*sourceViewState*/, + const rendering::RenderState& /*sourceRenderState*/, + const geometry::RealRectangle2D& /*destRect*/, + const rendering::ViewState& /*destViewState*/, + const rendering::RenderState& /*destRenderState*/ ) { // TODO(F2): copyRect NYI } @@ -1498,8 +1498,8 @@ namespace cairocanvas return ::basegfx::unotools::integerSize2DFromB2ISize( maSize ); } - uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool /*beFast*/ ) + uno::Reference< rendering::XBitmap > CanvasHelper::getScaledBitmap( const geometry::RealSize2D& newSize, + sal_Bool /*beFast*/ ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -1520,7 +1520,7 @@ namespace cairocanvas return uno::Reference< rendering::XBitmap >(); } - uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout& aLayout, + uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout& aLayout, const geometry::IntegerRectangle2D& rect ) { if( mpCairo ) { @@ -1538,30 +1538,30 @@ namespace cairocanvas cairo_paint( pCairo ); cairo_destroy( pCairo ); cairo_surface_destroy( pImageSurface ); - + aLayout.ScanLines = nHeight; aLayout.ScanLineBytes = nWidth*4; aLayout.ScanLineStride = aLayout.ScanLineBytes; - + return aRes; } - + return uno::Sequence< sal_Int8 >(); } - void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/, - const rendering::IntegerBitmapLayout& /*bitmapLayout*/, - const geometry::IntegerRectangle2D& /*rect*/ ) + void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/, + const rendering::IntegerBitmapLayout& /*bitmapLayout*/, + const geometry::IntegerRectangle2D& /*rect*/ ) { } - void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/, - const rendering::IntegerBitmapLayout& /*bitmapLayout*/, + void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/, + const rendering::IntegerBitmapLayout& /*bitmapLayout*/, const geometry::IntegerPoint2D& /*pos*/ ) { } - uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/, + uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/, const geometry::IntegerPoint2D& /*pos*/ ) { return uno::Sequence< sal_Int8 >(); @@ -1573,8 +1573,8 @@ namespace cairocanvas return uno::Reference< rendering::XBitmapPalette >(); } - namespace - { + namespace + { class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace > { private: @@ -1597,8 +1597,8 @@ namespace cairocanvas { return uno::Sequence< beans::PropertyValue >(); } - virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, + virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, uno::RuntimeException) { // TODO(P3): if we know anything about target @@ -1611,7 +1611,7 @@ namespace cairocanvas { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1632,7 +1632,7 @@ namespace cairocanvas { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1653,7 +1653,7 @@ namespace cairocanvas { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1731,15 +1731,15 @@ namespace cairocanvas { return util::Endianness::LITTLE; } - virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, + virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) ) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1763,8 +1763,8 @@ namespace cairocanvas return targetColorSpace->convertFromARGB(aIntermediate); } } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) ) @@ -1785,7 +1785,7 @@ namespace cairocanvas { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1810,7 +1810,7 @@ namespace cairocanvas { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1835,7 +1835,7 @@ namespace cairocanvas { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); - ENSURE_ARG_OR_THROW2(nLen%4==0, + ENSURE_ARG_OR_THROW2(nLen%4==0, "number of channels no multiple of 4", static_cast<rendering::XColorSpace*>(this), 0); @@ -1908,7 +1908,7 @@ namespace cairocanvas } public: - CairoColorSpace() : + CairoColorSpace() : maComponentTags(4), maBitCounts(4) { @@ -1919,21 +1919,21 @@ namespace cairocanvas pTags[2] = rendering::ColorComponentTag::RGB_RED; pTags[3] = rendering::ColorComponentTag::PREMULTIPLIED_ALPHA; - pBitCounts[0] = - pBitCounts[1] = - pBitCounts[2] = + pBitCounts[0] = + pBitCounts[1] = + pBitCounts[2] = pBitCounts[3] = 8; } }; struct CairoColorSpaceHolder : public rtl::StaticWithInit<uno::Reference<rendering::XIntegerBitmapColorSpace>, - CairoColorSpaceHolder> + CairoColorSpaceHolder> { uno::Reference<rendering::XIntegerBitmapColorSpace> operator()() { return new CairoColorSpace(); } - }; + }; } rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout() @@ -1966,7 +1966,7 @@ namespace cairocanvas bool CanvasHelper::repaint( const SurfaceSharedPtr& pSurface, const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + const rendering::RenderState& renderState ) { OSL_TRACE("CanvasHelper::repaint"); @@ -1984,8 +1984,8 @@ namespace cairocanvas aMatrix.xx = aMatrix.yy = 1; cairo_set_matrix( mpCairo.get(), &aMatrix ); - // if( !bHasAlpha ) - // cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); + // if( !bHasAlpha ) + // cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_set_source_surface( mpCairo.get(), pSurface->getCairoSurface().get(), 0, 0 ); cairo_paint( mpCairo.get() ); diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 89d26a941dec..923df8d64f48 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.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 @@ -95,170 +95,170 @@ namespace cairocanvas // XCanvas (only providing, not implementing the // interface. Also note subtle method parameter differences) void clear(); - void drawPoint( const ::com::sun::star::rendering::XCanvas* pCanvas, - const ::com::sun::star::geometry::RealPoint2D& aPoint, - const ::com::sun::star::rendering::ViewState& viewState, + void drawPoint( const ::com::sun::star::rendering::XCanvas* pCanvas, + const ::com::sun::star::geometry::RealPoint2D& aPoint, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); - void drawLine( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 drawBezier( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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, + void drawLine( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 drawBezier( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + drawPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + strokePolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + strokeTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + strokeTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + queryStrokeShapes( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + fillPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + fillTexturedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + fillTextureMappedPolyPolygon( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL - createFont( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - - ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > - queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* pCanvas, - const ::com::sun::star::rendering::FontInfo& aFilter, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aFontProperties ); - - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - drawText( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - drawTextLayout( const ::com::sun::star::rendering::XCanvas* pCanvas, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XTextLayout >& layoutetText, - const ::com::sun::star::rendering::ViewState& viewState, + createFont( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + + ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > + queryAvailableFonts( const ::com::sun::star::rendering::XCanvas* pCanvas, + const ::com::sun::star::rendering::FontInfo& aFilter, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& aFontProperties ); + + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + drawText( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + drawTextLayout( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - drawBitmap( const ::com::sun::star::rendering::XCanvas* pCanvas, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap >& xBitmap, - const ::com::sun::star::rendering::ViewState& viewState, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + drawBitmap( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + drawBitmapModulated( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getDevice(); // BitmapCanvasHelper functionality // ================================ - void copyRect( const ::com::sun::star::rendering::XCanvas* pCanvas, - 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 ); - + void copyRect( const ::com::sun::star::rendering::XCanvas* pCanvas, + 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 ); + ::com::sun::star::geometry::IntegerSize2D getSize(); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > + getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, + sal_Bool beFast ); - ::com::sun::star::uno::Sequence< sal_Int8 > - getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + ::com::sun::star::uno::Sequence< sal_Int8 > + getData( ::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::rendering::IntegerBitmapLayout& bitmapLayout, + void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data, + const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ); - void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color, - const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color, + const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ); - ::com::sun::star::uno::Sequence< sal_Int8 > - getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + ::com::sun::star::uno::Sequence< sal_Int8 > + getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ); ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette(); ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout(); - + // Flush drawing queue to screen - void flush() const; + void flush() const; /** Called from XCanvas base classes, to notify that content is _about_ to change @@ -271,26 +271,26 @@ namespace cairocanvas { LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR }; - + void doPolyPolygonPath( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, Operation aOperation, bool bNoLineJoin = false, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL, ::cairo::Cairo* pCairo=NULL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > - implDrawBitmapSurface( - const ::com::sun::star::rendering::XCanvas* pCanvas, - const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > + implDrawBitmapSurface( + const ::com::sun::star::rendering::XCanvas* pCanvas, + const ::cairo::SurfaceSharedPtr& pSurface, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::geometry::IntegerSize2D& rSize, bool bModulateColors, bool bHasAlpha ); bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ); protected: /** Surface provider diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index c7764617be05..0cc4713fcc60 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.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 @@ -54,31 +54,31 @@ namespace cairocanvas LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR }; - uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* , - const rendering::FontRequest& fontRequest, - const uno::Sequence< beans::PropertyValue >& extraFontProperties, - const geometry::Matrix2D& fontMatrix ) + uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* , + const rendering::FontRequest& fontRequest, + const uno::Sequence< beans::PropertyValue >& extraFontProperties, + const geometry::Matrix2D& fontMatrix ) { return uno::Reference< rendering::XCanvasFont >( new CanvasFont( fontRequest, extraFontProperties, fontMatrix, mpSurfaceProvider )); } - uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* , - const rendering::FontInfo& /*aFilter*/, - const uno::Sequence< beans::PropertyValue >& /*aFontProperties*/ ) + uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas* , + const rendering::FontInfo& /*aFilter*/, + const uno::Sequence< beans::PropertyValue >& /*aFontProperties*/ ) { // TODO return uno::Sequence< rendering::FontInfo >(); } static bool - setupFontTransform( ::OutputDevice& rOutDev, - ::Point& o_rPoint, - ::Font& io_rVCLFont, - const rendering::ViewState& rViewState, - const rendering::RenderState& rRenderState ) + setupFontTransform( ::OutputDevice& rOutDev, + ::Point& o_rPoint, + ::Font& io_rVCLFont, + const rendering::ViewState& rViewState, + const rendering::RenderState& rRenderState ) { ::basegfx::B2DHomMatrix aMatrix; - + ::canvas::tools::mergeViewAndRenderTransform(aMatrix, rViewState, rRenderState); @@ -86,7 +86,7 @@ namespace cairocanvas ::basegfx::B2DTuple aScale; ::basegfx::B2DTuple aTranslate; double nRotate, nShearX; - + aMatrix.decompose( aScale, aTranslate, nRotate, nShearX ); // query font metric _before_ tampering with width and height @@ -125,9 +125,9 @@ namespace cairocanvas static int setupOutDevState( OutputDevice& rOutDev, const rendering::XCanvas* pOwner, - const rendering::ViewState& viewState, + const rendering::ViewState& viewState, const rendering::RenderState& renderState, - ColorType eColorType ) + ColorType eColorType ) { ::canvas::tools::verifyInput( renderState, BOOST_CURRENT_FUNCTION, @@ -147,7 +147,7 @@ namespace cairocanvas if( viewState.Clip.is() ) { - ::basegfx::B2DPolyPolygon aClipPoly( + ::basegfx::B2DPolyPolygon aClipPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( viewState.Clip) ); @@ -156,22 +156,22 @@ namespace cairocanvas // setup non-empty clipping ::basegfx::B2DHomMatrix aMatrix; aClipPoly.transform( - ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, + ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - + aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); } } if( renderState.Clip.is() ) { - ::basegfx::B2DPolyPolygon aClipPoly( + ::basegfx::B2DPolyPolygon aClipPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( renderState.Clip) ); ::basegfx::B2DHomMatrix aMatrix; aClipPoly.transform( - ::canvas::tools::mergeViewAndRenderTransform( aMatrix, + ::canvas::tools::mergeViewAndRenderTransform( aMatrix, viewState, renderState ) ); @@ -241,7 +241,7 @@ namespace cairocanvas break; default: - ENSURE_OR_THROW( false, + ENSURE_OR_THROW( false, "CanvasHelper::setupOutDevState(): Unexpected color type"); break; } @@ -252,17 +252,17 @@ namespace cairocanvas bool setupTextOutput( OutputDevice& rOutDev, const rendering::XCanvas* pOwner, - ::Point& o_rOutPos, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const uno::Reference< rendering::XCanvasFont >& xFont ) + ::Point& o_rOutPos, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState, + const uno::Reference< rendering::XCanvasFont >& xFont ) { setupOutDevState( rOutDev, pOwner, viewState, renderState, TEXT_COLOR ); ::Font aVCLFont; CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() ); - + ENSURE_ARG_OR_THROW( pFont, "CanvasHelper::setupTextOutput(): Font not compatible with this canvas" ); @@ -289,12 +289,12 @@ namespace cairocanvas return true; } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* pOwner, - const rendering::StringContext& text, - const uno::Reference< rendering::XCanvasFont >& xFont, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - sal_Int8 textDirection ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas* pOwner, + const rendering::StringContext& text, + const uno::Reference< rendering::XCanvasFont >& xFont, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState, + sal_Int8 textDirection ) { #ifdef CAIRO_CANVAS_PERF_TRACE struct timespec aTimer; @@ -352,10 +352,10 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* pOwner, - const uno::Reference< rendering::XTextLayout >& xLayoutedText, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* pOwner, + const uno::Reference< rendering::XTextLayout >& xLayoutedText, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) { ENSURE_ARG_OR_THROW( xLayoutedText.is(), "CanvasHelper::drawTextLayout(): layout is NULL"); diff --git a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx index 7d4f459c8908..54d6139f8cb7 100644 --- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx +++ b/canvas/source/cairo/cairo_canvashelper_texturefill.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 @@ -73,19 +73,19 @@ namespace cairocanvas { namespace { - bool textureFill( OutputDevice& rOutDev, - GraphicObject& rGraphic, - const ::Point& rPosPixel, - const ::Size& rNextTileX, - const ::Size& rNextTileY, - sal_Int32 nTilesX, - sal_Int32 nTilesY, - const ::Size& rTileSize, - const GraphicAttr& rAttr) + bool textureFill( OutputDevice& rOutDev, + GraphicObject& rGraphic, + const ::Point& rPosPixel, + const ::Size& rNextTileX, + const ::Size& rNextTileY, + sal_Int32 nTilesX, + sal_Int32 nTilesY, + const ::Size& rTileSize, + const GraphicAttr& rAttr) { - BOOL bRet( false ); - Point aCurrPos; - int nX, nY; + BOOL bRet( false ); + Point aCurrPos; + int nX, nY; for( nY=0; nY < nTilesY; ++nY ) { @@ -96,11 +96,11 @@ namespace cairocanvas { // update return value. This method should return true, if // at least one of the looped Draws succeeded. - bRet |= rGraphic.Draw( &rOutDev, + bRet |= rGraphic.Draw( &rOutDev, aCurrPos, rTileSize, &rAttr ); - + aCurrPos.X() += rNextTileX.Width(); aCurrPos.Y() += rNextTileX.Height(); } @@ -120,15 +120,15 @@ namespace cairocanvas } } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas& rCanvas, + uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas& rCanvas, const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const uno::Sequence< rendering::Texture >& textures ) + const rendering::ViewState& viewState, + const rendering::RenderState& renderState, + const uno::Sequence< rendering::Texture >& textures ) { ENSURE_ARG_OR_THROW( xPolyPolygon.is(), "CanvasHelper::fillPolyPolygon(): polygon is NULL"); - ENSURE_ARG_OR_THROW( textures.getLength(), + ENSURE_ARG_OR_THROW( textures.getLength(), "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence"); cairo_save( mpCairo ); diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 6d5aa8660d1c..b0b6edde7d8c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.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 @@ -78,7 +78,7 @@ namespace cairocanvas OutputDevice* pOutDev=getOutputDevice(); mpSurface = cairo::createSurface( *pOutDev, - pOutDev->GetOutOffXPixel(), + pOutDev->GetOutOffXPixel(), pOutDev->GetOutOffYPixel(), pOutDev->GetOutputWidthPixel(), pOutDev->GetOutputHeightPixel() ); @@ -104,15 +104,15 @@ namespace cairocanvas #if defined (UNX) && !defined (QUARTZ) // X11 only if( mpSurface ) - mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(), + mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(), rSize.getY() + pOutDev->GetOutOffYPixel() ); else #endif - mpSurface = cairo::createSurface( + mpSurface = cairo::createSurface( *pOutDev, - pOutDev->GetOutOffXPixel(), + pOutDev->GetOutOffXPixel(), pOutDev->GetOutOffYPixel(), - rSize.getX(), rSize.getY() ); + rSize.getX(), rSize.getY() ); } geometry::RealSize2D DeviceHelper::getPhysicalResolution() @@ -140,35 +140,35 @@ namespace cairocanvas return ::vcl::unotools::size2DFromSize( aLogSize ); } - uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( - const uno::Reference< rendering::XGraphicDevice >& , - const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points ) + uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( + const uno::Reference< rendering::XGraphicDevice >& , + const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points ) { // disposed? if( !mpSurfaceProvider ) return uno::Reference< rendering::XLinePolyPolygon2D >(); // we're disposed - return uno::Reference< rendering::XLinePolyPolygon2D >( - new ::basegfx::unotools::UnoPolyPolygon( + return uno::Reference< rendering::XLinePolyPolygon2D >( + new ::basegfx::unotools::UnoPolyPolygon( ::basegfx::unotools::polyPolygonFromPoint2DSequenceSequence( points ) ) ); } - uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( - const uno::Reference< rendering::XGraphicDevice >& , - const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points ) + uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( + const uno::Reference< rendering::XGraphicDevice >& , + const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points ) { // disposed? if( !mpSurfaceProvider ) return uno::Reference< rendering::XBezierPolyPolygon2D >(); // we're disposed - return uno::Reference< rendering::XBezierPolyPolygon2D >( + return uno::Reference< rendering::XBezierPolyPolygon2D >( new ::basegfx::unotools::UnoPolyPolygon( ::basegfx::unotools::polyPolygonFromBezier2DSequenceSequence( points ) ) ); } - uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( - const uno::Reference< rendering::XGraphicDevice >& rDevice, - const geometry::IntegerSize2D& size ) + uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( + const uno::Reference< rendering::XGraphicDevice >& rDevice, + const geometry::IntegerSize2D& size ) { // disposed? if( !mpSurfaceProvider ) @@ -179,19 +179,19 @@ namespace cairocanvas ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ), SurfaceProviderRef(mpSurfaceProvider), rDevice.get(), - false )); + false )); } - uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( - const uno::Reference< rendering::XGraphicDevice >& , - const geometry::IntegerSize2D& /*size*/ ) + uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( + const uno::Reference< rendering::XGraphicDevice >& , + const geometry::IntegerSize2D& /*size*/ ) { return uno::Reference< rendering::XVolatileBitmap >(); } - uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( - const uno::Reference< rendering::XGraphicDevice >& rDevice, - const geometry::IntegerSize2D& size ) + uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( + const uno::Reference< rendering::XGraphicDevice >& rDevice, + const geometry::IntegerSize2D& size ) { // disposed? if( !mpSurfaceProvider ) @@ -202,12 +202,12 @@ namespace cairocanvas ::basegfx::unotools::b2ISizeFromIntegerSize2D( size ), SurfaceProviderRef(mpSurfaceProvider), rDevice.get(), - true )); + true )); } - uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( - const uno::Reference< rendering::XGraphicDevice >& , - const geometry::IntegerSize2D& /*size*/ ) + uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( + const uno::Reference< rendering::XGraphicDevice >& , + const geometry::IntegerSize2D& /*size*/ ) { return uno::Reference< rendering::XVolatileBitmap >(); } @@ -223,11 +223,11 @@ namespace cairocanvas // TODO(F3): offer fullscreen mode the XCanvas way return false; } - + uno::Any DeviceHelper::isAccelerated() const { return ::com::sun::star::uno::makeAny(false); - } + } uno::Any DeviceHelper::getDeviceHandle() const { @@ -239,18 +239,18 @@ namespace cairocanvas return uno::Any(); } - namespace - { + namespace + { struct DeviceColorSpace: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>, - DeviceColorSpace> + DeviceColorSpace> { uno::Reference<rendering::XColorSpace> operator()() { return vcl::unotools::createStandardColorSpace(); } - }; + }; } - + uno::Reference<rendering::XColorSpace> DeviceHelper::getColorSpace() const { // always the same diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 56c430aca318..33bbb5beebf7 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.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 @@ -59,7 +59,7 @@ namespace cairocanvas /** init helper @param rCanvas - Owning canvas. + Owning canvas. @param rRefDevice Reference output device. Needed for resolution @@ -74,31 +74,31 @@ namespace cairocanvas // XWindowGraphicDevice ::com::sun::star::geometry::RealSize2D getPhysicalResolution(); ::com::sun::star::geometry::RealSize2D getPhysicalSize(); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > createCompatibleLinePolyPolygon( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > createCompatibleBezierPolyPolygon( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::com::sun::star::geometry::IntegerSize2D& size ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::com::sun::star::geometry::IntegerSize2D& size ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::com::sun::star::geometry::IntegerSize2D& size ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::com::sun::star::geometry::IntegerSize2D& size ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleBitmap( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::com::sun::star::geometry::IntegerSize2D& size ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileBitmap( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::com::sun::star::geometry::IntegerSize2D& size ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > createCompatibleAlphaBitmap( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::com::sun::star::geometry::IntegerSize2D& size ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap( + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, + const ::com::sun::star::geometry::IntegerSize2D& size ); sal_Bool hasFullScreenMode( ); sal_Bool enterFullScreenMode( sal_Bool bEnter ); ::com::sun::star::uno::Any isAccelerated() const; ::com::sun::star::uno::Any getDeviceHandle() const; ::com::sun::star::uno::Any getSurfaceHandle() const; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > getColorSpace() const; /** called when DumpScreenContent property is enabled on @@ -116,7 +116,7 @@ namespace cairocanvas /** init helper @param rCanvas - Owning canvas. + Owning canvas. @param rRefDevice Reference output device. Needed for resolution @@ -124,7 +124,7 @@ namespace cairocanvas */ void implInit( SurfaceProvider& rSurfaceProvider, OutputDevice& rRefDevice ); - void setSize( const ::basegfx::B2ISize& rSize ); + void setSize( const ::basegfx::B2ISize& rSize ); private: /** Surface provider diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index ea71db57a3d2..d623d07dfebd 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.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 @@ -68,7 +68,7 @@ namespace cairo mpView(NULL), mpSurface( pSurface ) { - // Necessary, context is lost otherwise + // Necessary, context is lost otherwise CGContextRetain( getCGContext() ); // == NULL for non-native surfaces } @@ -80,7 +80,7 @@ namespace cairo * @param width width of the new surface * @param height height of the new surface * - * pSysData contains the platform native Window reference. + * pSysData contains the platform native Window reference. * pSysData is used to create a surface on the Window * * Set the mpSurface to the new surface or NULL @@ -93,19 +93,19 @@ namespace cairo // on Mac OS X / Quartz we are not drawing directly to the screen, but via regular CGContextRef. // The actual drawing to NSView (i.e. screen) is done in QuartzSurface::flush() - - // HACK: currently initial size for windowsurface is 0x0, which is not possible for us. - if (width == 0 || height == 0) { + + // HACK: currently initial size for windowsurface is 0x0, which is not possible for us. + if (width == 0 || height == 0) { width = [mpView bounds].size.width; height = [mpView bounds].size.height; OSL_TRACE("Canvas::cairo::Surface(): BUG!! size is ZERO! fixing to %d x %d...", width, height); } - + // create a generic surface, NSView/Window is ARGB32. mpSurface.reset( cairo_quartz_surface_create(CAIRO_FORMAT_ARGB32, width, height), &cairo_surface_destroy); - + cairo_surface_set_device_offset( mpSurface.get(), x, y ); } @@ -125,14 +125,14 @@ namespace cairo { OSL_TRACE("Canvas::cairo::Surface(CGContext:%p, x:%d, y:%d, w:%d, h:%d): New Surface.", rContext, x, y, width, height); // create surface based on CGContext - + // ensure kCGBitmapByteOrder32Host flag, otherwise Cairo breaks (we are practically always using CGBitmapContext) OSL_ASSERT ((CGBitmapContextGetBitsPerPixel(rContext) != 32) || (CGBitmapContextGetBitmapInfo(rContext) & kCGBitmapByteOrderMask) == kCGBitmapByteOrder32Host); - + mpSurface.reset(cairo_quartz_surface_create_for_cg_context(rContext, width, height), &cairo_surface_destroy); - + cairo_surface_set_device_offset( mpSurface.get(), x, y ); // Necessary, context is lost otherwise @@ -156,7 +156,7 @@ namespace cairo } /** - * QuartzSurface::getSimilar: Create new similar Canvas surface + * QuartzSurface::getSimilar: Create new similar Canvas surface * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h) * @param width width of the new surface * @param height height of the new surface @@ -167,11 +167,11 @@ namespace cairo * Cairo surface from aContent (cairo_content_t) * * @return new surface or NULL - **/ + **/ SurfaceSharedPtr QuartzSurface::getSimilar( Content aContent, int width, int height ) const { return SurfaceSharedPtr( - new QuartzSurface( + new QuartzSurface( CairoSurfaceSharedPtr( cairo_surface_create_similar( mpSurface.get(), aContent, width, height ), &cairo_surface_destroy ))); @@ -199,35 +199,35 @@ namespace cairo { // can only flush surfaces with NSView if( !mpView ) return; - + OSL_TRACE("Canvas::cairo::QuartzSurface::flush(): flush to NSView"); - + CGContextRef mrContext = getCGContext(); - + if (!mrContext) return; - + [mpView lockFocus]; - + /** - * This code is using same screen update code as in VCL (esp. AquaSalGraphics::UpdateWindow() ) + * This code is using same screen update code as in VCL (esp. AquaSalGraphics::UpdateWindow() ) */ CGContextRef rViewContext = reinterpret_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]); CGImageRef xImage = CGBitmapContextCreateImage(mrContext); - CGContextDrawImage(rViewContext, - CGRectMake( 0, 0, - CGImageGetWidth(xImage), + CGContextDrawImage(rViewContext, + CGRectMake( 0, 0, + CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage); CGImageRelease( xImage ); CGContextFlush( rViewContext ); - + [mpView unlockFocus]; } /** * QuartzSurface::getDepth: Get the color depth of the Canvas surface. * - * @return color depth + * @return color depth **/ int QuartzSurface::getDepth() const { @@ -239,7 +239,7 @@ namespace cairo } } OSL_TRACE("Canvas::cairo::QuartzSurface::getDepth(): ERROR - depth unspecified!"); - + return -1; } @@ -296,18 +296,18 @@ namespace cairo int x, int y, int width, int height ) { SurfaceSharedPtr surf; - - if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) + + if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) { const Window &rWindow = (const Window &) rRefDevice; const SystemEnvData* pSysData = GetSysData(&rWindow); if (pSysData) surf = SurfaceSharedPtr(new QuartzSurface(pSysData->pView, x, y, width, height)); - } + } else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV ) { SystemGraphicsData aSysData = ((const VirtualDevice&) rRefDevice).GetSystemGfxData(); - + if (aSysData.rCGContext) surf = SurfaceSharedPtr(new QuartzSurface(aSysData.rCGContext, x, y, width, height)); } @@ -324,18 +324,18 @@ namespace cairo * * @return new surface or empty surface **/ - SurfaceSharedPtr createBitmapSurface( const OutputDevice& /* rRefDevice */, - const BitmapSystemData& rData, + SurfaceSharedPtr createBitmapSurface( const OutputDevice& /* rRefDevice */, + const BitmapSystemData& rData, const Size& rSize ) { - OSL_TRACE( "requested size: %d x %d available size: %d x %d", + OSL_TRACE( "requested size: %d x %d available size: %d x %d", rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight ); - + if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) { CGContextRef rContext = (CGContextRef)rData.rImageContext; OSL_TRACE("Canvas::cairo::createBitmapSurface(): New native image surface, context = %p.", rData.rImageContext); - + return SurfaceSharedPtr(new QuartzSurface(rContext, 0, 0, rData.mnWidth, rData.mnHeight)); } return SurfaceSharedPtr(); diff --git a/canvas/source/cairo/cairo_quartz_cairo.hxx b/canvas/source/cairo/cairo_quartz_cairo.hxx index 0c6a7d56db95..a09ed918dce1 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.hxx +++ b/canvas/source/cairo/cairo_quartz_cairo.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 @@ -38,7 +38,7 @@ namespace cairo { - class QuartzSurface : public Surface + class QuartzSurface : public Surface { NSView* mpView; // if NULL - bg surface CairoSurfaceSharedPtr mpSurface; @@ -65,9 +65,9 @@ namespace cairo { virtual void flush() const; int getDepth() const; - + CGContextRef getCGContext() const; - + }; } diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx index 87a663c0dac1..f6b36fdcd783 100644 --- a/canvas/source/cairo/cairo_repainttarget.hxx +++ b/canvas/source/cairo/cairo_repainttarget.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 @@ -38,7 +38,7 @@ using namespace ::cairo; namespace cairocanvas { /* Definition of RepaintTarget interface */ - + /** Target interface for XCachedPrimitive implementations This interface must be implemented on all canvas diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index 77f053dcb305..ba1e63f95703 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.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/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx index b5ecb85b6b97..09146cd90fd4 100644 --- a/canvas/source/cairo/cairo_sprite.hxx +++ b/canvas/source/cairo/cairo_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 diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index a04c3e755eba..8267336c7c47 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.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 @@ -80,9 +80,9 @@ namespace cairocanvas */ ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 && maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER && - maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, + maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE, "CairoSpriteCanvas::initialize: wrong number of arguments, or wrong types" ); - + awt::Rectangle aRect; maArguments[2] >>= aRect; @@ -97,17 +97,17 @@ namespace cairocanvas throw lang::NoSupportException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent window not VCL window, or canvas out-of-process!")), - NULL); + NULL); bool bHasXRender = IsCairoWorking(pParentWindow); - ENSURE_ARG_OR_THROW( bHasXRender == true, + ENSURE_ARG_OR_THROW( bHasXRender == true, "CairoSpriteCanvas::SpriteCanvas: No RENDER extension" ); Size aPixelSize( pParentWindow->GetOutputSizePixel() ); const ::basegfx::B2ISize aSize( aPixelSize.Width(), aPixelSize.Height() ); - ENSURE_ARG_OR_THROW( pParentWindow != NULL, + ENSURE_ARG_OR_THROW( pParentWindow != NULL, "CairoSpriteCanvas::initialize: invalid Window pointer" ); // setup helper @@ -116,7 +116,7 @@ namespace cairocanvas aSize, bIsFullscreen ); - setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW)); + setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW)); maCanvasHelper.init( maRedrawManager, *this, @@ -215,7 +215,7 @@ namespace cairocanvas { maCanvasHelper.setSize( rSize ); // re-set background surface, in case it needed recreation - maCanvasHelper.setSurface( maDeviceHelper.getBufferSurface(), + maCanvasHelper.setSurface( maDeviceHelper.getBufferSurface(), false ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 54cd3a181cec..ed27bd3d2ac0 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.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,9 +68,9 @@ namespace cairocanvas ::com::sun::star::awt::XWindowListener, ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceName > WindowGraphicDeviceBase_Base; + ::com::sun::star::lang::XServiceName > WindowGraphicDeviceBase_Base; typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >, - SpriteDeviceHelper, + SpriteDeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > SpriteCanvasBase_Base; /** Mixin SpriteSurface @@ -97,9 +97,9 @@ namespace cairocanvas }; typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base, - SpriteCanvasHelper, + SpriteCanvasHelper, ::osl::MutexGuard, - ::cppu::OWeakObject > SpriteCanvasBaseT; + ::cppu::OWeakObject > SpriteCanvasBaseT; /** Product of this component's factory. @@ -114,9 +114,9 @@ namespace cairocanvas public RepaintTarget { public: - SpriteCanvas( const ::com::sun::star::uno::Sequence< + SpriteCanvas( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); void initialize(); @@ -133,7 +133,7 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); // XBufferController (partial) virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); @@ -154,7 +154,7 @@ namespace cairocanvas // RepaintTarget virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, - const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); SurfaceSharedPtr getWindowSurface(); diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index cdac16cbf8b7..ff0118f0c3e3 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.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 @@ -36,7 +36,7 @@ #include <vcl/canvastools.hxx> -#include <comphelper/scopeguard.hxx> +#include <comphelper/scopeguard.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> @@ -60,7 +60,7 @@ namespace cairocanvas */ void spriteRedraw( const CairoSharedPtr& pCairo, const ::canvas::Sprite::Reference& rSprite ) - { + { // downcast to derived cairocanvas::Sprite interface, which // provides the actual redraw methods. ::boost::polymorphic_downcast< Sprite* >(rSprite.get())->redraw( pCairo, true); @@ -71,7 +71,7 @@ namespace cairocanvas const ::basegfx::B2DRange& rArea ) { cairo_save( pCairo.get() ); - cairo_rectangle( pCairo.get(), ceil( rArea.getMinX() ), ceil( rArea.getMinY() ), + cairo_rectangle( pCairo.get(), ceil( rArea.getMinX() ), ceil( rArea.getMinY() ), floor( rArea.getWidth() ), floor( rArea.getHeight() ) ); cairo_clip( pCairo.get() ); cairo_set_source_surface( pCairo.get(), pBackgroundSurface->getCairoSurface().get(), 0, 0 ); @@ -88,8 +88,8 @@ namespace cairocanvas // wouldn't save much render time, and b) will clutter // scrolled sprite content outside this area) cairo_save( pCairo.get() ); - cairo_rectangle( pCairo.get(), rArea.getMinX(), rArea.getMinY(), - sal::static_int_cast<sal_Int32>(rArea.getWidth()), + cairo_rectangle( pCairo.get(), rArea.getMinX(), rArea.getMinY(), + sal::static_int_cast<sal_Int32>(rArea.getWidth()), sal::static_int_cast<sal_Int32>(rArea.getHeight()) ); cairo_clip( pCairo.get() ); @@ -120,7 +120,7 @@ namespace cairocanvas Used for generic update, which renders into device buffer. */ void spriteRedrawStub2( const CairoSharedPtr& pCairo, - const ::canvas::Sprite::Reference& rSprite ) + const ::canvas::Sprite::Reference& rSprite ) { if( rSprite.is() ) { @@ -140,7 +140,7 @@ namespace cairocanvas if( rSprite.is() ) ::boost::polymorphic_downcast< Sprite* >( rSprite.get() )->redraw( pCairo, false ); - } + } } SpriteCanvasHelper::SpriteCanvasHelper() : @@ -160,7 +160,7 @@ namespace cairocanvas CanvasHelper::init( rSize, rDevice, &rDevice ); } - + void SpriteCanvasHelper::disposing() { mpCompositingSurface.reset(); @@ -168,17 +168,17 @@ namespace cairocanvas mpRedrawManager = NULL; // forward to base - CanvasHelper::disposing(); + CanvasHelper::disposing(); } - uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( + uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation( const uno::Reference< rendering::XAnimation >& ) { return uno::Reference< rendering::XAnimatedSprite >(); } - uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( - const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, + uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps( + const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, sal_Int8 /*interpolationMode*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); @@ -189,12 +189,12 @@ namespace cairocanvas if( !mpRedrawManager ) return uno::Reference< rendering::XCustomSprite >(); // we're disposed - return uno::Reference< rendering::XCustomSprite >( - new CanvasCustomSprite( spriteSize, + return uno::Reference< rendering::XCustomSprite >( + new CanvasCustomSprite( spriteSize, mpOwningSpriteCanvas ) ); } - uno::Reference< rendering::XSprite > SpriteCanvasHelper::createClonedSprite( + uno::Reference< rendering::XSprite > SpriteCanvasHelper::createClonedSprite( const uno::Reference< rendering::XSprite >& ) { return uno::Reference< rendering::XSprite >(); @@ -204,7 +204,7 @@ namespace cairocanvas sal_Bool bUpdateAll, bool& io_bSurfaceDirty ) { - if( !mpRedrawManager || + if( !mpRedrawManager || !mpOwningSpriteCanvas || !mpOwningSpriteCanvas->getWindowSurface() || !mpOwningSpriteCanvas->getBufferSurface() ) @@ -244,8 +244,8 @@ namespace cairocanvas cairo_rectangle( pCompositingCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); cairo_clip( pCompositingCairo.get() ); cairo_save( pCompositingCairo.get() ); - cairo_set_source_surface( pCompositingCairo.get(), - mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), + cairo_set_source_surface( pCompositingCairo.get(), + mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pCompositingCairo.get() ); @@ -253,7 +253,7 @@ namespace cairocanvas // repaint all active sprites on top of background into // VDev. - mpRedrawManager->forEachSprite( + mpRedrawManager->forEachSprite( ::boost::bind( &spriteRedraw, boost::cref(pCompositingCairo), @@ -262,8 +262,8 @@ namespace cairocanvas // flush to screen cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); cairo_clip( pWindowCairo.get() ); - cairo_set_source_surface( pWindowCairo.get(), - pCompositingSurface->getCairoSurface().get(), + cairo_set_source_surface( pWindowCairo.get(), + pCompositingSurface->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pWindowCairo.get() ); @@ -283,14 +283,14 @@ namespace cairocanvas void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect ) { - if( mpOwningSpriteCanvas && mpCompositingSurface ) + if( mpOwningSpriteCanvas && mpCompositingSurface ) repaintBackground( mpCompositingSurface->getCairo(), - mpOwningSpriteCanvas->getBufferSurface(), + mpOwningSpriteCanvas->getBufferSurface(), rUpdateRect ); } - void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& rMoveStart, - const ::basegfx::B2DRange& rMoveEnd, + void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& rMoveStart, + const ::basegfx::B2DRange& rMoveEnd, const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea ) { ENSURE_OR_THROW( mpOwningSpriteCanvas && @@ -314,7 +314,7 @@ namespace cairocanvas // the destination area: otherwise, the next scroll update // would copy pixel that are not supposed to be part of // the sprite. - ::basegfx::B2IRange aSourceRect( + ::basegfx::B2IRange aSourceRect( ::canvas::tools::spritePixelAreaFromB2DRange( rMoveStart ) ); const ::basegfx::B2IRange& rDestRect( ::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) ); @@ -324,7 +324,7 @@ namespace cairocanvas // TODO(E3): This is plain buggy (but copies the behaviour of // the old Impress slideshow) - the scrolled area might - // actually lie _below_ another window! + // actually lie _below_ another window! // clip to output bounds (cannot properly scroll stuff // _outside_ our screen area) @@ -341,7 +341,7 @@ namespace cairocanvas // repaint all affected sprites directly to output device ::std::for_each( rUpdateArea.maComponentList.begin(), rUpdateArea.maComponentList.end(), - ::boost::bind( + ::boost::bind( &spriteRedrawStub3, boost::cref(pCompositingCairo), _1 ) ); @@ -356,24 +356,24 @@ namespace cairocanvas cairo_save( pCompositingCairo.get() ); // scroll content in device back buffer - cairo_set_source_surface( pCompositingCairo.get(), + cairo_set_source_surface( pCompositingCairo.get(), mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), aDestPos.getX() - aSourceUpperLeftPos.getX(), aDestPos.getY() - aSourceUpperLeftPos.getY() ); cairo_rectangle( pCompositingCairo.get(), aDestPos.getX(), aDestPos.getY(), - sal::static_int_cast<sal_Int32>(aDestRect.getWidth()), + sal::static_int_cast<sal_Int32>(aDestRect.getWidth()), sal::static_int_cast<sal_Int32>(aDestRect.getHeight()) ); cairo_clip( pCompositingCairo.get() ); cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pCompositingCairo.get() ); cairo_restore( pCompositingCairo.get() ); - const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator + const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator aFirst( rUpdateArea.maComponentList.begin() ); - ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator + ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator aSecond( aFirst ); ++aSecond; - + ENSURE_OR_THROW( aFirst->second.getSprite().is(), "VCLCanvas::scrollUpdate(): no sprite" ); @@ -404,13 +404,13 @@ namespace cairocanvas cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); cairo_clip( pWindowCairo.get() ); - cairo_set_source_surface( pWindowCairo.get(), - pCompositingSurface->getCairoSurface().get(), + cairo_set_source_surface( pWindowCairo.get(), + pCompositingSurface->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pWindowCairo.get() ); } - + void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea, const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { @@ -439,7 +439,7 @@ namespace cairocanvas // repaint all affected sprites directly to output device ::std::for_each( rSortedUpdateSprites.begin(), rSortedUpdateSprites.end(), - ::boost::bind( + ::boost::bind( &spriteRedrawStub, boost::cref(pCompositingCairo), _1 ) ); @@ -449,13 +449,13 @@ namespace cairocanvas cairo_clip( pWindowCairo.get() ); cairo_rectangle( pWindowCairo.get(), aPos.getX(), aPos.getY(), aSize.getX(), aSize.getY() ); cairo_clip( pWindowCairo.get() ); - cairo_set_source_surface( pWindowCairo.get(), - pCompositingSurface->getCairoSurface().get(), + cairo_set_source_surface( pWindowCairo.get(), + pCompositingSurface->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pWindowCairo.get() ); } - + void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rRequestedArea, const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { @@ -478,7 +478,7 @@ namespace cairocanvas // a fraction of a sprite pixel... Clip position at origin, // otherwise, truncation of size below might leave visible // areas uncovered by VDev. - const Point aOutputPosition( + const Point aOutputPosition( ::std::max( sal_Int32( 0 ), static_cast< sal_Int32 >(rRequestedArea.getMinX()) ), ::std::max( sal_Int32( 0 ), @@ -486,7 +486,7 @@ namespace cairocanvas // round output size towards +infty. Don't want to truncate a // fraction of a sprite pixel... Limit size of VDev to output // device's area. - const Size aOutputSize( + const Size aOutputSize( ::std::min( rSize.getX(), ::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X()) ), ::std::min( rSize.getY(), @@ -497,13 +497,13 @@ namespace cairocanvas // paint background cairo_save( pCompositingCairo.get() ); - cairo_set_source_surface( pCompositingCairo.get(), - mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), + cairo_set_source_surface( pCompositingCairo.get(), + mpOwningSpriteCanvas->getBufferSurface()->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pCompositingCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pCompositingCairo.get() ); cairo_restore( pCompositingCairo.get() ); - + // repaint all affected sprites on top of background into // VDev. ::std::for_each( rSortedUpdateSprites.begin(), @@ -515,8 +515,8 @@ namespace cairocanvas // flush to screen cairo_rectangle( pWindowCairo.get(), aOutputPosition.X(), aOutputPosition.Y(), aOutputSize.Width(), aOutputSize.Height() ); cairo_clip( pWindowCairo.get() ); - cairo_set_source_surface( pWindowCairo.get(), - pCompositingSurface->getCairoSurface().get(), + cairo_set_source_surface( pWindowCairo.get(), + pCompositingSurface->getCairoSurface().get(), 0, 0 ); cairo_set_operator( pWindowCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_paint( pWindowCairo.get() ); @@ -533,13 +533,13 @@ namespace cairocanvas if( !mpCompositingSurface ) { - mpCompositingSurface = - mpOwningSpriteCanvas->getWindowSurface()->getSimilar( - CAIRO_CONTENT_COLOR, + mpCompositingSurface = + mpOwningSpriteCanvas->getWindowSurface()->getSimilar( + CAIRO_CONTENT_COLOR, rNeededSize.getX(), rNeededSize.getY() ); maCompositingSurfaceSize = rNeededSize; } - + return mpCompositingSurface; } } diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index 8e3e60901302..2bed2b2d6dc0 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.hxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.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 @@ -51,31 +51,31 @@ namespace cairocanvas public: SpriteCanvasHelper(); - void init( ::canvas::SpriteRedrawManager& rManager, + void init( ::canvas::SpriteRedrawManager& rManager, SpriteCanvas& rOwningSpriteCanvas, const ::basegfx::B2ISize& rSize ); - + /// Dispose all internal references void disposing(); // XSpriteCanvas - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XAnimatedSprite > createSpriteFromAnimation( + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XAnimatedSprite > createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ); - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XAnimatedSprite > createSpriteFromBitmaps( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > >& animationBitmaps, + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XAnimatedSprite > createSpriteFromBitmaps( + const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > >& animationBitmaps, sal_Int8 interpolationMode ); - - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCustomSprite > createCustomSprite( + + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCustomSprite > createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ); - - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSprite > createClonedSprite( + + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSprite > createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ); /** Actually perform the screen update @@ -119,21 +119,21 @@ namespace cairocanvas All info necessary, should rMoveStart be partially or fully outside the outdev */ - void scrollUpdate( const ::basegfx::B2DRange& rMoveStart, - const ::basegfx::B2DRange& rMoveEnd, - const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea ); + void scrollUpdate( const ::basegfx::B2DRange& rMoveStart, + const ::basegfx::B2DRange& rMoveEnd, + const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea ); void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea, - const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); + const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); void genericUpdate( const ::basegfx::B2DRange& rTotalArea, - const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); + const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); private: ::cairo::SurfaceSharedPtr getCompositingSurface( const ::basegfx::B2ISize& rNeededSize ); /// Set from the SpriteCanvas: instance coordinating sprite redraw - ::canvas::SpriteRedrawManager* mpRedrawManager; + ::canvas::SpriteRedrawManager* mpRedrawManager; /// Set from the init method. used to generate sprites SpriteCanvas* mpOwningSpriteCanvas; diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index 8167775977c2..5a8158aa3027 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.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 @@ -64,7 +64,7 @@ namespace cairocanvas {} void SpriteDeviceHelper::init( Window& rOutputWindow, - SpriteCanvas& rSpriteCanvas, + SpriteCanvas& rSpriteCanvas, const ::basegfx::B2ISize& rSize, bool bFullscreen ) { @@ -112,7 +112,7 @@ namespace cairocanvas uno::Any SpriteDeviceHelper::isAccelerated() const { return ::com::sun::star::uno::makeAny(true); - } + } uno::Any SpriteDeviceHelper::getDeviceHandle() const { @@ -136,8 +136,8 @@ namespace cairocanvas if( mpBufferSurface && maSize != rSize ) mpBufferSurface.reset(); if( !mpBufferSurface ) - mpBufferSurface = getWindowSurface()->getSimilar( - CAIRO_CONTENT_COLOR, + mpBufferSurface = getWindowSurface()->getSimilar( + CAIRO_CONTENT_COLOR, rSize.getX(), rSize.getY() ); if( maSize != rSize ) diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index e0736379bb2a..a7a05150f245 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.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 @@ -54,7 +54,7 @@ namespace cairocanvas SpriteDeviceHelper(); void init( Window& rOutputWindow, - SpriteCanvas& rSpriteCanvas, + SpriteCanvas& rSpriteCanvas, const ::basegfx::B2ISize& rSize, bool bFullscreen ); @@ -63,7 +63,7 @@ namespace cairocanvas // XWindowGraphicDevice ::sal_Int32 createBuffers( ::sal_Int32 nBuffers ); - void destroyBuffers( ); + void destroyBuffers( ); ::sal_Bool showBuffer( bool, ::sal_Bool ); ::sal_Bool switchBuffer( bool, ::sal_Bool bUpdateAll ); @@ -72,7 +72,7 @@ namespace cairocanvas ::com::sun::star::uno::Any getSurfaceHandle() const; void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds ); - void setSize( const ::basegfx::B2ISize& rSize ); + void setSize( const ::basegfx::B2ISize& rSize ); ::cairo::SurfaceSharedPtr getSurface(); ::cairo::SurfaceSharedPtr getBufferSurface(); @@ -84,7 +84,7 @@ namespace cairocanvas private: /// Pointer to sprite canvas (owner of this helper), needed to create bitmaps - SpriteCanvas* mpSpriteCanvas; + SpriteCanvas* mpSpriteCanvas; ::cairo::SurfaceSharedPtr mpBufferSurface; diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 711cc45c504b..5a47aef1dc4a 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.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 @@ -64,9 +64,9 @@ namespace cairocanvas mpBufferSurface(), mbTextureDirty(true) {} - + void SpriteHelper::init( const geometry::RealSize2D& rSpriteSize, - const SpriteCanvasRef& rSpriteCanvas ) + const SpriteCanvasRef& rSpriteCanvas ) { ENSURE_OR_THROW( rSpriteCanvas.get(), "SpriteHelper::init(): Invalid device, sprite canvas or surface" ); @@ -148,7 +148,7 @@ namespace cairocanvas ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( rClip )); - doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(), + doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(), NULL, SurfaceProviderRef(mpSpriteCanvas.get()), rClip->getFillRule() ); } @@ -160,8 +160,8 @@ namespace cairocanvas if( isContentFullyOpaque() ) cairo_set_operator( pCairo.get(), CAIRO_OPERATOR_SOURCE ); - cairo_set_source_surface( pCairo.get(), - mpBufferSurface->getCairoSurface().get(), + cairo_set_source_surface( pCairo.get(), + mpBufferSurface->getCairoSurface().get(), fX, fY ); if( ::rtl::math::approxEqual( fAlpha, 1.0 ) ) cairo_paint( pCairo.get() ); diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx index 8d31fa61dd31..10b7fdcf3f43 100644 --- a/canvas/source/cairo/cairo_spritehelper.hxx +++ b/canvas/source/cairo/cairo_spritehelper.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 @@ -77,7 +77,7 @@ namespace cairocanvas When true, little debug bound rects for sprites are shown */ void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, - const SpriteCanvasRef& rSpriteCanvas ); + const SpriteCanvasRef& rSpriteCanvas ); void disposing(); @@ -99,11 +99,11 @@ namespace cairocanvas */ void redraw( const ::cairo::CairoSharedPtr& pCairo, const ::basegfx::B2DPoint& rPos, - bool& bSurfacesDirty, + bool& bSurfacesDirty, bool bBufferedUpdate ) const; - + private: - virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( + virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const; diff --git a/canvas/source/cairo/cairo_spritesurface.hxx b/canvas/source/cairo/cairo_spritesurface.hxx index 1c84e3842ffd..caebcface0db 100644 --- a/canvas/source/cairo/cairo_spritesurface.hxx +++ b/canvas/source/cairo/cairo_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 @@ -40,7 +40,7 @@ class Rectangle; namespace cairocanvas { /* Definition of SpriteSurface interface */ - + class SpriteSurface { public: @@ -53,18 +53,18 @@ namespace cairocanvas virtual void hideSprite( const Sprite::ImplRef& sprite ) = 0; // call this when XSprite::move() is called - virtual void moveSprite( const Sprite::ImplRef& sprite, - const Point& rOldPos, - const Point& rNewPos, - const Size& rSpriteSize ) = 0; + virtual void moveSprite( const Sprite::ImplRef& sprite, + const Point& rOldPos, + const Point& rNewPos, + const Size& rSpriteSize ) = 0; // call this when some part of your sprite has changed. That // includes show/hide´, i.e. for show, both showSprite and // updateSprite must be called. - virtual void updateSprite( const Sprite::ImplRef& sprite, - const Point& rPos, - const Rectangle& rUpdateArea ) = 0; - + virtual void updateSprite( const Sprite::ImplRef& sprite, + const Point& rPos, + const Rectangle& rUpdateArea ) = 0; + }; } diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx index 923fc8b8c0d2..6164ef0f1f67 100644 --- a/canvas/source/cairo/cairo_surfaceprovider.hxx +++ b/canvas/source/cairo/cairo_surfaceprovider.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 @@ -44,7 +44,7 @@ namespace cairocanvas class Bitmap; /* Definition of RepaintTarget interface */ - + /** Target interface for XCachedPrimitive implementations This interface must be implemented on all canvas @@ -62,7 +62,7 @@ namespace cairocanvas virtual SurfaceSharedPtr getSurface() = 0; /// create new surface in given size - virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, + virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0; /// create new surface from given bitmap virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 63a89e6f527f..d8de6c55e37e 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.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 @@ -68,7 +68,7 @@ # include "cairo_xlib_cairo.hxx" # include <cairo-ft.h> #else -# error Native API needed. +# error Native API needed. #endif using namespace ::cairo; @@ -79,7 +79,7 @@ namespace cairocanvas namespace { void setupLayoutMode( OutputDevice& rOutDev, - sal_Int8 nTextDirection ) + sal_Int8 nTextDirection ) { // TODO(P3): avoid if already correctly set ULONG nLayoutMode; @@ -113,11 +113,11 @@ namespace cairocanvas } } - TextLayout::TextLayout( const rendering::StringContext& aText, - sal_Int8 nDirection, - sal_Int64 /*nRandomSeed*/, - const CanvasFont::Reference& rFont, - const SurfaceProviderRef& rRefDevice ) : + TextLayout::TextLayout( const rendering::StringContext& aText, + sal_Int8 nDirection, + sal_Int64 /*nRandomSeed*/, + const CanvasFont::Reference& rFont, + const SurfaceProviderRef& rRefDevice ) : TextLayout_Base( m_aMutex ), maText( aText ), maLogicalAdvancements(), @@ -126,7 +126,7 @@ namespace cairocanvas mnTextDirection( nDirection ) { } - + TextLayout::~TextLayout() { } @@ -229,7 +229,7 @@ namespace cairocanvas return 0.0; } - double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, + double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -246,7 +246,7 @@ namespace cairocanvas return rendering::TextHit(); } - rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, + rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -255,8 +255,8 @@ namespace cairocanvas return rendering::Caret(); } - sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nCaretAdvancement*/, + sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, + sal_Int32 /*nCaretAdvancement*/, sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -265,7 +265,7 @@ namespace cairocanvas return 0; } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -274,7 +274,7 @@ namespace cairocanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -311,12 +311,12 @@ namespace cairocanvas return maText; } - + void TextLayout::useFont( Cairo* pCairo ) { rendering::FontRequest aFontRequest = mpFont->getFontRequest(); rendering::FontInfo aFontInfo = aFontRequest.FontDescription; - + cairo_select_font_face( pCairo, ::rtl::OUStringToOString( aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL ); cairo_set_font_size( pCairo, aFontRequest.CellSize ); } @@ -386,7 +386,7 @@ namespace cairocanvas const rendering::ViewState& viewState, const rendering::RenderState& renderState ) const { - ::osl::MutexGuard aGuard( m_aMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); SystemTextLayoutData aSysLayoutData; #if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1) LOGFONTW logfont; @@ -395,11 +395,11 @@ namespace cairocanvas // TODO(P2): cache that ::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]); - + if( maLogicalAdvancements.getLength() ) { setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); - + // TODO(F3): ensure correct length and termination for DX // array (last entry _must_ contain the overall width) } @@ -459,11 +459,11 @@ namespace cairocanvas return true; } } - + if (aSysLayoutData.rGlyphData.empty()) return false; //??? false? - + /** - * Setup platform independent glyph vector into cairo-based glyphs vector. + * Setup platform independent glyph vector into cairo-based glyphs vector. **/ // Loop through the fonts used and render the matching glyphs for each @@ -598,7 +598,7 @@ namespace cairocanvas ); cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size()); - + //faux bold if (rSysFontData.bFakeBold) { double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() ); @@ -653,10 +653,10 @@ namespace cairocanvas }; } - void TextLayout::setupTextOffsets( sal_Int32* outputOffsets, - const uno::Sequence< double >& inputOffsets, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) const + void TextLayout::setupTextOffsets( sal_Int32* outputOffsets, + const uno::Sequence< double >& inputOffsets, + const rendering::ViewState& viewState, + const rendering::RenderState& renderState ) const { ENSURE_OR_THROW( outputOffsets!=NULL, "TextLayout::setupTextOffsets offsets NULL" ); @@ -691,7 +691,7 @@ namespace cairocanvas { uno::Sequence< ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); - + return aRet; } } diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index 57ee24835f44..a2bcf4421e9f 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.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,16 +52,16 @@ namespace cairocanvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout, ::com::sun::star::lang::XServiceInfo > TextLayout_Base; - class TextLayout : public ::comphelper::OBaseMutex, + class TextLayout : public ::comphelper::OBaseMutex, public TextLayout_Base, private ::boost::noncopyable { public: - TextLayout( const ::com::sun::star::rendering::StringContext& aText, - sal_Int8 nDirection, + TextLayout( const ::com::sun::star::rendering::StringContext& aText, + sal_Int8 nDirection, sal_Int64 nRandomSeed, const CanvasFont::Reference& rFont, - const SurfaceProviderRef& rRefDevice ); + const SurfaceProviderRef& rRefDevice ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -84,7 +84,7 @@ namespace cairocanvas virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -93,14 +93,14 @@ namespace cairocanvas bool draw( ::cairo::Cairo* pCairo ); bool draw( SurfaceSharedPtr& pSurface, OutputDevice& rOutDev, - const Point& rOutpos, - const ::com::sun::star::rendering::ViewState& viewState, + const Point& rOutpos, + const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) const; - void setupTextOffsets( sal_Int32* outputOffsets, + void setupTextOffsets( sal_Int32* outputOffsets, const ::com::sun::star::uno::Sequence< double >& inputOffsets, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) const; + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState ) const; protected: ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves. @@ -109,7 +109,7 @@ namespace cairocanvas ::com::sun::star::rendering::StringContext maText; ::com::sun::star::uno::Sequence< double > maLogicalAdvancements; CanvasFont::Reference mpFont; - SurfaceProviderRef mpRefDevice; + SurfaceProviderRef mpRefDevice; sal_Int8 mnTextDirection; void useFont( ::cairo::Cairo* pCairo ); diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index ef08b9cec925..d286604706c6 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.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 @@ -37,7 +37,7 @@ ************************************************************************/ #include <tools/prewin.h> -#include <windows.h> +#include <windows.h> #include <tools/postwin.h> #include <osl/diagnose.h> @@ -81,7 +81,7 @@ namespace cairo * @param x horizontal location of the new surface * @param y vertical location of the new surface * - * pSysData contains the platform native Window reference. + * pSysData contains the platform native Window reference. * pSysData is used to create a surface on the Window * * Set the mpSurface to the new surface or NULL @@ -106,7 +106,7 @@ namespace cairo mpSurface() { OSL_ASSERT(rBmpData.pDIB == NULL); - + if(rBmpData.pDIB != NULL) { // So just leave mpSurface to NULL, little else we can do at // this stage. Hopefully the Win32 patch to @@ -114,8 +114,8 @@ namespace cairo // const Size&) will catch the cases where this // constructor would be called with a DIB bitmap, and we // will never get here. At least it worked for Ballmer.ppt. - } - else + } + else { HDC hDC = CreateCompatibleDC(NULL); void* hOrigBitmap; @@ -141,7 +141,7 @@ namespace cairo } /** - * Surface::getSimilar: Create new similar Canvas surface + * Surface::getSimilar: Create new similar Canvas surface * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h) * @param width width of the new surface * @param height height of the new surface @@ -152,11 +152,11 @@ namespace cairo * Cairo surface from aContent (cairo_content_t) * * @return new surface or NULL - **/ + **/ SurfaceSharedPtr Win32Surface::getSimilar( Content aContent, int width, int height ) const { return SurfaceSharedPtr( - new Win32Surface( + new Win32Surface( CairoSurfaceSharedPtr( cairo_surface_create_similar( mpSurface.get(), aContent, width, height ), &cairo_surface_destroy ))); @@ -184,7 +184,7 @@ namespace cairo /** * Surface::getDepth: Get the color depth of the Canvas surface. * - * @return color depth + * @return color depth **/ int Win32Surface::getDepth() const { @@ -275,9 +275,9 @@ namespace cairo const BitmapSystemData& rData, const Size& rSize ) { - OSL_TRACE( "requested size: %d x %d available size: %d x %d", + OSL_TRACE( "requested size: %d x %d available size: %d x %d", rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight ); - + if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) return SurfaceSharedPtr(new Win32Surface( rData )); else @@ -298,24 +298,24 @@ namespace cairo WORD glyph_index; HDC hdc = NULL; int i = 0; - + hdc = CreateCompatibleDC (NULL); - + if (!hdc) return 0; if (!SetGraphicsMode (hdc, GM_ADVANCED)) { DeleteDC (hdc); return 0; } - + SelectObject (hdc, hfont); SetMapMode (hdc, MM_TEXT); - + unicode[0] = ucs4; unicode[1] = 0; if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) == GDI_ERROR) { glyph_index = 0; } - + DeleteDC (hdc); return glyph_index; } diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx index fb66cfcc3a1c..3ed001897024 100644 --- a/canvas/source/cairo/cairo_win32_cairo.hxx +++ b/canvas/source/cairo/cairo_win32_cairo.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 @@ -31,7 +31,7 @@ #ifdef WNT # include <tools/prewin.h> -# include <windows.h> +# include <windows.h> # include <tools/postwin.h> #endif @@ -39,7 +39,7 @@ namespace cairo { - class Win32Surface : public Surface + class Win32Surface : public Surface { CairoSurfaceSharedPtr mpSurface; diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index fb7f575e9b66..3ce0994f13f1 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.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 @@ -76,7 +76,7 @@ namespace cairo nScreen(pSysDat.nScreen), nDepth(pSysDat.nDepth), aColormap(pSysDat.aColormap), - pRenderFormat(pSysDat.pRenderFormat) + pRenderFormat(pSysDat.pXRenderFormat) {} X11SysData::X11SysData( const SystemEnvData& pSysDat ) : @@ -106,8 +106,8 @@ namespace cairo * * Set the mpSurface as pSurface **/ - X11Surface::X11Surface( const X11SysData& rSysData, - const X11PixmapSharedPtr& rPixmap, + X11Surface::X11Surface( const X11SysData& rSysData, + const X11PixmapSharedPtr& rPixmap, const CairoSurfaceSharedPtr& pSurface ) : maSysData(rSysData), mpPixmap(rPixmap), @@ -125,7 +125,7 @@ namespace cairo * * Set the mpSurface as pSurface **/ - X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) : + X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) : maSysData(), mpPixmap(), mpSurface(pSurface) @@ -169,7 +169,7 @@ namespace cairo * * Set the mpSurface to the new surface or NULL **/ - X11Surface::X11Surface( const X11SysData& rSysData, + X11Surface::X11Surface( const X11SysData& rSysData, const BitmapSystemData& rData ) : maSysData( rSysData ), mpPixmap(), @@ -194,7 +194,7 @@ namespace cairo } /** - * Surface::getSimilar: Create new similar Canvas surface + * Surface::getSimilar: Create new similar Canvas surface * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h) * @param width width of the new surface * @param height height of the new surface @@ -205,17 +205,17 @@ namespace cairo * Cairo surface from aContent (cairo_content_t) * * @return new surface or NULL - **/ + **/ SurfaceSharedPtr X11Surface::getSimilar( Content aContent, int width, int height ) const { Pixmap hPixmap; - if( maSysData.pDisplay && maSysData.hDrawable ) + if( maSysData.pDisplay && maSysData.hDrawable ) { XRenderPictFormat* pFormat; - int nFormat; + int nFormat; - switch (aContent) + switch (aContent) { case CAIRO_CONTENT_ALPHA: nFormat = PictStandardA8; @@ -237,20 +237,20 @@ namespace cairo X11SysData aSysData(maSysData); aSysData.pRenderFormat = pFormat; return SurfaceSharedPtr( - new X11Surface( aSysData, + new X11Surface( aSysData, X11PixmapSharedPtr( new X11Pixmap(hPixmap, maSysData.pDisplay)), CairoSurfaceSharedPtr( - cairo_xlib_surface_create_with_xrender_format( - (Display*)maSysData.pDisplay, + cairo_xlib_surface_create_with_xrender_format( + (Display*)maSysData.pDisplay, hPixmap, ScreenOfDisplay((Display *)maSysData.pDisplay, maSysData.nScreen), pFormat, width, height ), &cairo_surface_destroy) )); - } + } else return SurfaceSharedPtr( - new X11Surface( maSysData, + new X11Surface( maSysData, X11PixmapSharedPtr(), CairoSurfaceSharedPtr( cairo_surface_create_similar( mpSurface.get(), aContent, width, height ), @@ -263,7 +263,7 @@ namespace cairo aSystemGraphicsData.nSize = sizeof(SystemGraphicsData); aSystemGraphicsData.hDrawable = getDrawable(); - aSystemGraphicsData.pRenderFormat = getRenderFormat(); + aSystemGraphicsData.pXRenderFormat = getRenderFormat(); return boost::shared_ptr<VirtualDevice>( new VirtualDevice( &aSystemGraphicsData, getDepth() )); @@ -291,7 +291,7 @@ namespace cairo /** * Surface::getDepth: Get the color depth of the Canvas surface. * - * @return color depth + * @return color depth **/ int X11Surface::getDepth() const { @@ -335,10 +335,10 @@ namespace cairo } SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice, - const BitmapSystemData& rData, + const BitmapSystemData& rData, const Size& rSize ) { - OSL_TRACE( "requested size: %d x %d available size: %d x %d", + OSL_TRACE( "requested size: %d x %d available size: %d x %d", rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight ); if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) { diff --git a/canvas/source/cairo/cairo_xlib_cairo.hxx b/canvas/source/cairo/cairo_xlib_cairo.hxx index 92ca044a72ff..63d80dbf3f68 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.hxx +++ b/canvas/source/cairo/cairo_xlib_cairo.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,13 +43,13 @@ namespace cairo { explicit X11SysData( const SystemGraphicsData& ); explicit X11SysData( const SystemEnvData& ); - void* pDisplay; // the relevant display connection - long hDrawable; // a drawable - void* pVisual; // the visual in use - int nScreen; // the current screen of the drawable - int nDepth; // depth of said visual - long aColormap; // the colormap being used - void* pRenderFormat; // render format for drawable + void* pDisplay; // the relevant display connection + long hDrawable; // a drawable + void* pVisual; // the visual in use + int nScreen; // the current screen of the drawable + int nDepth; // depth of said visual + long aColormap; // the colormap being used + void* pRenderFormat; // render format for drawable }; /// RAII wrapper for a pixmap @@ -70,7 +70,7 @@ namespace cairo { typedef boost::shared_ptr<X11Pixmap> X11PixmapSharedPtr; - class X11Surface : public Surface + class X11Surface : public Surface { const X11SysData maSysData; X11PixmapSharedPtr mpPixmap; |