diff options
Diffstat (limited to 'cppcanvas/inc')
-rw-r--r-- | cppcanvas/inc/cppcanvas/basegfxfactory.hxx | 14 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/bitmap.hxx | 12 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/bitmapcanvas.hxx | 6 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/canvas.hxx | 20 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/canvasgraphic.hxx | 10 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/color.hxx | 36 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/customsprite.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/font.hxx | 8 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/polypolygon.hxx | 18 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/renderer.hxx | 28 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/sprite.hxx | 10 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/spritecanvas.hxx | 18 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/text.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/inc/cppcanvas/vclfactory.hxx | 44 | ||||
-rw-r--r-- | cppcanvas/inc/pch/precompiled_cppcanvas.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2 |
16 files changed, 116 insertions, 116 deletions
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx index 10be95fc8eb5..1337ceb09394 100644 --- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx +++ b/cppcanvas/inc/cppcanvas/basegfxfactory.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 @@ -73,20 +73,20 @@ namespace cppcanvas The created polygon initially has the same size in user coordinate space as the source polygon */ - PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolygon& rPoly ) const; - PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolyPolygon& rPoly ) const; + PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolygon& rPoly ) const; + PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::basegfx::B2DPolyPolygon& rPoly ) const; /** Create an uninitialized bitmap with the given size */ - BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; + BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; /** Create an uninitialized alpha bitmap with the given size */ - BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; + BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize ) const; - /** Create a text portion with the given content string + /** Create a text portion with the given content string */ - TextSharedPtr createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const; + TextSharedPtr createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const; private: friend struct InitInstance2; diff --git a/cppcanvas/inc/cppcanvas/bitmap.hxx b/cppcanvas/inc/cppcanvas/bitmap.hxx index 425428b24ab5..4a959a5c22f3 100644 --- a/cppcanvas/inc/cppcanvas/bitmap.hxx +++ b/cppcanvas/inc/cppcanvas/bitmap.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 @@ -35,7 +35,7 @@ #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/bitmapcanvas.hxx> -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XBitmap; } } } } @@ -67,12 +67,12 @@ namespace cppcanvas @return whether the rendering finished successfully. */ - virtual bool drawAlphaModulated( double nAlphaModulation ) const = 0; + virtual bool drawAlphaModulated( double nAlphaModulation ) const = 0; - virtual BitmapCanvasSharedPtr getBitmapCanvas() const = 0; + virtual BitmapCanvasSharedPtr getBitmapCanvas() const = 0; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > getUNOBitmap() const = 0; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > getUNOBitmap() const = 0; }; typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; diff --git a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx b/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx index 4221833bc29e..af3d9d69af01 100644 --- a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx +++ b/cppcanvas/inc/cppcanvas/bitmapcanvas.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,10 +51,10 @@ namespace cppcanvas class BitmapCanvas : public virtual Canvas { public: - virtual ::basegfx::B2ISize getSize() const = 0; + virtual ::basegfx::B2ISize getSize() const = 0; // shared_ptr does not allow for covariant return types - BitmapCanvasSharedPtr cloneBitmapCanvas() const + BitmapCanvasSharedPtr cloneBitmapCanvas() const { BitmapCanvasSharedPtr p( ::boost::dynamic_pointer_cast< BitmapCanvas >(this->clone()) ); OSL_ENSURE(p.get(), "BitmapCanvas::cloneBitmapCanvas(): dynamic cast failed"); diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx index 385006fdba46..26dd843556bc 100644 --- a/cppcanvas/inc/cppcanvas/canvas.hxx +++ b/cppcanvas/inc/cppcanvas/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 @@ -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; struct ViewState; @@ -71,8 +71,8 @@ namespace cppcanvas class Canvas { public: - enum - { + enum + { /** Extra pixel used when canvas anti-aliases. Enlarge the bounding box of drawing primitives by this @@ -86,13 +86,13 @@ namespace cppcanvas virtual ~Canvas() {} - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0; virtual ::basegfx::B2DHomMatrix getTransformation() const = 0; virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0; virtual void setClip() = 0; - /** Get current clip + /** Get current clip @return NULL, if no clip is set, otherwise the current clip poly-polygon */ @@ -103,13 +103,13 @@ namespace cppcanvas virtual ColorSharedPtr createColor() const = 0; virtual CanvasSharedPtr clone() const = 0; - virtual void clear() const = 0; + virtual void clear() const = 0; // this should be considered private. if RTTI gets enabled // someday, remove that to a separate interface - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas > getUNOCanvas() const = 0; - virtual ::com::sun::star::rendering::ViewState getViewState() const = 0; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XCanvas > getUNOCanvas() const = 0; + virtual ::com::sun::star::rendering::ViewState getViewState() const = 0; }; } diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx index 4ae43fb4334c..5fbf310ea503 100644 --- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx +++ b/cppcanvas/inc/cppcanvas/canvasgraphic.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 @@ -78,10 +78,10 @@ namespace cppcanvas /// Copy source as-is to destination. Fa = 1, Fb = 0. SOURCE, - + /// Leave destination as-is. Fa = 0, Fb = 1. DESTINATION, - + /// Copy source over destination. Fa = 1, Fb = 1-Aa. OVER, @@ -123,7 +123,7 @@ namespace cppcanvas /** Set object transformation matrix */ - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) = 0; /** Get object transformation matrix */ virtual ::basegfx::B2DHomMatrix getTransformation() const = 0; @@ -162,7 +162,7 @@ namespace cppcanvas @return whether the rendering finished successfully. */ virtual bool draw() const = 0; - + }; typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr; diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx index 6a8e872f328d..44b3ff93b44a 100644 --- a/cppcanvas/inc/cppcanvas/color.hxx +++ b/cppcanvas/inc/cppcanvas/color.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,37 +50,37 @@ namespace cppcanvas virtual ~Color() {} - virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const = 0; - virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0; + virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const = 0; + virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0; }; typedef ::boost::shared_ptr< ::cppcanvas::Color > ColorSharedPtr; - inline sal_uInt8 getRed( Color::IntSRGBA nCol ) - { - return static_cast<sal_uInt8>( (nCol&0xFF000000U) >> 24U ); + inline sal_uInt8 getRed( Color::IntSRGBA nCol ) + { + return static_cast<sal_uInt8>( (nCol&0xFF000000U) >> 24U ); } - inline sal_uInt8 getGreen( Color::IntSRGBA nCol ) - { - return static_cast<sal_uInt8>( (nCol&0x00FF0000U) >> 16U ); + inline sal_uInt8 getGreen( Color::IntSRGBA nCol ) + { + return static_cast<sal_uInt8>( (nCol&0x00FF0000U) >> 16U ); } - inline sal_uInt8 getBlue( Color::IntSRGBA nCol ) - { - return static_cast<sal_uInt8>( (nCol&0x0000FF00U) >> 8U ); + inline sal_uInt8 getBlue( Color::IntSRGBA nCol ) + { + return static_cast<sal_uInt8>( (nCol&0x0000FF00U) >> 8U ); } - inline sal_uInt8 getAlpha( Color::IntSRGBA nCol ) - { - return static_cast<sal_uInt8>( nCol&0x000000FFU ); + inline sal_uInt8 getAlpha( Color::IntSRGBA nCol ) + { + return static_cast<sal_uInt8>( nCol&0x000000FFU ); } - inline Color::IntSRGBA makeColor( sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue, sal_uInt8 nAlpha ) - { + inline Color::IntSRGBA makeColor( sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue, sal_uInt8 nAlpha ) + { return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha); } - + inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue) { return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue); diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/cppcanvas/inc/cppcanvas/customsprite.hxx index bd92fbd6f76a..b9dc13e286c4 100644 --- a/cppcanvas/inc/cppcanvas/customsprite.hxx +++ b/cppcanvas/inc/cppcanvas/customsprite.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/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx index b8d864321fd8..855c22aa0ece 100644 --- a/cppcanvas/inc/cppcanvas/font.hxx +++ b/cppcanvas/inc/cppcanvas/font.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 rtl class OUString; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XCanvasFont; } } } } @@ -54,9 +54,9 @@ namespace cppcanvas virtual ~Font() {} virtual ::rtl::OUString getName() const = 0; - virtual double getCellSize() const = 0; + virtual double getCellSize() const = 0; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > getUNOFont() const = 0; }; diff --git a/cppcanvas/inc/cppcanvas/polypolygon.hxx b/cppcanvas/inc/cppcanvas/polypolygon.hxx index 0adc9426b692..5ffcf7cffc51 100644 --- a/cppcanvas/inc/cppcanvas/polypolygon.hxx +++ b/cppcanvas/inc/cppcanvas/polypolygon.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 @@ namespace basegfx class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XPolyPolygon2D; } } } } @@ -70,21 +70,21 @@ namespace cppcanvas /** Set polygon fill color */ - virtual void setRGBAFillColor( Color::IntSRGBA ) = 0; + virtual void setRGBAFillColor( Color::IntSRGBA ) = 0; /** Set polygon line color */ - virtual void setRGBALineColor( Color::IntSRGBA ) = 0; + virtual void setRGBALineColor( Color::IntSRGBA ) = 0; /** Get polygon fill color */ - virtual Color::IntSRGBA getRGBAFillColor() const = 0; + virtual Color::IntSRGBA getRGBAFillColor() const = 0; /** Get polygon line color */ - virtual Color::IntSRGBA getRGBALineColor() const = 0; + virtual Color::IntSRGBA getRGBALineColor() const = 0; - virtual void setStrokeWidth( const double& rStrokeWidth ) = 0; - virtual double getStrokeWidth() const = 0; + virtual void setStrokeWidth( const double& rStrokeWidth ) = 0; + virtual double getStrokeWidth() const = 0; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0; }; diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx index 79f1eb0744f7..c944d830c376 100644 --- a/cppcanvas/inc/cppcanvas/renderer.hxx +++ b/cppcanvas/inc/cppcanvas/renderer.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 @@ -75,8 +75,8 @@ namespace cppcanvas @return whether the rendering finished successfully. */ - virtual bool drawSubset( sal_Int32 nStartIndex, - sal_Int32 nEndIndex ) const = 0; + virtual bool drawSubset( sal_Int32 nStartIndex, + sal_Int32 nEndIndex ) const = 0; /** Query bounding box of metafile subset @@ -102,24 +102,24 @@ namespace cppcanvas @return the bounding box of the specified subset */ - virtual ::basegfx::B2DRange getSubsetArea( sal_Int32 nStartIndex, - sal_Int32 nEndIndex ) const = 0; + virtual ::basegfx::B2DRange getSubsetArea( sal_Int32 nStartIndex, + sal_Int32 nEndIndex ) const = 0; /** Parameters for the Renderer */ struct Parameters { /// Optionally forces the fill color attribute for all actions - ::comphelper::OptionalValue< Color::IntSRGBA > maFillColor; + ::comphelper::OptionalValue< Color::IntSRGBA > maFillColor; /// Optionally forces the line color attribute for all actions - ::comphelper::OptionalValue< Color::IntSRGBA > maLineColor; + ::comphelper::OptionalValue< Color::IntSRGBA > maLineColor; /// Optionally forces the text color attribute for all actions - ::comphelper::OptionalValue< Color::IntSRGBA > maTextColor; + ::comphelper::OptionalValue< Color::IntSRGBA > maTextColor; /// Optionally forces the given fontname for all text actions - ::comphelper::OptionalValue< ::rtl::OUString > maFontName; + ::comphelper::OptionalValue< ::rtl::OUString > maFontName; /** Optionally transforms all text output actions with the given matrix (in addition to the overall canvas @@ -129,19 +129,19 @@ namespace cppcanvas rect coordinate system, i.e. the metafile is assumed to be contained in the unit rect. */ - ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix > maTextTransformation; + ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix > maTextTransformation; /// Optionally forces the given font weight for all text actions - ::comphelper::OptionalValue< sal_Int8 > maFontWeight; + ::comphelper::OptionalValue< sal_Int8 > maFontWeight; /// Optionally forces the given font letter form (italics etc.) for all text actions - ::comphelper::OptionalValue< sal_Int8 > maFontLetterForm; + ::comphelper::OptionalValue< sal_Int8 > maFontLetterForm; /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions - ::comphelper::OptionalValue< sal_Int8 > maFontProportion; + ::comphelper::OptionalValue< sal_Int8 > maFontProportion; /// Optionally forces underlining for all text actions - ::comphelper::OptionalValue< bool > maFontUnderline; + ::comphelper::OptionalValue< bool > maFontUnderline; }; }; diff --git a/cppcanvas/inc/cppcanvas/sprite.hxx b/cppcanvas/inc/cppcanvas/sprite.hxx index 08c2beb2286a..bec621e55cf9 100644 --- a/cppcanvas/inc/cppcanvas/sprite.hxx +++ b/cppcanvas/inc/cppcanvas/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 @@ -40,7 +40,7 @@ namespace basegfx class B2DPoint; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XSprite; } } } } @@ -84,7 +84,7 @@ namespace cppcanvas interpreted in device coordinates (i.e. screen pixel) */ virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0; - + /** Set output clipping This method applies the clip poly-polygon interpreted in @@ -93,7 +93,7 @@ namespace cppcanvas virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) = 0; virtual void setClip() = 0; - + virtual void show() = 0; virtual void hide() = 0; @@ -107,7 +107,7 @@ namespace cppcanvas */ virtual void setPriority( double fPriority ) = 0; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > getUNOSprite() const = 0; }; diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx index df29d4345a85..a1f5cbe913e3 100644 --- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx +++ b/cppcanvas/inc/cppcanvas/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 @@ -40,7 +40,7 @@ #include <cppcanvas/sprite.hxx> #include <cppcanvas/customsprite.hxx> -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } } @@ -60,21 +60,21 @@ namespace cppcanvas class SpriteCanvas : public virtual BitmapCanvas { public: - virtual bool updateScreen( bool bUpdateAll ) const = 0; - - virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const = 0; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const = 0; + virtual bool updateScreen( bool bUpdateAll ) const = 0; + + virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const = 0; + virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const = 0; // shared_ptr does not allow for covariant return types - SpriteCanvasSharedPtr cloneSpriteCanvas() const + SpriteCanvasSharedPtr cloneSpriteCanvas() const { SpriteCanvasSharedPtr p( ::boost::dynamic_pointer_cast< SpriteCanvas >(this->clone()) ); OSL_ENSURE(p.get(), "SpriteCanvas::cloneSpriteCanvas(): dynamic cast failed"); return p; } - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const = 0; + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const = 0; }; } diff --git a/cppcanvas/inc/cppcanvas/text.hxx b/cppcanvas/inc/cppcanvas/text.hxx index 1787103141ae..528d98db8c6a 100644 --- a/cppcanvas/inc/cppcanvas/text.hxx +++ b/cppcanvas/inc/cppcanvas/text.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/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx index acd51dfd8a81..23ece5bd2044 100644 --- a/cppcanvas/inc/cppcanvas/vclfactory.hxx +++ b/cppcanvas/inc/cppcanvas/vclfactory.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 @@ -53,7 +53,7 @@ namespace rtl { class OUString; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XBitmapCanvas; class XSpriteCanvas; @@ -76,60 +76,60 @@ namespace cppcanvas public: static VCLFactory& getInstance(); - BitmapCanvasSharedPtr createCanvas( const ::Window& rVCLWindow ); - BitmapCanvasSharedPtr createCanvas( const ::com::sun::star::uno::Reference< + BitmapCanvasSharedPtr createCanvas( const ::Window& rVCLWindow ); + BitmapCanvasSharedPtr createCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& xCanvas ); - SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow ) const; - SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< + SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow ) const; + SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const; - SpriteCanvasSharedPtr createFullscreenSpriteCanvas( const ::Window& rVCLWindow, const Size& rFullscreenSize ) const; + SpriteCanvasSharedPtr createFullscreenSpriteCanvas( const ::Window& rVCLWindow, const Size& rFullscreenSize ) const; /** Create a polygon from a tools::Polygon The created polygon initially has the same size in user coordinate space as the source polygon */ - PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::Polygon& rPoly ) const; - PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::PolyPolygon& rPoly ) const; + PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::Polygon& rPoly ) const; + PolyPolygonSharedPtr createPolyPolygon( const CanvasSharedPtr&, const ::PolyPolygon& rPoly ) const; /** Create an uninitialized bitmap with the given size */ - BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; + BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; /** Create an uninitialized alpha bitmap with the given size */ - BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; + BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&, const ::Size& rSize ) const; /** Create a bitmap from a VCL Bitmap */ - BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::Bitmap& rBitmap ) const; - BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::BitmapEx& rBmpEx ) const; + BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::Bitmap& rBitmap ) const; + BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const ::BitmapEx& rBmpEx ) const; /** Create a renderer object from a Graphic The created renderer initially draws the graphic one-by-one units large, in user coordinate space */ - RendererSharedPtr createRenderer( const CanvasSharedPtr& rCanvas, - const ::Graphic& rGraphic, - const Renderer::Parameters& rParms ) const; + RendererSharedPtr createRenderer( const CanvasSharedPtr& rCanvas, + const ::Graphic& rGraphic, + const Renderer::Parameters& rParms ) const; /** Create a renderer object from a Metafile The created renderer initially draws the metafile one-by-one units large, in user coordinate space */ - RendererSharedPtr createRenderer( const CanvasSharedPtr& rCanvas, - const ::GDIMetaFile& rMtf, - const Renderer::Parameters& rParms ) const; + RendererSharedPtr createRenderer( const CanvasSharedPtr& rCanvas, + const ::GDIMetaFile& rMtf, + const Renderer::Parameters& rParms ) const; /** Create an animated sprite from a VCL animation */ - SpriteSharedPtr createAnimatedSprite( const SpriteCanvasSharedPtr&, const ::Animation& rAnim ) const; + SpriteSharedPtr createAnimatedSprite( const SpriteCanvasSharedPtr&, const ::Animation& rAnim ) const; - /** Create a text portion with the given content string + /** Create a text portion with the given content string */ - TextSharedPtr createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const; + TextSharedPtr createText( const CanvasSharedPtr&, const ::rtl::OUString& ) const; private: friend struct InitInstance; diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx b/cppcanvas/inc/pch/precompiled_cppcanvas.cxx index 04b6f76e6ab5..22098888d3c5 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index 87c94a92a0ff..9142ff1f0c6d 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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 |