Skip to content

C
core
Kaydet (Commit) 76be88a3 authored tarafından Thomas Arnhold's avatar Thomas Arnhold Kaydeden (comit) Fridrich Štrba
Dosyalara gözat
Seçenekler

canvas: drop using from headers 

Change-Id: Ifcfd08984df883a06a133b407ac90ddf259b3bef
üst 18f78c23
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 31 deletions
canvas/source/cairo/cairo_canvas.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -134,10 +134,10 @@ namespace cairocanvas
const ::com::sun::star::rendering::RenderState& renderState ) SAL_OVERRIDE;
// SurfaceProvider
virtual SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual OutputDevice* getOutputDevice() SAL_OVERRIDE;
private:
......
canvas/source/cairo/cairo_canvasbitmap.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -95,14 +95,14 @@ namespace cairocanvas
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// SurfaceProvider
virtual SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual OutputDevice* getOutputDevice() SAL_OVERRIDE;
// RepaintTarget
virtual bool repaint( const SurfaceSharedPtr& pSurface,
virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) SAL_OVERRIDE;
......
canvas/source/cairo/cairo_canvascustomsprite.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -129,10 +129,10 @@ namespace cairocanvas
const ::com::sun::star::rendering::RenderState& renderState ) SAL_OVERRIDE;
// SurfaceProvider
virtual SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual OutputDevice* getOutputDevice() SAL_OVERRIDE;
private:
......
canvas/source/cairo/cairo_canvashelper.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -307,8 +307,8 @@ namespace cairocanvas
/// When true, content is able to represent alpha
bool mbHaveAlpha;
CairoSharedPtr mpCairo;
SurfaceSharedPtr mpSurface;
::cairo::CairoSharedPtr mpCairo;
::cairo::SurfaceSharedPtr mpSurface;
::basegfx::B2ISize maSize;
};
......
canvas/source/cairo/cairo_repainttarget.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -24,8 +24,6 @@
#include "cairo_cairo.hxx"
using namespace ::cairo;
namespace cairocanvas
{
/* Definition of RepaintTarget interface */
......
canvas/source/cairo/cairo_spritecanvas.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -133,10 +133,10 @@ namespace cairocanvas
virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// SurfaceProvider
virtual SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr getSurface() SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE;
virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE;
virtual OutputDevice* getOutputDevice() SAL_OVERRIDE;
// RepaintTarget
......@@ -144,8 +144,8 @@ namespace cairocanvas
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) SAL_OVERRIDE;
SurfaceSharedPtr getWindowSurface();
SurfaceSharedPtr getBufferSurface();
::cairo::SurfaceSharedPtr getWindowSurface();
::cairo::SurfaceSharedPtr getBufferSurface();
const ::basegfx::B2ISize& getSizePixel();
void setSizePixel( const ::basegfx::B2ISize& rSize );
......
canvas/source/cairo/cairo_surfaceprovider.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -25,8 +25,6 @@
#include "cairo_cairo.hxx"
using namespace ::cairo;
class OutputDevice;
class Bitmap;
......@@ -50,18 +48,18 @@ namespace cairocanvas
This should return the default surface to render on.
*/
virtual SurfaceSharedPtr getSurface() = 0;
virtual ::cairo::SurfaceSharedPtr getSurface() = 0;
/// create new surface in given size
virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize,
Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize,
::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0;
/// create new surface from given bitmap
virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0;
/** convert surface between alpha and non-alpha
channel. returns new surface on success, NULL otherwise
*/
virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) = 0;
virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) = 0;
/** Provides the underlying vcl outputdevice this surface renders on
*/
......
canvas/source/cairo/cairo_textlayout.hxx
Dosyayı görüntüle @ 76be88a3
......@@ -81,7 +81,7 @@ namespace cairocanvas
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
bool draw( SurfaceSharedPtr& pSurface,
bool draw( ::cairo::SurfaceSharedPtr& pSurface,
OutputDevice& rOutDev,
const Point& rOutpos,
const ::com::sun::star::rendering::ViewState& viewState,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment