diff options
Diffstat (limited to 'cppcanvas/source/wrapper')
22 files changed, 287 insertions, 287 deletions
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx index c65a4216b522..696c977ddf18 100644 --- a/cppcanvas/source/wrapper/basegfxfactory.cxx +++ b/cppcanvas/source/wrapper/basegfxfactory.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 @@ -69,16 +69,16 @@ namespace cppcanvas BaseGfxFactory::BaseGfxFactory() { } - + BaseGfxFactory::~BaseGfxFactory() { } - PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::basegfx::B2DPolygon& rPoly ) const + PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, + const ::basegfx::B2DPolygon& rPoly ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -88,18 +88,18 @@ namespace cppcanvas if( !xCanvas.is() ) return PolyPolygonSharedPtr(); - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, + return PolyPolygonSharedPtr( + new internal::ImplPolyPolygon( rCanvas, ::basegfx::unotools::xPolyPolygonFromB2DPolygon( xCanvas->getDevice(), rPoly) ) ); } - - PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::basegfx::B2DPolyPolygon& rPolyPoly ) const + + PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, + const ::basegfx::B2DPolyPolygon& rPolyPoly ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -109,20 +109,20 @@ namespace cppcanvas if( !xCanvas.is() ) return PolyPolygonSharedPtr(); - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, + return PolyPolygonSharedPtr( + new internal::ImplPolyPolygon( rCanvas, ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( xCanvas->getDevice(), rPolyPoly) ) ); } - BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr& rCanvas, + BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr& rCanvas, const ::basegfx::B2ISize& rSize ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - + if( rCanvas.get() == NULL ) return BitmapSharedPtr(); @@ -130,19 +130,19 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( - new internal::ImplBitmap( rCanvas, - xCanvas->getDevice()->createCompatibleBitmap( + return BitmapSharedPtr( + new internal::ImplBitmap( rCanvas, + xCanvas->getDevice()->createCompatibleBitmap( ::basegfx::unotools::integerSize2DFromB2ISize(rSize) ) ) ); } - BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr& rCanvas, + BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr& rCanvas, const ::basegfx::B2ISize& rSize ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - + if( rCanvas.get() == NULL ) return BitmapSharedPtr(); @@ -150,15 +150,15 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( - new internal::ImplBitmap( rCanvas, - xCanvas->getDevice()->createCompatibleAlphaBitmap( + return BitmapSharedPtr( + new internal::ImplBitmap( rCanvas, + xCanvas->getDevice()->createCompatibleAlphaBitmap( ::basegfx::unotools::integerSize2DFromB2ISize(rSize) ) ) ); } TextSharedPtr BaseGfxFactory::createText( const CanvasSharedPtr& rCanvas, const ::rtl::OUString& rText ) const { - return TextSharedPtr( new internal::ImplText( rCanvas, + return TextSharedPtr( new internal::ImplText( rCanvas, rText ) ); } diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index bf00e0f673c6..5748fedbfc6d 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.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 @@ -44,7 +44,7 @@ namespace cppcanvas namespace internal { - ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas, + ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas, const uno::Reference< rendering::XBitmap >& rBitmap ) : CanvasGraphicHelper( rParentCanvas ), mxBitmap( rBitmap ), @@ -55,7 +55,7 @@ namespace cppcanvas uno::Reference< rendering::XBitmapCanvas > xBitmapCanvas( rBitmap, uno::UNO_QUERY ); if( xBitmapCanvas.is() ) - mpBitmapCanvas.reset( new ImplBitmapCanvas( + mpBitmapCanvas.reset( new ImplBitmapCanvas( uno::Reference< rendering::XBitmapCanvas >(rBitmap, uno::UNO_QUERY) ) ); } @@ -79,8 +79,8 @@ namespace cppcanvas } // TODO(P1): implement caching - pCanvas->getUNOCanvas()->drawBitmap( mxBitmap, - pCanvas->getViewState(), + pCanvas->getUNOCanvas()->drawBitmap( mxBitmap, + pCanvas->getViewState(), getRenderState() ); return true; @@ -103,12 +103,12 @@ namespace cppcanvas rendering::RenderState aLocalState( getRenderState() ); uno::Sequence<rendering::ARGBColor> aCol(1); aCol[0] = rendering::ARGBColor( nAlphaModulation, 1.0, 1.0, 1.0 ); - aLocalState.DeviceColor = + aLocalState.DeviceColor = pCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace()->convertFromARGB(aCol); // TODO(P1): implement caching - pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, - pCanvas->getViewState(), + pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap, + pCanvas->getViewState(), aLocalState ); return true; diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index c27d095d1888..56bdd29070c7 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.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 @@ -50,7 +50,7 @@ namespace cppcanvas public: ImplBitmap( const CanvasSharedPtr& rParentCanvas, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& rBitmap ); virtual ~ImplBitmap(); @@ -59,19 +59,19 @@ namespace cppcanvas virtual bool draw() const; virtual bool drawAlphaModulated( double nAlphaModulation ) const; - virtual BitmapCanvasSharedPtr getBitmapCanvas() const; + virtual BitmapCanvasSharedPtr getBitmapCanvas() const; // Bitmap implementation - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > getUNOBitmap() const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > getUNOBitmap() const; private: // default: disabled copy/assignment ImplBitmap(const ImplBitmap&); ImplBitmap& operator=( const ImplBitmap& ); - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; - BitmapCanvasSharedPtr mpBitmapCanvas; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; + BitmapCanvasSharedPtr mpBitmapCanvas; }; } } diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx index 6aa08a9334d0..5526d00e7548 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.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 @@ -59,7 +59,7 @@ namespace cppcanvas ImplBitmapCanvas::~ImplBitmapCanvas() { } - + ::basegfx::B2ISize ImplBitmapCanvas::getSize() const { OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::getSize(): Invalid canvas" ); diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 5b1b625630a0..722656d37a45 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ namespace cppcanvas class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas { public: - ImplBitmapCanvas( const ::com::sun::star::uno::Reference< + ImplBitmapCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rCanvas ); virtual ~ImplBitmapCanvas(); - virtual ::basegfx::B2ISize getSize() const; + virtual ::basegfx::B2ISize getSize() const; - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const; // take compiler-provided default copy constructor //ImplBitmapCanvas(const ImplBitmapCanvas&); @@ -62,8 +62,8 @@ namespace cppcanvas // default: disabled assignment ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ); - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; }; } } diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 2fb6debc0eae..d871ac345915 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.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,10 +73,10 @@ namespace cppcanvas ::basegfx::B2DHomMatrix ImplCanvas::getTransformation() const { ::basegfx::B2DHomMatrix aMatrix; - return ::canvas::tools::getViewStateTransform( aMatrix, + return ::canvas::tools::getViewStateTransform( aMatrix, maViewState ); } - + void ImplCanvas::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) { // TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write @@ -99,7 +99,7 @@ namespace cppcanvas { return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) ); } - + ColorSharedPtr ImplCanvas::createColor() const { return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) ); @@ -109,7 +109,7 @@ namespace cppcanvas { return CanvasSharedPtr( new ImplCanvas( *this ) ); } - + void ImplCanvas::clear() const { OSL_ENSURE( mxCanvas.is(), "ImplCanvas::clear(): Invalid XCanvas" ); diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index 481a5541441c..56254496220b 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace basegfx class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XCanvas; } } } } @@ -63,29 +63,29 @@ namespace cppcanvas class ImplCanvas : public virtual Canvas { public: - ImplCanvas( const ::com::sun::star::uno::Reference< + ImplCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& rCanvas ); virtual ~ImplCanvas(); virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); virtual ::basegfx::B2DHomMatrix getTransformation() const; - + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); virtual void setClip(); virtual ::basegfx::B2DPolyPolygon const* getClip() const; - + virtual FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const; - + virtual ColorSharedPtr createColor() const; - + virtual CanvasSharedPtr clone() const; virtual void clear() const; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas > getUNOCanvas() const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCanvas > getUNOCanvas() const; - virtual ::com::sun::star::rendering::ViewState getViewState() const; + virtual ::com::sun::star::rendering::ViewState getViewState() const; // take compiler-provided default copy constructor //ImplCanvas(const ImplCanvas&); @@ -94,9 +94,9 @@ namespace cppcanvas // default: disabled assignment ImplCanvas& operator=( const ImplCanvas& ); - mutable ::com::sun::star::rendering::ViewState maViewState; + mutable ::com::sun::star::rendering::ViewState maViewState; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; }; } diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx index c474deee2420..a4e5f6703db0 100644 --- a/cppcanvas/source/wrapper/implcolor.cxx +++ b/cppcanvas/source/wrapper/implcolor.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/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx index 3bc47da73d01..ff72564163d4 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ namespace cppcanvas class ImplColor : public Color { public: - ImplColor( const ::com::sun::star::uno::Reference< + ImplColor( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice ); virtual ~ImplColor(); - virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const; - virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const; + virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const; + virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const; private: - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice; }; } diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx index e41e728e40ce..c93ab1d65399 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.cxx +++ b/cppcanvas/source/wrapper/implcustomsprite.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 @@ -40,10 +40,10 @@ namespace cppcanvas { namespace internal { - ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, - const uno::Reference< rendering::XCustomSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : - ImplSprite( rParentCanvas, + ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, + const uno::Reference< rendering::XCustomSprite >& rSprite, + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : + ImplSprite( rParentCanvas, uno::Reference< rendering::XSprite >(rSprite, uno::UNO_QUERY), rTransformArbiter ), diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index fe40c017b83c..f4c4b5ba1d06 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,11 +47,11 @@ namespace cppcanvas class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite { public: - ImplCustomSprite( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCustomSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); + ImplCustomSprite( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCustomSprite >& rSprite, + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplCustomSprite(); virtual CanvasSharedPtr getContentCanvas() const; @@ -61,8 +61,8 @@ namespace cppcanvas ImplCustomSprite(const ImplCustomSprite&); ImplCustomSprite& operator=( const ImplCustomSprite& ); - mutable CanvasSharedPtr mpLastCanvas; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite; + mutable CanvasSharedPtr mpLastCanvas; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite; }; } } diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx index b466cfabd068..d92779e9f97a 100644 --- a/cppcanvas/source/wrapper/implfont.cxx +++ b/cppcanvas/source/wrapper/implfont.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 @@ namespace cppcanvas { ImplFont::ImplFont( const uno::Reference< rendering::XCanvas >& rCanvas, - const ::rtl::OUString& rFontName, + const ::rtl::OUString& rFontName, const double& rCellSize ) : mxCanvas( rCanvas ), mxFont( NULL ) @@ -57,12 +57,12 @@ namespace cppcanvas geometry::Matrix2D aFontMatrix; ::canvas::tools::setIdentityMatrix2D( aFontMatrix ); - mxFont = mxCanvas->createFont( aFontRequest, + mxFont = mxCanvas->createFont( aFontRequest, uno::Sequence< beans::PropertyValue >(), aFontMatrix ); } - + ImplFont::~ImplFont() { } diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 589bab707e84..e5fed9da466c 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace rtl class OUString; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XCanvasFont; } } } } @@ -57,22 +57,22 @@ namespace cppcanvas class ImplFont : public Font { public: - ImplFont( const ::com::sun::star::uno::Reference< + ImplFont( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& rCanvas, - const ::rtl::OUString& rFontName, + const ::rtl::OUString& rFontName, const double& rCellSize ); virtual ~ImplFont(); virtual ::rtl::OUString getName() const; - virtual double getCellSize() const; + virtual double getCellSize() const; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > getUNOFont() const; private: - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; }; } } diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index ac1fa728378c..ed28fae41d9c 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.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 @@ -53,12 +53,12 @@ namespace cppcanvas const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) : CanvasGraphicHelper( rParentCanvas ), mxPolyPoly( rPolyPoly ), - maStrokeAttributes(1.0, - 10.0, - uno::Sequence< double >(), - uno::Sequence< double >(), - rendering::PathCapType::ROUND, - rendering::PathCapType::ROUND, + maStrokeAttributes(1.0, + 10.0, + uno::Sequence< double >(), + uno::Sequence< double >(), + rendering::PathCapType::ROUND, + rendering::PathCapType::ROUND, rendering::PathJoinType::ROUND ), maFillColor(), maStrokeColor(), @@ -74,7 +74,7 @@ namespace cppcanvas void ImplPolyPolygon::addPolygon( const ::basegfx::B2DPolygon& rPoly ) { - OSL_ENSURE( mxPolyPoly.is(), + OSL_ENSURE( mxPolyPoly.is(), "ImplPolyPolygon::addPolygon(): Invalid polygon" ); if( !mxPolyPoly.is() ) @@ -82,9 +82,9 @@ namespace cppcanvas uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() ); - OSL_ENSURE( xDevice.is(), + OSL_ENSURE( xDevice.is(), "ImplPolyPolygon::addPolygon(): Invalid graphic device" ); - + if( !xDevice.is() ) return; @@ -96,7 +96,7 @@ namespace cppcanvas void ImplPolyPolygon::addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) { - OSL_ENSURE( mxPolyPoly.is(), + OSL_ENSURE( mxPolyPoly.is(), "ImplPolyPolygon::addPolyPolygon(): Invalid polygon" ); if( !mxPolyPoly.is() ) @@ -104,9 +104,9 @@ namespace cppcanvas uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() ); - OSL_ENSURE( xDevice.is(), + OSL_ENSURE( xDevice.is(), "ImplPolyPolygon::addPolyPolygon(): Invalid graphic device" ); - + if( !xDevice.is() ) return; @@ -118,27 +118,27 @@ namespace cppcanvas void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor ) { - maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), + maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), aColor ); mbFillColorSet = true; } void ImplPolyPolygon::setRGBALineColor( Color::IntSRGBA aColor ) { - maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), + maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), aColor ); mbStrokeColorSet = true; } Color::IntSRGBA ImplPolyPolygon::getRGBAFillColor() const { - return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), + return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), maFillColor ); } Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const { - return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), + return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), maStrokeColor ); } @@ -159,7 +159,7 @@ namespace cppcanvas OSL_ENSURE( pCanvas.get() != NULL && pCanvas->getUNOCanvas().is(), "ImplBitmap::draw: invalid canvas" ); - + if( pCanvas.get() == NULL || !pCanvas->getUNOCanvas().is() ) return false; @@ -169,8 +169,8 @@ namespace cppcanvas rendering::RenderState aLocalState( getRenderState() ); aLocalState.DeviceColor = maFillColor; - pCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly, - pCanvas->getViewState(), + pCanvas->getUNOCanvas()->fillPolyPolygon( mxPolyPoly, + pCanvas->getViewState(), aLocalState ); } @@ -180,17 +180,17 @@ namespace cppcanvas aLocalState.DeviceColor = maStrokeColor; if( ::rtl::math::approxEqual(maStrokeAttributes.StrokeWidth, 1.0) ) - pCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly, - pCanvas->getViewState(), + pCanvas->getUNOCanvas()->drawPolyPolygon( mxPolyPoly, + pCanvas->getViewState(), aLocalState ); else - pCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly, - pCanvas->getViewState(), + pCanvas->getUNOCanvas()->strokePolyPolygon( mxPolyPoly, + pCanvas->getViewState(), aLocalState, maStrokeAttributes ); } - return true; + return true; } uno::Reference< rendering::XPolyPolygon2D > ImplPolyPolygon::getUNOPolyPolygon() const diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index 7d89039f29c7..e12d75fb0d95 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.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 @@ -37,7 +37,7 @@ #include <cppcanvas/polypolygon.hxx> #include <canvasgraphichelper.hxx> -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { struct RealPoint2D; } } } } @@ -52,40 +52,40 @@ namespace cppcanvas { public: ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly ); virtual ~ImplPolyPolygon(); - virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ); - virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ); + virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ); + virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ); - virtual void setRGBAFillColor( Color::IntSRGBA ); - virtual void setRGBALineColor( Color::IntSRGBA ); - virtual Color::IntSRGBA getRGBAFillColor() const; - virtual Color::IntSRGBA getRGBALineColor() const; + virtual void setRGBAFillColor( Color::IntSRGBA ); + virtual void setRGBALineColor( Color::IntSRGBA ); + virtual Color::IntSRGBA getRGBAFillColor() const; + virtual Color::IntSRGBA getRGBALineColor() const; - virtual void setStrokeWidth( const double& rStrokeWidth ); - virtual double getStrokeWidth() const; + virtual void setStrokeWidth( const double& rStrokeWidth ); + virtual double getStrokeWidth() const; - virtual bool draw() const; + virtual bool draw() const; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const; private: // default: disabled copy/assignment ImplPolyPolygon(const ImplPolyPolygon&); ImplPolyPolygon& operator= ( const ImplPolyPolygon& ); + + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly; - - ::com::sun::star::rendering::StrokeAttributes maStrokeAttributes; + ::com::sun::star::rendering::StrokeAttributes maStrokeAttributes; - ::com::sun::star::uno::Sequence< double > maFillColor; - ::com::sun::star::uno::Sequence< double > maStrokeColor; - bool mbFillColorSet; - bool mbStrokeColorSet; + ::com::sun::star::uno::Sequence< double > maFillColor; + ::com::sun::star::uno::Sequence< double > maStrokeColor; + bool mbFillColorSet; + bool mbStrokeColorSet; }; } diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx index f2f5fba781bd..4673de2c1f41 100644 --- a/cppcanvas/source/wrapper/implsprite.cxx +++ b/cppcanvas/source/wrapper/implsprite.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 @@ -46,9 +46,9 @@ namespace cppcanvas namespace internal { - ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, - const uno::Reference< rendering::XSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : + ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, + const uno::Reference< rendering::XSprite >& rSprite, + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : mxGraphicDevice(), mxSprite( rSprite ), mxAnimatedSprite(), @@ -66,9 +66,9 @@ namespace cppcanvas OSL_ENSURE( mpTransformArbiter.get(), "ImplSprite::ImplSprite(): Invalid transformation arbiter"); } - ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, - const uno::Reference< rendering::XAnimatedSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : + ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, + const uno::Reference< rendering::XAnimatedSprite >& rSprite, + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : mxGraphicDevice(), mxSprite( uno::Reference< rendering::XSprite >(rSprite, uno::UNO_QUERY) ), @@ -112,13 +112,13 @@ namespace cppcanvas if( mxSprite.is() ) { - rendering::ViewState aViewState; - rendering::RenderState aRenderState; - + rendering::ViewState aViewState; + rendering::RenderState aRenderState; + ::canvas::tools::initViewState( aViewState ); ::canvas::tools::initRenderState( aRenderState ); - - mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), + + mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), aViewState, aRenderState ); } @@ -130,16 +130,16 @@ namespace cppcanvas if( mxSprite.is() ) { - rendering::ViewState aViewState; - rendering::RenderState aRenderState; + rendering::ViewState aViewState; + rendering::RenderState aRenderState; ::canvas::tools::initViewState( aViewState ); ::canvas::tools::initRenderState( aRenderState ); ::canvas::tools::setViewStateTransform( aViewState, mpTransformArbiter->getTransformation() ); - - mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), + + mxSprite->move( ::basegfx::unotools::point2DFromB2DPoint( rNewPos ), aViewState, aRenderState ); } @@ -162,7 +162,7 @@ namespace cppcanvas { OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas"); OSL_ENSURE( mxSprite.is(), "ImplSprite::transform(): Invalid sprite"); - + if( mxSprite.is() && mxGraphicDevice.is() ) mxSprite->clip( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxGraphicDevice, rClipPoly ) ); @@ -172,20 +172,20 @@ namespace cppcanvas { OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas"); OSL_ENSURE( mxSprite.is(), "ImplSprite::transform(): Invalid sprite"); - + if( mxSprite.is() && mxGraphicDevice.is() ) { - ::basegfx::B2DPolyPolygon aTransformedClipPoly( rClipPoly ); - - // extract linear part of canvas view transformation (linear means: - // without translational components) - ::basegfx::B2DHomMatrix aViewTransform( mpTransformArbiter->getTransformation() ); + ::basegfx::B2DPolyPolygon aTransformedClipPoly( rClipPoly ); + + // extract linear part of canvas view transformation (linear means: + // without translational components) + ::basegfx::B2DHomMatrix aViewTransform( mpTransformArbiter->getTransformation() ); aViewTransform.set( 0, 2, 0.0 ); aViewTransform.set( 1, 2, 0.0 ); - - // transform polygon from view to device coordinate space + + // transform polygon from view to device coordinate space aTransformedClipPoly.transform( aViewTransform ); - + mxSprite->clip( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxGraphicDevice, aTransformedClipPoly ) ); } @@ -195,11 +195,11 @@ namespace cppcanvas { OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::setClip(): Invalid canvas"); OSL_ENSURE( mxSprite.is(), "ImplSprite::setClip(): Invalid sprite"); - + if( mxSprite.is() && mxGraphicDevice.is() ) mxSprite->clip( uno::Reference< rendering::XPolyPolygon2D >() ); } - + void ImplSprite::show() { OSL_ENSURE( mxSprite.is(), "ImplSprite::show(): Invalid sprite"); diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index 1397791d1f82..d8b4a8600fd1 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ namespace cppcanvas class ImplSprite : public virtual Sprite { public: - ImplSprite( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); - ImplSprite( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, - const ::com::sun::star::uno::Reference< + ImplSprite( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, + const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSprite >& rSprite, + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); + ImplSprite( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite >& rSprite, - const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); + const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplSprite(); virtual void setAlpha( const double& rAlpha ); @@ -65,16 +65,16 @@ namespace cppcanvas virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ); virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); virtual void setClip(); - + virtual void show(); virtual void hide(); virtual void setPriority( double fPriority ); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSprite > getUNOSprite() const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSprite > getUNOSprite() const; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const; @@ -83,10 +83,10 @@ namespace cppcanvas ImplSprite(const ImplSprite&); ImplSprite& operator=( const ImplSprite& ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite; - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > mxAnimatedSprite; - ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > mxAnimatedSprite; + ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; }; } } diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index cc8cf5bdefcc..c116fd970a5e 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.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 @@ -69,7 +69,7 @@ namespace cppcanvas { OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::ImplSpriteCanvas(): Invalid canvas" ); } - + ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) : Canvas(), BitmapCanvas(), @@ -104,7 +104,7 @@ namespace cppcanvas return mxSpriteCanvas->updateScreen( bUpdateAll ); } - + CustomSpriteSharedPtr ImplSpriteCanvas::createCustomSprite( const ::basegfx::B2DSize& rSize ) const { OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" ); @@ -112,7 +112,7 @@ namespace cppcanvas if( !mxSpriteCanvas.is() ) return CustomSpriteSharedPtr(); - return CustomSpriteSharedPtr( + return CustomSpriteSharedPtr( new ImplCustomSprite( mxSpriteCanvas, mxSpriteCanvas->createCustomSprite( ::basegfx::unotools::size2DFromB2DSize(rSize) ), mpTransformArbiter ) ); @@ -121,7 +121,7 @@ namespace cppcanvas SpriteSharedPtr ImplSpriteCanvas::createClonedSprite( const SpriteSharedPtr& rSprite ) const { OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" ); - OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(), + OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(), "ImplSpriteCanvas::createCustomSprite(): Invalid sprite" ); if( !mxSpriteCanvas.is() || @@ -131,16 +131,16 @@ namespace cppcanvas return SpriteSharedPtr(); } - return SpriteSharedPtr( + return SpriteSharedPtr( new ImplSprite( mxSpriteCanvas, mxSpriteCanvas->createClonedSprite( rSprite->getUNOSprite() ), mpTransformArbiter ) ); } - SpriteSharedPtr ImplSpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& rAnimationBitmaps, - sal_Int8 nInterpolationMode ) + SpriteSharedPtr ImplSpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& rAnimationBitmaps, + sal_Int8 nInterpolationMode ) { - return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas, + return SpriteSharedPtr( new internal::ImplSprite( mxSpriteCanvas, mxSpriteCanvas->createSpriteFromBitmaps( rAnimationBitmaps, nInterpolationMode ), mpTransformArbiter ) ); diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index d308b313b7dd..a6844431e456 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,29 +48,29 @@ namespace cppcanvas class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas { public: - ImplSpriteCanvas( const ::com::sun::star::uno::Reference< + ImplSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& rCanvas ); ImplSpriteCanvas(const ImplSpriteCanvas&); virtual ~ImplSpriteCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - - virtual bool updateScreen( bool bUpdateAll ) const; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const; + virtual bool updateScreen( bool bUpdateAll ) const; + + virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const; + virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const; - SpriteSharedPtr createSpriteFromBitmaps( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > >& animationBitmaps, - sal_Int8 interpolationMode ); + SpriteSharedPtr createSpriteFromBitmaps( + const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > >& animationBitmaps, + sal_Int8 interpolationMode ); - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const; /** This class passes the view transformation to child sprites @@ -80,16 +80,16 @@ namespace cppcanvas itself, but has somehow pass an object to child sprites those can query for the canvas' view transform. */ - class TransformationArbiter + class TransformationArbiter { public: TransformationArbiter(); - void setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform ); - ::basegfx::B2DHomMatrix getTransformation() const; + void setTransformation( const ::basegfx::B2DHomMatrix& rViewTransform ); + ::basegfx::B2DHomMatrix getTransformation() const; private: - ::basegfx::B2DHomMatrix maTransformation; + ::basegfx::B2DHomMatrix maTransformation; }; typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; @@ -98,8 +98,8 @@ namespace cppcanvas // default: disabled assignment ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ); - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; - TransformationArbiterSharedPtr mpTransformArbiter; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; + TransformationArbiterSharedPtr mpTransformArbiter; }; } } diff --git a/cppcanvas/source/wrapper/impltext.cxx b/cppcanvas/source/wrapper/impltext.cxx index 68592105c14a..57433c7c8baa 100644 --- a/cppcanvas/source/wrapper/impltext.cxx +++ b/cppcanvas/source/wrapper/impltext.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 @@ -46,8 +46,8 @@ namespace cppcanvas namespace internal { - ImplText::ImplText( const CanvasSharedPtr& rParentCanvas, - const ::rtl::OUString& rText ) : + ImplText::ImplText( const CanvasSharedPtr& rParentCanvas, + const ::rtl::OUString& rText ) : CanvasGraphicHelper( rParentCanvas ), mpFont(), maText(rText) diff --git a/cppcanvas/source/wrapper/impltext.hxx b/cppcanvas/source/wrapper/impltext.hxx index a45e7dab2114..c24efece4463 100644 --- a/cppcanvas/source/wrapper/impltext.hxx +++ b/cppcanvas/source/wrapper/impltext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ namespace cppcanvas { public: - ImplText( const CanvasSharedPtr& rParentCanvas, - const ::rtl::OUString& rText ); + ImplText( const CanvasSharedPtr& rParentCanvas, + const ::rtl::OUString& rText ); virtual ~ImplText(); @@ -62,8 +62,8 @@ namespace cppcanvas ImplText(const ImplText&); ImplText& operator= ( const ImplText& ); - FontSharedPtr mpFont; - ::rtl::OUString maText; + FontSharedPtr mpFont; + ::rtl::OUString maText; }; } } diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 870de321055c..b4a92ef3eba1 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.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 @@ -71,15 +71,15 @@ namespace cppcanvas VCLFactory::VCLFactory() { } - + VCLFactory::~VCLFactory() { } BitmapCanvasSharedPtr VCLFactory::createCanvas( const ::Window& rVCLWindow ) - { - return BitmapCanvasSharedPtr( - new internal::ImplBitmapCanvas( + { + return BitmapCanvasSharedPtr( + new internal::ImplBitmapCanvas( uno::Reference< rendering::XBitmapCanvas >( rVCLWindow.GetCanvas(), uno::UNO_QUERY) ) ); @@ -87,14 +87,14 @@ namespace cppcanvas BitmapCanvasSharedPtr VCLFactory::createCanvas( const uno::Reference< rendering::XBitmapCanvas >& xCanvas ) { - return BitmapCanvasSharedPtr( + return BitmapCanvasSharedPtr( new internal::ImplBitmapCanvas( xCanvas ) ); } SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const ::Window& rVCLWindow ) const { - return SpriteCanvasSharedPtr( - new internal::ImplSpriteCanvas( + return SpriteCanvasSharedPtr( + new internal::ImplSpriteCanvas( uno::Reference< rendering::XSpriteCanvas >( rVCLWindow.GetSpriteCanvas(), uno::UNO_QUERY) ) ); @@ -102,25 +102,25 @@ namespace cppcanvas SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& xCanvas ) const { - return SpriteCanvasSharedPtr( + return SpriteCanvasSharedPtr( new internal::ImplSpriteCanvas( xCanvas ) ); } - SpriteCanvasSharedPtr VCLFactory::createFullscreenSpriteCanvas( const ::Window& rVCLWindow, - const Size& rFullscreenSize ) const + SpriteCanvasSharedPtr VCLFactory::createFullscreenSpriteCanvas( const ::Window& rVCLWindow, + const Size& rFullscreenSize ) const { - return SpriteCanvasSharedPtr( - new internal::ImplSpriteCanvas( + return SpriteCanvasSharedPtr( + new internal::ImplSpriteCanvas( uno::Reference< rendering::XSpriteCanvas >( rVCLWindow.GetFullscreenSpriteCanvas( rFullscreenSize ), uno::UNO_QUERY) ) ); } - PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::Polygon& rPoly ) const + PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, + const ::Polygon& rPoly ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createPolyPolygon(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -130,18 +130,18 @@ namespace cppcanvas if( !xCanvas.is() ) return PolyPolygonSharedPtr(); - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, + return PolyPolygonSharedPtr( + new internal::ImplPolyPolygon( rCanvas, ::vcl::unotools::xPolyPolygonFromPolygon( xCanvas->getDevice(), rPoly) ) ); } - PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::PolyPolygon& rPolyPoly ) const + PolyPolygonSharedPtr VCLFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, + const ::PolyPolygon& rPolyPoly ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createPolyPolygon(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -151,20 +151,20 @@ namespace cppcanvas if( !xCanvas.is() ) return PolyPolygonSharedPtr(); - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, + return PolyPolygonSharedPtr( + new internal::ImplPolyPolygon( rCanvas, ::vcl::unotools::xPolyPolygonFromPolyPolygon( xCanvas->getDevice(), rPolyPoly) ) ); } - BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, - const ::Size& rSize ) const + BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, + const ::Size& rSize ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); - + if( rCanvas.get() == NULL ) return BitmapSharedPtr(); @@ -172,19 +172,19 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( - new internal::ImplBitmap( rCanvas, - xCanvas->getDevice()->createCompatibleBitmap( + return BitmapSharedPtr( + new internal::ImplBitmap( rCanvas, + xCanvas->getDevice()->createCompatibleBitmap( ::vcl::unotools::integerSize2DFromSize(rSize) ) ) ); } - BitmapSharedPtr VCLFactory::createAlphaBitmap( const CanvasSharedPtr& rCanvas, - const ::Size& rSize ) const + BitmapSharedPtr VCLFactory::createAlphaBitmap( const CanvasSharedPtr& rCanvas, + const ::Size& rSize ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); - + if( rCanvas.get() == NULL ) return BitmapSharedPtr(); @@ -192,17 +192,17 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( - new internal::ImplBitmap( rCanvas, - xCanvas->getDevice()->createCompatibleAlphaBitmap( + return BitmapSharedPtr( + new internal::ImplBitmap( rCanvas, + xCanvas->getDevice()->createCompatibleAlphaBitmap( ::vcl::unotools::integerSize2DFromSize(rSize) ) ) ); } - BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, - const ::Bitmap& rBitmap ) const + BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, + const ::Bitmap& rBitmap ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -212,17 +212,17 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, + return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, ::vcl::unotools::xBitmapFromBitmap( xCanvas->getDevice(), rBitmap) ) ); } - BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, - const ::BitmapEx& rBmpEx ) const + BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, + const ::BitmapEx& rBmpEx ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -232,18 +232,18 @@ namespace cppcanvas if( !xCanvas.is() ) return BitmapSharedPtr(); - return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, + return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, ::vcl::unotools::xBitmapFromBitmapEx( xCanvas->getDevice(), rBmpEx) ) ); } - RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, - const ::Graphic& rGraphic, - const Renderer::Parameters& rParms ) const + RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, + const ::Graphic& rGraphic, + const Renderer::Parameters& rParms ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createRenderer(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -254,20 +254,20 @@ namespace cppcanvas return RendererSharedPtr(); if( rGraphic.GetType() == GRAPHIC_GDIMETAFILE ) - return RendererSharedPtr( new internal::ImplRenderer( rCanvas, + return RendererSharedPtr( new internal::ImplRenderer( rCanvas, rGraphic.GetGDIMetaFile(), rParms ) ); else - return RendererSharedPtr( new internal::ImplRenderer( rCanvas, + return RendererSharedPtr( new internal::ImplRenderer( rCanvas, rGraphic.GetBitmapEx(), rParms ) ); } - RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, - const ::GDIMetaFile& rMtf, - const Renderer::Parameters& rParms ) const + RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, + const ::GDIMetaFile& rMtf, + const Renderer::Parameters& rParms ) const { - return RendererSharedPtr( new internal::ImplRenderer( rCanvas, + return RendererSharedPtr( new internal::ImplRenderer( rCanvas, rMtf, rParms ) ); } @@ -275,7 +275,7 @@ namespace cppcanvas SpriteSharedPtr VCLFactory::createAnimatedSprite( const SpriteCanvasSharedPtr& rCanvas, const ::Animation& rAnim ) const { OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), + rCanvas->getUNOCanvas().is(), "VCLFactory::createAnimatedSprite(): Invalid canvas" ); if( rCanvas.get() == NULL ) @@ -324,7 +324,7 @@ namespace cppcanvas // simply clear bitmap to transparent aBmpEx.Erase( ::Color( 255, 0,0,0 ) ); } - else if( rAnimBmp.eDisposal == DISPOSE_PREVIOUS ) + else if( rAnimBmp.eDisposal == DISPOSE_PREVIOUS ) { // copy in last known full frame aBmpEx = aRestoreBuffer; @@ -335,10 +335,10 @@ namespace cppcanvas "VCLFactory::createAnimatedSprite(): Somebody set the deprecated DISPOSE_FULL at the Animation" ); // update display - aBmpEx.CopyPixel( Rectangle( rAnimBmp.aPosPix, - rAnimBmp.aSizePix ), + aBmpEx.CopyPixel( Rectangle( rAnimBmp.aPosPix, + rAnimBmp.aSizePix ), Rectangle( aEmptyPoint, - rAnimBmp.aSizePix ), + rAnimBmp.aSizePix ), &rAnimBmp.aBmpEx ); // store last DISPOSE_NOT frame, for later @@ -357,7 +357,7 @@ namespace cppcanvas TextSharedPtr VCLFactory::createText( const CanvasSharedPtr& rCanvas, const ::rtl::OUString& rText ) const { - return TextSharedPtr( new internal::ImplText( rCanvas, + return TextSharedPtr( new internal::ImplText( rCanvas, rText ) ); } |