diff options
Diffstat (limited to 'canvas/source/cairo/cairo_xlib_cairo.cxx')
| -rw-r--r-- | canvas/source/cairo/cairo_xlib_cairo.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index a0569ab5a442..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 @@ -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 ), @@ -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() ) { |