diff options
Diffstat (limited to 'canvas/source/vcl/canvasbitmap.hxx')
-rw-r--r-- | canvas/source/vcl/canvasbitmap.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index a8b20725c629..a1162001d9d1 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/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,11 +56,11 @@ namespace vclcanvas 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; - typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, - CanvasBitmapHelper, + ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; + typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, + CanvasBitmapHelper, tools::LocalGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + ::cppu::OWeakObject > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public RepaintTarget @@ -85,7 +85,7 @@ namespace vclcanvas /// Must be called with locked Solar mutex CanvasBitmap( const BitmapEx& rBitmap, ::com::sun::star::rendering::XGraphicDevice& rDevice, - const OutDevProviderSharedPtr& rOutDevProvider ); + const OutDevProviderSharedPtr& rOutDevProvider ); // overridden because of mpDevice virtual void SAL_CALL disposing(); @@ -99,7 +99,7 @@ namespace vclcanvas virtual bool repaint( const GraphicObjectSharedPtr& rGrf, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, - const ::Point& rPt, + const ::Point& rPt, const ::Size& rSz, const GraphicAttr& rAttr ) const; @@ -121,7 +121,7 @@ namespace vclcanvas private: /** MUST hold here, too, since CanvasHelper only contains a - raw pointer (without refcounting) + raw pointer (without refcounting) */ ::com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> mxDevice; }; |