summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'cppcanvas/source/wrapper')
-rw-r--r--cppcanvas/source/wrapper/implbitmap.hxx10
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx7
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx15
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx10
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx12
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx12
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx20
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx20
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx12
9 files changed, 56 insertions, 62 deletions
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 939803bbf9f9..f0e1aaee2bed 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -41,8 +41,7 @@ namespace cppcanvas
public:
ImplBitmap( const CanvasSharedPtr& rParentCanvas,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmap >& rBitmap );
+ const css::uno::Reference< css::rendering::XBitmap >& rBitmap );
virtual ~ImplBitmap();
@@ -53,15 +52,14 @@ namespace cppcanvas
virtual BitmapCanvasSharedPtr getBitmapCanvas() const SAL_OVERRIDE;
// Bitmap implementation
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
+ virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
private:
ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;
- BitmapCanvasSharedPtr mpBitmapCanvas;
+ const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
+ BitmapCanvasSharedPtr mpBitmapCanvas;
};
}
}
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 8c0be601a62d..32cf790a5d05 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -38,8 +38,7 @@ namespace cppcanvas
class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
{
public:
- explicit ImplBitmapCanvas( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
+ explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas );
virtual ~ImplBitmapCanvas();
virtual ::basegfx::B2ISize getSize() const SAL_OVERRIDE;
@@ -52,8 +51,8 @@ namespace cppcanvas
private:
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
- 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 css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas;
+ const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
};
}
}
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 86535fc06ba4..0099f02a3f7e 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -50,8 +50,7 @@ namespace cppcanvas
class ImplCanvas : public virtual Canvas
{
public:
- explicit ImplCanvas( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XCanvas >& rCanvas );
+ explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas );
virtual ~ImplCanvas();
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE;
@@ -69,10 +68,10 @@ namespace cppcanvas
virtual void clear() const SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XCanvas > getUNOCanvas() const SAL_OVERRIDE;
+ virtual css::uno::Reference<
+ css::rendering::XCanvas > getUNOCanvas() const SAL_OVERRIDE;
- virtual ::com::sun::star::rendering::ViewState getViewState() const SAL_OVERRIDE;
+ virtual css::rendering::ViewState getViewState() const SAL_OVERRIDE;
// take compiler-provided default copy constructor
//ImplCanvas(const ImplCanvas&);
@@ -80,9 +79,9 @@ namespace cppcanvas
private:
ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
- mutable ::com::sun::star::rendering::ViewState maViewState;
- boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas;
+ mutable css::rendering::ViewState maViewState;
+ boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
+ const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
};
}
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 4c45844d8d56..883080f29b10 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -37,15 +37,15 @@ namespace cppcanvas
class ImplColor : public Color
{
public:
- explicit ImplColor( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >& rDevice );
+ explicit ImplColor( const css::uno::Reference<
+ css::rendering::XGraphicDevice >& rDevice );
virtual ~ImplColor();
- virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
+ virtual IntSRGBA getIntSRGBA( css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
+ virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice;
+ css::uno::Reference< css::rendering::XGraphicDevice > mxDevice;
};
}
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 8720a9f46ca7..a698908ac751 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -38,10 +38,10 @@ 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,
+ ImplCustomSprite( const css::uno::Reference<
+ css::rendering::XSpriteCanvas >& rParentCanvas,
+ const css::uno::Reference<
+ css::rendering::XCustomSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplCustomSprite();
@@ -51,8 +51,8 @@ namespace cppcanvas
ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
- mutable CanvasSharedPtr mpLastCanvas;
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite;
+ mutable CanvasSharedPtr mpLastCanvas;
+ const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
};
}
}
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 227e7da83f99..89904a5a1b44 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -44,22 +44,20 @@ namespace cppcanvas
class ImplFont : public Font
{
public:
- ImplFont( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XCanvas >& rCanvas,
+ ImplFont( const css::uno::Reference< css::rendering::XCanvas >& rCanvas,
const OUString& rFontName,
const double& rCellSize );
virtual ~ImplFont();
virtual OUString getName() const SAL_OVERRIDE;
- virtual double getCellSize() const SAL_OVERRIDE;
+ virtual double getCellSize() const SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
+ virtual css::uno::Reference< css::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas;
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont;
+ css::uno::Reference< css::rendering::XCanvas > mxCanvas;
+ css::uno::Reference< css::rendering::XCanvasFont > mxFont;
};
}
}
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 16cd744a0e8d..9558c4b55001 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -43,8 +43,8 @@ namespace cppcanvas
{
public:
ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
+ const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPolyPoly );
virtual ~ImplPolyPolygon();
@@ -61,21 +61,21 @@ namespace cppcanvas
virtual bool draw() const SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
+ virtual css::uno::Reference<
+ css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
private:
ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;
+ const css::uno::Reference< css::rendering::XPolyPolygon2D > mxPolyPoly;
- ::com::sun::star::rendering::StrokeAttributes maStrokeAttributes;
+ css::rendering::StrokeAttributes maStrokeAttributes;
- ::com::sun::star::uno::Sequence< double > maFillColor;
- ::com::sun::star::uno::Sequence< double > maStrokeColor;
- bool mbFillColorSet;
- bool mbStrokeColorSet;
+ css::uno::Sequence< double > maFillColor;
+ css::uno::Sequence< double > maStrokeColor;
+ bool mbFillColorSet;
+ bool mbStrokeColorSet;
};
}
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index e7ff8dd5b283..876f4391e35f 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -37,10 +37,10 @@ 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,
+ ImplSprite( const css::uno::Reference<
+ css::rendering::XSpriteCanvas >& rParentCanvas,
+ const css::uno::Reference<
+ css::rendering::XSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplSprite();
@@ -57,17 +57,17 @@ namespace cppcanvas
virtual void setPriority( double fPriority ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE;
+ virtual css::uno::Reference<
+ css::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE;
private:
ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
- ::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;
+ css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
+ const css::uno::Reference< css::rendering::XSprite > mxSprite;
+ const css::uno::Reference< css::rendering::XAnimatedSprite > mxAnimatedSprite;
+ ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter;
};
}
}
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 76652d323ceb..69f63dfb6dca 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -39,8 +39,8 @@ namespace cppcanvas
class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
{
public:
- ImplSpriteCanvas( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XSpriteCanvas >& rCanvas );
+ ImplSpriteCanvas( const css::uno::Reference<
+ css::rendering::XSpriteCanvas >& rCanvas );
ImplSpriteCanvas(const ImplSpriteCanvas&);
virtual ~ImplSpriteCanvas();
@@ -54,8 +54,8 @@ namespace cppcanvas
virtual CanvasSharedPtr clone() const SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE;
+ virtual css::uno::Reference<
+ css::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE;
/** This class passes the view transformation
to child sprites
@@ -82,8 +82,8 @@ namespace cppcanvas
private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas;
- TransformationArbiterSharedPtr mpTransformArbiter;
+ const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
+ TransformationArbiterSharedPtr mpTransformArbiter;
};
}
}