Kaydet (Commit) ab4c5466 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in include/cppcanvas

Change-Id: Iffaf661fe915c9b0e3500ae3923fd8300583c512
Reviewed-on: https://gerrit.libreoffice.org/19484Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 73231904
...@@ -61,8 +61,7 @@ namespace cppcanvas ...@@ -61,8 +61,7 @@ namespace cppcanvas
virtual BitmapCanvasSharedPtr getBitmapCanvas() const = 0; virtual BitmapCanvasSharedPtr getBitmapCanvas() const = 0;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const = 0;
::com::sun::star::rendering::XBitmap > getUNOBitmap() const = 0;
}; };
typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
......
...@@ -90,9 +90,9 @@ namespace cppcanvas ...@@ -90,9 +90,9 @@ namespace cppcanvas
// this should be considered private. if RTTI gets enabled // this should be considered private. if RTTI gets enabled
// someday, remove that to a separate interface // someday, remove that to a separate interface
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XCanvas > getUNOCanvas() const = 0; css::rendering::XCanvas > getUNOCanvas() const = 0;
virtual ::com::sun::star::rendering::ViewState getViewState() const = 0; virtual css::rendering::ViewState getViewState() const = 0;
}; };
} }
......
...@@ -39,7 +39,7 @@ namespace cppcanvas ...@@ -39,7 +39,7 @@ namespace cppcanvas
virtual ~Color() {} virtual ~Color() {}
virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0; virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0;
}; };
typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr; typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
......
...@@ -69,8 +69,8 @@ namespace cppcanvas ...@@ -69,8 +69,8 @@ namespace cppcanvas
virtual void setStrokeWidth( const double& rStrokeWidth ) = 0; virtual void setStrokeWidth( const double& rStrokeWidth ) = 0;
virtual double getStrokeWidth() const = 0; virtual double getStrokeWidth() const = 0;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0; css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
}; };
typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr; typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
......
...@@ -97,8 +97,8 @@ namespace cppcanvas ...@@ -97,8 +97,8 @@ namespace cppcanvas
*/ */
virtual void setPriority( double fPriority ) = 0; virtual void setPriority( double fPriority ) = 0;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XSprite > getUNOSprite() const = 0; css::rendering::XSprite > getUNOSprite() const = 0;
}; };
typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr; typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
......
...@@ -53,8 +53,8 @@ namespace cppcanvas ...@@ -53,8 +53,8 @@ namespace cppcanvas
virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const = 0; virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const = 0;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const = 0; css::rendering::XSpriteCanvas > getUNOSpriteCanvas() const = 0;
}; };
} }
......
...@@ -64,14 +64,11 @@ namespace cppcanvas ...@@ -64,14 +64,11 @@ namespace cppcanvas
class CPPCANVAS_DLLPUBLIC VCLFactory class CPPCANVAS_DLLPUBLIC VCLFactory
{ {
public: public:
static CanvasSharedPtr createCanvas( const ::com::sun::star::uno::Reference< static CanvasSharedPtr createCanvas( const css::uno::Reference< css::rendering::XCanvas >& xCanvas );
::com::sun::star::rendering::XCanvas >& xCanvas ); static BitmapCanvasSharedPtr createBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& xCanvas );
static BitmapCanvasSharedPtr createBitmapCanvas( const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >& xCanvas );
static SpriteCanvasSharedPtr createSpriteCanvas( const vcl::Window& rVCLWindow ); static SpriteCanvasSharedPtr createSpriteCanvas( const vcl::Window& rVCLWindow );
static SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< static SpriteCanvasSharedPtr createSpriteCanvas( const css::uno::Reference< css::rendering::XSpriteCanvas >& xCanvas );
::com::sun::star::rendering::XSpriteCanvas >& xCanvas );
/** Create a bitmap from a VCL Bitmap /** Create a bitmap from a VCL Bitmap
*/ */
......
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