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

Change-Id: Ibb7493456c20600fe3e823c74af6e572d9577817
Reviewed-on: https://gerrit.libreoffice.org/17379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-07-28 09:46:23 +02:00
committed by Noel Grandin
parent d10de0360f
commit a99520eb0a
19 changed files with 123 additions and 133 deletions

View File

@@ -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;
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;
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 isTextOutlineModeSet;
bool isTextEffectShadowSet;
bool isTextWordUnderlineSet;
bool isLineColorSet;
bool isFillColorSet;
bool isTextFillColorSet;
bool isTextLineColorSet;
bool isLineColorSet;
bool isFillColorSet;
bool isTextFillColorSet;
bool isTextLineColorSet;
};
}
}