Skip to content

C
core
Kaydet (Commit) a99520eb authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

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

Change-Id: Ibb7493456c20600fe3e823c74af6e572d9577817
Reviewed-on: https://gerrit.libreoffice.org/17379Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst d10de036
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 136 deletions
cppcanvas/source/inc/canvasgraphichelper.hxx
Dosyayı görüntüle @ a99520eb
...@@ -58,16 +58,16 @@ namespace cppcanvas ...@@ -58,16 +58,16 @@ namespace cppcanvas
protected: protected:
// for our clients // for our clients
// =============== // ===============
CanvasSharedPtr getCanvas() const { return mpCanvas; } CanvasSharedPtr getCanvas() const { return mpCanvas; }
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; } css::uno::Reference< css::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; }
const ::com::sun::star::rendering::RenderState& getRenderState() const; const css::rendering::RenderState& getRenderState() const;
private: private:
mutable ::com::sun::star::rendering::RenderState maRenderState; mutable css::rendering::RenderState maRenderState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
}; };
} }
......
cppcanvas/source/inc/implrenderer.hxx
Dosyayı görüntüle @ a99520eb
...@@ -239,10 +239,10 @@ static float GetSwapFloat( SvStream& rSt ) ...@@ -239,10 +239,10 @@ static float GetSwapFloat( SvStream& rSt )
const ActionFactoryParameters& rParms, const ActionFactoryParameters& rParms,
bool bIntersect ); bool bIntersect );
static ::com::sun::star::uno::Reference< static css::uno::Reference<
::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation, css::rendering::XCanvasFont > createFont( double& o_rFontRotation,
const vcl::Font& rFont, const vcl::Font& rFont,
const ActionFactoryParameters& rParms ); const ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf, bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms, const ActionFactoryParameters& rParms,
bool bSubsettableActions ); bool bSubsettableActions );
...@@ -287,7 +287,7 @@ static float GetSwapFloat( SvStream& rSt ) ...@@ -287,7 +287,7 @@ static float GetSwapFloat( SvStream& rSt )
/// @return how much we should shorten the original polygon. /// @return how much we should shorten the original polygon.
double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength, double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength,
const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart, const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart,
const com::sun::star::rendering::StrokeAttributes& rAttributes, const css::rendering::StrokeAttributes& rAttributes,
const ActionFactoryParameters& rParms, OutDevState& rState); const ActionFactoryParameters& rParms, OutDevState& rState);
void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex); void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
......
cppcanvas/source/inc/outdevstate.hxx
Dosyayı görüntüle @ a99520eb
...@@ -59,7 +59,7 @@ namespace cppcanvas ...@@ -59,7 +59,7 @@ namespace cppcanvas
textEmphasisMarkStyle(EMPHASISMARK_NONE), textEmphasisMarkStyle(EMPHASISMARK_NONE),
pushFlags(PushFlags::ALL), pushFlags(PushFlags::ALL),
textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT), textDirection(css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
textAlignment(0), // TODO(Q2): Synchronize with implrenderer textAlignment(0), // TODO(Q2): Synchronize with implrenderer
// and possibly new rendering::TextAlignment // and possibly new rendering::TextAlignment
textReliefStyle(RELIEF_NONE), textReliefStyle(RELIEF_NONE),
...@@ -79,44 +79,44 @@ namespace cppcanvas ...@@ -79,44 +79,44 @@ namespace cppcanvas
{ {
} }
::basegfx::B2DPolyPolygon clip; ::basegfx::B2DPolyPolygon clip;
::Rectangle clipRect; ::Rectangle clipRect;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xClipPoly; css::uno::Reference< css::rendering::XPolyPolygon2D > xClipPoly;
::com::sun::star::uno::Sequence< double > lineColor; css::uno::Sequence< double > lineColor;
::com::sun::star::uno::Sequence< double > fillColor; css::uno::Sequence< double > fillColor;
::com::sun::star::uno::Sequence< double > textColor; css::uno::Sequence< double > textColor;
::com::sun::star::uno::Sequence< double > textFillColor; css::uno::Sequence< double > textFillColor;
::com::sun::star::uno::Sequence< double > textLineColor; css::uno::Sequence< double > textLineColor;
/** Current font. /** Current font.
@attention Beware, this member can be NULL, and @attention Beware, this member can be NULL, and
nevertheless text output is generated. nevertheless text output is generated.
*/ */
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > xFont; css::uno::Reference< css::rendering::XCanvasFont > xFont;
::basegfx::B2DHomMatrix transform; ::basegfx::B2DHomMatrix transform;
::basegfx::B2DHomMatrix mapModeTransform; ::basegfx::B2DHomMatrix mapModeTransform;
double fontRotation; double fontRotation;
sal_uInt16 textEmphasisMarkStyle; sal_uInt16 textEmphasisMarkStyle;
PushFlags pushFlags; PushFlags pushFlags;
sal_Int8 textDirection; sal_Int8 textDirection;
sal_Int8 textAlignment; sal_Int8 textAlignment;
sal_Int8 textReliefStyle; sal_Int8 textReliefStyle;
sal_Int8 textOverlineStyle; sal_Int8 textOverlineStyle;
sal_Int8 textUnderlineStyle; sal_Int8 textUnderlineStyle;
sal_Int8 textStrikeoutStyle; sal_Int8 textStrikeoutStyle;
TextAlign textReferencePoint; TextAlign textReferencePoint;
bool isTextOutlineModeSet; bool isTextOutlineModeSet;
bool isTextEffectShadowSet; bool isTextEffectShadowSet;
bool isTextWordUnderlineSet; bool isTextWordUnderlineSet;
bool isLineColorSet; bool isLineColorSet;
bool isFillColorSet; bool isFillColorSet;
bool isTextFillColorSet; bool isTextFillColorSet;
bool isTextLineColorSet; bool isTextLineColorSet;
}; };
} }
} }
......
cppcanvas/source/inc/tools.hxx
Dosyayı görüntüle @ a99520eb
...@@ -34,14 +34,12 @@ namespace cppcanvas ...@@ -34,14 +34,12 @@ namespace cppcanvas
{ {
namespace tools namespace tools
{ {
::com::sun::star::uno::Sequence< double > css::uno::Sequence< double >
intSRGBAToDoubleSequence( const ::com::sun::star::uno::Reference< intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&,
::com::sun::star::rendering::XGraphicDevice >&,
Color::IntSRGBA ); Color::IntSRGBA );
Color::IntSRGBA doubleSequenceToIntSRGBA( const ::com::sun::star::uno::Reference< Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice,
::com::sun::star::rendering::XGraphicDevice >& rDevice, const css::uno::Sequence< double >& rColor );
const ::com::sun::star::uno::Sequence< double >& rColor );
} }
} }
......
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
Dosyayı görüntüle @ a99520eb
...@@ -71,13 +71,11 @@ namespace cppcanvas ...@@ -71,13 +71,11 @@ namespace cppcanvas
using Action::render; using Action::render;
private: private:
virtual bool renderPrimitive( ::com::sun::star::uno::Reference< virtual bool renderPrimitive( css::uno::Reference< css::rendering::XCachedPrimitive >& rCachedPrimitive,
::com::sun::star::rendering::XCachedPrimitive >& rCachedPrimitive, const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
mutable ::com::sun::star::uno::Reference< mutable css::uno::Reference< css::rendering::XCachedPrimitive > mxCachedPrimitive;
::com::sun::star::rendering::XCachedPrimitive > mxCachedPrimitive;
mutable ::basegfx::B2DHomMatrix maLastTransformation; mutable ::basegfx::B2DHomMatrix maLastTransformation;
const bool mbOnlyRedrawWithSameTransform; const bool mbOnlyRedrawWithSameTransform;
}; };
......
cppcanvas/source/mtfrenderer/implrenderer.cxx
Dosyayı görüntüle @ a99520eb
...@@ -140,19 +140,19 @@ namespace ...@@ -140,19 +140,19 @@ namespace
switch(rLineInfo.GetLineCap()) switch(rLineInfo.GetLineCap())
{ {
default: /* com::sun::star::drawing::LineCap_BUTT */ default: /* css::drawing::LineCap_BUTT */
{ {
o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT; o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT; o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT;
break; break;
} }
case com::sun::star::drawing::LineCap_ROUND: case css::drawing::LineCap_ROUND:
{ {
o_rStrokeAttributes.StartCapType = rendering::PathCapType::ROUND; o_rStrokeAttributes.StartCapType = rendering::PathCapType::ROUND;
o_rStrokeAttributes.EndCapType = rendering::PathCapType::ROUND; o_rStrokeAttributes.EndCapType = rendering::PathCapType::ROUND;
break; break;
} }
case com::sun::star::drawing::LineCap_SQUARE: case css::drawing::LineCap_SQUARE:
{ {
o_rStrokeAttributes.StartCapType = rendering::PathCapType::SQUARE; o_rStrokeAttributes.StartCapType = rendering::PathCapType::SQUARE;
o_rStrokeAttributes.EndCapType = rendering::PathCapType::SQUARE; o_rStrokeAttributes.EndCapType = rendering::PathCapType::SQUARE;
......
cppcanvas/source/mtfrenderer/mtftools.hxx
Dosyayı görüntüle @ a99520eb
...@@ -53,7 +53,7 @@ namespace cppcanvas ...@@ -53,7 +53,7 @@ namespace cppcanvas
sets up the transformation and the clip from the sets up the transformation and the clip from the
OutDevState. OutDevState.
*/ */
void initRenderState( ::com::sun::star::rendering::RenderState& renderState, void initRenderState( css::rendering::RenderState& renderState,
const ::cppcanvas::internal::OutDevState& outdevState ); const ::cppcanvas::internal::OutDevState& outdevState );
/** Calc output offset relative to baseline /** Calc output offset relative to baseline
...@@ -130,7 +130,7 @@ namespace cppcanvas ...@@ -130,7 +130,7 @@ namespace cppcanvas
@return true, if the clip has changed, false if not @return true, if the clip has changed, false if not
*/ */
bool modifyClip( ::com::sun::star::rendering::RenderState& o_rRenderState, bool modifyClip( css::rendering::RenderState& o_rRenderState,
const struct ::cppcanvas::internal::OutDevState& rOutdevState, const struct ::cppcanvas::internal::OutDevState& rOutdevState,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const ::basegfx::B2DPoint& rOffset, const ::basegfx::B2DPoint& rOffset,
...@@ -170,9 +170,9 @@ namespace cppcanvas ...@@ -170,9 +170,9 @@ namespace cppcanvas
/** Transform given bounds to device coordinate system. /** Transform given bounds to device coordinate system.
*/ */
::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange& rBounds, ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange& rBounds,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/** Generate text underline/strikeout info struct from OutDev /** Generate text underline/strikeout info struct from OutDev
state. state.
......
cppcanvas/source/mtfrenderer/pointaction.cxx
Dosyayı görüntüle @ a99520eb
...@@ -68,7 +68,7 @@ namespace cppcanvas ...@@ -68,7 +68,7 @@ namespace cppcanvas
private: private:
::basegfx::B2DPoint maPoint; ::basegfx::B2DPoint maPoint;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
::com::sun::star::rendering::RenderState maState; css::rendering::RenderState maState;
}; };
PointAction::PointAction( const ::basegfx::B2DPoint& rPoint, PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
......
cppcanvas/source/mtfrenderer/polypolyaction.hxx
Dosyayı görüntüle @ a99520eb
...@@ -60,7 +60,7 @@ namespace cppcanvas ...@@ -60,7 +60,7 @@ namespace cppcanvas
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::com::sun::star::rendering::Texture& ); const css::rendering::Texture& );
/// Create line polygon (always stroked, not filled) /// Create line polygon (always stroked, not filled)
ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
...@@ -71,7 +71,7 @@ namespace cppcanvas ...@@ -71,7 +71,7 @@ namespace cppcanvas
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::com::sun::star::rendering::StrokeAttributes& ); const css::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we take the colors always opaque) /// For transparent painting of the given polygon (normally, we take the colors always opaque)
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
......
cppcanvas/source/uno/uno_mtfrenderer.hxx
Dosyayı görüntüle @ a99520eb
...@@ -17,26 +17,26 @@ ...@@ -17,26 +17,26 @@
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <vcl/gdimtf.hxx> #include <vcl/gdimtf.hxx>
typedef cppu::WeakComponentImplHelper<com::sun::star::rendering::XMtfRenderer, com::sun::star::beans::XFastPropertySet> MtfRendererBase; typedef cppu::WeakComponentImplHelper<css::rendering::XMtfRenderer, css::beans::XFastPropertySet> MtfRendererBase;
class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase
{ {
public: public:
MtfRenderer (com::sun::star::uno::Sequence<com::sun::star::uno::Any> const& args, MtfRenderer (css::uno::Sequence<css::uno::Any> const& args,
com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&); css::uno::Reference<css::uno::XComponentContext> const&);
// XMtfRenderer iface // XMtfRenderer iface
void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL draw (double fScaleX, double fScaleY) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFastPropertySet // XFastPropertySet
// setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::com::sun::star::uno::Any(); } virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Any(); }
virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
GDIMetaFile* mpMetafile; GDIMetaFile* mpMetafile;
com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> mxCanvas; css::uno::Reference<css::rendering::XBitmapCanvas> mxCanvas;
}; };
#endif #endif
......
cppcanvas/source/wrapper/implbitmap.hxx
Dosyayı görüntüle @ a99520eb
...@@ -41,8 +41,7 @@ namespace cppcanvas ...@@ -41,8 +41,7 @@ namespace cppcanvas
public: public:
ImplBitmap( const CanvasSharedPtr& rParentCanvas, ImplBitmap( const CanvasSharedPtr& rParentCanvas,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XBitmap >& rBitmap );
::com::sun::star::rendering::XBitmap >& rBitmap );
virtual ~ImplBitmap(); virtual ~ImplBitmap();
...@@ -53,15 +52,14 @@ namespace cppcanvas ...@@ -53,15 +52,14 @@ namespace cppcanvas
virtual BitmapCanvasSharedPtr getBitmapCanvas() const SAL_OVERRIDE; virtual BitmapCanvasSharedPtr getBitmapCanvas() const SAL_OVERRIDE;
// Bitmap implementation // Bitmap implementation
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
private: private:
ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION; ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION; ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
BitmapCanvasSharedPtr mpBitmapCanvas; BitmapCanvasSharedPtr mpBitmapCanvas;
}; };
} }
} }
......
cppcanvas/source/wrapper/implbitmapcanvas.hxx
Dosyayı görüntüle @ a99520eb
...@@ -38,8 +38,7 @@ namespace cppcanvas ...@@ -38,8 +38,7 @@ namespace cppcanvas
class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
{ {
public: public:
explicit ImplBitmapCanvas( const ::com::sun::star::uno::Reference< explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas );
::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
virtual ~ImplBitmapCanvas(); virtual ~ImplBitmapCanvas();
virtual ::basegfx::B2ISize getSize() const SAL_OVERRIDE; virtual ::basegfx::B2ISize getSize() const SAL_OVERRIDE;
...@@ -52,8 +51,8 @@ namespace cppcanvas ...@@ -52,8 +51,8 @@ namespace cppcanvas
private: private:
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION; ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas; const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
}; };
} }
} }
......
cppcanvas/source/wrapper/implcanvas.hxx
Dosyayı görüntüle @ a99520eb
...@@ -50,8 +50,7 @@ namespace cppcanvas ...@@ -50,8 +50,7 @@ namespace cppcanvas
class ImplCanvas : public virtual Canvas class ImplCanvas : public virtual Canvas
{ {
public: public:
explicit ImplCanvas( const ::com::sun::star::uno::Reference< explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas );
::com::sun::star::rendering::XCanvas >& rCanvas );
virtual ~ImplCanvas(); virtual ~ImplCanvas();
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE;
...@@ -69,10 +68,10 @@ namespace cppcanvas ...@@ -69,10 +68,10 @@ namespace cppcanvas
virtual void clear() const SAL_OVERRIDE; virtual void clear() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XCanvas > getUNOCanvas() const SAL_OVERRIDE; 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 // take compiler-provided default copy constructor
//ImplCanvas(const ImplCanvas&); //ImplCanvas(const ImplCanvas&);
...@@ -80,9 +79,9 @@ namespace cppcanvas ...@@ -80,9 +79,9 @@ namespace cppcanvas
private: private:
ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION; ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
mutable ::com::sun::star::rendering::ViewState maViewState; mutable css::rendering::ViewState maViewState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
}; };
} }
......
cppcanvas/source/wrapper/implcolor.hxx
Dosyayı görüntüle @ a99520eb
...@@ -37,15 +37,15 @@ namespace cppcanvas ...@@ -37,15 +37,15 @@ namespace cppcanvas
class ImplColor : public Color class ImplColor : public Color
{ {
public: public:
explicit ImplColor( const ::com::sun::star::uno::Reference< explicit ImplColor( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice ); css::rendering::XGraphicDevice >& rDevice );
virtual ~ImplColor(); virtual ~ImplColor();
virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE; virtual IntSRGBA getIntSRGBA( css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE; virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice; css::uno::Reference< css::rendering::XGraphicDevice > mxDevice;
}; };
} }
......
cppcanvas/source/wrapper/implcustomsprite.hxx
Dosyayı görüntüle @ a99520eb
...@@ -38,10 +38,10 @@ namespace cppcanvas ...@@ -38,10 +38,10 @@ namespace cppcanvas
class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite
{ {
public: public:
ImplCustomSprite( const ::com::sun::star::uno::Reference< ImplCustomSprite( const css::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, css::rendering::XSpriteCanvas >& rParentCanvas,
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XCustomSprite >& rSprite, css::rendering::XCustomSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplCustomSprite(); virtual ~ImplCustomSprite();
...@@ -51,8 +51,8 @@ namespace cppcanvas ...@@ -51,8 +51,8 @@ namespace cppcanvas
ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION; ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION; ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
mutable CanvasSharedPtr mpLastCanvas; mutable CanvasSharedPtr mpLastCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite; const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
}; };
} }
} }
......
cppcanvas/source/wrapper/implfont.hxx
Dosyayı görüntüle @ a99520eb
...@@ -44,22 +44,20 @@ namespace cppcanvas ...@@ -44,22 +44,20 @@ namespace cppcanvas
class ImplFont : public Font class ImplFont : public Font
{ {
public: public:
ImplFont( const ::com::sun::star::uno::Reference< ImplFont( const css::uno::Reference< css::rendering::XCanvas >& rCanvas,
::com::sun::star::rendering::XCanvas >& rCanvas,
const OUString& rFontName, const OUString& rFontName,
const double& rCellSize ); const double& rCellSize );
virtual ~ImplFont(); virtual ~ImplFont();
virtual OUString getName() const SAL_OVERRIDE; virtual OUString getName() const SAL_OVERRIDE;
virtual double getCellSize() const SAL_OVERRIDE; virtual double getCellSize() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference< css::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
::com::sun::star::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; css::uno::Reference< css::rendering::XCanvas > mxCanvas;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; css::uno::Reference< css::rendering::XCanvasFont > mxFont;
}; };
} }
} }
......
cppcanvas/source/wrapper/implpolypolygon.hxx
Dosyayı görüntüle @ a99520eb
...@@ -43,8 +43,8 @@ namespace cppcanvas ...@@ -43,8 +43,8 @@ namespace cppcanvas
{ {
public: public:
ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas, ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly ); css::rendering::XPolyPolygon2D >& rPolyPoly );
virtual ~ImplPolyPolygon(); virtual ~ImplPolyPolygon();
...@@ -61,21 +61,21 @@ namespace cppcanvas ...@@ -61,21 +61,21 @@ namespace cppcanvas
virtual bool draw() const SAL_OVERRIDE; virtual bool draw() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE; css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
private: private:
ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION; ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( 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; css::uno::Sequence< double > maFillColor;
::com::sun::star::uno::Sequence< double > maStrokeColor; css::uno::Sequence< double > maStrokeColor;
bool mbFillColorSet; bool mbFillColorSet;
bool mbStrokeColorSet; bool mbStrokeColorSet;
}; };
} }
......
cppcanvas/source/wrapper/implsprite.hxx
Dosyayı görüntüle @ a99520eb
...@@ -37,10 +37,10 @@ namespace cppcanvas ...@@ -37,10 +37,10 @@ namespace cppcanvas
class ImplSprite : public virtual Sprite class ImplSprite : public virtual Sprite
{ {
public: public:
ImplSprite( const ::com::sun::star::uno::Reference< ImplSprite( const css::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, css::rendering::XSpriteCanvas >& rParentCanvas,
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XSprite >& rSprite, css::rendering::XSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplSprite(); virtual ~ImplSprite();
...@@ -57,17 +57,17 @@ namespace cppcanvas ...@@ -57,17 +57,17 @@ namespace cppcanvas
virtual void setPriority( double fPriority ) SAL_OVERRIDE; virtual void setPriority( double fPriority ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE; css::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE;
private: private:
ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION; ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION; ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite; const css::uno::Reference< css::rendering::XSprite > mxSprite;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > mxAnimatedSprite; const css::uno::Reference< css::rendering::XAnimatedSprite > mxAnimatedSprite;
ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter;
}; };
} }
} }
......
cppcanvas/source/wrapper/implspritecanvas.hxx
Dosyayı görüntüle @ a99520eb
...@@ -39,8 +39,8 @@ namespace cppcanvas ...@@ -39,8 +39,8 @@ namespace cppcanvas
class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
{ {
public: public:
ImplSpriteCanvas( const ::com::sun::star::uno::Reference< ImplSpriteCanvas( const css::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas >& rCanvas ); css::rendering::XSpriteCanvas >& rCanvas );
ImplSpriteCanvas(const ImplSpriteCanvas&); ImplSpriteCanvas(const ImplSpriteCanvas&);
virtual ~ImplSpriteCanvas(); virtual ~ImplSpriteCanvas();
...@@ -54,8 +54,8 @@ namespace cppcanvas ...@@ -54,8 +54,8 @@ namespace cppcanvas
virtual CanvasSharedPtr clone() const SAL_OVERRIDE; virtual CanvasSharedPtr clone() const SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< virtual css::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE; css::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE;
/** This class passes the view transformation /** This class passes the view transformation
to child sprites to child sprites
...@@ -82,8 +82,8 @@ namespace cppcanvas ...@@ -82,8 +82,8 @@ namespace cppcanvas
private: private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION; ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
TransformationArbiterSharedPtr mpTransformArbiter; TransformationArbiterSharedPtr mpTransformArbiter;
}; };
} }
} }
......
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