summaryrefslogtreecommitdiff
path: root/cppcanvas/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'cppcanvas/source/inc')
-rw-r--r--cppcanvas/source/inc/canvasgraphichelper.hxx14
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx10
-rw-r--r--cppcanvas/source/inc/outdevstate.hxx64
-rw-r--r--cppcanvas/source/inc/tools.hxx10
4 files changed, 48 insertions, 50 deletions
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 031b9e7b5302..209f191e55cd 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -58,16 +58,16 @@ namespace cppcanvas
protected:
// for our clients
// ===============
- CanvasSharedPtr getCanvas() const { return mpCanvas; }
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; }
- const ::com::sun::star::rendering::RenderState& getRenderState() const;
+ CanvasSharedPtr getCanvas() const { return mpCanvas; }
+ css::uno::Reference< css::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; }
+ const css::rendering::RenderState& getRenderState() const;
private:
- mutable ::com::sun::star::rendering::RenderState maRenderState;
+ mutable css::rendering::RenderState maRenderState;
- boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
- CanvasSharedPtr mpCanvas;
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
+ boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
+ CanvasSharedPtr mpCanvas;
+ css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
};
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index b4b2b28c3903..118ae6d3fd2a 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -239,10 +239,10 @@ static float GetSwapFloat( SvStream& rSt )
const ActionFactoryParameters& rParms,
bool bIntersect );
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation,
- const vcl::Font& rFont,
- const ActionFactoryParameters& rParms );
+ static css::uno::Reference<
+ css::rendering::XCanvasFont > createFont( double& o_rFontRotation,
+ const vcl::Font& rFont,
+ const ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
bool bSubsettableActions );
@@ -287,7 +287,7 @@ static float GetSwapFloat( SvStream& rSt )
/// @return how much we should shorten the original polygon.
double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength,
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);
void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 339688a5aca2..e343570a72f2 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -59,7 +59,7 @@ namespace cppcanvas
textEmphasisMarkStyle(EMPHASISMARK_NONE),
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
// and possibly new rendering::TextAlignment
textReliefStyle(RELIEF_NONE),
@@ -79,44 +79,44 @@ namespace cppcanvas
{
}
- ::basegfx::B2DPolyPolygon clip;
- ::Rectangle clipRect;
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xClipPoly;
+ ::basegfx::B2DPolyPolygon clip;
+ ::Rectangle clipRect;
+ css::uno::Reference< css::rendering::XPolyPolygon2D > xClipPoly;
- ::com::sun::star::uno::Sequence< double > lineColor;
- ::com::sun::star::uno::Sequence< double > fillColor;
- ::com::sun::star::uno::Sequence< double > textColor;
- ::com::sun::star::uno::Sequence< double > textFillColor;
- ::com::sun::star::uno::Sequence< double > textLineColor;
+ css::uno::Sequence< double > lineColor;
+ css::uno::Sequence< double > fillColor;
+ css::uno::Sequence< double > textColor;
+ css::uno::Sequence< double > textFillColor;
+ css::uno::Sequence< double > textLineColor;
/** Current font.
@attention Beware, this member can be NULL, and
nevertheless text output is generated.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > xFont;
- ::basegfx::B2DHomMatrix transform;
- ::basegfx::B2DHomMatrix mapModeTransform;
- double fontRotation;
-
- sal_uInt16 textEmphasisMarkStyle;
- PushFlags pushFlags;
- sal_Int8 textDirection;
- sal_Int8 textAlignment;
- sal_Int8 textReliefStyle;
- sal_Int8 textOverlineStyle;
- sal_Int8 textUnderlineStyle;
- sal_Int8 textStrikeoutStyle;
- TextAlign textReferencePoint;
-
- bool isTextOutlineModeSet;
- bool isTextEffectShadowSet;
- bool isTextWordUnderlineSet;
-
- bool isLineColorSet;
- bool isFillColorSet;
- bool isTextFillColorSet;
- bool isTextLineColorSet;
+ css::uno::Reference< css::rendering::XCanvasFont > xFont;
+ ::basegfx::B2DHomMatrix transform;
+ ::basegfx::B2DHomMatrix mapModeTransform;
+ double fontRotation;
+
+ sal_uInt16 textEmphasisMarkStyle;
+ PushFlags pushFlags;
+ sal_Int8 textDirection;
+ sal_Int8 textAlignment;
+ sal_Int8 textReliefStyle;
+ sal_Int8 textOverlineStyle;
+ sal_Int8 textUnderlineStyle;
+ sal_Int8 textStrikeoutStyle;
+ TextAlign textReferencePoint;
+
+ bool isTextOutlineModeSet;
+ bool isTextEffectShadowSet;
+ bool isTextWordUnderlineSet;
+
+ bool isLineColorSet;
+ bool isFillColorSet;
+ bool isTextFillColorSet;
+ bool isTextLineColorSet;
};
}
}
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index b55f2c8582c1..079f952d4b01 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -34,14 +34,12 @@ namespace cppcanvas
{
namespace tools
{
- ::com::sun::star::uno::Sequence< double >
- intSRGBAToDoubleSequence( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >&,
+ css::uno::Sequence< double >
+ intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&,
Color::IntSRGBA );
- Color::IntSRGBA doubleSequenceToIntSRGBA( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XGraphicDevice >& rDevice,
- const ::com::sun::star::uno::Sequence< double >& rColor );
+ Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice,
+ const css::uno::Sequence< double >& rColor );
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 07:44:58 +0000