diff options
Diffstat (limited to 'drawinglayer/source/primitive2d/textprimitive2d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive2d/textprimitive2d.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index e928f8326126..131249c6272f 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ using namespace com::sun::star; namespace { // adapts fontScale for usage with TextLayouter. Input is rScale which is the extracted - // scale from a text transformation. A copy is modified so that it contains only positive + // scale from a text transformation. A copy is modified so that it contains only positive // scalings and XY-equal scalings to allow to get a non-X-scaled Vcl-Font for TextLayouter. - // rScale is adapted accordingly to contain the corrected scale which would need to be - // applied to e.g. outlines received from TextLayouter under usage of fontScale. This + // rScale is adapted accordingly to contain the corrected scale which would need to be + // applied to e.g. outlines received from TextLayouter under usage of fontScale. This // includes Y-Scale, X-Scale-correction and mirrorings. basegfx::B2DVector getCorrectedScaleAndFontScale(basegfx::B2DVector& rScale) { @@ -107,7 +107,7 @@ namespace drawinglayer // decompose object transformation to single values basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; - + // if decomposition returns false, create no geometry since e.g. scaling may // be zero if(getTextTransform().decompose(aScale, aTranslate, fRotate, fShearX)) @@ -129,8 +129,8 @@ namespace drawinglayer // prepare textlayoutdevice TextLayouterDevice aTextLayouter; aTextLayouter.setFontAttribute( - getFontAttribute(), - aFontScale.getX(), + getFontAttribute(), + aFontScale.getX(), aFontScale.getY(), getLocale()); @@ -149,23 +149,23 @@ namespace drawinglayer // get the text outlines aTextLayouter.getTextOutlines( - rTarget, - getText(), - getTextPosition(), - getTextLength(), + rTarget, + getText(), + getTextPosition(), + getTextLength(), aScaledDXArray); } else { // get the text outlines aTextLayouter.getTextOutlines( - rTarget, - getText(), - getTextPosition(), - getTextLength(), + rTarget, + getText(), + getTextPosition(), + getTextLength(), getDXArray()); } - + // create primitives for the outlines const sal_uInt32 nCount(rTarget.size()); @@ -214,14 +214,14 @@ namespace drawinglayer basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; aPolygonTransform.decompose(aScale, aTranslate, fRotate, fShearX); - + // create outline text effect with current content and replace Primitive2DReference aNewTextEffect(new TextEffectPrimitive2D( - aRetval, - aTranslate, - fRotate, + aRetval, + aTranslate, + fRotate, TEXTEFFECTSTYLE2D_OUTLINE)); - + aRetval = Primitive2DSequence(&aNewTextEffect, 1); } } @@ -232,7 +232,7 @@ namespace drawinglayer TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D( const basegfx::B2DHomMatrix& rNewTransform, - const String& rText, + const String& rText, xub_StrLen aTextPosition, xub_StrLen aTextLength, const ::std::vector< double >& rDXArray, @@ -241,7 +241,7 @@ namespace drawinglayer const basegfx::BColor& rFontColor, bool bFilled, long nWidthToFill) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTextTransform(rNewTransform), maText(rText), maTextPosition(aTextPosition), @@ -256,7 +256,7 @@ namespace drawinglayer { #ifdef DBG_UTIL const xub_StrLen aStringLength(getText().Len()); - OSL_ENSURE(aStringLength >= getTextPosition() && aStringLength >= getTextPosition() + getTextLength(), + OSL_ENSURE(aStringLength >= getTextPosition() && aStringLength >= getTextPosition() + getTextLength(), "TextSimplePortionPrimitive2D with text out of range (!)"); #endif } @@ -297,7 +297,7 @@ namespace drawinglayer // decompose object transformation to single values basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; - + if(getTextTransform().decompose(aScale, aTranslate, fRotate, fShearX)) { // for the TextLayouterDevice, it is necessary to have a scaling representing @@ -309,8 +309,8 @@ namespace drawinglayer // prepare textlayoutdevice TextLayouterDevice aTextLayouter; aTextLayouter.setFontAttribute( - getFontAttribute(), - aFontScale.getX(), + getFontAttribute(), + aFontScale.getX(), aFontScale.getY(), getLocale()); @@ -323,7 +323,7 @@ namespace drawinglayer // prepare object transformation for range const basegfx::B2DHomMatrix aRangeTransformation(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aScale, fShearX, fRotate, aTranslate)); - + // apply range transformation to it aNewRange.transform(aRangeTransformation); |