diff options
Diffstat (limited to 'drawinglayer/source/primitive2d')
46 files changed, 528 insertions, 528 deletions
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 35cdc7e95bf8..75544c00792f 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.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 @@ namespace drawinglayer namespace primitive2d { AnimatedSwitchPrimitive2D::AnimatedSwitchPrimitive2D( - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), mpAnimationEntry(0), mbIsTextAnimation(bIsTextAnimation) { @@ -108,10 +108,10 @@ namespace drawinglayer namespace primitive2d { AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D( - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation) - : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation) + : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation) { } @@ -144,16 +144,16 @@ namespace drawinglayer { AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D( const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack, - const animation::AnimationEntry& rAnimationEntry, + const animation::AnimationEntry& rAnimationEntry, const Primitive2DSequence& rChildren, bool bIsTextAnimation) - : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation), + : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation), maMatrixStack() { // copy matrices to locally pre-decomposed matrix stack const sal_uInt32 nCount(rmMatrixStack.size()); maMatrixStack.reserve(nCount); - + for(sal_uInt32 a(0L); a < nCount; a++) { maMatrixStack.push_back(basegfx::tools::B2DHomMatrixBufferedDecompose(rmMatrixStack[a])); diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index 44f8a138d5f5..fd73f52ccfdb 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.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 @@ -63,7 +63,7 @@ namespace drawinglayer BackgroundColorPrimitive2D::BackgroundColorPrimitive2D( const basegfx::BColor& rBColor) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maBColor(rBColor), maLastViewport() { @@ -88,7 +88,7 @@ namespace drawinglayer } Primitive2DSequence BackgroundColorPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); if(getBuffered2DDecomposition().hasElements() && (maLastViewport != rViewInformation.getViewport())) diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 00dc22cd89a3..f655fec22972 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.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 @@ -44,7 +44,7 @@ namespace drawinglayer namespace primitive2d { BasePrimitive2D::BasePrimitive2D() - : BasePrimitive2DImplBase(m_aMutex) + : BasePrimitive2DImplBase(m_aMutex) { } @@ -93,7 +93,7 @@ namespace drawinglayer } BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D() - : BasePrimitive2D(), + : BasePrimitive2D(), maBuffered2DDecomposition() { } diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index 8e780ce2d38a..3efbd0de0223 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.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 @@ -44,9 +44,9 @@ namespace drawinglayer namespace primitive2d { BitmapPrimitive2D::BitmapPrimitive2D( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform) - : BasePrimitive2D(), + : BasePrimitive2D(), maBitmapEx(rBitmapEx), maTransform(rTransform) { diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 8a7d8b297a90..cb026ccf6caf 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.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 @@ -78,7 +78,7 @@ namespace drawinglayer aLeft.append(aTmpEnd); xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aLeft, + aLeft, getRGBColor())); } else @@ -88,7 +88,7 @@ namespace drawinglayer // is available and fat line special case reductions between 0.5 < x < 2.5 line widths // are executed due to the FilledPolygon-do-not-paint-their-bottom-and-right-lines. const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular); - + aLeft.append(aTmpStart + aLineWidthOffset); aLeft.append(aTmpEnd + aLineWidthOffset); aLeft.append(aTmpEnd - aLineWidthOffset); @@ -113,9 +113,9 @@ namespace drawinglayer // create hairline primitive aRight.append(aTmpStart); aRight.append(aTmpEnd); - + xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aRight, + aRight, getRGBColor())); } else @@ -151,14 +151,14 @@ namespace drawinglayer aPolygon.append(aTmpEnd); xRetval[0] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aPolygon, + aPolygon, getRGBColor())); } else { // create filled polygon primitive const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular); - + aPolygon.append( aTmpStart ); aPolygon.append( aTmpEnd ); @@ -204,7 +204,7 @@ namespace drawinglayer bool bCreateOutside, const basegfx::BColor& rRGBColor, const short nStyle) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maStart(rStart), maEnd(rEnd), mfLeftWidth(fLeftWidth), diff --git a/drawinglayer/source/primitive2d/chartprimitive2d.cxx b/drawinglayer/source/primitive2d/chartprimitive2d.cxx index 87fdd094b8e9..23957295df55 100644 --- a/drawinglayer/source/primitive2d/chartprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/chartprimitive2d.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 @@ -47,7 +47,7 @@ namespace drawinglayer const uno::Reference< frame::XModel >& rxChartModel, const basegfx::B2DHomMatrix& rTransformation, const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), mxChartModel(rxChartModel), maTransformation(rTransformation) { diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 6ab0812b27a6..126542142ab6 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.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 @@ -64,7 +64,7 @@ namespace drawinglayer if(!mxXControl.is() && getControlModel().is()) { uno::Reference< beans::XPropertySet > xSet(getControlModel(), uno::UNO_QUERY); - + if(xSet.is()) { uno::Any aValue(xSet->getPropertyValue(rtl::OUString::createFromAscii("DefaultControl"))); @@ -83,7 +83,7 @@ namespace drawinglayer if(xXControl.is()) { xXControl->setModel(getControlModel()); - + // remember XControl mxXControl = xXControl; } @@ -152,10 +152,10 @@ namespace drawinglayer xControlView->setGraphics(xGraphics); { // #i93162# For painting the control setting a Zoom (using setZoom() at the xControlView) - // is needed to define the font size. Normally this is done in + // is needed to define the font size. Normally this is done in // ViewObjectContactOfUnoControl::createPrimitive2DSequence by using positionControlForPaint(). // For some reason the difference between MAP_TWIPS and MAP_100TH_MM still plays - // a role there so that for Draw/Impress/Calc (the MAP_100TH_MM users) i need to set a zoom + // a role there so that for Draw/Impress/Calc (the MAP_100TH_MM users) i need to set a zoom // here, too. The factor includes the needed scale, but is calculated by pure comparisons. It // is somehow related to the twips/100thmm relationship. bool bUserIs100thmm(false); @@ -164,7 +164,7 @@ namespace drawinglayer if(xControl.is()) { uno::Reference< awt::XWindowPeer > xWindowPeer(xControl->getPeer()); - + if(xWindowPeer.is()) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation(xWindowPeer); @@ -197,7 +197,7 @@ namespace drawinglayer basegfx::fTools::equalZero(aScale.getY()) ? 1.0 : aDiscreteSize.getY() / aScale.getY()); static double fZoomScale(28.0); // do not ask for this constant factor, but it gets the zoom right aScreenZoom *= fZoomScale; - + // set zoom at control view for text scaling xControlView->setZoom((float)aScreenZoom.getX(), (float)aScreenZoom.getY()); } @@ -214,15 +214,15 @@ namespace drawinglayer // to avoid scaling, use the Bitmap pixel size as primitive size const Size aBitmapSize(aContent.GetSizePixel()); basegfx::B2DVector aBitmapSizeLogic( - rViewInformation.getInverseObjectToViewTransformation() * + rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1)); - + if(bScaleUsed) { // if scaled adapt to scaled size aBitmapSizeLogic /= fFactor; } - + // short form for scale and translate transformation const basegfx::B2DHomMatrix aBitmapTransform(basegfx::tools::createScaleTranslateB2DHomMatrix( aBitmapSizeLogic.getX(), aBitmapSizeLogic.getY(), aTranslate.getX(), aTranslate.getY())); @@ -273,7 +273,7 @@ namespace drawinglayer ControlPrimitive2D::ControlPrimitive2D( const basegfx::B2DHomMatrix& rTransform, const uno::Reference< awt::XControlModel >& rxControlModel) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), mxControlModel(rxControlModel), mxXControl(), @@ -285,7 +285,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rTransform, const uno::Reference< awt::XControlModel >& rxControlModel, const uno::Reference< awt::XControl >& rxXControl) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), mxControlModel(rxControlModel), mxXControl(rxXControl), @@ -332,7 +332,7 @@ namespace drawinglayer // both exist, check for equality bRetval = (getXControl() == rCompare.getXControl()); } - + return bRetval; } } @@ -349,7 +349,7 @@ namespace drawinglayer } Primitive2DSequence ControlPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { // this primitive is view-dependent related to the scaling. If scaling has changed, // destroy existing decomposition. To detect change, use size of unit size in view coordinates ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index 167497181de3..a00a1e47f9e0 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.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 @@ -41,8 +41,8 @@ namespace drawinglayer { Primitive2DSequence DiscreteBitmapPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { - // use getViewTransformation() and getObjectTransformation() from - // ObjectAndViewTransformationDependentPrimitive2D to create a BitmapPrimitive2D + // use getViewTransformation() and getObjectTransformation() from + // ObjectAndViewTransformationDependentPrimitive2D to create a BitmapPrimitive2D // with the correct mapping Primitive2DSequence xRetval; @@ -86,9 +86,9 @@ namespace drawinglayer } DiscreteBitmapPrimitive2D::DiscreteBitmapPrimitive2D( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const basegfx::B2DPoint& rTopLeft) - : ObjectAndViewTransformationDependentPrimitive2D(), + : ObjectAndViewTransformationDependentPrimitive2D(), maBitmapEx(rBitmapEx), maTopLeft(rTopLeft) { diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index 7e6964db7f55..e2e2b3bd2151 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.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 @@ -50,8 +50,8 @@ namespace drawinglayer { namespace primitive2d { - bool Embedded3DPrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const - { + bool Embedded3DPrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const + { osl::MutexGuard aGuard( m_aMutex ); // create on demand @@ -59,9 +59,9 @@ namespace drawinglayer { // create shadow extraction processor processor3d::Shadow3DExtractingProcessor aShadowProcessor( - getViewInformation3D(), + getViewInformation3D(), getObjectTransformation(), - getLightNormal(), + getLightNormal(), getShadowSlant(), getScene3DRange()); @@ -95,7 +95,7 @@ namespace drawinglayer const basegfx::B3DVector& rLightNormal, double fShadowSlant, const basegfx::B3DRange& rScene3DRange) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), mxChildren3D(rxChildren3D), maObjectTransformation(rObjectTransformation), maViewInformation3D(rViewInformation3D), @@ -114,7 +114,7 @@ namespace drawinglayer if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const Embedded3DPrimitive2D& rCompare = static_cast< const Embedded3DPrimitive2D& >(rPrimitive); - + return (primitive3d::arePrimitive3DSequencesEqual(getChildren3D(), rCompare.getChildren3D()) && getObjectTransformation() == rCompare.getObjectTransformation() && getViewInformation3D() == rCompare.getViewInformation3D() diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index 8d8d757491ca..eba693ddc031 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.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 @@ -64,7 +64,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rEpsTransform, const GfxLink& rGfxLink, const GDIMetaFile& rMetaFile) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maEpsTransform(rEpsTransform), maGfxLink(rGfxLink), maMetaFile(rMetaFile) diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx index dc5a228be2ba..8a4d70b9590c 100644 --- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.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 @@ -77,7 +77,7 @@ namespace drawinglayer // create bitmap primitive and add to result const Primitive2DReference xRef( new BitmapPrimitive2D(getFillBitmap().getBitmapEx(), aNewMatrix)); - + aRetval[a] = xRef; } } @@ -94,7 +94,7 @@ namespace drawinglayer // create bitmap primitive and add exclusive to decomposition (hand over ownership) const Primitive2DReference xRef( new BitmapPrimitive2D(getFillBitmap().getBitmapEx(), aObjectTransform)); - + aRetval = Primitive2DSequence(&xRef, 1L); } } @@ -104,9 +104,9 @@ namespace drawinglayer } FillBitmapPrimitive2D::FillBitmapPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + const basegfx::B2DHomMatrix& rTransformation, const attribute::FillBitmapAttribute& rFillBitmap) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransformation(rTransformation), maFillBitmap(rFillBitmap) { diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index fb19bebc87e7..b75f9a6e0de1 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.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 @@ -136,7 +136,7 @@ namespace drawinglayer // create primitive const Primitive2DReference xRef( new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(getObjectRange())), + basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(getObjectRange())), rColors[0])); aRetval[0] = xRef; } @@ -151,7 +151,7 @@ namespace drawinglayer // create solid fill const Primitive2DReference xRef( new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aNewPoly), + basegfx::B2DPolyPolygon(aNewPoly), rColors[a + 1])); aRetval[a + 1] = xRef; } @@ -177,7 +177,7 @@ namespace drawinglayer sal_uInt32 nIndex(0); aRetval.realloc(nEntryCount); - + if(rColors.size()) { basegfx::B2DRange aOuterPolyRange(aOuterPoly.getB2DRange()); @@ -211,7 +211,7 @@ namespace drawinglayer // prepare shape of the Unit Polygon basegfx::B2DPolygon aUnitPolygon; - if(attribute::GRADIENTSTYLE_RADIAL == getFillGradient().getStyle() + if(attribute::GRADIENTSTYLE_RADIAL == getFillGradient().getStyle() || attribute::GRADIENTSTYLE_ELLIPTICAL == getFillGradient().getStyle()) { aUnitPolygon = basegfx::tools::createPolygonFromCircle( @@ -262,9 +262,9 @@ namespace drawinglayer } FillGradientPrimitive2D::FillGradientPrimitive2D( - const basegfx::B2DRange& rObjectRange, + const basegfx::B2DRange& rObjectRange, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maObjectRange(rObjectRange), maFillGradient(rFillGradient) { @@ -276,7 +276,7 @@ namespace drawinglayer { const FillGradientPrimitive2D& rCompare = (FillGradientPrimitive2D&)rPrimitive; - return (getObjectRange() == rCompare.getObjectRange() + return (getObjectRange() == rCompare.getObjectRange() && getFillGradient() == rCompare.getFillGradient()); } diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 91e68f04e003..1e0e9fdff90f 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.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 @@ -122,10 +122,10 @@ namespace drawinglayer } FillHatchPrimitive2D::FillHatchPrimitive2D( - const basegfx::B2DRange& rObjectRange, - const basegfx::BColor& rBColor, + const basegfx::B2DRange& rObjectRange, + const basegfx::BColor& rBColor, const attribute::FillHatchAttribute& rFillHatch) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maObjectRange(rObjectRange), maFillHatch(rFillHatch), maBColor(rBColor) @@ -138,7 +138,7 @@ namespace drawinglayer { const FillHatchPrimitive2D& rCompare = (FillHatchPrimitive2D&)rPrimitive; - return (getObjectRange() == rCompare.getObjectRange() + return (getObjectRange() == rCompare.getObjectRange() && getFillHatch() == rCompare.getFillHatch() && getBColor() == rCompare.getBColor()); } diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 2d5efbfb15da..8a9e73d5adc9 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.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 @@ -66,14 +66,14 @@ namespace { struct animationStep { - BitmapEx maBitmapEx; - sal_uInt32 mnTime; + BitmapEx maBitmapEx; + sal_uInt32 mnTime; }; class animatedBitmapExPreparator { - ::Animation maAnimation; - ::std::vector< animationStep > maSteps; + ::Animation maAnimation; + ::std::vector< animationStep > maSteps; sal_uInt32 generateStepTime(sal_uInt32 nIndex) const; @@ -113,7 +113,7 @@ namespace } animatedBitmapExPreparator::animatedBitmapExPreparator(const Graphic& rGraphic) - : maAnimation(rGraphic.GetAnimation()) + : maAnimation(rGraphic.GetAnimation()) { OSL_ENSURE(GRAPHIC_BITMAP == rGraphic.GetType() && rGraphic.IsAnimated(), "animatedBitmapExPreparator: graphic is not animated (!)"); @@ -136,7 +136,7 @@ namespace { animationStep aNextStep; aNextStep.mnTime = generateStepTime(a); - + // prepare step const AnimationBitmap& rAnimBitmap = maAnimation.Get(sal_uInt16(a)); @@ -197,7 +197,7 @@ namespace break; } } - + // create BitmapEx Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(), aVirtualDevice.GetOutputSizePixel()); Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap(Point(), aVirtualDeviceMask.GetOutputSizePixel()); @@ -216,7 +216,7 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DSequence GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& + Primitive2DSequence GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& #ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE rViewInformation #else @@ -310,10 +310,10 @@ namespace drawinglayer if(bDoTest) { // All this is/was test code for testing MetafilePrimitive2D::create2DDecomposition - // extensively. It may be needed again when diverse actions need debugging, so i leave + // extensively. It may be needed again when diverse actions need debugging, so i leave // it in here, but take it out using USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE. // Use it by compiling with the code, insert any DrawObject, convert to Metafile. The - // debugger will then stop here (when breakpoint set, of course). You may enter single + // debugger will then stop here (when breakpoint set, of course). You may enter single // parts of actions and/or change to true what You want to check. GDIMetaFile aMtf; VirtualDevice aOut; @@ -336,8 +336,8 @@ namespace drawinglayer const Fraction aNeutralFraction(1, 1); const MapMode aRelativeMapMode( - MAP_RELATIVE, - Point(-aRectangle.Left(), -aRectangle.Top()), + MAP_RELATIVE, + Point(-aRectangle.Left(), -aRectangle.Top()), aNeutralFraction, aNeutralFraction); aOut.SetMapMode(aRelativeMapMode); @@ -403,7 +403,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < 5000; a++) { const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); if(!(a % 3)) @@ -426,7 +426,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < 5000; a++) { const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); aOut.DrawPixel(aPoint); } @@ -439,14 +439,14 @@ namespace drawinglayer aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); aOut.SetFillColor(); - + Point aStart( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); Point aStop( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - + LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fHor / 50.0)); bool bUseLineInfo(false); @@ -466,16 +466,16 @@ namespace drawinglayer { aStart = aStop; aStop = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); } else { aStart = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); aStop = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); } @@ -548,7 +548,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); aPolygon[a] = aPoint; } @@ -587,7 +587,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); aPolygon[a] = aPoint; } @@ -618,7 +618,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), + aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); aPolygon[a] = aPoint; } @@ -630,7 +630,7 @@ namespace drawinglayer aPolyPolygon.Insert(aPolygon); } - + aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); aOut.DrawPolyPolygon(aPolyPolygon); @@ -659,8 +659,8 @@ namespace drawinglayer BitmapEx aBitmapEx(aPNGReader.Read()); const Size aSizePixel(aBitmapEx.GetSizePixel()); aOut.DrawBitmapEx( - aRectangle.TopLeft(), - aRectangle.GetSize(), + aRectangle.TopLeft(), + aRectangle.GetSize(), Point(0, 0), Size(aSizePixel.Width() /2, aSizePixel.Height() / 2), aBitmapEx); @@ -671,16 +671,16 @@ namespace drawinglayer const double fHor(aRectangle.getWidth()); const double fVer(aRectangle.getHeight()); const Point aPointA( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.3)); const Point aPointB( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.5)); const Point aPointC( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.7)); const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8); - + const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8); Font aFont(aFontName, Size(0, 1000)); aFont.SetAlign(ALIGN_BASELINE); @@ -707,16 +707,16 @@ namespace drawinglayer const double fHor(aRectangle.getWidth()); const double fVer(aRectangle.getHeight()); const Point aPointA( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.3)); const Point aPointB( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.5)); const Point aPointC( - aRectangle.Left() + basegfx::fround(fHor * 0.2), + aRectangle.Left() + basegfx::fround(fHor * 0.2), aRectangle.Top() + basegfx::fround(fVer * 0.7)); const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8); - + const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8); Font aFont(aFontName, Size(0, 1000)); aFont.SetAlign(ALIGN_BASELINE); @@ -734,10 +734,10 @@ namespace drawinglayer aMtf.WindStart(); aMtf.SetPrefMapMode(MapMode(MAP_100TH_MM)); aMtf.SetPrefSize(Size(aRectangle.getWidth(), aRectangle.getHeight())); - + xPrimitive = Primitive2DReference( new MetafilePrimitive2D( - aTransform, + aTransform, aMtf)); } else @@ -749,7 +749,7 @@ namespace drawinglayer xPrimitive = Primitive2DReference( new MetafilePrimitive2D( - aTransform, + aTransform, rMetafile)); // #i100357# find out if clipping is needed for this primitive. Unfortunately, @@ -770,7 +770,7 @@ namespace drawinglayer xPrimitive = Primitive2DReference( new MaskPrimitive2D( - basegfx::B2DPolyPolygon(aMaskPolygon), + basegfx::B2DPolyPolygon(aMaskPolygon), aChildContent)); } #ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE @@ -799,7 +799,7 @@ namespace drawinglayer // create ranges. The current object range is just scale and translate const basegfx::B2DRange aCurrent( - aTranslate.getX(), aTranslate.getY(), + aTranslate.getX(), aTranslate.getY(), aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY()); // calculate scalings between real image size and logic object size. This @@ -810,7 +810,7 @@ namespace drawinglayer { const MapMode aMapMode100thmm(MAP_100TH_MM); Size aBitmapSize(getGraphicObject().GetPrefSize()); - + // #i95968# better support PrefMapMode; special for MAP_PIXEL was missing if(MAP_PIXEL == getGraphicObject().GetPrefMapMode().GetMapUnit()) { @@ -892,10 +892,10 @@ namespace drawinglayer } GraphicPrimitive2D::GraphicPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), maGraphicObject(rGraphicObject), maGraphicAttr(rGraphicAttr) @@ -903,9 +903,9 @@ namespace drawinglayer } GraphicPrimitive2D::GraphicPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), maGraphicObject(rGraphicObject), maGraphicAttr() diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 0439aa2436cf..6c0fd1948a37 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.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 @@ -155,7 +155,7 @@ namespace drawinglayer const basegfx::B2DRange aDiscreteRangeCross( aViewPos.getX() - fHalfCrossSize, aViewPos.getY() - fHalfCrossSize, aViewPos.getX() + fHalfCrossSize, aViewPos.getY() + fHalfCrossSize); - + if(rViewInformation.getDiscreteViewport().overlaps(aDiscreteRangeCross)) { const basegfx::B2DPoint aLogicPos(rViewInformation.getInverseObjectToViewTransformation() * aViewPos); @@ -202,7 +202,7 @@ namespace drawinglayer const sal_uInt32 nCountCross(aPositionsCross.size()); const sal_uInt32 nRetvalCount((nCountPoint ? 1 : 0) + (nCountCross ? 1 : 0)); sal_uInt32 nInsertCounter(0); - + aRetval.realloc(nRetvalCount); // add PointArrayPrimitive2D if point markers were added @@ -231,7 +231,7 @@ namespace drawinglayer } GridPrimitive2D::GridPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + const basegfx::B2DHomMatrix& rTransform, double fWidth, double fHeight, double fSmallestViewDistance, @@ -240,7 +240,7 @@ namespace drawinglayer sal_uInt32 nSubdivisionsY, const basegfx::BColor& rBColor, const BitmapEx& rCrossMarker) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), mfWidth(fWidth), mfHeight(fHeight), @@ -260,7 +260,7 @@ namespace drawinglayer if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const GridPrimitive2D& rCompare = (GridPrimitive2D&)rPrimitive; - + return (getTransform() == rCompare.getTransform() && getWidth() == rCompare.getWidth() && getHeight() == rCompare.getHeight() @@ -288,7 +288,7 @@ namespace drawinglayer } Primitive2DSequence GridPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); if(getBuffered2DDecomposition().hasElements()) diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index 25908a5b4c98..abb6989a5763 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.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 @@ -43,7 +43,7 @@ namespace drawinglayer namespace primitive2d { GroupPrimitive2D::GroupPrimitive2D( const Primitive2DSequence& rChildren ) - : BasePrimitive2D(), + : BasePrimitive2D(), maChildren(rChildren) { } diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index e5d861806721..45559b7c1b50 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.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 @@ -72,7 +72,7 @@ namespace drawinglayer aLineA.transform(rViewInformation.getInverseObjectToViewTransformation()); PolygonMarkerPrimitive2D* pNewA = new PolygonMarkerPrimitive2D(aLineA, getRGBColA(), getRGBColB(), getDiscreteDashLength()); aTempPrimitiveTarget.push_back(pNewA); - + const basegfx::B2DVector aPerpendicularNormalizedDirection(basegfx::getPerpendicular(aNormalizedDirection)); const basegfx::B2DPoint aStartB(aViewPosition - aPerpendicularNormalizedDirection); const basegfx::B2DPoint aEndB(aViewPosition + aPerpendicularNormalizedDirection); @@ -135,7 +135,7 @@ namespace drawinglayer aTempPrimitiveTarget.push_back(pNew); } } - + break; } } @@ -154,17 +154,17 @@ namespace drawinglayer } HelplinePrimitive2D::HelplinePrimitive2D( - const basegfx::B2DPoint& rPosition, - const basegfx::B2DVector& rDirection, - HelplineStyle2D eStyle, - const basegfx::BColor& rRGBColA, - const basegfx::BColor& rRGBColB, + const basegfx::B2DPoint& rPosition, + const basegfx::B2DVector& rDirection, + HelplineStyle2D eStyle, + const basegfx::BColor& rRGBColA, + const basegfx::BColor& rRGBColB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPosition(rPosition), maDirection(rDirection), meStyle(eStyle), - maRGBColA(rRGBColA), + maRGBColA(rRGBColA), maRGBColB(rRGBColB), mfDiscreteDashLength(fDiscreteDashLength), maLastObjectToViewTransformation(), @@ -190,7 +190,7 @@ namespace drawinglayer } Primitive2DSequence HelplinePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); if(getBuffered2DDecomposition().hasElements()) diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx index 65e2ce48731d..b40c3a7ae13c 100644 --- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx @@ -52,7 +52,7 @@ namespace drawinglayer { HiddenGeometryPrimitive2D::HiddenGeometryPrimitive2D( const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx index 7bd3be3cc596..dc1f10fbc075 100644 --- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/invertprimitive2d.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 @@ -44,7 +44,7 @@ namespace drawinglayer { InvertPrimitive2D::InvertPrimitive2D( const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index 3bc4f8a4bafe..5aa3beebd076 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.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 @@ -58,13 +58,13 @@ namespace drawinglayer { // get pixel size Size aBitmapSize(getMarker().GetSizePixel()); - + if(aBitmapSize.Width() && aBitmapSize.Height()) { // get logic half pixel size - basegfx::B2DVector aLogicHalfSize(rViewInformation.getInverseObjectToViewTransformation() * + basegfx::B2DVector aLogicHalfSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(aBitmapSize.getWidth() - 1.0, aBitmapSize.getHeight() - 1.0)); - + // use half size for expand aLogicHalfSize *= 0.5; @@ -93,7 +93,7 @@ namespace drawinglayer MarkerArrayPrimitive2D::MarkerArrayPrimitive2D( const std::vector< basegfx::B2DPoint >& rPositions, const BitmapEx& rMarker) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPositions(rPositions), maMarker(rMarker) { @@ -132,9 +132,9 @@ namespace drawinglayer if(aBitmapSize.Width() && aBitmapSize.Height()) { // get logic half size - basegfx::B2DVector aLogicHalfSize(rViewInformation.getInverseObjectToViewTransformation() * + basegfx::B2DVector aLogicHalfSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(aBitmapSize.getWidth(), aBitmapSize.getHeight())); - + // use half size for expand aLogicHalfSize *= 0.5; diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx index a864cd7cd89e..ab1d36f3ccc2 100644 --- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/maskprimitive2d.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 @@ -43,9 +43,9 @@ namespace drawinglayer namespace primitive2d { MaskPrimitive2D::MaskPrimitive2D( - const basegfx::B2DPolyPolygon& rMask, + const basegfx::B2DPolyPolygon& rMask, const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maMask(rMask) { } diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 70b09b504118..4c69061e819e 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.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 @@ -56,7 +56,7 @@ namespace drawinglayer aBackgroundPolygon.transform(getTransform()); const Primitive2DReference xRefBackground( new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aBackgroundPolygon), + basegfx::B2DPolyPolygon(aBackgroundPolygon), getBackgroundColor())); xRetval[0] = xRefBackground; @@ -74,7 +74,7 @@ namespace drawinglayer if(getDiscreteBorder()) { - const basegfx::B2DVector aDiscreteInLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aDiscreteInLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector((double)getDiscreteBorder(), (double)getDiscreteBorder())); const double fDiscreteSize(aDiscreteInLogic.getX() + aDiscreteInLogic.getY()); @@ -89,7 +89,7 @@ namespace drawinglayer // shrunk primitive has no content (zero size in X or Y), nothing to display. Still create // invisible content for HitTest and BoundRect const Primitive2DReference xHiddenLines(new HiddenGeometryPrimitive2D(xRetval)); - + xRetval = Primitive2DSequence(&xHiddenLines, 1); } else @@ -114,7 +114,7 @@ namespace drawinglayer const rtl::OUString& rURL, const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransform(rTransform), maURL(rURL), maBackgroundColor(rBackgroundColor), @@ -144,10 +144,10 @@ namespace drawinglayer if(getDiscreteBorder()) { - const basegfx::B2DVector aDiscreteInLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aDiscreteInLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector((double)getDiscreteBorder(), (double)getDiscreteBorder())); const double fDiscreteSize(aDiscreteInLogic.getX() + aDiscreteInLogic.getY()); - + aRetval.grow(-0.5 * fDiscreteSize); } diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index d205981205aa..ffb90a570080 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.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 @@ -84,16 +84,16 @@ namespace { private: /// current transformation (aka MapMode) - basegfx::B2DHomMatrix maTransformation; - MapUnit maMapUnit; + basegfx::B2DHomMatrix maTransformation; + MapUnit maMapUnit; /// current colors - basegfx::BColor maLineColor; - basegfx::BColor maFillColor; - basegfx::BColor maTextColor; - basegfx::BColor maTextFillColor; - basegfx::BColor maTextLineColor; - basegfx::BColor maOverlineColor; + basegfx::BColor maLineColor; + basegfx::BColor maFillColor; + basegfx::BColor maTextColor; + basegfx::BColor maTextFillColor; + basegfx::BColor maTextLineColor; + basegfx::BColor maOverlineColor; /// clipping basegfx::B2DPolyPolygon maClipPolyPoygon; @@ -107,13 +107,13 @@ namespace /// bitfield /// contains all active markers - bool mbLineColor : 1; - bool mbFillColor : 1; - bool mbTextColor : 1; - bool mbTextFillColor : 1; - bool mbTextLineColor : 1; - bool mbOverlineColor : 1; - bool mbClipPolyPolygonActive : 1; + bool mbLineColor : 1; + bool mbFillColor : 1; + bool mbTextColor : 1; + bool mbTextFillColor : 1; + bool mbTextLineColor : 1; + bool mbOverlineColor : 1; + bool mbClipPolyPolygonActive : 1; public: PropertyHolder() @@ -156,7 +156,7 @@ namespace void setLineColor(const basegfx::BColor& rNew) { if(rNew != maLineColor) maLineColor = rNew; } bool getLineColorActive() const { return mbLineColor; } void setLineColorActive(bool bNew) { if(bNew != mbLineColor) mbLineColor = bNew; } - + const basegfx::BColor& getFillColor() const { return maFillColor; } void setFillColor(const basegfx::BColor& rNew) { if(rNew != maFillColor) maFillColor = rNew; } bool getFillColorActive() const { return mbFillColor; } @@ -398,13 +398,13 @@ namespace { RegionHandle aRegionHandle(aRegion.BeginEnumRects()); Rectangle aRegionRectangle; - + while(aRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) { if(!aRegionRectangle.IsEmpty()) { const basegfx::B2DRange aRegionRange( - aRegionRectangle.Left(), aRegionRectangle.Top(), + aRegionRectangle.Left(), aRegionRectangle.Top(), aRegionRectangle.Right(), aRegionRectangle.Bottom()); aRetval.append(basegfx::tools::createPolygonFromRect(aRegionRange)); } @@ -422,7 +422,7 @@ namespace namespace { - /** Helper class to buffer and hold a Primive target vector. It + /** Helper class to buffer and hold a Primive target vector. It encapsulates the new/delete functionality and aloows to work on pointers of the implementation classes. All data will be converted to uno sequences of uno references when accessing the @@ -474,7 +474,7 @@ namespace // All Targets were pointers, but do not need to be deleted since they // were converted to UNO API references now, so they stay as long as - // referenced. Do NOT delete the C++ implementation classes here, but clear + // referenced. Do NOT delete the C++ implementation classes here, but clear // the buffer to not delete them in the destructor. aTargets.clear(); @@ -488,7 +488,7 @@ namespace new drawinglayer::primitive2d::MaskPrimitive2D( rClipPolyPolygon, xRetval)); - + xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xMask, 1); } } @@ -502,7 +502,7 @@ namespace namespace { - /** Helper class which builds a stack on the TargetHolder class */ + /** Helper class which builds a stack on the TargetHolder class */ class TargetHolders { private: @@ -577,7 +577,7 @@ namespace drawinglayer public: /// constructor NonOverlappingFillGradientPrimitive2D( - const basegfx::B2DRange& rObjectRange, + const basegfx::B2DRange& rObjectRange, const attribute::FillGradientAttribute& rFillGradient) : FillGradientPrimitive2D(rObjectRange, rFillGradient) { @@ -618,7 +618,7 @@ namespace if(rMapMode.GetScaleX() != aNoScale || rMapMode.GetScaleY() != aNoScale) { aMapping.scale( - double(rMapMode.GetScaleX()), + double(rMapMode.GetScaleX()), double(rMapMode.GetScaleY())); } @@ -627,8 +627,8 @@ namespace /** helper to create a PointArrayPrimitive2D based on current context */ void createPointArrayPrimitive( - const std::vector< basegfx::B2DPoint >& rPositions, - TargetHolder& rTarget, + const std::vector< basegfx::B2DPoint >& rPositions, + TargetHolder& rTarget, PropertyHolder& rProperties, basegfx::BColor aBColor) { @@ -661,7 +661,7 @@ namespace /** helper to create a PolygonHairlinePrimitive2D based on current context */ void createHairlinePrimitive( const basegfx::B2DPolygon& rLinePolygon, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(rLinePolygon.count()) @@ -678,7 +678,7 @@ namespace /** helper to create a PolyPolygonColorPrimitive2D based on current context */ void createFillPrimitive( const basegfx::B2DPolyPolygon& rFillPolyPolygon, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(rFillPolyPolygon.count()) @@ -695,8 +695,8 @@ namespace /** helper to create a PolygonStrokePrimitive2D based on current context */ void createLinePrimitive( const basegfx::B2DPolygon& rLinePolygon, - const LineInfo& rLineInfo, - TargetHolder& rTarget, + const LineInfo& rLineInfo, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(rLinePolygon.count()) @@ -761,14 +761,14 @@ namespace /** helper to create needed line and fill primitives based on current context */ void createHairlineAndFillPrimitive( const basegfx::B2DPolygon& rPolygon, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(rProperties.getFillColorActive()) { createFillPrimitive(basegfx::B2DPolyPolygon(rPolygon), rTarget, rProperties); } - + if(rProperties.getLineColorActive()) { createHairlinePrimitive(rPolygon, rTarget, rProperties); @@ -778,14 +778,14 @@ namespace /** helper to create needed line and fill primitives based on current context */ void createHairlineAndFillPrimitive( const basegfx::B2DPolyPolygon& rPolyPolygon, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(rProperties.getFillColorActive()) { createFillPrimitive(rPolyPolygon, rTarget, rProperties); } - + if(rProperties.getLineColorActive()) { for(sal_uInt32 a(0); a < rPolyPolygon.count(); a++) @@ -802,16 +802,16 @@ namespace transformed embedding of a BitmapPrimitive2D. */ void createBitmapExPrimitive( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const Point& rPoint, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(!rBitmapEx.IsEmpty()) { basegfx::B2DPoint aPoint(rPoint.X(), rPoint.Y()); aPoint = rProperties.getTransformation() * aPoint; - + rTarget.append( new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D( rBitmapEx, @@ -821,23 +821,23 @@ namespace /** helper to create BitmapPrimitive2D based on current context */ void createBitmapExPrimitive( - const BitmapEx& rBitmapEx, + const BitmapEx& rBitmapEx, const Point& rPoint, const Size& rSize, - TargetHolder& rTarget, + TargetHolder& rTarget, PropertyHolder& rProperties) { if(!rBitmapEx.IsEmpty()) { basegfx::B2DHomMatrix aObjectTransform; - + aObjectTransform.set(0, 0, rSize.Width()); aObjectTransform.set(1, 1, rSize.Height()); aObjectTransform.set(0, 2, rPoint.X()); aObjectTransform.set(1, 2, rPoint.Y()); - + aObjectTransform = rProperties.getTransformation() * aObjectTransform; - + rTarget.append( new drawinglayer::primitive2d::BitmapPrimitive2D( rBitmapEx, @@ -847,21 +847,21 @@ namespace /** helper to create a regular BotmapEx from a MaskAction (definitions which use a bitmap without transparence but define one of the colors as - transparent) + transparent) */ BitmapEx createMaskBmpEx(const Bitmap& rBitmap, const Color& rMaskColor) { const Color aWhite(COL_WHITE); BitmapPalette aBiLevelPalette(2); - + aBiLevelPalette[0] = aWhite; aBiLevelPalette[1] = rMaskColor; Bitmap aMask(rBitmap.CreateMask(aWhite)); Bitmap aSolid(rBitmap.GetSizePixel(), 1, &aBiLevelPalette); - + aSolid.Erase(rMaskColor); - + return BitmapEx(aSolid, aMask); } @@ -873,7 +873,7 @@ namespace const Color aStartColor(rGradient.GetStartColor()); const sal_uInt16 nStartIntens(rGradient.GetStartIntensity()); basegfx::BColor aStart(aStartColor.getBColor()); - + if(nStartIntens != 100) { const basegfx::BColor aBlack; @@ -883,7 +883,7 @@ namespace const Color aEndColor(rGradient.GetEndColor()); const sal_uInt16 nEndIntens(rGradient.GetEndIntensity()); basegfx::BColor aEnd(aEndColor.getBColor()); - + if(nEndIntens != 100) { const basegfx::BColor aBlack; @@ -894,29 +894,29 @@ namespace switch(rGradient.GetStyle()) { - case GRADIENT_LINEAR : + case GRADIENT_LINEAR : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_LINEAR; break; } - case GRADIENT_AXIAL : + case GRADIENT_AXIAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_AXIAL; break; } - case GRADIENT_RADIAL : + case GRADIENT_RADIAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_RADIAL; break; } - case GRADIENT_ELLIPTICAL : + case GRADIENT_ELLIPTICAL : { aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_ELLIPTICAL; break; } - case GRADIENT_SQUARE : + case GRADIENT_SQUARE : { - aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE; + aGradientStyle = drawinglayer::attribute::GRADIENTSTYLE_SQUARE; break; } default : // GRADIENT_RECT @@ -946,14 +946,14 @@ namespace switch(rHatch.GetStyle()) { - default : // case HATCH_SINGLE : + default : // case HATCH_SINGLE : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE; + aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE; break; } - case HATCH_DOUBLE : + case HATCH_DOUBLE : { - aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE; + aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE; break; } case HATCH_TRIPLE : @@ -962,7 +962,7 @@ namespace break; } } - + return drawinglayer::attribute::FillHatchAttribute( aHatchStyle, (double)rHatch.GetDistance(), @@ -992,7 +992,7 @@ namespace // // This ClipPolyPolygon is identical to the current one, so there is no need to // create a MaskPrimitive2D containing the up-to-now created primitives, but - // this was done before. While this does not lead to wrong primitive + // this was done before. While this does not lead to wrong primitive // representations of the metafile data, it creates unneccesarily expensive // representations. Just detecting when no really 'new' ClipPolyPolygon gets set // solves the problem. @@ -1016,7 +1016,7 @@ namespace // Here the old and the new are definitively different, maybe // old one and/or new one is not active. - // Handle deletion of old ClipPolyPolygon. The process evtl. created primitives which + // Handle deletion of old ClipPolyPolygon. The process evtl. created primitives which // belong to this active ClipPolyPolygon. These need to be embedded to a // MaskPrimitive2D accordingly. if(rPropertyHolders.Current().getClipPolyPolygonActive() && rTargetHolders.size() > 1) @@ -1141,7 +1141,7 @@ namespace else { // really a gradient - drawinglayer::primitive2d::BasePrimitive2D* pRetval = + drawinglayer::primitive2d::BasePrimitive2D* pRetval = new drawinglayer::primitive2d::FillGradientPrimitive2D( rRange, aAttribute); @@ -1202,7 +1202,7 @@ namespace if(rWallpaper.IsRect() && !rWallpaper.GetRect().IsEmpty()) { aWallpaperRange = basegfx::B2DRange( - rWallpaper.GetRect().Left(), rWallpaper.GetRect().Top(), + rWallpaper.GetRect().Left(), rWallpaper.GetRect().Top(), rWallpaper.GetRect().Right(), rWallpaper.GetRect().Bottom()); } @@ -1211,7 +1211,7 @@ namespace aWallpaperRange, aBitmapEx, eWallpaperStyle); - + if(rProperty.getTransformation().isIdentity()) { // add directly @@ -1374,7 +1374,7 @@ namespace // TextDecoratedPortionPrimitive2D is needed, create one pResult = new drawinglayer::primitive2d::TextDecoratedPortionPrimitive2D( - + // attributes for TextSimplePortionPrimitive2D aTextTransform, rText, @@ -1436,7 +1436,7 @@ namespace { // build text range const basegfx::B2DRange aTextRange( - 0.0, -aTextLayouterDevice.getFontAscent(), + 0.0, -aTextLayouterDevice.getFontAscent(), fTextWidth, aTextLayouterDevice.getFontDescent()); // create Transform @@ -1557,7 +1557,7 @@ namespace if(bStrikeoutUsed) { // create primitive geometry for strikeout - if(drawinglayer::primitive2d::TEXT_STRIKEOUT_SLASH == aTextStrikeout + if(drawinglayer::primitive2d::TEXT_STRIKEOUT_SLASH == aTextStrikeout || drawinglayer::primitive2d::TEXT_STRIKEOUT_X == aTextStrikeout) { // strikeout with character @@ -1642,9 +1642,9 @@ namespace I have marked the single MetaActions with: - SIMPLE, DONE: + SIMPLE, DONE: Simple, e.g nothing to do or value setting in the context - + CHECKED, WORKS WELL: Thoroughly tested with extra written test code which created a replacement Metafile just to test this action in various combinations @@ -1753,7 +1753,7 @@ namespace if(aLinePolygon.count()) { - if(pA->GetLineInfo() == aLineInfo + if(pA->GetLineInfo() == aLineInfo && aStart == aLinePolygon.getB2DPoint(aLinePolygon.count() - 1)) { aLinePolygon.append(aEnd); @@ -1774,7 +1774,7 @@ namespace aLinePolygon.append(aStart); aLinePolygon.append(aEnd); } - + nAction++; if(nAction < nCount) pAction = rMetaFile.GetAction(nAction); } @@ -1814,9 +1814,9 @@ namespace case META_ROUNDRECT_ACTION : { /** CHECKED, WORKS WELL */ - /** The original OutputDevice::DrawRect paints nothing when nHor or nVer is zero; but just + /** The original OutputDevice::DrawRect paints nothing when nHor or nVer is zero; but just because the tools::Polygon operator creating the rounding does produce nonsense. I assume - this an error and create an unrounded rectangle in that case (implicit in + this an error and create an unrounded rectangle in that case (implicit in createPolygonFromRect) */ if(rPropertyHolders.Current().getLineOrFillActive()) @@ -1827,7 +1827,7 @@ namespace if(!rRectangle.IsEmpty()) { const basegfx::B2DRange aRange(rRectangle.Left(), rRectangle.Top(), rRectangle.Right(), rRectangle.Bottom()); - + if(!aRange.isEmpty()) { const sal_uInt32 nHor(pA->GetHorzRound()); @@ -2020,7 +2020,7 @@ namespace { nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex; } - + if(nTextLength && rPropertyHolders.Current().getTextColorActive()) { // preapare DXArray (if used) @@ -2036,7 +2036,7 @@ namespace aDXArray.push_back((double)(*(pDXArray + a))); } } - + proccessMetaTextAction( pA->GetPoint(), pA->GetText(), @@ -2057,7 +2057,7 @@ namespace // Implemented getting the DXArray and checking for scale at all. If // scale is more than 3.5% different, scale the DXArray before usage. // New status: - + /** CHECKED, WORKS WELL */ const MetaStretchTextAction* pA = (const MetaStretchTextAction*)pAction; sal_uInt32 nTextLength(pA->GetLen()); @@ -2068,7 +2068,7 @@ namespace { nTextLength = nStringLength - nTextIndex; } - + if(nTextLength && rPropertyHolders.Current().getTextColorActive()) { drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice; @@ -2109,7 +2109,7 @@ namespace rTargetHolders.Current(), rPropertyHolders.Current()); } - + break; } case META_TEXTRECT_ACTION : @@ -2119,7 +2119,7 @@ namespace const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction; const Rectangle& rRectangle = pA->GetRect(); const sal_uInt32 nStringLength(pA->GetText().Len()); - + if(!rRectangle.IsEmpty() && 0 != nStringLength) { // The problem with this action is that it describes unlayouted text @@ -2285,7 +2285,7 @@ namespace { aCroppedBitmap.Crop(aCropRectangle); } - + const BitmapEx aCroppedBitmapEx(createMaskBmpEx(aCroppedBitmap, pA->GetColor())); createBitmapExPrimitive(aCroppedBitmapEx, pA->GetDestPoint(), pA->GetDestSize(), rTargetHolders.Current(), rPropertyHolders.Current()); } @@ -2307,13 +2307,13 @@ namespace const Gradient& rGradient = pA->GetGradient(); const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient)); basegfx::B2DPolyPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); - + if(aAttribute.getStartColor() == aAttribute.getEndColor()) { // not really a gradient. Create filled rectangle createFillPrimitive( - aOutline, - rTargetHolders.Current(), + aOutline, + rTargetHolders.Current(), rPropertyHolders.Current()); } else @@ -2387,13 +2387,13 @@ namespace /** CHECKED, WORKS WELL */ const MetaWallpaperAction* pA = (const MetaWallpaperAction*)pAction; Rectangle aWallpaperRectangle(pA->GetRect()); - + if(!aWallpaperRectangle.IsEmpty()) { const Wallpaper& rWallpaper = pA->GetWallpaper(); const WallpaperStyle eWallpaperStyle(rWallpaper.GetStyle()); basegfx::B2DRange aWallpaperRange( - aWallpaperRectangle.Left(), aWallpaperRectangle.Top(), + aWallpaperRectangle.Left(), aWallpaperRectangle.Top(), aWallpaperRectangle.Right(), aWallpaperRectangle.Bottom()); if(WALLPAPER_NULL != eWallpaperStyle) @@ -2441,7 +2441,7 @@ namespace { // new clipping. Get PolyPolygon and transform with current transformation basegfx::B2DPolyPolygon aNewClipPolyPolygon(getB2DPolyPolygonFromRegion(pA->GetRegion())); - + aNewClipPolyPolygon.transform(rPropertyHolders.Current().getTransformation()); HandleNewClipRegion(aNewClipPolyPolygon, rTargetHolders, rPropertyHolders); } @@ -2449,7 +2449,7 @@ namespace { // end clipping const basegfx::B2DPolyPolygon aEmptyPolyPolygon; - + HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders); } @@ -2466,7 +2466,7 @@ namespace // intersect with empty rectangle will always give empty // ClipPolyPolygon; start new clipping with empty PolyPolygon const basegfx::B2DPolyPolygon aEmptyPolyPolygon; - + HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders); } else @@ -2495,18 +2495,18 @@ namespace if(aOriginalPolyPolygon.count()) { aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnRange( - aOriginalPolyPolygon, - aClipRange, - true, + aOriginalPolyPolygon, + aClipRange, + true, false); } - + if(aClippedPolyPolygon != aOriginalPolyPolygon) { // start new clipping with intersected region HandleNewClipRegion( - aClippedPolyPolygon, - rTargetHolders, + aClippedPolyPolygon, + rTargetHolders, rPropertyHolders); } } @@ -2534,7 +2534,7 @@ namespace // intersect with empty region will always give empty // region; start new clipping with empty PolyPolygon const basegfx::B2DPolyPolygon aEmptyPolyPolygon; - + HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders); } else @@ -2562,7 +2562,7 @@ namespace aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon( aOriginalPolyPolygon, aNewClipPolyPolygon, true, false); } - + if(aClippedPolyPolygon != aOriginalPolyPolygon) { // start new clipping with intersected ClipPolyPolygon @@ -2612,7 +2612,7 @@ namespace } } } - + break; } case META_LINECOLOR_ACTION : @@ -2620,11 +2620,11 @@ namespace /** CHECKED, WORKS WELL */ const MetaLineColorAction* pA = (const MetaLineColorAction*)pAction; const bool bActive(pA->IsSetting()); - + rPropertyHolders.Current().setLineColorActive(bActive); if(bActive) rPropertyHolders.Current().setLineColor(pA->GetColor().getBColor()); - + break; } case META_FILLCOLOR_ACTION : @@ -2677,7 +2677,7 @@ namespace const MetaTextAlignAction* pA = (const MetaTextAlignAction*)pAction; const TextAlign aNewTextAlign = pA->GetTextAlign(); - // TextAlign is applied to the current font (as in + // TextAlign is applied to the current font (as in // OutputDevice::SetTextAlign which would be used when // playing the Metafile) if(rPropertyHolders.Current().getFont().GetAlign() != aNewTextAlign) @@ -2737,7 +2737,7 @@ namespace aMapping = getTransformFromMapMode(rMapMode) * aMapping; rPropertyHolders.Current().setMapUnit(rMapMode.GetMapUnit()); } - + if(!aMapping.isIdentity()) { aMapping = aMapping * rPropertyHolders.Current().getTransformation(); @@ -2779,7 +2779,7 @@ namespace { rPropertyHolders.Current().setTextColor(rFontColor.getBColor()); } - + // caution: do NOT decativate here on transparet, see // OutputDevice::SetFont(..) for more info // rPropertyHolders.Current().setTextColorActive(bActivate); @@ -2812,7 +2812,7 @@ namespace /** CHECKED, WORKS WELL */ const bool bRegionMayChange(rPropertyHolders.Current().getPushFlags() & PUSH_CLIPREGION); const bool bRasterOpMayChange(rPropertyHolders.Current().getPushFlags() & PUSH_RASTEROP); - + if(bRegionMayChange && rPropertyHolders.Current().getClipPolyPolygonActive()) { // end evtl. clipping @@ -2820,7 +2820,7 @@ namespace HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders); } - + if(bRasterOpMayChange && rPropertyHolders.Current().isRasterOpActive()) { // end evtl. RasterOp @@ -2885,7 +2885,7 @@ namespace // back to old target rTargetHolders.Pop(); - + if(aSubContent.hasElements()) { rTargetHolders.Current().append( @@ -2917,7 +2917,7 @@ namespace aObjectTransform.set(1, 1, aRectangle.GetHeight()); aObjectTransform.set(0, 2, aRectangle.Left()); aObjectTransform.set(1, 2, aRectangle.Top()); - + // add current transformation aObjectTransform = rPropertyHolders.Current().getTransformation() * aObjectTransform; @@ -2928,7 +2928,7 @@ namespace pA->GetLink(), pA->GetSubstitute())); } - + break; } case META_REFPOINT_ACTION : @@ -2962,9 +2962,9 @@ namespace // checked files). It's used in combination with the current // Font. const MetaTextLineAction* pA = (const MetaTextLineAction*)pAction; - + proccessMetaTextLineAction( - *pA, + *pA, rTargetHolders.Current(), rPropertyHolders.Current()); @@ -3000,7 +3000,7 @@ namespace // check if gradient is a real gradient const Gradient& rGradient = pA->GetGradient(); const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient)); - + if(aAttribute.getStartColor() == aAttribute.getEndColor()) { // not really a gradient; create UnifiedTransparencePrimitive2D @@ -3013,16 +3013,16 @@ namespace { // really a gradient. Create gradient sub-content (with correct scaling) basegfx::B2DRange aRange( - aTargetRectangle.Left(), aTargetRectangle.Top(), + aTargetRectangle.Left(), aTargetRectangle.Top(), aTargetRectangle.Right(), aTargetRectangle.Bottom()); aRange.transform(rPropertyHolders.Current().getTransformation()); // prepare gradient for transparent content const drawinglayer::primitive2d::Primitive2DReference xTransparence( new drawinglayer::primitive2d::FillGradientPrimitive2D( - aRange, + aRange, aAttribute)); - + // create transparence primitive rTargetHolders.Current().append( new drawinglayer::primitive2d::TransparencePrimitive2D( @@ -3072,7 +3072,7 @@ namespace case META_COMMENT_ACTION : { /** CHECKED, WORKS WELL */ - // I already implemented + // I already implemented // XPATHFILL_SEQ_BEGIN, XPATHFILL_SEQ_END // XPATHSTROKE_SEQ_BEGIN, XPATHSTROKE_SEQ_END, // but opted to remove these again; it works well without them @@ -3085,7 +3085,7 @@ namespace // pure recorded paint of the gradients uses the XOR paint functionality // ('trick'). This is (and will be) broblematic with AntAliasing, so it's // better to use this info - const MetaGradientExAction* pMetaGradientExAction = 0; + const MetaGradientExAction* pMetaGradientExAction = 0; bool bDone(false); sal_uInt32 b(nAction + 1); @@ -3118,11 +3118,11 @@ namespace { // transform geometry aPolyPolygon.transform(rPropertyHolders.Current().getTransformation()); - + // get and check if gradient is a real gradient const Gradient& rGradient = pMetaGradientExAction->GetGradient(); const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient)); - + if(aAttribute.getStartColor() == aAttribute.getEndColor()) { // not really a gradient @@ -3179,12 +3179,12 @@ namespace drawinglayer while(aTargetHolders.size() > 1) { - appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, + appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aTargetHolders.Current().getPrimitive2DSequence(aPropertyHolders.Current())); aTargetHolders.Pop(); } - - appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, + + appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aTargetHolders.Current().getPrimitive2DSequence(aPropertyHolders.Current())); if(xRetval.hasElements()) @@ -3214,9 +3214,9 @@ namespace drawinglayer } MetafilePrimitive2D::MetafilePrimitive2D( - const basegfx::B2DHomMatrix& rMetaFileTransform, + const basegfx::B2DHomMatrix& rMetaFileTransform, const GDIMetaFile& rMetaFile) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maMetaFileTransform(rMetaFileTransform), maMetaFile(rMetaFile) { @@ -3228,7 +3228,7 @@ namespace drawinglayer { const MetafilePrimitive2D& rCompare = (MetafilePrimitive2D&)rPrimitive; - return (getTransform() == rCompare.getTransform() + return (getTransform() == rCompare.getTransform() && getMetaFile() == rCompare.getMetaFile()); } diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 2d7e22ffd542..d43403be1409 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.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 @@ -43,9 +43,9 @@ namespace drawinglayer namespace primitive2d { ModifiedColorPrimitive2D::ModifiedColorPrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, const basegfx::BColorModifier& rColorModifier) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maColorModifier(rColorModifier) { } diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index dd4bc359adb7..e28f5debcbfd 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.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 @@ -52,7 +52,7 @@ namespace drawinglayer Primitive2DSequence xRetval; Primitive2DSequence aContent(getPageContent()); - if(aContent.hasElements() + if(aContent.hasElements() && basegfx::fTools::more(getContentWidth(), 0.0) && basegfx::fTools::more(getContentHeight(), 0.0)) { @@ -87,7 +87,7 @@ namespace drawinglayer // center the output. Calculate needed scale factors const double fScaleX(aScale.getX() / getContentWidth()); const double fScaleY(aScale.getY() / getContentHeight()); - + // to keep the aspect, use the smaller scale and adapt missing size by translation if(fScaleX < fScaleY) { @@ -107,7 +107,7 @@ namespace drawinglayer aPageTrans.translate(fSpaceToAdd * 0.5, 0.0); aPageTrans.scale(aScale.getX() / fNeededWidth, fScaleY); } - + // add the missing object transformation aspects const basegfx::B2DHomMatrix aCombined(basegfx::tools::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); @@ -117,11 +117,11 @@ namespace drawinglayer { // completely scale to PageObject size. Scale to unit size. aPageTrans.scale(1.0/ getContentWidth(), 1.0 / getContentHeight()); - + // apply object matrix aPageTrans *= getTransform(); } - + // embed in necessary transformation to map from SdrPage to SdrPageObject const Primitive2DReference xReferenceB(new TransformPrimitive2D(aPageTrans, aContent)); xRetval = Primitive2DSequence(&xReferenceB, 1); @@ -138,7 +138,7 @@ namespace drawinglayer double fContentHeight, const Primitive2DSequence& rPageContent, bool bKeepAspectRatio) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), mxDrawPage(rxDrawPage), maPageContent(rPageContent), maTransform(rTransform), @@ -153,7 +153,7 @@ namespace drawinglayer if(BasePrimitive2D::operator==(rPrimitive)) { const PagePreviewPrimitive2D& rCompare = static_cast< const PagePreviewPrimitive2D& >(rPrimitive); - + return (getXDrawPage() == rCompare.getXDrawPage() && getPageContent() == rCompare.getPageContent() && getTransform() == rCompare.getTransform() diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index 94b3f9cb7a9a..df508d4a6377 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.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 @@ -45,7 +45,7 @@ namespace drawinglayer PointArrayPrimitive2D::PointArrayPrimitive2D( const std::vector< basegfx::B2DPoint >& rPositions, const basegfx::BColor& rRGBColor) - : BasePrimitive2D(), + : BasePrimitive2D(), maPositions(rPositions), maRGBColor(rRGBColor), maB2DRange() @@ -76,7 +76,7 @@ namespace drawinglayer { aNewRange.expand(*aIter); } - + // assign to buffered value const_cast< PointArrayPrimitive2D* >(this)->maB2DRange = aNewRange; } diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 6a656445db40..79a280f00df4 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.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 @@ -49,9 +49,9 @@ namespace drawinglayer namespace primitive2d { PolygonHairlinePrimitive2D::PolygonHairlinePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rBColor) - : BasePrimitive2D(), + : BasePrimitive2D(), maPolygon(rPolygon), maBColor(rBColor) { @@ -63,7 +63,7 @@ namespace drawinglayer { const PolygonHairlinePrimitive2D& rCompare = (PolygonHairlinePrimitive2D&)rPrimitive; - return (getB2DPolygon() == rCompare.getB2DPolygon() + return (getB2DPolygon() == rCompare.getB2DPolygon() && getBColor() == rCompare.getBColor()); } @@ -81,7 +81,7 @@ namespace drawinglayer // Calculate view-dependent hairline width const basegfx::B2DVector aDiscreteSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)); const double fDiscreteHalfLineWidth(aDiscreteSize.getLength() * 0.5); - + if(basegfx::fTools::more(fDiscreteHalfLineWidth, 0.0)) { aRetval.grow(fDiscreteHalfLineWidth); @@ -137,11 +137,11 @@ namespace drawinglayer } PolygonMarkerPrimitive2D::PolygonMarkerPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolygon(rPolygon), maRGBColorA(rRGBColorA), maRGBColorB(rRGBColorB), @@ -176,7 +176,7 @@ namespace drawinglayer // Calculate view-dependent hairline width const basegfx::B2DVector aDiscreteSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)); const double fDiscreteHalfLineWidth(aDiscreteSize.getLength() * 0.5); - + if(basegfx::fTools::more(fDiscreteHalfLineWidth, 0.0)) { aRetval.grow(fDiscreteHalfLineWidth); @@ -188,7 +188,7 @@ namespace drawinglayer } Primitive2DSequence PolygonMarkerPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); bool bNeedNewDecomposition(false); @@ -246,7 +246,7 @@ namespace drawinglayer { // apply LineStyle basegfx::tools::applyLineDashing( - aB2DPolygon, getStrokeAttribute().getDotDashArray(), + aB2DPolygon, getStrokeAttribute().getDotDashArray(), &aHairLinePolyPolygon, 0, getStrokeAttribute().getFullDotDashLen()); } @@ -273,12 +273,12 @@ namespace drawinglayer for(sal_uInt32 b(0L); b < aAreaPolyPolygon.count(); b++) { // put into single polyPolygon primitives to make clear that this is NOT meant - // to be painted as a single PolyPolygon (XORed as fill rule). Alternatively, a + // to be painted as a single PolyPolygon (XORed as fill rule). Alternatively, a // melting process may be used here one day. const basegfx::B2DPolyPolygon aNewPolyPolygon(aAreaPolyPolygon.getB2DPolygon(b)); static bool bTestByUsingRandomColor(false); const basegfx::BColor aColor(bTestByUsingRandomColor - ? basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0) + ? basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0) : getLineAttribute().getColor()); const Primitive2DReference xRef(new PolyPolygonColorPrimitive2D(aNewPolyPolygon, aColor)); aRetval[b] = xRef; @@ -291,7 +291,7 @@ namespace drawinglayer // prepare return value const Primitive2DReference xRef( new PolyPolygonHairlinePrimitive2D( - aHairLinePolyPolygon, + aHairLinePolyPolygon, getLineAttribute().getColor())); return Primitive2DSequence(&xRef, 1); @@ -304,10 +304,10 @@ namespace drawinglayer } PolygonStrokePrimitive2D::PolygonStrokePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolygon(rPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute(rStrokeAttribute) @@ -315,9 +315,9 @@ namespace drawinglayer } PolygonStrokePrimitive2D::PolygonStrokePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolygon(rPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute() @@ -330,7 +330,7 @@ namespace drawinglayer { const PolygonStrokePrimitive2D& rCompare = (PolygonStrokePrimitive2D&)rPrimitive; - return (getB2DPolygon() == rCompare.getB2DPolygon() + return (getB2DPolygon() == rCompare.getB2DPolygon() && getLineAttribute() == rCompare.getLineAttribute() && getStrokeAttribute() == rCompare.getStrokeAttribute()); } @@ -369,7 +369,7 @@ namespace drawinglayer // Calculate view-dependent hairline width const basegfx::B2DVector aDiscreteSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)); const double fDiscreteHalfLineWidth(aDiscreteSize.getLength() * 0.5); - + if(basegfx::fTools::more(fDiscreteHalfLineWidth, 0.0)) { aRetval.grow(fDiscreteHalfLineWidth); @@ -420,12 +420,12 @@ namespace drawinglayer } PolygonWavePrimitive2D::PolygonWavePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute, double fWaveWidth, double fWaveHeight) - : PolygonStrokePrimitive2D(rPolygon, rLineAttribute, rStrokeAttribute), + : PolygonStrokePrimitive2D(rPolygon, rLineAttribute, rStrokeAttribute), mfWaveWidth(fWaveWidth), mfWaveHeight(fWaveHeight) { @@ -441,11 +441,11 @@ namespace drawinglayer } PolygonWavePrimitive2D::PolygonWavePrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, double fWaveWidth, double fWaveHeight) - : PolygonStrokePrimitive2D(rPolygon, rLineAttribute), + : PolygonStrokePrimitive2D(rPolygon, rLineAttribute), mfWaveWidth(fWaveWidth), mfWaveHeight(fWaveHeight) { @@ -524,7 +524,7 @@ namespace drawinglayer { // create start arrow primitive and consume aArrowA = basegfx::tools::createAreaGeometryForLineStartEnd( - aLocalPolygon, getStart().getB2DPolyPolygon(), true, getStart().getWidth(), + aLocalPolygon, getStart().getB2DPolyPolygon(), true, getStart().getWidth(), fPolyLength, getStart().isCentered() ? 0.5 : 0.0, &fStart); // create some overlapping @@ -535,7 +535,7 @@ namespace drawinglayer { // create end arrow primitive and consume aArrowB = basegfx::tools::createAreaGeometryForLineStartEnd( - aLocalPolygon, getEnd().getB2DPolyPolygon(), false, getEnd().getWidth(), + aLocalPolygon, getEnd().getB2DPolyPolygon(), false, getEnd().getWidth(), fPolyLength, getEnd().isCentered() ? 0.5 : 0.0, &fEnd); // create some overlapping @@ -554,7 +554,7 @@ namespace drawinglayer sal_uInt32 nInd(0L); // add shaft - const Primitive2DReference xRefShaft(new + const Primitive2DReference xRefShaft(new PolygonStrokePrimitive2D( aLocalPolygon, getLineAttribute(), getStrokeAttribute())); aRetval[nInd++] = xRefShaft; @@ -579,23 +579,23 @@ namespace drawinglayer } PolygonStrokeArrowPrimitive2D::PolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::StrokeAttribute& rStrokeAttribute, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd) - : PolygonStrokePrimitive2D(rPolygon, rLineAttribute, rStrokeAttribute), + : PolygonStrokePrimitive2D(rPolygon, rLineAttribute, rStrokeAttribute), maStart(rStart), maEnd(rEnd) { } PolygonStrokeArrowPrimitive2D::PolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolygon& rPolygon, + const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd) - : PolygonStrokePrimitive2D(rPolygon, rLineAttribute), + : PolygonStrokePrimitive2D(rPolygon, rLineAttribute), maStart(rStart), maEnd(rEnd) { @@ -607,7 +607,7 @@ namespace drawinglayer { const PolygonStrokeArrowPrimitive2D& rCompare = (PolygonStrokeArrowPrimitive2D&)rPrimitive; - return (getStart() == rCompare.getStart() + return (getStart() == rCompare.getStart() && getEnd() == rCompare.getEnd()); } diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index e1102f8eeb35..98966c70a3b7 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.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 @@ -73,7 +73,7 @@ namespace drawinglayer } PolyPolygonHairlinePrimitive2D::PolyPolygonHairlinePrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maBColor(rBColor) { @@ -85,7 +85,7 @@ namespace drawinglayer { const PolyPolygonHairlinePrimitive2D& rCompare = (PolyPolygonHairlinePrimitive2D&)rPrimitive; - return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() + return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getBColor() == rCompare.getBColor()); } @@ -133,11 +133,11 @@ namespace drawinglayer } PolyPolygonMarkerPrimitive2D::PolyPolygonMarkerPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maRGBColorA(rRGBColorA), maRGBColorB(rRGBColorB), @@ -151,7 +151,7 @@ namespace drawinglayer { const PolyPolygonMarkerPrimitive2D& rCompare = (PolyPolygonMarkerPrimitive2D&)rPrimitive; - return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() + return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getRGBColorA() == rCompare.getRGBColorA() && getRGBColorB() == rCompare.getRGBColorB() && getDiscreteDashLength() == rCompare.getDiscreteDashLength()); @@ -203,10 +203,10 @@ namespace drawinglayer } PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute(rStrokeAttribute) @@ -214,9 +214,9 @@ namespace drawinglayer } PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute() @@ -229,7 +229,7 @@ namespace drawinglayer { const PolyPolygonStrokePrimitive2D& rCompare = (PolyPolygonStrokePrimitive2D&)rPrimitive; - return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() + return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getLineAttribute() == rCompare.getLineAttribute() && getStrokeAttribute() == rCompare.getStrokeAttribute()); } @@ -285,7 +285,7 @@ namespace drawinglayer else { aRetval[a] = Primitive2DReference( - new PolygonStrokeArrowPrimitive2D(aPolygon, getLineAttribute(), + new PolygonStrokeArrowPrimitive2D(aPolygon, getLineAttribute(), getStrokeAttribute(), getStart(), getEnd())); } } @@ -299,23 +299,23 @@ namespace drawinglayer } PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::StrokeAttribute& rStrokeAttribute, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd) - : PolyPolygonStrokePrimitive2D(rPolyPolygon, rLineAttribute, rStrokeAttribute), + : PolyPolygonStrokePrimitive2D(rPolyPolygon, rLineAttribute, rStrokeAttribute), maStart(rStart), maEnd(rEnd) { } PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::LineStartEndAttribute& rStart, + const attribute::LineStartEndAttribute& rStart, const attribute::LineStartEndAttribute& rEnd) - : PolyPolygonStrokePrimitive2D(rPolyPolygon, rLineAttribute), + : PolyPolygonStrokePrimitive2D(rPolyPolygon, rLineAttribute), maStart(rStart), maEnd(rEnd) { @@ -327,7 +327,7 @@ namespace drawinglayer { const PolyPolygonStrokeArrowPrimitive2D& rCompare = (PolyPolygonStrokeArrowPrimitive2D&)rPrimitive; - return (getStart() == rCompare.getStart() + return (getStart() == rCompare.getStart() && getEnd() == rCompare.getEnd()); } @@ -363,9 +363,9 @@ namespace drawinglayer namespace primitive2d { PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor) - : BasePrimitive2D(), + : BasePrimitive2D(), maPolyPolygon(rPolyPolygon), maBColor(rBColor) { @@ -377,7 +377,7 @@ namespace drawinglayer { const PolyPolygonColorPrimitive2D& rCompare = (PolyPolygonColorPrimitive2D&)rPrimitive; - return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() + return (getB2DPolyPolygon() == rCompare.getB2DPolyPolygon() && getBColor() == rCompare.getBColor()); } @@ -415,7 +415,7 @@ namespace drawinglayer // create mask primitive MaskPrimitive2D* pNewMask = new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence); const Primitive2DReference xRef(pNewMask); - + return Primitive2DSequence(&xRef, 1); } else @@ -425,9 +425,9 @@ namespace drawinglayer } PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maFillGradient(rFillGradient) { @@ -480,10 +480,10 @@ namespace drawinglayer } PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBackgroundColor, const attribute::FillHatchAttribute& rFillHatch) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maBackgroundColor(rBackgroundColor), maFillHatch(rFillHatch) @@ -533,7 +533,7 @@ namespace drawinglayer // create mask primitive MaskPrimitive2D* pNewMask = new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence); const Primitive2DReference xRef(pNewMask); - + return Primitive2DSequence(&xRef, 1); } else @@ -543,9 +543,9 @@ namespace drawinglayer } PolyPolygonBitmapPrimitive2D::PolyPolygonBitmapPrimitive2D( - const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::FillBitmapAttribute& rFillBitmap) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maPolyPolygon(rPolyPolygon), maFillBitmap(rFillBitmap) { @@ -556,7 +556,7 @@ namespace drawinglayer if(BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const PolyPolygonBitmapPrimitive2D& rCompare = (PolyPolygonBitmapPrimitive2D&)rPrimitive; - + return (getFillBitmap() == rCompare.getFillBitmap()); } diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx index af73fcf278a8..03425a2ead73 100644 --- a/drawinglayer/source/primitive2d/primitivetools2d.cxx +++ b/drawinglayer/source/primitive2d/primitivetools2d.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 diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 7d83868fa784..f9959744c29d 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.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 @@ -55,8 +55,8 @@ namespace drawinglayer { namespace primitive2d { - bool ScenePrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const - { + bool ScenePrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const + { ::osl::MutexGuard aGuard( m_aMutex ); // create on demand @@ -75,9 +75,9 @@ namespace drawinglayer // create shadow extraction processor processor3d::Shadow3DExtractingProcessor aShadowProcessor( - getViewInformation3D(), + getViewInformation3D(), getObjectTransformation(), - aLightNormal, + aLightNormal, fShadowSlant, aScene3DRange); @@ -212,7 +212,7 @@ namespace drawinglayer // calculate logic render size in world coordinates for usage in renderer basegfx::B2DVector aLogicRenderSize( - aDiscreteRange.getWidth() * fReduceFactor, + aDiscreteRange.getWidth() * fReduceFactor, aDiscreteRange.getHeight() * fReduceFactor); aLogicRenderSize *= rViewInformation.getInverseObjectToViewTransformation(); @@ -222,12 +222,12 @@ namespace drawinglayer // use default 3D primitive processor to create BitmapEx for aUnitVisiblePart and process processor3d::ZBufferProcessor3D aZBufferProcessor3D( - getViewInformation3D(), + getViewInformation3D(), rViewInformation, - getSdrSceneAttribute(), + getSdrSceneAttribute(), getSdrLightingAttribute(), - aLogicRenderSize.getX(), - aLogicRenderSize.getY(), + aLogicRenderSize.getX(), + aLogicRenderSize.getY(), aUnitVisibleRange, nOversampleValue); @@ -279,7 +279,7 @@ namespace drawinglayer { // create 2D geometry extraction processor processor3d::Geometry2DExtractingProcessor aGeometryProcessor( - getViewInformation3D(), + getViewInformation3D(), getObjectTransformation()); // process local primitives @@ -348,12 +348,12 @@ namespace drawinglayer } ScenePrimitive2D::ScenePrimitive2D( - const primitive3d::Primitive3DSequence& rxChildren3D, - const attribute::SdrSceneAttribute& rSdrSceneAttribute, - const attribute::SdrLightingAttribute& rSdrLightingAttribute, + const primitive3d::Primitive3DSequence& rxChildren3D, + const attribute::SdrSceneAttribute& rSdrSceneAttribute, + const attribute::SdrLightingAttribute& rSdrLightingAttribute, const basegfx::B2DHomMatrix& rObjectTransformation, const geometry::ViewInformation3D& rViewInformation3D) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), mxChildren3D(rxChildren3D), maSdrSceneAttribute(rSdrSceneAttribute), maSdrLightingAttribute(rSdrLightingAttribute), @@ -389,7 +389,7 @@ namespace drawinglayer // transform unit range to discrete coordinate range basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0); aRetval.transform(rViewInformation.getObjectToViewTransformation() * getObjectTransformation()); - + // force to discrete expanded bounds (it grows, so expanding works perfectly well) aRetval.expand(basegfx::B2DTuple(floor(aRetval.getMinX()), floor(aRetval.getMinY()))); aRetval.expand(basegfx::B2DTuple(ceil(aRetval.getMaxX()), ceil(aRetval.getMaxY()))); @@ -412,7 +412,7 @@ namespace drawinglayer } Primitive2DSequence ScenePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); // get the involved ranges (see helper method calculateDiscreteSizes for details) @@ -426,7 +426,7 @@ namespace drawinglayer basegfx::B2DRange aVisibleDiscreteRange; calculateDiscreteSizes(rViewInformation, aDiscreteRange, aVisibleDiscreteRange, aUnitVisibleRange); bDiscreteSizesAreCalculated = true; - + // needs to be painted when the new part is not part of the last // decomposition if(!maOldUnitVisiblePart.isInside(aUnitVisibleRange)) diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx index 0ac1cdf59788..315015e589bc 100644 --- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx +++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx @@ -57,8 +57,8 @@ namespace drawinglayer const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon()); return createHiddenGeometryPrimitives2D( - bFilled, - basegfx::B2DPolyPolygon(aUnitOutline), + bFilled, + basegfx::B2DPolyPolygon(aUnitOutline), rMatrix); } @@ -67,8 +67,8 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& rPolyPolygon) { return createHiddenGeometryPrimitives2D( - bFilled, - rPolyPolygon, + bFilled, + rPolyPolygon, basegfx::B2DHomMatrix()); } @@ -77,8 +77,8 @@ namespace drawinglayer const basegfx::B2DRange& rRange) { return createHiddenGeometryPrimitives2D( - bFilled, - rRange, + bFilled, + rRange, basegfx::B2DHomMatrix()); } @@ -90,8 +90,8 @@ namespace drawinglayer const basegfx::B2DPolyPolygon aOutline(basegfx::tools::createPolygonFromRect(rRange)); return createHiddenGeometryPrimitives2D( - bFilled, - aOutline, + bFilled, + aOutline, rMatrix); } @@ -108,7 +108,7 @@ namespace drawinglayer if(bFilled) { xReference = new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aScaledOutline), + basegfx::B2DPolyPolygon(aScaledOutline), basegfx::BColor(0.0, 0.0, 0.0)); } else @@ -116,7 +116,7 @@ namespace drawinglayer const basegfx::BColor aGrayTone(0xc0 / 255.0, 0xc0 / 255.0, 0xc0 / 255.0); xReference = new PolyPolygonHairlinePrimitive2D( - aScaledOutline, + aScaledOutline, aGrayTone); } diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index 1247ba2785b6..c0d436964e89 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.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 @@ -49,10 +49,10 @@ namespace drawinglayer namespace primitive2d { ShadowPrimitive2D::ShadowPrimitive2D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maShadowTransform(rShadowTransform), maShadowColor(rShadowColor) { @@ -63,8 +63,8 @@ namespace drawinglayer if(BasePrimitive2D::operator==(rPrimitive)) { const ShadowPrimitive2D& rCompare = static_cast< const ShadowPrimitive2D& >(rPrimitive); - - return (getShadowTransform() == rCompare.getShadowTransform() + + return (getShadowTransform() == rCompare.getShadowTransform() && getShadowColor() == rCompare.getShadowColor()); } diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx index e6a0a1ce8dc9..4e26a06e02b7 100644 --- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.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 @@ -45,7 +45,7 @@ namespace drawinglayer StructureTagPrimitive2D::StructureTagPrimitive2D( const vcl::PDFWriter::StructElement& rStructureElement, const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maStructureElement(rStructureElement) { } diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index de799da011e1..2457e8f7be78 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.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 @@ -84,8 +84,8 @@ namespace drawinglayer // TextLayouterDevice is needed to get metrics for text decorations like // underline/strikeout/emphasis marks from it. For setup, the font size is needed aTextLayouter.setFontAttribute( - getFontAttribute(), - rDecTrans.getScale().getX(), + getFontAttribute(), + rDecTrans.getScale().getX(), rDecTrans.getScale().getY(), getLocale()); @@ -100,8 +100,8 @@ namespace drawinglayer { fTextWidth = rDXArray.back() * rDecTrans.getScale().getX(); const double fFontScaleX(rDecTrans.getScale().getX()); - - if(!basegfx::fTools::equal(fFontScaleX, 1.0) + + if(!basegfx::fTools::equal(fFontScaleX, 1.0) && !basegfx::fTools::equalZero(fFontScaleX)) { // need to take FontScaling out of the DXArray @@ -256,8 +256,8 @@ namespace drawinglayer { // ..but only completely when no DXArray aTextLayouter.setFontAttribute( - getFontAttribute(), - rDecTrans.getScale().getX(), + getFontAttribute(), + rDecTrans.getScale().getX(), rDecTrans.getScale().getY(), getLocale()); } @@ -278,7 +278,7 @@ namespace drawinglayer { // prepare new DXArray for the single word aNewDXArray = ::std::vector< double >( - getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextStart - getTextPosition()), + getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextStart - getTextPosition()), getDXArray().begin() + static_cast< sal_uInt32 >(nNewTextEnd - getTextPosition())); } @@ -286,7 +286,7 @@ namespace drawinglayer { // needs to be moved to a new start position double fOffset(0.0); - + if(bNoDXArray) { // evaluate using TextLayouter @@ -304,8 +304,8 @@ namespace drawinglayer // so FontScale would be double double fOffsetNoScale(fOffset); const double fFontScaleX(rDecTrans.getScale().getX()); - - if(!basegfx::fTools::equal(fFontScaleX, 1.0) + + if(!basegfx::fTools::equal(fFontScaleX, 1.0) && !basegfx::fTools::equalZero(fFontScaleX)) { fOffsetNoScale /= fFontScaleX; @@ -333,8 +333,8 @@ namespace drawinglayer // create geometry content for the single word. Do not forget // to use the new transformation basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose aDecTrans(aNewTransform); - - impCreateGeometryContent(rTarget, aDecTrans, getText(), nNewTextStart, + + impCreateGeometryContent(rTarget, aDecTrans, getText(), nNewTextStart, nNewTextEnd - nNewTextStart, aNewDXArray, aNewFontAttribute); if(aNextWordBoundary.endPos >= getTextPosition() + getTextLength()) @@ -348,14 +348,14 @@ namespace drawinglayer const sal_Int32 nLastEndPos(aNextWordBoundary.endPos); aNextWordBoundary = xLocalBreakIterator->getWordBoundary( - getText(), aNextWordBoundary.endPos, getLocale(), + getText(), aNextWordBoundary.endPos, getLocale(), ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True); if(nLastEndPos == aNextWordBoundary.endPos) { // backward hit, force next word aNextWordBoundary = xLocalBreakIterator->getWordBoundary( - getText(), nLastEndPos + 1, getLocale(), + getText(), nLastEndPos + 1, getLocale(), ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True); } @@ -532,7 +532,7 @@ namespace drawinglayer bool bEmphasisMarkBelow, TextRelief eTextRelief, bool bShadow) - : TextSimplePortionPrimitive2D(rNewTransform, rText, aTextPosition, aTextLength, rDXArray, rFontAttribute, rLocale, rFontColor), + : TextSimplePortionPrimitive2D(rNewTransform, rText, aTextPosition, aTextLength, rDXArray, rFontAttribute, rLocale, rFontColor), maOverlineColor(rOverlineColor), maTextlineColor(rTextlineColor), meFontOverline(eFontOverline), diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index 41e51c6e9e2f..cf29d00e3b9a 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.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 @@ -50,7 +50,7 @@ namespace drawinglayer // get the distance of one discrete units from target display. Use between 1.0 and sqrt(2) to // have good results on rotated objects, too - const basegfx::B2DVector aDistance(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aDistance(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(fDiscreteSize, fDiscreteSize)); const basegfx::B2DVector aDiagonalDistance(aDistance * (1.0 / 1.44)); @@ -114,7 +114,7 @@ namespace drawinglayer // add original, too aRetval[1] = Primitive2DReference(new GroupPrimitive2D(getTextContent())); } - + break; } case TEXTEFFECTSTYLE2D_OUTLINE: @@ -122,7 +122,7 @@ namespace drawinglayer // create transform primitives in all directions basegfx::B2DHomMatrix aTransform; aRetval.realloc(9); - + aTransform.set(0, 2, aDistance.getX()); aTransform.set(1, 2, 0.0); aRetval[0] = Primitive2DReference(new TransformPrimitive2D(aTransform, getTextContent())); @@ -171,7 +171,7 @@ namespace drawinglayer const basegfx::B2DPoint& rRotationCenter, double fDirection, TextEffectStyle2D eTextEffectStyle2D) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTextContent(rTextContent), maRotationCenter(rRotationCenter), mfDirection(fDirection), @@ -208,7 +208,7 @@ namespace drawinglayer } Primitive2DSequence TextEffectPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { + { ::osl::MutexGuard aGuard( m_aMutex ); if(getBuffered2DDecomposition().hasElements()) diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx index b9ad03531206..5247d4404ece 100644 --- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.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 @@ -92,13 +92,13 @@ namespace drawinglayer { switch(eFontStrikeout) { - case STRIKEOUT_SINGLE: return TEXT_STRIKEOUT_SINGLE; - case STRIKEOUT_DOUBLE: return TEXT_STRIKEOUT_DOUBLE; - case STRIKEOUT_BOLD: return TEXT_STRIKEOUT_BOLD; - case STRIKEOUT_SLASH: return TEXT_STRIKEOUT_SLASH; - case STRIKEOUT_X: return TEXT_STRIKEOUT_X; + case STRIKEOUT_SINGLE: return TEXT_STRIKEOUT_SINGLE; + case STRIKEOUT_DOUBLE: return TEXT_STRIKEOUT_DOUBLE; + case STRIKEOUT_BOLD: return TEXT_STRIKEOUT_BOLD; + case STRIKEOUT_SLASH: return TEXT_STRIKEOUT_SLASH; + case STRIKEOUT_X: return TEXT_STRIKEOUT_X; // FontStrikeout_FORCE_EQUAL_SIZE, STRIKEOUT_NONE, STRIKEOUT_DONTKNOW - default: return TEXT_STRIKEOUT_NONE; + default: return TEXT_STRIKEOUT_NONE; } } @@ -106,12 +106,12 @@ namespace drawinglayer { switch(eTextStrikeout) { - default: /*case primitive2d::TEXT_STRIKEOUT_NONE*/ return STRIKEOUT_NONE; - case TEXT_STRIKEOUT_SINGLE: return STRIKEOUT_SINGLE; - case TEXT_STRIKEOUT_DOUBLE: return STRIKEOUT_DOUBLE; - case TEXT_STRIKEOUT_BOLD: return STRIKEOUT_BOLD; - case TEXT_STRIKEOUT_SLASH: return STRIKEOUT_SLASH; - case TEXT_STRIKEOUT_X: return STRIKEOUT_X; + default: /*case primitive2d::TEXT_STRIKEOUT_NONE*/ return STRIKEOUT_NONE; + case TEXT_STRIKEOUT_SINGLE: return STRIKEOUT_SINGLE; + case TEXT_STRIKEOUT_DOUBLE: return STRIKEOUT_DOUBLE; + case TEXT_STRIKEOUT_BOLD: return STRIKEOUT_BOLD; + case TEXT_STRIKEOUT_SLASH: return STRIKEOUT_SLASH; + case TEXT_STRIKEOUT_X: return STRIKEOUT_X; } } diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index 4653a0437a3b..896b37252fdc 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.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 @@ -43,7 +43,7 @@ namespace drawinglayer namespace primitive2d { TextHierarchyLinePrimitive2D::TextHierarchyLinePrimitive2D(const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } @@ -60,7 +60,7 @@ namespace drawinglayer namespace primitive2d { TextHierarchyParagraphPrimitive2D::TextHierarchyParagraphPrimitive2D(const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } @@ -77,7 +77,7 @@ namespace drawinglayer namespace primitive2d { TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } @@ -94,7 +94,7 @@ namespace drawinglayer namespace primitive2d { TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } @@ -114,7 +114,7 @@ namespace drawinglayer const Primitive2DSequence& rChildren, const FieldType& rFieldType, const rtl::OUString& rString) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), meType(rFieldType), maString(rString) { @@ -145,7 +145,7 @@ namespace drawinglayer namespace primitive2d { TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren) + : GroupPrimitive2D(rChildren) { } diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index e6ce69866cc8..c3435333a3d3 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.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 @@ -45,9 +45,9 @@ namespace { class ImpTimedRefDev : public Timer { - ImpTimedRefDev** mppStaticPointerOnMe; - VirtualDevice* mpVirDev; - sal_uInt32 mnUseCount; + ImpTimedRefDev** mppStaticPointerOnMe; + VirtualDevice* mpVirDev; + sal_uInt32 mnUseCount; public: ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe); @@ -59,7 +59,7 @@ namespace }; ImpTimedRefDev::ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe) - : mppStaticPointerOnMe(ppStaticPointerOnMe), + : mppStaticPointerOnMe(ppStaticPointerOnMe), mpVirDev(0L), mnUseCount(0L) { @@ -146,7 +146,7 @@ namespace drawinglayer } TextLayouterDevice::TextLayouterDevice() - : mrDevice(acquireGlobalVirtualDevice()) + : mrDevice(acquireGlobalVirtualDevice()) { } @@ -161,15 +161,15 @@ namespace drawinglayer } void TextLayouterDevice::setFontAttribute( - const attribute::FontAttribute& rFontAttribute, - double fFontScaleX, + const attribute::FontAttribute& rFontAttribute, + double fFontScaleX, double fFontScaleY, const ::com::sun::star::lang::Locale& rLocale) { setFont(getVclFontFromFontAttribute( - rFontAttribute, - fFontScaleX, - fFontScaleY, + rFontAttribute, + fFontScaleX, + fFontScaleY, 0.0, rLocale)); } @@ -237,7 +237,7 @@ namespace drawinglayer { nTextLength = nStringLength - nIndex; } - + if(nDXArrayCount) { OSL_ENSURE(nDXArrayCount == nTextLength, "DXArray size does not correspond to text portion size (!)"); @@ -300,7 +300,7 @@ namespace drawinglayer if(!aRect.IsEmpty()) { return basegfx::B2DRange( - aRect.Left(), aRect.Top(), + aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom()); } } @@ -435,9 +435,9 @@ namespace drawinglayer } attribute::FontAttribute getFontAttributeFromVclFont( - basegfx::B2DVector& o_rSize, - const Font& rFont, - bool bRTL, + basegfx::B2DVector& o_rSize, + const Font& rFont, + bool bRTL, bool bBiDiStrong) { const attribute::FontAttribute aRetval( diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index b76056b5a219..f04021c77f7f 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.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 @@ -202,11 +202,11 @@ namespace drawinglayer aLine.append(basegfx::B2DPoint(0.0, fOffset)); aLine.append(basegfx::B2DPoint(getWidth(), fOffset)); - + const basegfx::B2DHomMatrix aUnscaledTransform( basegfx::tools::createShearXRotateTranslateB2DHomMatrix( fShearX, fRotate, aTranslate)); - + aLine.transform(aUnscaledTransform); if(bWaveLine) @@ -238,7 +238,7 @@ namespace drawinglayer // double line, create 2nd primitive with offset using TransformPrimitive based on // already created NewPrimitive double fLineDist(2.3 * fHeight); - + if(bWaveLine) { fLineDist = 6.3 * fHeight; @@ -258,7 +258,7 @@ namespace drawinglayer // add transform primitive const Primitive2DSequence aContent(&aNewPrimitive, 1); - appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, Primitive2DReference(new TransformPrimitive2D(aTransform, aContent))); } } 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); diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 98d7a64e2dfc..c278ba74949b 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.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 @@ -87,13 +87,13 @@ namespace drawinglayer // get decomposition getObjectTransformation().decompose(aScale, aTranslate, fRotate, fShearX); - + // prepare TextLayouter TextLayouterDevice aTextLayouter; - + aTextLayouter.setFontAttribute( - getFontAttribute(), - aScale.getX(), + getFontAttribute(), + aScale.getX(), aScale.getY(), getLocale()); @@ -177,7 +177,7 @@ namespace drawinglayer basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; getObjectTransformation().decompose(aScale, aTranslate, fRotate, fShearX); - + // set line attribute switch(getTextStrikeout()) { @@ -239,10 +239,10 @@ namespace drawinglayer aTransform.translate(aTranslate.getX(), aTranslate.getY()); // add transform primitive - appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, + appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, Primitive2DReference( new TransformPrimitive2D( - aTransform, + aTransform, xRetval))); } diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index b3f1e2e1b0a3..f8ad7e2e3608 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.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 @@ -44,9 +44,9 @@ namespace drawinglayer namespace primitive2d { TransformPrimitive2D::TransformPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + const basegfx::B2DHomMatrix& rTransformation, const Primitive2DSequence& rChildren) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maTransformation(rTransformation) { } diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx index 59d3b8dd7559..ab2f8c469cee 100644 --- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx @@ -51,9 +51,9 @@ namespace drawinglayer namespace primitive2d { TransparencePrimitive2D::TransparencePrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, const Primitive2DSequence& rTransparence) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), maTransparence(rTransparence) { } diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 6663fd920909..cd6384b41074 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -57,9 +57,9 @@ namespace drawinglayer namespace primitive2d { UnifiedTransparencePrimitive2D::UnifiedTransparencePrimitive2D( - const Primitive2DSequence& rChildren, + const Primitive2DSequence& rChildren, double fTransparence) - : GroupPrimitive2D(rChildren), + : GroupPrimitive2D(rChildren), mfTransparence(fTransparence) { } @@ -92,9 +92,9 @@ namespace drawinglayer } else if(getTransparence() > 0.0 && getTransparence() < 1.0) { - // The idea is to create a TransparencePrimitive2D with transparent content using a fill color - // corresponding to the transparence value. Problem is that in most systems, the right - // and bottom pixel array is not filled when filling polygons, thus this would not + // The idea is to create a TransparencePrimitive2D with transparent content using a fill color + // corresponding to the transparence value. Problem is that in most systems, the right + // and bottom pixel array is not filled when filling polygons, thus this would not // always produce a complete transparent bitmap. There are some solutions: // // - Grow the used polygon range by one discrete unit in X and Y. This @@ -106,13 +106,13 @@ namespace drawinglayer // - At this decomposition, add a filled polygon and a hairline polygon. This // solution stays view-independent. // - // I will take the last one here. The small overhead of two primitives will only be + // I will take the last one here. The small overhead of two primitives will only be // used when UnifiedTransparencePrimitive2D is not handled directly. const basegfx::B2DRange aPolygonRange(getB2DRangeFromPrimitive2DSequence(getChildren(), rViewInformation)); const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aPolygonRange)); const basegfx::BColor aGray(getTransparence(), getTransparence(), getTransparence()); Primitive2DSequence aTransparenceContent(2); - + aTransparenceContent[0] = Primitive2DReference(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPolygon), aGray)); aTransparenceContent[1] = Primitive2DReference(new PolygonHairlinePrimitive2D(aPolygon, aGray)); diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index 0213ba90a6c6..625cd5db13b9 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.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 @@ -58,12 +58,12 @@ namespace drawinglayer { // shortcut for scale; use simple BitmapPrimitive2D basegfx::B2DHomMatrix aObjectTransform; - + aObjectTransform.set(0, 0, getLocalObjectRange().getWidth()); aObjectTransform.set(1, 1, getLocalObjectRange().getHeight()); aObjectTransform.set(0, 2, getLocalObjectRange().getMinX()); aObjectTransform.set(1, 2, getLocalObjectRange().getMinY()); - + Primitive2DReference xReference( new BitmapPrimitive2D( getBitmapEx(), @@ -78,7 +78,7 @@ namespace drawinglayer aInverseViewTransformation.invert(); basegfx::B2DVector aLogicSize(rPixelSize.Width(), rPixelSize.Height()); aLogicSize = aInverseViewTransformation * aLogicSize; - + // apply laout basegfx::B2DPoint aTargetTopLeft(getLocalObjectRange().getMinimum()); bool bUseTargetTopLeft(true); @@ -157,18 +157,18 @@ namespace drawinglayer // create aligned, single BitmapPrimitive2D basegfx::B2DHomMatrix aObjectTransform; - + aObjectTransform.set(0, 0, aTargetRange.getWidth()); aObjectTransform.set(1, 1, aTargetRange.getHeight()); aObjectTransform.set(0, 2, aTargetRange.getMinX()); aObjectTransform.set(1, 2, aTargetRange.getMinY()); - + Primitive2DReference xReference( new BitmapPrimitive2D( getBitmapEx(), aObjectTransform)); aRetval = Primitive2DSequence(&xReference, 1); - + // clip when not completely inside object range bNeedsClipping = !getLocalObjectRange().isInside(aTargetRange); } @@ -196,12 +196,12 @@ namespace drawinglayer // create ObjectTransform basegfx::B2DHomMatrix aObjectTransform; - + aObjectTransform.set(0, 0, getLocalObjectRange().getWidth()); aObjectTransform.set(1, 1, getLocalObjectRange().getHeight()); aObjectTransform.set(0, 2, getLocalObjectRange().getMinX()); aObjectTransform.set(1, 2, getLocalObjectRange().getMinY()); - + // create FillBitmapPrimitive const drawinglayer::primitive2d::Primitive2DReference xFillBitmap( new drawinglayer::primitive2d::FillBitmapPrimitive2D( @@ -230,12 +230,12 @@ namespace drawinglayer return aRetval; } - + WallpaperBitmapPrimitive2D::WallpaperBitmapPrimitive2D( const basegfx::B2DRange& rObjectRange, const BitmapEx& rBitmapEx, WallpaperStyle eWallpaperStyle) - : ViewTransformationDependentPrimitive2D(), + : ViewTransformationDependentPrimitive2D(), maObjectRange(rObjectRange), maBitmapEx(rBitmapEx), meWallpaperStyle(eWallpaperStyle) @@ -255,7 +255,7 @@ namespace drawinglayer return false; } - + basegfx::B2DRange WallpaperBitmapPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { return getLocalObjectRange(); diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index 825251036d7a..2e38ed8bed31 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.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 @@ -44,7 +44,7 @@ namespace drawinglayer Primitive2DSequence WrongSpellPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { // ATM this decompose is view-independent, what the original VCL-Display is not. To mimic - // the old behaviour here if wanted it is necessary to add get2DDecomposition and implement + // the old behaviour here if wanted it is necessary to add get2DDecomposition and implement // it similar to the usage in e.g. HelplinePrimitive2D. Remembering the ViewTransformation // should be enough then. // The view-independent wavelines work well (if You ask me). Maybe the old VCL-Behaviour is only @@ -81,7 +81,7 @@ namespace drawinglayer // create the waveline primitive Primitive2DReference xPrimitive(new PolygonWavePrimitive2D(aPolygon, aLineAttribute, fWaveWidth, 0.5 * fWaveWidth)); Primitive2DSequence xRetval(&xPrimitive, 1); - + return xRetval; } @@ -90,7 +90,7 @@ namespace drawinglayer double fStart, double fStop, const basegfx::BColor& rColor) - : BufferedDecompositionPrimitive2D(), + : BufferedDecompositionPrimitive2D(), maTransformation(rTransformation), mfStart(fStart), mfStop(fStop), |