diff options
Diffstat (limited to 'drawinglayer/source')
115 files changed, 2116 insertions, 2103 deletions
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx index 348e9b4a37cc..856005cb9294 100644 --- a/drawinglayer/source/animation/animationtiming.cxx +++ b/drawinglayer/source/animation/animationtiming.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 @@ -51,7 +51,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// AnimationEntryFixed::AnimationEntryFixed(double fDuration, double fState) - : mfDuration(fDuration), + : mfDuration(fDuration), mfState(fState) { } @@ -69,7 +69,7 @@ namespace drawinglayer { const AnimationEntryFixed* pCompare = dynamic_cast< const AnimationEntryFixed* >(&rCandidate); - return (pCompare + return (pCompare && basegfx::fTools::equal(mfDuration, pCompare->mfDuration) && basegfx::fTools::equal(mfState, pCompare->mfState)); } @@ -99,7 +99,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// AnimationEntryLinear::AnimationEntryLinear(double fDuration, double fFrequency, double fStart, double fStop) - : mfDuration(fDuration), + : mfDuration(fDuration), mfFrequency(fFrequency), mfStart(fStart), mfStop(fStop) @@ -118,8 +118,8 @@ namespace drawinglayer bool AnimationEntryLinear::operator==(const AnimationEntry& rCandidate) const { const AnimationEntryLinear* pCompare = dynamic_cast< const AnimationEntryLinear* >(&rCandidate); - - return (pCompare + + return (pCompare && basegfx::fTools::equal(mfDuration, pCompare->mfDuration) && basegfx::fTools::equal(mfStart, pCompare->mfStart) && basegfx::fTools::equal(mfStop, pCompare->mfStop)); @@ -188,7 +188,7 @@ namespace drawinglayer } AnimationEntryList::AnimationEntryList() - : mfDuration(0.0) + : mfDuration(0.0) { } @@ -203,19 +203,19 @@ namespace drawinglayer AnimationEntry* AnimationEntryList::clone() const { AnimationEntryList* pNew = new AnimationEntryList(); - + for(sal_uInt32 a(0L); a < maEntries.size(); a++) { pNew->append(*maEntries[a]); } - + return pNew; } bool AnimationEntryList::operator==(const AnimationEntry& rCandidate) const { const AnimationEntryList* pCompare = dynamic_cast< const AnimationEntryList* >(&rCandidate); - + if(pCompare && mfDuration == pCompare->mfDuration) { for(sal_uInt32 a(0L); a < maEntries.size(); a++) @@ -285,7 +285,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// AnimationEntryLoop::AnimationEntryLoop(sal_uInt32 nRepeat) - : AnimationEntryList(), + : AnimationEntryList(), mnRepeat(nRepeat) { } @@ -297,20 +297,20 @@ namespace drawinglayer AnimationEntry* AnimationEntryLoop::clone() const { AnimationEntryLoop* pNew = new AnimationEntryLoop(mnRepeat); - + for(sal_uInt32 a(0L); a < maEntries.size(); a++) { pNew->append(*maEntries[a]); } - + return pNew; } bool AnimationEntryLoop::operator==(const AnimationEntry& rCandidate) const { const AnimationEntryLoop* pCompare = dynamic_cast< const AnimationEntryLoop* >(&rCandidate); - - return (pCompare + + return (pCompare && mnRepeat == pCompare->mnRepeat && AnimationEntryList::operator==(rCandidate)); } @@ -354,7 +354,7 @@ namespace drawinglayer const double fTimeAtLoopStart((double)nCurrentLoop * mfDuration); const double fRelativeTime(fTime - fTimeAtLoopStart); const double fNextEventAtLoop(AnimationEntryList::getNextEventTime(fRelativeTime)); - + if(!basegfx::fTools::equalZero(fNextEventAtLoop)) { fNewTime = fNextEventAtLoop + fTimeAtLoopStart; diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx index 89e5b721eae1..807564da2a28 100644 --- a/drawinglayer/source/attribute/fillbitmapattribute.cxx +++ b/drawinglayer/source/attribute/fillbitmapattribute.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 @@ -42,22 +42,22 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - BitmapEx maBitmapEx; - basegfx::B2DPoint maTopLeft; - basegfx::B2DVector maSize; + BitmapEx maBitmapEx; + basegfx::B2DPoint maTopLeft; + basegfx::B2DVector maSize; // bitfield - unsigned mbTiling : 1; + unsigned mbTiling : 1; ImpFillBitmapAttribute( - const BitmapEx& rBitmapEx, - const basegfx::B2DPoint& rTopLeft, - const basegfx::B2DVector& rSize, + const BitmapEx& rBitmapEx, + const basegfx::B2DPoint& rTopLeft, + const basegfx::B2DVector& rSize, bool bTiling) - : mnRefCount(0), + : mnRefCount(0), maBitmapEx(rBitmapEx), maTopLeft(rTopLeft), maSize(rSize), @@ -100,23 +100,23 @@ namespace drawinglayer }; FillBitmapAttribute::FillBitmapAttribute( - const BitmapEx& rBitmapEx, - const basegfx::B2DPoint& rTopLeft, - const basegfx::B2DVector& rSize, + const BitmapEx& rBitmapEx, + const basegfx::B2DPoint& rTopLeft, + const basegfx::B2DVector& rSize, bool bTiling) - : mpFillBitmapAttribute(new ImpFillBitmapAttribute( + : mpFillBitmapAttribute(new ImpFillBitmapAttribute( rBitmapEx, rTopLeft, rSize, bTiling)) { } FillBitmapAttribute::FillBitmapAttribute() - : mpFillBitmapAttribute(ImpFillBitmapAttribute::get_global_default()) + : mpFillBitmapAttribute(ImpFillBitmapAttribute::get_global_default()) { mpFillBitmapAttribute->mnRefCount++; } FillBitmapAttribute::FillBitmapAttribute(const FillBitmapAttribute& rCandidate) - : mpFillBitmapAttribute(rCandidate.mpFillBitmapAttribute) + : mpFillBitmapAttribute(rCandidate.mpFillBitmapAttribute) { mpFillBitmapAttribute->mnRefCount++; } @@ -150,7 +150,7 @@ namespace drawinglayer { delete mpFillBitmapAttribute; } - + mpFillBitmapAttribute = rCandidate.mpFillBitmapAttribute; mpFillBitmapAttribute->mnRefCount++; } @@ -173,24 +173,24 @@ namespace drawinglayer return (*rCandidate.mpFillBitmapAttribute == *mpFillBitmapAttribute); } - const BitmapEx& FillBitmapAttribute::getBitmapEx() const - { - return mpFillBitmapAttribute->getBitmapEx(); + const BitmapEx& FillBitmapAttribute::getBitmapEx() const + { + return mpFillBitmapAttribute->getBitmapEx(); } - const basegfx::B2DPoint& FillBitmapAttribute::getTopLeft() const - { - return mpFillBitmapAttribute->getTopLeft(); + const basegfx::B2DPoint& FillBitmapAttribute::getTopLeft() const + { + return mpFillBitmapAttribute->getTopLeft(); } - const basegfx::B2DVector& FillBitmapAttribute::getSize() const - { - return mpFillBitmapAttribute->getSize(); + const basegfx::B2DVector& FillBitmapAttribute::getSize() const + { + return mpFillBitmapAttribute->getSize(); } - bool FillBitmapAttribute::getTiling() const - { - return mpFillBitmapAttribute->getTiling(); + bool FillBitmapAttribute::getTiling() const + { + return mpFillBitmapAttribute->getTiling(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx index d89345dff74f..4bbebb700869 100644 --- a/drawinglayer/source/attribute/fillgradientattribute.cxx +++ b/drawinglayer/source/attribute/fillgradientattribute.cxx @@ -50,28 +50,28 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - GradientStyle meStyle; - double mfBorder; - double mfOffsetX; - double mfOffsetY; - double mfAngle; - basegfx::BColor maStartColor; - basegfx::BColor maEndColor; - sal_uInt16 mnSteps; + GradientStyle meStyle; + double mfBorder; + double mfOffsetX; + double mfOffsetY; + double mfAngle; + basegfx::BColor maStartColor; + basegfx::BColor maEndColor; + sal_uInt16 mnSteps; ImpFillGradientAttribute( - GradientStyle eStyle, - double fBorder, - double fOffsetX, - double fOffsetY, - double fAngle, - const basegfx::BColor& rStartColor, - const basegfx::BColor& rEndColor, + GradientStyle eStyle, + double fBorder, + double fOffsetX, + double fOffsetY, + double fAngle, + const basegfx::BColor& rStartColor, + const basegfx::BColor& rEndColor, sal_uInt16 nSteps) - : mnRefCount(0), + : mnRefCount(0), meStyle(eStyle), mfBorder(fBorder), mfOffsetX(fOffsetX), @@ -127,27 +127,27 @@ namespace drawinglayer }; FillGradientAttribute::FillGradientAttribute( - GradientStyle eStyle, - double fBorder, - double fOffsetX, - double fOffsetY, - double fAngle, - const basegfx::BColor& rStartColor, - const basegfx::BColor& rEndColor, + GradientStyle eStyle, + double fBorder, + double fOffsetX, + double fOffsetY, + double fAngle, + const basegfx::BColor& rStartColor, + const basegfx::BColor& rEndColor, sal_uInt16 nSteps) - : mpFillGradientAttribute(new ImpFillGradientAttribute( + : mpFillGradientAttribute(new ImpFillGradientAttribute( eStyle, fBorder, fOffsetX, fOffsetY, fAngle, rStartColor, rEndColor, nSteps)) { } FillGradientAttribute::FillGradientAttribute() - : mpFillGradientAttribute(ImpFillGradientAttribute::get_global_default()) + : mpFillGradientAttribute(ImpFillGradientAttribute::get_global_default()) { mpFillGradientAttribute->mnRefCount++; } FillGradientAttribute::FillGradientAttribute(const FillGradientAttribute& rCandidate) - : mpFillGradientAttribute(rCandidate.mpFillGradientAttribute) + : mpFillGradientAttribute(rCandidate.mpFillGradientAttribute) { mpFillGradientAttribute->mnRefCount++; } @@ -181,7 +181,7 @@ namespace drawinglayer { delete mpFillGradientAttribute; } - + mpFillGradientAttribute = rCandidate.mpFillGradientAttribute; mpFillGradientAttribute->mnRefCount++; } @@ -204,44 +204,44 @@ namespace drawinglayer return (*rCandidate.mpFillGradientAttribute == *mpFillGradientAttribute); } - const basegfx::BColor& FillGradientAttribute::getStartColor() const + const basegfx::BColor& FillGradientAttribute::getStartColor() const { - return mpFillGradientAttribute->getStartColor(); + return mpFillGradientAttribute->getStartColor(); } - const basegfx::BColor& FillGradientAttribute::getEndColor() const + const basegfx::BColor& FillGradientAttribute::getEndColor() const { - return mpFillGradientAttribute->getEndColor(); + return mpFillGradientAttribute->getEndColor(); } - double FillGradientAttribute::getBorder() const + double FillGradientAttribute::getBorder() const { - return mpFillGradientAttribute->getBorder(); + return mpFillGradientAttribute->getBorder(); } - double FillGradientAttribute::getOffsetX() const + double FillGradientAttribute::getOffsetX() const { - return mpFillGradientAttribute->getOffsetX(); + return mpFillGradientAttribute->getOffsetX(); } - double FillGradientAttribute::getOffsetY() const + double FillGradientAttribute::getOffsetY() const { - return mpFillGradientAttribute->getOffsetY(); + return mpFillGradientAttribute->getOffsetY(); } - double FillGradientAttribute::getAngle() const + double FillGradientAttribute::getAngle() const { - return mpFillGradientAttribute->getAngle(); + return mpFillGradientAttribute->getAngle(); } - GradientStyle FillGradientAttribute::getStyle() const + GradientStyle FillGradientAttribute::getStyle() const { - return mpFillGradientAttribute->getStyle(); + return mpFillGradientAttribute->getStyle(); } - sal_uInt16 FillGradientAttribute::getSteps() const + sal_uInt16 FillGradientAttribute::getSteps() const { - return mpFillGradientAttribute->getSteps(); + return mpFillGradientAttribute->getSteps(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx index c630a29e7857..92f57684ebfc 100644 --- a/drawinglayer/source/attribute/fillhatchattribute.cxx +++ b/drawinglayer/source/attribute/fillhatchattribute.cxx @@ -50,24 +50,24 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - HatchStyle meStyle; - double mfDistance; - double mfAngle; - basegfx::BColor maColor; + HatchStyle meStyle; + double mfDistance; + double mfAngle; + basegfx::BColor maColor; // bitfield - unsigned mbFillBackground : 1; + unsigned mbFillBackground : 1; ImpFillHatchAttribute( - HatchStyle eStyle, - double fDistance, - double fAngle, - const basegfx::BColor& rColor, + HatchStyle eStyle, + double fDistance, + double fAngle, + const basegfx::BColor& rColor, bool bFillBackground) - : mnRefCount(0), + : mnRefCount(0), meStyle(eStyle), mfDistance(fDistance), mfAngle(fAngle), @@ -113,24 +113,24 @@ namespace drawinglayer }; FillHatchAttribute::FillHatchAttribute( - HatchStyle eStyle, - double fDistance, - double fAngle, - const basegfx::BColor& rColor, + HatchStyle eStyle, + double fDistance, + double fAngle, + const basegfx::BColor& rColor, bool bFillBackground) - : mpFillHatchAttribute(new ImpFillHatchAttribute( + : mpFillHatchAttribute(new ImpFillHatchAttribute( eStyle, fDistance, fAngle, rColor, bFillBackground)) { } FillHatchAttribute::FillHatchAttribute() - : mpFillHatchAttribute(ImpFillHatchAttribute::get_global_default()) + : mpFillHatchAttribute(ImpFillHatchAttribute::get_global_default()) { mpFillHatchAttribute->mnRefCount++; } FillHatchAttribute::FillHatchAttribute(const FillHatchAttribute& rCandidate) - : mpFillHatchAttribute(rCandidate.mpFillHatchAttribute) + : mpFillHatchAttribute(rCandidate.mpFillHatchAttribute) { mpFillHatchAttribute->mnRefCount++; } @@ -164,7 +164,7 @@ namespace drawinglayer { delete mpFillHatchAttribute; } - + mpFillHatchAttribute = rCandidate.mpFillHatchAttribute; mpFillHatchAttribute->mnRefCount++; } @@ -188,31 +188,31 @@ namespace drawinglayer } // data read access - HatchStyle FillHatchAttribute::getStyle() const - { - return mpFillHatchAttribute->getStyle(); + HatchStyle FillHatchAttribute::getStyle() const + { + return mpFillHatchAttribute->getStyle(); } - double FillHatchAttribute::getDistance() const - { - return mpFillHatchAttribute->getDistance(); + double FillHatchAttribute::getDistance() const + { + return mpFillHatchAttribute->getDistance(); } - double FillHatchAttribute::getAngle() const - { - return mpFillHatchAttribute->getAngle(); + double FillHatchAttribute::getAngle() const + { + return mpFillHatchAttribute->getAngle(); } - const basegfx::BColor& FillHatchAttribute::getColor() const - { - return mpFillHatchAttribute->getColor(); + const basegfx::BColor& FillHatchAttribute::getColor() const + { + return mpFillHatchAttribute->getColor(); } - bool FillHatchAttribute::isFillBackground() const - { - return mpFillHatchAttribute->isFillBackground(); + bool FillHatchAttribute::isFillBackground() const + { + return mpFillHatchAttribute->isFillBackground(); } - + } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index 2554a6bb0d0c..7ec5dfd8e8a8 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.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 @@ -42,18 +42,18 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; /// core data - String maFamilyName; // Font Family Name - String maStyleName; // Font Style Name - sal_uInt16 mnWeight; // Font weight + String maFamilyName; // Font Family Name + String maStyleName; // Font Style Name + sal_uInt16 mnWeight; // Font weight /// bitfield - unsigned mbSymbol : 1; // Symbol Font Flag - unsigned mbVertical : 1; // Vertical Text Flag - unsigned mbItalic : 1; // Italic Flag - unsigned mbOutline : 1; // Outline Flag + unsigned mbSymbol : 1; // Symbol Font Flag + unsigned mbVertical : 1; // Vertical Text Flag + unsigned mbItalic : 1; // Italic Flag + unsigned mbOutline : 1; // Outline Flag unsigned mbRTL : 1; // RTL Flag unsigned mbBiDiStrong : 1; // BiDi Flag unsigned mbMonospaced : 1; @@ -69,7 +69,7 @@ namespace drawinglayer bool bOutline, bool bRTL, bool bBiDiStrong) - : mnRefCount(0), + : mnRefCount(0), maFamilyName(rFamilyName), maStyleName(rStyleName), mnWeight(nWeight), @@ -139,19 +139,19 @@ namespace drawinglayer bool bOutline, bool bRTL, bool bBiDiStrong) - : mpFontAttribute(new ImpFontAttribute( + : mpFontAttribute(new ImpFontAttribute( rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong)) { } FontAttribute::FontAttribute() - : mpFontAttribute(ImpFontAttribute::get_global_default()) + : mpFontAttribute(ImpFontAttribute::get_global_default()) { mpFontAttribute->mnRefCount++; } FontAttribute::FontAttribute(const FontAttribute& rCandidate) - : mpFontAttribute(rCandidate.mpFontAttribute) + : mpFontAttribute(rCandidate.mpFontAttribute) { mpFontAttribute->mnRefCount++; } @@ -185,7 +185,7 @@ namespace drawinglayer { delete mpFontAttribute; } - + mpFontAttribute = rCandidate.mpFontAttribute; mpFontAttribute->mnRefCount++; } @@ -208,49 +208,49 @@ namespace drawinglayer return (*rCandidate.mpFontAttribute == *mpFontAttribute); } - const String& FontAttribute::getFamilyName() const - { - return mpFontAttribute->getFamilyName(); + const String& FontAttribute::getFamilyName() const + { + return mpFontAttribute->getFamilyName(); } - const String& FontAttribute::getStyleName() const - { - return mpFontAttribute->getStyleName(); + const String& FontAttribute::getStyleName() const + { + return mpFontAttribute->getStyleName(); } - sal_uInt16 FontAttribute::getWeight() const - { - return mpFontAttribute->getWeight(); + sal_uInt16 FontAttribute::getWeight() const + { + return mpFontAttribute->getWeight(); } - bool FontAttribute::getSymbol() const - { - return mpFontAttribute->getSymbol(); + bool FontAttribute::getSymbol() const + { + return mpFontAttribute->getSymbol(); } - bool FontAttribute::getVertical() const - { - return mpFontAttribute->getVertical(); + bool FontAttribute::getVertical() const + { + return mpFontAttribute->getVertical(); } - bool FontAttribute::getItalic() const - { - return mpFontAttribute->getItalic(); + bool FontAttribute::getItalic() const + { + return mpFontAttribute->getItalic(); } - bool FontAttribute::getOutline() const - { - return mpFontAttribute->getOutline(); + bool FontAttribute::getOutline() const + { + return mpFontAttribute->getOutline(); } - bool FontAttribute::getRTL() const - { - return mpFontAttribute->getRTL(); + bool FontAttribute::getRTL() const + { + return mpFontAttribute->getRTL(); } - bool FontAttribute::getBiDiStrong() const - { - return mpFontAttribute->getBiDiStrong(); + bool FontAttribute::getBiDiStrong() const + { + return mpFontAttribute->getBiDiStrong(); } bool FontAttribute::getMonospaced() const diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx index 20fd9308ff06..30646cc692eb 100644 --- a/drawinglayer/source/attribute/lineattribute.cxx +++ b/drawinglayer/source/attribute/lineattribute.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 @@ -42,18 +42,18 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - basegfx::BColor maColor; // color - double mfWidth; // absolute line width - basegfx::B2DLineJoin meLineJoin; // type of LineJoin + basegfx::BColor maColor; // color + double mfWidth; // absolute line width + basegfx::B2DLineJoin meLineJoin; // type of LineJoin ImpLineAttribute( const basegfx::BColor& rColor, double fWidth, basegfx::B2DLineJoin aB2DLineJoin) - : mnRefCount(0), + : mnRefCount(0), maColor(rColor), mfWidth(fWidth), meLineJoin(aB2DLineJoin) @@ -95,19 +95,19 @@ namespace drawinglayer const basegfx::BColor& rColor, double fWidth, basegfx::B2DLineJoin aB2DLineJoin) - : mpLineAttribute(new ImpLineAttribute( + : mpLineAttribute(new ImpLineAttribute( rColor, fWidth, aB2DLineJoin)) { } LineAttribute::LineAttribute() - : mpLineAttribute(ImpLineAttribute::get_global_default()) + : mpLineAttribute(ImpLineAttribute::get_global_default()) { mpLineAttribute->mnRefCount++; } LineAttribute::LineAttribute(const LineAttribute& rCandidate) - : mpLineAttribute(rCandidate.mpLineAttribute) + : mpLineAttribute(rCandidate.mpLineAttribute) { mpLineAttribute->mnRefCount++; } @@ -141,7 +141,7 @@ namespace drawinglayer { delete mpLineAttribute; } - + mpLineAttribute = rCandidate.mpLineAttribute; mpLineAttribute->mnRefCount++; } @@ -164,19 +164,19 @@ namespace drawinglayer return (*rCandidate.mpLineAttribute == *mpLineAttribute); } - const basegfx::BColor& LineAttribute::getColor() const - { + const basegfx::BColor& LineAttribute::getColor() const + { return mpLineAttribute->getColor(); } - double LineAttribute::getWidth() const - { - return mpLineAttribute->getWidth(); + double LineAttribute::getWidth() const + { + return mpLineAttribute->getWidth(); } - - basegfx::B2DLineJoin LineAttribute::getLineJoin() const - { - return mpLineAttribute->getLineJoin(); + + basegfx::B2DLineJoin LineAttribute::getLineJoin() const + { + return mpLineAttribute->getLineJoin(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx index 0f022b8c9d1b..615aef0cab2d 100644 --- a/drawinglayer/source/attribute/linestartendattribute.cxx +++ b/drawinglayer/source/attribute/linestartendattribute.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,20 +43,20 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - double mfWidth; // absolute line StartEndGeometry base width - basegfx::B2DPolyPolygon maPolyPolygon; // the StartEndGeometry PolyPolygon + double mfWidth; // absolute line StartEndGeometry base width + basegfx::B2DPolyPolygon maPolyPolygon; // the StartEndGeometry PolyPolygon // bitfield - unsigned mbCentered : 1; // use centered to ineStart/End point? + unsigned mbCentered : 1; // use centered to ineStart/End point? ImpLineStartEndAttribute( - double fWidth, - const basegfx::B2DPolyPolygon& rPolyPolygon, + double fWidth, + const basegfx::B2DPolyPolygon& rPolyPolygon, bool bCentered) - : mnRefCount(0), + : mnRefCount(0), mfWidth(fWidth), maPolyPolygon(rPolyPolygon), mbCentered(bCentered) @@ -95,22 +95,22 @@ namespace drawinglayer }; LineStartEndAttribute::LineStartEndAttribute( - double fWidth, - const basegfx::B2DPolyPolygon& rPolyPolygon, + double fWidth, + const basegfx::B2DPolyPolygon& rPolyPolygon, bool bCentered) - : mpLineStartEndAttribute(new ImpLineStartEndAttribute( + : mpLineStartEndAttribute(new ImpLineStartEndAttribute( fWidth, rPolyPolygon, bCentered)) { } LineStartEndAttribute::LineStartEndAttribute() - : mpLineStartEndAttribute(ImpLineStartEndAttribute::get_global_default()) + : mpLineStartEndAttribute(ImpLineStartEndAttribute::get_global_default()) { mpLineStartEndAttribute->mnRefCount++; } LineStartEndAttribute::LineStartEndAttribute(const LineStartEndAttribute& rCandidate) - : mpLineStartEndAttribute(rCandidate.mpLineStartEndAttribute) + : mpLineStartEndAttribute(rCandidate.mpLineStartEndAttribute) { mpLineStartEndAttribute->mnRefCount++; } @@ -144,7 +144,7 @@ namespace drawinglayer { delete mpLineStartEndAttribute; } - + mpLineStartEndAttribute = rCandidate.mpLineStartEndAttribute; mpLineStartEndAttribute->mnRefCount++; } @@ -167,26 +167,26 @@ namespace drawinglayer return (*rCandidate.mpLineStartEndAttribute == *mpLineStartEndAttribute); } - double LineStartEndAttribute::getWidth() const - { - return mpLineStartEndAttribute->getWidth(); + double LineStartEndAttribute::getWidth() const + { + return mpLineStartEndAttribute->getWidth(); } - const basegfx::B2DPolyPolygon& LineStartEndAttribute::getB2DPolyPolygon() const - { - return mpLineStartEndAttribute->getB2DPolyPolygon(); + const basegfx::B2DPolyPolygon& LineStartEndAttribute::getB2DPolyPolygon() const + { + return mpLineStartEndAttribute->getB2DPolyPolygon(); } - bool LineStartEndAttribute::isCentered() const - { - return mpLineStartEndAttribute->isCentered(); + bool LineStartEndAttribute::isCentered() const + { + return mpLineStartEndAttribute->isCentered(); } - bool LineStartEndAttribute::isActive() const - { - return (0.0 != getWidth() - && 0 != getB2DPolyPolygon().count() - && 0 != getB2DPolyPolygon().getB2DPolygon(0).count()); + bool LineStartEndAttribute::isActive() const + { + return (0.0 != getWidth() + && 0 != getB2DPolyPolygon().count() + && 0 != getB2DPolyPolygon().getB2DPolygon(0).count()); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 0b56ace5df24..71486765eab6 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.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 @@ -42,16 +42,16 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // materialAttribute3D definitions - basegfx::BColor maColor; // object color - basegfx::BColor maSpecular; // material specular color - basegfx::BColor maEmission; // material emissive color - sal_uInt16 mnSpecularIntensity; // material specular intensity [0..128] + basegfx::BColor maColor; // object color + basegfx::BColor maSpecular; // material specular color + basegfx::BColor maEmission; // material emissive color + sal_uInt16 mnSpecularIntensity; // material specular intensity [0..128] ImpMaterialAttribute3D(const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) - : mnRefCount(0), + : mnRefCount(0), maColor(rColor), maSpecular(rSpecular), maEmission(rEmission), @@ -60,7 +60,7 @@ namespace drawinglayer } ImpMaterialAttribute3D(const basegfx::BColor& rColor) - : mnRefCount(0), + : mnRefCount(0), maColor(rColor), maSpecular(1.0, 1.0, 1.0), maEmission(), @@ -103,29 +103,29 @@ namespace drawinglayer }; MaterialAttribute3D::MaterialAttribute3D( - const basegfx::BColor& rColor, - const basegfx::BColor& rSpecular, - const basegfx::BColor& rEmission, + const basegfx::BColor& rColor, + const basegfx::BColor& rSpecular, + const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) - : mpMaterialAttribute3D(new ImpMaterialAttribute3D( + : mpMaterialAttribute3D(new ImpMaterialAttribute3D( rColor, rSpecular, rEmission, nSpecularIntensity)) { } MaterialAttribute3D::MaterialAttribute3D( const basegfx::BColor& rColor) - : mpMaterialAttribute3D(new ImpMaterialAttribute3D(rColor)) + : mpMaterialAttribute3D(new ImpMaterialAttribute3D(rColor)) { } MaterialAttribute3D::MaterialAttribute3D() - : mpMaterialAttribute3D(ImpMaterialAttribute3D::get_global_default()) + : mpMaterialAttribute3D(ImpMaterialAttribute3D::get_global_default()) { mpMaterialAttribute3D->mnRefCount++; } MaterialAttribute3D::MaterialAttribute3D(const MaterialAttribute3D& rCandidate) - : mpMaterialAttribute3D(rCandidate.mpMaterialAttribute3D) + : mpMaterialAttribute3D(rCandidate.mpMaterialAttribute3D) { mpMaterialAttribute3D->mnRefCount++; } @@ -159,7 +159,7 @@ namespace drawinglayer { delete mpMaterialAttribute3D; } - + mpMaterialAttribute3D = rCandidate.mpMaterialAttribute3D; mpMaterialAttribute3D->mnRefCount++; } @@ -182,24 +182,24 @@ namespace drawinglayer return (*rCandidate.mpMaterialAttribute3D == *mpMaterialAttribute3D); } - const basegfx::BColor& MaterialAttribute3D::getColor() const - { + const basegfx::BColor& MaterialAttribute3D::getColor() const + { return mpMaterialAttribute3D->getColor(); } - const basegfx::BColor& MaterialAttribute3D::getSpecular() const - { + const basegfx::BColor& MaterialAttribute3D::getSpecular() const + { return mpMaterialAttribute3D->getSpecular(); } - const basegfx::BColor& MaterialAttribute3D::getEmission() const - { + const basegfx::BColor& MaterialAttribute3D::getEmission() const + { return mpMaterialAttribute3D->getEmission(); } - sal_uInt16 MaterialAttribute3D::getSpecularIntensity() const - { - return mpMaterialAttribute3D->getSpecularIntensity(); + sal_uInt16 MaterialAttribute3D::getSpecularIntensity() const + { + return mpMaterialAttribute3D->getSpecularIntensity(); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx index 33b5a3155089..a5daed92ad82 100644 --- a/drawinglayer/source/attribute/sdrallattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrallattribute3d.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 @@ -38,12 +38,12 @@ namespace drawinglayer namespace attribute { SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D( - const SdrLineAttribute& rLine, - const SdrFillAttribute& rFill, - const SdrLineStartEndAttribute& rLineStartEnd, - const SdrShadowAttribute& rShadow, + const SdrLineAttribute& rLine, + const SdrFillAttribute& rFill, + const SdrLineStartEndAttribute& rLineStartEnd, + const SdrShadowAttribute& rShadow, const FillGradientAttribute& rFillFloatTransGradient) - : maLine(rLine), + : maLine(rLine), maFill(rFill), maLineStartEnd(rLineStartEnd), maShadow(rShadow), @@ -52,7 +52,7 @@ namespace drawinglayer } SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D() - : maLine(), + : maLine(), maFill(), maLineStartEnd(), maShadow(), diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx index 9dd5a668e646..8a1cbda055df 100644 --- a/drawinglayer/source/attribute/sdrfillattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillattribute.cxx @@ -53,23 +53,23 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // fill definitions - double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. - basegfx::BColor maColor; // fill color - FillGradientAttribute maGradient; // fill gradient (if used) - FillHatchAttribute maHatch; // fill hatch (if used) - SdrFillBitmapAttribute maBitmap; // fill bitmap (if used) + double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. + basegfx::BColor maColor; // fill color + FillGradientAttribute maGradient; // fill gradient (if used) + FillHatchAttribute maHatch; // fill hatch (if used) + SdrFillBitmapAttribute maBitmap; // fill bitmap (if used) public: ImpSdrFillAttribute( - double fTransparence, - const basegfx::BColor& rColor, - const FillGradientAttribute& rGradient, - const FillHatchAttribute& rHatch, + double fTransparence, + const basegfx::BColor& rColor, + const FillGradientAttribute& rGradient, + const FillHatchAttribute& rHatch, const SdrFillBitmapAttribute& rBitmap) - : mnRefCount(0), + : mnRefCount(0), mfTransparence(fTransparence), maColor(rColor), maGradient(rGradient), @@ -79,7 +79,7 @@ namespace drawinglayer } // data read access - double getTransparence() const { return mfTransparence; } + double getTransparence() const { return mfTransparence; } const basegfx::BColor& getColor() const { return maColor; } const FillGradientAttribute& getGradient() const { return maGradient; } const FillHatchAttribute& getHatch() const { return maHatch; } @@ -102,7 +102,7 @@ namespace drawinglayer if(!pDefault) { pDefault = new ImpSdrFillAttribute( - 0.0, + 0.0, basegfx::BColor(), FillGradientAttribute(), FillHatchAttribute(), @@ -117,24 +117,24 @@ namespace drawinglayer }; SdrFillAttribute::SdrFillAttribute( - double fTransparence, - const basegfx::BColor& rColor, - const FillGradientAttribute& rGradient, - const FillHatchAttribute& rHatch, + double fTransparence, + const basegfx::BColor& rColor, + const FillGradientAttribute& rGradient, + const FillHatchAttribute& rHatch, const SdrFillBitmapAttribute& rBitmap) - : mpSdrFillAttribute(new ImpSdrFillAttribute( + : mpSdrFillAttribute(new ImpSdrFillAttribute( fTransparence, rColor, rGradient, rHatch, rBitmap)) { } SdrFillAttribute::SdrFillAttribute() - : mpSdrFillAttribute(ImpSdrFillAttribute::get_global_default()) + : mpSdrFillAttribute(ImpSdrFillAttribute::get_global_default()) { mpSdrFillAttribute->mnRefCount++; } SdrFillAttribute::SdrFillAttribute(const SdrFillAttribute& rCandidate) - : mpSdrFillAttribute(rCandidate.mpSdrFillAttribute) + : mpSdrFillAttribute(rCandidate.mpSdrFillAttribute) { mpSdrFillAttribute->mnRefCount++; } @@ -168,7 +168,7 @@ namespace drawinglayer { delete mpSdrFillAttribute; } - + mpSdrFillAttribute = rCandidate.mpSdrFillAttribute; mpSdrFillAttribute->mnRefCount++; } @@ -191,29 +191,29 @@ namespace drawinglayer return (*rCandidate.mpSdrFillAttribute == *mpSdrFillAttribute); } - double SdrFillAttribute::getTransparence() const - { - return mpSdrFillAttribute->getTransparence(); + double SdrFillAttribute::getTransparence() const + { + return mpSdrFillAttribute->getTransparence(); } - const basegfx::BColor& SdrFillAttribute::getColor() const - { - return mpSdrFillAttribute->getColor(); + const basegfx::BColor& SdrFillAttribute::getColor() const + { + return mpSdrFillAttribute->getColor(); } - const FillGradientAttribute& SdrFillAttribute::getGradient() const - { - return mpSdrFillAttribute->getGradient(); + const FillGradientAttribute& SdrFillAttribute::getGradient() const + { + return mpSdrFillAttribute->getGradient(); } - const FillHatchAttribute& SdrFillAttribute::getHatch() const - { - return mpSdrFillAttribute->getHatch(); + const FillHatchAttribute& SdrFillAttribute::getHatch() const + { + return mpSdrFillAttribute->getHatch(); } - const SdrFillBitmapAttribute& SdrFillAttribute::getBitmap() const - { - return mpSdrFillAttribute->getBitmap(); + const SdrFillBitmapAttribute& SdrFillAttribute::getBitmap() const + { + return mpSdrFillAttribute->getBitmap(); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx index f718ce8f81ab..3ef2c572a640 100644 --- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.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,30 +43,30 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - Bitmap maBitmap; - basegfx::B2DVector maSize; - basegfx::B2DVector maOffset; - basegfx::B2DVector maOffsetPosition; - basegfx::B2DVector maRectPoint; + Bitmap maBitmap; + basegfx::B2DVector maSize; + basegfx::B2DVector maOffset; + basegfx::B2DVector maOffsetPosition; + basegfx::B2DVector maRectPoint; // bitfield - unsigned mbTiling : 1; - unsigned mbStretch : 1; - unsigned mbLogSize : 1; + unsigned mbTiling : 1; + unsigned mbStretch : 1; + unsigned mbLogSize : 1; ImpSdrFillBitmapAttribute( - const Bitmap& rBitmap, - const basegfx::B2DVector& rSize, + const Bitmap& rBitmap, + const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, - const basegfx::B2DVector& rOffsetPosition, + const basegfx::B2DVector& rOffsetPosition, const basegfx::B2DVector& rRectPoint, - bool bTiling, - bool bStretch, + bool bTiling, + bool bStretch, bool bLogSize) - : mnRefCount(0), + : mnRefCount(0), maBitmap(rBitmap), maSize(rSize), maOffset(rOffset), @@ -95,11 +95,11 @@ namespace drawinglayer && getOffset() == rCandidate.getOffset() && getOffsetPosition() == rCandidate.getOffsetPosition() && getRectPoint() == rCandidate.getRectPoint() - && getTiling() == rCandidate.getTiling() - && getStretch() == rCandidate.getStretch() + && getTiling() == rCandidate.getTiling() + && getStretch() == rCandidate.getStretch() && getLogSize() == rCandidate.getLogSize()); } - + static ImpSdrFillBitmapAttribute* get_global_default() { static ImpSdrFillBitmapAttribute* pDefault = 0; @@ -112,8 +112,8 @@ namespace drawinglayer basegfx::B2DVector(), basegfx::B2DVector(), basegfx::B2DVector(), - false, - false, + false, + false, false); // never delete; start with RefCount 1, not 0 @@ -125,27 +125,27 @@ namespace drawinglayer }; SdrFillBitmapAttribute::SdrFillBitmapAttribute( - const Bitmap& rBitmap, - const basegfx::B2DVector& rSize, + const Bitmap& rBitmap, + const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, - const basegfx::B2DVector& rOffsetPosition, + const basegfx::B2DVector& rOffsetPosition, const basegfx::B2DVector& rRectPoint, - bool bTiling, - bool bStretch, + bool bTiling, + bool bStretch, bool bLogSize) - : mpSdrFillBitmapAttribute(new ImpSdrFillBitmapAttribute( + : mpSdrFillBitmapAttribute(new ImpSdrFillBitmapAttribute( rBitmap, rSize, rOffset, rOffsetPosition, rRectPoint, bTiling, bStretch, bLogSize)) { } SdrFillBitmapAttribute::SdrFillBitmapAttribute() - : mpSdrFillBitmapAttribute(ImpSdrFillBitmapAttribute::get_global_default()) + : mpSdrFillBitmapAttribute(ImpSdrFillBitmapAttribute::get_global_default()) { mpSdrFillBitmapAttribute->mnRefCount++; } SdrFillBitmapAttribute::SdrFillBitmapAttribute(const SdrFillBitmapAttribute& rCandidate) - : mpSdrFillBitmapAttribute(rCandidate.mpSdrFillBitmapAttribute) + : mpSdrFillBitmapAttribute(rCandidate.mpSdrFillBitmapAttribute) { mpSdrFillBitmapAttribute->mnRefCount++; } @@ -179,7 +179,7 @@ namespace drawinglayer { delete mpSdrFillBitmapAttribute; } - + mpSdrFillBitmapAttribute = rCandidate.mpSdrFillBitmapAttribute; mpSdrFillBitmapAttribute->mnRefCount++; } @@ -202,44 +202,44 @@ namespace drawinglayer return (*rCandidate.mpSdrFillBitmapAttribute == *mpSdrFillBitmapAttribute); } - const Bitmap& SdrFillBitmapAttribute::getBitmap() const - { - return mpSdrFillBitmapAttribute->getBitmap(); + const Bitmap& SdrFillBitmapAttribute::getBitmap() const + { + return mpSdrFillBitmapAttribute->getBitmap(); } - const basegfx::B2DVector& SdrFillBitmapAttribute::getSize() const - { - return mpSdrFillBitmapAttribute->getSize(); + const basegfx::B2DVector& SdrFillBitmapAttribute::getSize() const + { + return mpSdrFillBitmapAttribute->getSize(); } - const basegfx::B2DVector& SdrFillBitmapAttribute::getOffset() const - { - return mpSdrFillBitmapAttribute->getOffset(); + const basegfx::B2DVector& SdrFillBitmapAttribute::getOffset() const + { + return mpSdrFillBitmapAttribute->getOffset(); } - const basegfx::B2DVector& SdrFillBitmapAttribute::getOffsetPosition() const - { - return mpSdrFillBitmapAttribute->getOffsetPosition(); + const basegfx::B2DVector& SdrFillBitmapAttribute::getOffsetPosition() const + { + return mpSdrFillBitmapAttribute->getOffsetPosition(); } - const basegfx::B2DVector& SdrFillBitmapAttribute::getRectPoint() const - { - return mpSdrFillBitmapAttribute->getRectPoint(); + const basegfx::B2DVector& SdrFillBitmapAttribute::getRectPoint() const + { + return mpSdrFillBitmapAttribute->getRectPoint(); } - bool SdrFillBitmapAttribute::getTiling() const - { - return mpSdrFillBitmapAttribute->getTiling(); + bool SdrFillBitmapAttribute::getTiling() const + { + return mpSdrFillBitmapAttribute->getTiling(); } - bool SdrFillBitmapAttribute::getStretch() const - { - return mpSdrFillBitmapAttribute->getStretch(); + bool SdrFillBitmapAttribute::getStretch() const + { + return mpSdrFillBitmapAttribute->getStretch(); } - bool SdrFillBitmapAttribute::getLogSize() const - { - return mpSdrFillBitmapAttribute->getLogSize(); + bool SdrFillBitmapAttribute::getLogSize() const + { + return mpSdrFillBitmapAttribute->getLogSize(); } FillBitmapAttribute SdrFillBitmapAttribute::getFillBitmapAttribute(const basegfx::B2DRange& rRange) const diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx index 01db18350bc0..025ed4285c28 100644 --- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx @@ -51,20 +51,20 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // 3D light attribute definitions - basegfx::BColor maColor; - basegfx::B3DVector maDirection; + basegfx::BColor maColor; + basegfx::B3DVector maDirection; // bitfield - unsigned mbSpecular : 1; + unsigned mbSpecular : 1; ImpSdr3DLightAttribute( - const basegfx::BColor& rColor, - const basegfx::B3DVector& rDirection, + const basegfx::BColor& rColor, + const basegfx::B3DVector& rDirection, bool bSpecular) - : mnRefCount(0), + : mnRefCount(0), maColor(rColor), maDirection(rDirection), mbSpecular(bSpecular) @@ -82,7 +82,7 @@ namespace drawinglayer && getDirection() == rCandidate.getDirection() && getSpecular() == rCandidate.getSpecular()); } - + static ImpSdr3DLightAttribute* get_global_default() { static ImpSdr3DLightAttribute* pDefault = 0; @@ -103,22 +103,22 @@ namespace drawinglayer }; Sdr3DLightAttribute::Sdr3DLightAttribute( - const basegfx::BColor& rColor, - const basegfx::B3DVector& rDirection, + const basegfx::BColor& rColor, + const basegfx::B3DVector& rDirection, bool bSpecular) - : mpSdr3DLightAttribute(new ImpSdr3DLightAttribute( + : mpSdr3DLightAttribute(new ImpSdr3DLightAttribute( rColor, rDirection, bSpecular)) { } Sdr3DLightAttribute::Sdr3DLightAttribute() - : mpSdr3DLightAttribute(ImpSdr3DLightAttribute::get_global_default()) + : mpSdr3DLightAttribute(ImpSdr3DLightAttribute::get_global_default()) { mpSdr3DLightAttribute->mnRefCount++; } Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate) - : mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute) + : mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute) { mpSdr3DLightAttribute->mnRefCount++; } @@ -152,7 +152,7 @@ namespace drawinglayer { delete mpSdr3DLightAttribute; } - + mpSdr3DLightAttribute = rCandidate.mpSdr3DLightAttribute; mpSdr3DLightAttribute->mnRefCount++; } @@ -175,19 +175,19 @@ namespace drawinglayer return (*rCandidate.mpSdr3DLightAttribute == *mpSdr3DLightAttribute); } - const basegfx::BColor& Sdr3DLightAttribute::getColor() const - { - return mpSdr3DLightAttribute->getColor(); + const basegfx::BColor& Sdr3DLightAttribute::getColor() const + { + return mpSdr3DLightAttribute->getColor(); } - const basegfx::B3DVector& Sdr3DLightAttribute::getDirection() const - { - return mpSdr3DLightAttribute->getDirection(); + const basegfx::B3DVector& Sdr3DLightAttribute::getDirection() const + { + return mpSdr3DLightAttribute->getDirection(); } - bool Sdr3DLightAttribute::getSpecular() const - { - return mpSdr3DLightAttribute->getSpecular(); + bool Sdr3DLightAttribute::getSpecular() const + { + return mpSdr3DLightAttribute->getSpecular(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx index c50ab509990e..9aa7a8c9a7f5 100644 --- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx @@ -52,16 +52,16 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // 3D light attribute definitions - basegfx::BColor maAmbientLight; - ::std::vector< Sdr3DLightAttribute > maLightVector; + basegfx::BColor maAmbientLight; + ::std::vector< Sdr3DLightAttribute > maLightVector; ImpSdrLightingAttribute( const basegfx::BColor& rAmbientLight, const ::std::vector< Sdr3DLightAttribute >& rLightVector) - : mnRefCount(0), + : mnRefCount(0), maAmbientLight(rAmbientLight), maLightVector(rLightVector) { @@ -76,7 +76,7 @@ namespace drawinglayer return (getAmbientLight() == rCandidate.getAmbientLight() && getLightVector() == rCandidate.getLightVector()); } - + static ImpSdrLightingAttribute* get_global_default() { static ImpSdrLightingAttribute* pDefault = 0; @@ -98,19 +98,19 @@ namespace drawinglayer SdrLightingAttribute::SdrLightingAttribute( const basegfx::BColor& rAmbientLight, const ::std::vector< Sdr3DLightAttribute >& rLightVector) - : mpSdrLightingAttribute(new ImpSdrLightingAttribute( + : mpSdrLightingAttribute(new ImpSdrLightingAttribute( rAmbientLight, rLightVector)) { } SdrLightingAttribute::SdrLightingAttribute() - : mpSdrLightingAttribute(ImpSdrLightingAttribute::get_global_default()) + : mpSdrLightingAttribute(ImpSdrLightingAttribute::get_global_default()) { mpSdrLightingAttribute->mnRefCount++; } SdrLightingAttribute::SdrLightingAttribute(const SdrLightingAttribute& rCandidate) - : mpSdrLightingAttribute(rCandidate.mpSdrLightingAttribute) + : mpSdrLightingAttribute(rCandidate.mpSdrLightingAttribute) { mpSdrLightingAttribute->mnRefCount++; } @@ -144,7 +144,7 @@ namespace drawinglayer { delete mpSdrLightingAttribute; } - + mpSdrLightingAttribute = rCandidate.mpSdrLightingAttribute; mpSdrLightingAttribute->mnRefCount++; } @@ -167,20 +167,20 @@ namespace drawinglayer return (*rCandidate.mpSdrLightingAttribute == *mpSdrLightingAttribute); } - const basegfx::BColor& SdrLightingAttribute::getAmbientLight() const - { - return mpSdrLightingAttribute->getAmbientLight(); + const basegfx::BColor& SdrLightingAttribute::getAmbientLight() const + { + return mpSdrLightingAttribute->getAmbientLight(); } - - const ::std::vector< Sdr3DLightAttribute >& SdrLightingAttribute::getLightVector() const - { - return mpSdrLightingAttribute->getLightVector(); + + const ::std::vector< Sdr3DLightAttribute >& SdrLightingAttribute::getLightVector() const + { + return mpSdrLightingAttribute->getLightVector(); } // color model solver basegfx::BColor SdrLightingAttribute::solveColorModel( - const basegfx::B3DVector& rNormalInEyeCoordinates, - const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, + const basegfx::B3DVector& rNormalInEyeCoordinates, + const basegfx::BColor& rColor, const basegfx::BColor& rSpecular, const basegfx::BColor& rEmission, sal_uInt16 nSpecularIntensity) const { // initialize with emissive color @@ -191,13 +191,13 @@ namespace drawinglayer // prepare light access. Is there a light? const sal_uInt32 nLightCount(mpSdrLightingAttribute->getLightVector().size()); - + if(nLightCount && !rNormalInEyeCoordinates.equalZero()) { // prepare normal basegfx::B3DVector aEyeNormal(rNormalInEyeCoordinates); aEyeNormal.normalize(); - + for(sal_uInt32 a(0L); a < nLightCount; a++) { const Sdr3DLightAttribute& rLight(mpSdrLightingAttribute->getLightVector()[a]); diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index d7e10824448f..47517274dbfb 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -50,24 +50,24 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // line definitions - basegfx::B2DLineJoin meJoin; // B2DLINEJOIN_* defines - double mfWidth; // 1/100th mm, 0.0==hair - double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. - basegfx::BColor maColor; // color of line - ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern - double mfFullDotDashLen; // sum of maDotDashArray (for convenience) + basegfx::B2DLineJoin meJoin; // B2DLINEJOIN_* defines + double mfWidth; // 1/100th mm, 0.0==hair + double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. + basegfx::BColor maColor; // color of line + ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern + double mfFullDotDashLen; // sum of maDotDashArray (for convenience) ImpSdrLineAttribute( - basegfx::B2DLineJoin eJoin, - double fWidth, - double fTransparence, - const basegfx::BColor& rColor, - const ::std::vector< double >& rDotDashArray, + basegfx::B2DLineJoin eJoin, + double fWidth, + double fTransparence, + const basegfx::BColor& rColor, + const ::std::vector< double >& rDotDashArray, double fFullDotDashLen) - : mnRefCount(0), + : mnRefCount(0), meJoin(eJoin), mfWidth(fWidth), mfTransparence(fTransparence), @@ -78,7 +78,7 @@ namespace drawinglayer } ImpSdrLineAttribute(const basegfx::BColor& rColor) - : mnRefCount(0), + : mnRefCount(0), meJoin(basegfx::B2DLINEJOIN_NONE), mfWidth(0.0), mfTransparence(0.0), @@ -87,7 +87,7 @@ namespace drawinglayer mfFullDotDashLen(0.0) { } - + // data read access basegfx::B2DLineJoin getJoin() const { return meJoin; } double getWidth() const { return mfWidth; } @@ -112,11 +112,11 @@ namespace drawinglayer if(!pDefault) { pDefault = new ImpSdrLineAttribute( - basegfx::B2DLINEJOIN_ROUND, - 0.0, - 0.0, + basegfx::B2DLINEJOIN_ROUND, + 0.0, + 0.0, basegfx::BColor(), - std::vector< double >(), + std::vector< double >(), 0.0); // never delete; start with RefCount 1, not 0 @@ -128,31 +128,31 @@ namespace drawinglayer }; SdrLineAttribute::SdrLineAttribute( - basegfx::B2DLineJoin eJoin, - double fWidth, - double fTransparence, - const basegfx::BColor& rColor, - const ::std::vector< double >& rDotDashArray, + basegfx::B2DLineJoin eJoin, + double fWidth, + double fTransparence, + const basegfx::BColor& rColor, + const ::std::vector< double >& rDotDashArray, double fFullDotDashLen) - : mpSdrLineAttribute(new ImpSdrLineAttribute( + : mpSdrLineAttribute(new ImpSdrLineAttribute( eJoin, fWidth, fTransparence, rColor, rDotDashArray, fFullDotDashLen)) { } SdrLineAttribute::SdrLineAttribute( const basegfx::BColor& rColor) - : mpSdrLineAttribute(new ImpSdrLineAttribute(rColor)) + : mpSdrLineAttribute(new ImpSdrLineAttribute(rColor)) { } SdrLineAttribute::SdrLineAttribute() - : mpSdrLineAttribute(ImpSdrLineAttribute::get_global_default()) + : mpSdrLineAttribute(ImpSdrLineAttribute::get_global_default()) { mpSdrLineAttribute->mnRefCount++; } SdrLineAttribute::SdrLineAttribute(const SdrLineAttribute& rCandidate) - : mpSdrLineAttribute(rCandidate.mpSdrLineAttribute) + : mpSdrLineAttribute(rCandidate.mpSdrLineAttribute) { mpSdrLineAttribute->mnRefCount++; } @@ -186,7 +186,7 @@ namespace drawinglayer { delete mpSdrLineAttribute; } - + mpSdrLineAttribute = rCandidate.mpSdrLineAttribute; mpSdrLineAttribute->mnRefCount++; } @@ -209,39 +209,39 @@ namespace drawinglayer return (*rCandidate.mpSdrLineAttribute == *mpSdrLineAttribute); } - basegfx::B2DLineJoin SdrLineAttribute::getJoin() const - { - return mpSdrLineAttribute->getJoin(); + basegfx::B2DLineJoin SdrLineAttribute::getJoin() const + { + return mpSdrLineAttribute->getJoin(); } - double SdrLineAttribute::getWidth() const - { - return mpSdrLineAttribute->getWidth(); + double SdrLineAttribute::getWidth() const + { + return mpSdrLineAttribute->getWidth(); } - double SdrLineAttribute::getTransparence() const - { - return mpSdrLineAttribute->getTransparence(); + double SdrLineAttribute::getTransparence() const + { + return mpSdrLineAttribute->getTransparence(); } - const basegfx::BColor& SdrLineAttribute::getColor() const - { - return mpSdrLineAttribute->getColor(); + const basegfx::BColor& SdrLineAttribute::getColor() const + { + return mpSdrLineAttribute->getColor(); } - const ::std::vector< double >& SdrLineAttribute::getDotDashArray() const - { - return mpSdrLineAttribute->getDotDashArray(); + const ::std::vector< double >& SdrLineAttribute::getDotDashArray() const + { + return mpSdrLineAttribute->getDotDashArray(); } - double SdrLineAttribute::getFullDotDashLen() const - { - return mpSdrLineAttribute->getFullDotDashLen(); + double SdrLineAttribute::getFullDotDashLen() const + { + return mpSdrLineAttribute->getFullDotDashLen(); } - bool SdrLineAttribute::isDashed() const - { - return (0L != getDotDashArray().size()); + bool SdrLineAttribute::isDashed() const + { + return (0L != getDotDashArray().size()); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx index d943a91ad723..a4671372251c 100644 --- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx +++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx @@ -50,30 +50,30 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // line arrow definitions - basegfx::B2DPolyPolygon maStartPolyPolygon; // start Line PolyPolygon - basegfx::B2DPolyPolygon maEndPolyPolygon; // end Line PolyPolygon - double mfStartWidth; // 1/100th mm - double mfEndWidth; // 1/100th mm + basegfx::B2DPolyPolygon maStartPolyPolygon; // start Line PolyPolygon + basegfx::B2DPolyPolygon maEndPolyPolygon; // end Line PolyPolygon + double mfStartWidth; // 1/100th mm + double mfEndWidth; // 1/100th mm // bitfield - unsigned mbStartActive : 1L; // start of Line is active - unsigned mbEndActive : 1L; // end of Line is active - unsigned mbStartCentered : 1L; // Line is centered on line start point - unsigned mbEndCentered : 1L; // Line is centered on line end point - + unsigned mbStartActive : 1L; // start of Line is active + unsigned mbEndActive : 1L; // end of Line is active + unsigned mbStartCentered : 1L; // Line is centered on line start point + unsigned mbEndCentered : 1L; // Line is centered on line end point + ImpSdrLineStartEndAttribute( - const basegfx::B2DPolyPolygon& rStartPolyPolygon, + const basegfx::B2DPolyPolygon& rStartPolyPolygon, const basegfx::B2DPolyPolygon& rEndPolyPolygon, - double fStartWidth, - double fEndWidth, - bool bStartActive, - bool bEndActive, - bool bStartCentered, + double fStartWidth, + double fEndWidth, + bool bStartActive, + bool bEndActive, + bool bStartCentered, bool bEndCentered) - : mnRefCount(0), + : mnRefCount(0), maStartPolyPolygon(rStartPolyPolygon), maEndPolyPolygon(rEndPolyPolygon), mfStartWidth(fStartWidth), @@ -106,7 +106,7 @@ namespace drawinglayer && isStartCentered() == rCandidate.isStartCentered() && isEndCentered() == rCandidate.isEndCentered()); } - + static ImpSdrLineStartEndAttribute* get_global_default() { static ImpSdrLineStartEndAttribute* pDefault = 0; @@ -114,13 +114,13 @@ namespace drawinglayer if(!pDefault) { pDefault = new ImpSdrLineStartEndAttribute( + basegfx::B2DPolyPolygon(), basegfx::B2DPolyPolygon(), - basegfx::B2DPolyPolygon(), - 0.0, - 0.0, - false, - false, - false, + 0.0, + 0.0, + false, + false, + false, false); // never delete; start with RefCount 1, not 0 @@ -132,27 +132,27 @@ namespace drawinglayer }; SdrLineStartEndAttribute::SdrLineStartEndAttribute( - const basegfx::B2DPolyPolygon& rStartPolyPolygon, + const basegfx::B2DPolyPolygon& rStartPolyPolygon, const basegfx::B2DPolyPolygon& rEndPolyPolygon, - double fStartWidth, - double fEndWidth, - bool bStartActive, - bool bEndActive, - bool bStartCentered, + double fStartWidth, + double fEndWidth, + bool bStartActive, + bool bEndActive, + bool bStartCentered, bool bEndCentered) - : mpSdrLineStartEndAttribute(new ImpSdrLineStartEndAttribute( + : mpSdrLineStartEndAttribute(new ImpSdrLineStartEndAttribute( rStartPolyPolygon, rEndPolyPolygon, fStartWidth, fEndWidth, bStartActive, bEndActive, bStartCentered, bEndCentered)) { } SdrLineStartEndAttribute::SdrLineStartEndAttribute() - : mpSdrLineStartEndAttribute(ImpSdrLineStartEndAttribute::get_global_default()) + : mpSdrLineStartEndAttribute(ImpSdrLineStartEndAttribute::get_global_default()) { mpSdrLineStartEndAttribute->mnRefCount++; } SdrLineStartEndAttribute::SdrLineStartEndAttribute(const SdrLineStartEndAttribute& rCandidate) - : mpSdrLineStartEndAttribute(rCandidate.mpSdrLineStartEndAttribute) + : mpSdrLineStartEndAttribute(rCandidate.mpSdrLineStartEndAttribute) { mpSdrLineStartEndAttribute->mnRefCount++; } @@ -186,7 +186,7 @@ namespace drawinglayer { delete mpSdrLineStartEndAttribute; } - + mpSdrLineStartEndAttribute = rCandidate.mpSdrLineStartEndAttribute; mpSdrLineStartEndAttribute->mnRefCount++; } @@ -209,44 +209,44 @@ namespace drawinglayer return (*rCandidate.mpSdrLineStartEndAttribute == *mpSdrLineStartEndAttribute); } - const basegfx::B2DPolyPolygon& SdrLineStartEndAttribute::getStartPolyPolygon() const - { - return mpSdrLineStartEndAttribute->getStartPolyPolygon(); + const basegfx::B2DPolyPolygon& SdrLineStartEndAttribute::getStartPolyPolygon() const + { + return mpSdrLineStartEndAttribute->getStartPolyPolygon(); } - const basegfx::B2DPolyPolygon& SdrLineStartEndAttribute::getEndPolyPolygon() const - { - return mpSdrLineStartEndAttribute->getEndPolyPolygon(); + const basegfx::B2DPolyPolygon& SdrLineStartEndAttribute::getEndPolyPolygon() const + { + return mpSdrLineStartEndAttribute->getEndPolyPolygon(); } - double SdrLineStartEndAttribute::getStartWidth() const - { - return mpSdrLineStartEndAttribute->getStartWidth(); + double SdrLineStartEndAttribute::getStartWidth() const + { + return mpSdrLineStartEndAttribute->getStartWidth(); } - double SdrLineStartEndAttribute::getEndWidth() const - { - return mpSdrLineStartEndAttribute->getEndWidth(); + double SdrLineStartEndAttribute::getEndWidth() const + { + return mpSdrLineStartEndAttribute->getEndWidth(); } - bool SdrLineStartEndAttribute::isStartActive() const - { - return mpSdrLineStartEndAttribute->isStartActive(); + bool SdrLineStartEndAttribute::isStartActive() const + { + return mpSdrLineStartEndAttribute->isStartActive(); } - bool SdrLineStartEndAttribute::isEndActive() const - { - return mpSdrLineStartEndAttribute->isEndActive(); + bool SdrLineStartEndAttribute::isEndActive() const + { + return mpSdrLineStartEndAttribute->isEndActive(); } - bool SdrLineStartEndAttribute::isStartCentered() const - { - return mpSdrLineStartEndAttribute->isStartCentered(); + bool SdrLineStartEndAttribute::isStartCentered() const + { + return mpSdrLineStartEndAttribute->isStartCentered(); } - bool SdrLineStartEndAttribute::isEndCentered() const - { - return mpSdrLineStartEndAttribute->isEndCentered(); + bool SdrLineStartEndAttribute::isEndCentered() const + { + return mpSdrLineStartEndAttribute->isEndCentered(); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx index 92cf886e0c35..068937643489 100644 --- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx @@ -50,25 +50,25 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // 3D object attribute definitions - ::com::sun::star::drawing::NormalsKind maNormalsKind; // normals type (0..2) - ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionX; // texture projection type X (0..2) - ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionY; // texture projection type Y (0..2) - ::com::sun::star::drawing::TextureKind2 maTextureKind; // texture kind (see uno API) - ::com::sun::star::drawing::TextureMode maTextureMode; // texture kind (see uno API) - MaterialAttribute3D maMaterial; // object, specular and emissive colors, SpecularIntensity + ::com::sun::star::drawing::NormalsKind maNormalsKind; // normals type (0..2) + ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionX; // texture projection type X (0..2) + ::com::sun::star::drawing::TextureProjectionMode maTextureProjectionY; // texture projection type Y (0..2) + ::com::sun::star::drawing::TextureKind2 maTextureKind; // texture kind (see uno API) + ::com::sun::star::drawing::TextureMode maTextureMode; // texture kind (see uno API) + MaterialAttribute3D maMaterial; // object, specular and emissive colors, SpecularIntensity // bitfield - unsigned mbNormalsInvert : 1; // invert normals - unsigned mbDoubleSided : 1; // surfaces are double sided - unsigned mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene - unsigned mbTextureFilter : 1; // filter texture to make more smooth - unsigned mbReducedLineGeometry : 1; // use reduced line geometry (object specific) + unsigned mbNormalsInvert : 1; // invert normals + unsigned mbDoubleSided : 1; // surfaces are double sided + unsigned mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene + unsigned mbTextureFilter : 1; // filter texture to make more smooth + unsigned mbReducedLineGeometry : 1; // use reduced line geometry (object specific) ImpSdr3DObjectAttribute( - ::com::sun::star::drawing::NormalsKind aNormalsKind, + ::com::sun::star::drawing::NormalsKind aNormalsKind, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY, ::com::sun::star::drawing::TextureKind2 aTextureKind, @@ -79,7 +79,7 @@ namespace drawinglayer bool bShadow3D, bool bTextureFilter, bool bReducedLineGeometry) - : mnRefCount(0), + : mnRefCount(0), maNormalsKind(aNormalsKind), maTextureProjectionX(aTextureProjectionX), maTextureProjectionY(aTextureProjectionY), @@ -121,7 +121,7 @@ namespace drawinglayer && getTextureFilter() == rCandidate.getTextureFilter() && getReducedLineGeometry() == rCandidate.getReducedLineGeometry()); } - + static ImpSdr3DObjectAttribute* get_global_default() { static ImpSdr3DObjectAttribute* pDefault = 0; @@ -150,7 +150,7 @@ namespace drawinglayer }; Sdr3DObjectAttribute::Sdr3DObjectAttribute( - ::com::sun::star::drawing::NormalsKind aNormalsKind, + ::com::sun::star::drawing::NormalsKind aNormalsKind, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX, ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY, ::com::sun::star::drawing::TextureKind2 aTextureKind, @@ -161,20 +161,20 @@ namespace drawinglayer bool bShadow3D, bool bTextureFilter, bool bReducedLineGeometry) - : mpSdr3DObjectAttribute(new ImpSdr3DObjectAttribute( + : mpSdr3DObjectAttribute(new ImpSdr3DObjectAttribute( aNormalsKind, aTextureProjectionX, aTextureProjectionY, aTextureKind, aTextureMode, rMaterial, bNormalsInvert, bDoubleSided, bShadow3D, bTextureFilter, bReducedLineGeometry)) { } Sdr3DObjectAttribute::Sdr3DObjectAttribute() - : mpSdr3DObjectAttribute(ImpSdr3DObjectAttribute::get_global_default()) + : mpSdr3DObjectAttribute(ImpSdr3DObjectAttribute::get_global_default()) { mpSdr3DObjectAttribute->mnRefCount++; } Sdr3DObjectAttribute::Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate) - : mpSdr3DObjectAttribute(rCandidate.mpSdr3DObjectAttribute) + : mpSdr3DObjectAttribute(rCandidate.mpSdr3DObjectAttribute) { mpSdr3DObjectAttribute->mnRefCount++; } @@ -208,7 +208,7 @@ namespace drawinglayer { delete mpSdr3DObjectAttribute; } - + mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute; mpSdr3DObjectAttribute->mnRefCount++; } @@ -231,59 +231,59 @@ namespace drawinglayer return (*rCandidate.mpSdr3DObjectAttribute == *mpSdr3DObjectAttribute); } - ::com::sun::star::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const - { - return mpSdr3DObjectAttribute->getNormalsKind(); + ::com::sun::star::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const + { + return mpSdr3DObjectAttribute->getNormalsKind(); } - ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const - { - return mpSdr3DObjectAttribute->getTextureProjectionX(); + ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const + { + return mpSdr3DObjectAttribute->getTextureProjectionX(); } - ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const - { - return mpSdr3DObjectAttribute->getTextureProjectionY(); + ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const + { + return mpSdr3DObjectAttribute->getTextureProjectionY(); } - ::com::sun::star::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const - { - return mpSdr3DObjectAttribute->getTextureKind(); + ::com::sun::star::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const + { + return mpSdr3DObjectAttribute->getTextureKind(); } - ::com::sun::star::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const - { - return mpSdr3DObjectAttribute->getTextureMode(); + ::com::sun::star::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const + { + return mpSdr3DObjectAttribute->getTextureMode(); } - const MaterialAttribute3D& Sdr3DObjectAttribute::getMaterial() const - { - return mpSdr3DObjectAttribute->getMaterial(); + const MaterialAttribute3D& Sdr3DObjectAttribute::getMaterial() const + { + return mpSdr3DObjectAttribute->getMaterial(); } - bool Sdr3DObjectAttribute::getNormalsInvert() const - { - return mpSdr3DObjectAttribute->getNormalsInvert(); + bool Sdr3DObjectAttribute::getNormalsInvert() const + { + return mpSdr3DObjectAttribute->getNormalsInvert(); } - bool Sdr3DObjectAttribute::getDoubleSided() const - { - return mpSdr3DObjectAttribute->getDoubleSided(); + bool Sdr3DObjectAttribute::getDoubleSided() const + { + return mpSdr3DObjectAttribute->getDoubleSided(); } - bool Sdr3DObjectAttribute::getShadow3D() const - { - return mpSdr3DObjectAttribute->getShadow3D(); + bool Sdr3DObjectAttribute::getShadow3D() const + { + return mpSdr3DObjectAttribute->getShadow3D(); } - bool Sdr3DObjectAttribute::getTextureFilter() const - { - return mpSdr3DObjectAttribute->getTextureFilter(); + bool Sdr3DObjectAttribute::getTextureFilter() const + { + return mpSdr3DObjectAttribute->getTextureFilter(); } - bool Sdr3DObjectAttribute::getReducedLineGeometry() const - { - return mpSdr3DObjectAttribute->getReducedLineGeometry(); + bool Sdr3DObjectAttribute::getReducedLineGeometry() const + { + return mpSdr3DObjectAttribute->getReducedLineGeometry(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx index 5eb8d93c135e..2cdadb2f75e1 100644 --- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx @@ -49,16 +49,16 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // 3D scene attribute definitions - double mfDistance; - double mfShadowSlant; - ::com::sun::star::drawing::ProjectionMode maProjectionMode; - ::com::sun::star::drawing::ShadeMode maShadeMode; + double mfDistance; + double mfShadowSlant; + ::com::sun::star::drawing::ProjectionMode maProjectionMode; + ::com::sun::star::drawing::ShadeMode maShadeMode; // bitfield - unsigned mbTwoSidedLighting : 1; + unsigned mbTwoSidedLighting : 1; public: ImpSdrSceneAttribute( @@ -67,7 +67,7 @@ namespace drawinglayer ::com::sun::star::drawing::ProjectionMode aProjectionMode, ::com::sun::star::drawing::ShadeMode aShadeMode, bool bTwoSidedLighting) - : mnRefCount(0), + : mnRefCount(0), mfDistance(fDistance), mfShadowSlant(fShadowSlant), maProjectionMode(aProjectionMode), @@ -118,19 +118,19 @@ namespace drawinglayer ::com::sun::star::drawing::ProjectionMode aProjectionMode, ::com::sun::star::drawing::ShadeMode aShadeMode, bool bTwoSidedLighting) - : mpSdrSceneAttribute(new ImpSdrSceneAttribute( + : mpSdrSceneAttribute(new ImpSdrSceneAttribute( fDistance, fShadowSlant, aProjectionMode, aShadeMode, bTwoSidedLighting)) { } SdrSceneAttribute::SdrSceneAttribute() - : mpSdrSceneAttribute(ImpSdrSceneAttribute::get_global_default()) + : mpSdrSceneAttribute(ImpSdrSceneAttribute::get_global_default()) { mpSdrSceneAttribute->mnRefCount++; } SdrSceneAttribute::SdrSceneAttribute(const SdrSceneAttribute& rCandidate) - : mpSdrSceneAttribute(rCandidate.mpSdrSceneAttribute) + : mpSdrSceneAttribute(rCandidate.mpSdrSceneAttribute) { mpSdrSceneAttribute->mnRefCount++; } @@ -164,7 +164,7 @@ namespace drawinglayer { delete mpSdrSceneAttribute; } - + mpSdrSceneAttribute = rCandidate.mpSdrSceneAttribute; mpSdrSceneAttribute->mnRefCount++; } @@ -187,29 +187,29 @@ namespace drawinglayer return (*rCandidate.mpSdrSceneAttribute == *mpSdrSceneAttribute); } - double SdrSceneAttribute::getDistance() const - { - return mpSdrSceneAttribute->getDistance(); + double SdrSceneAttribute::getDistance() const + { + return mpSdrSceneAttribute->getDistance(); } - double SdrSceneAttribute::getShadowSlant() const - { - return mpSdrSceneAttribute->getShadowSlant(); + double SdrSceneAttribute::getShadowSlant() const + { + return mpSdrSceneAttribute->getShadowSlant(); } - ::com::sun::star::drawing::ProjectionMode SdrSceneAttribute::getProjectionMode() const - { - return mpSdrSceneAttribute->getProjectionMode(); + ::com::sun::star::drawing::ProjectionMode SdrSceneAttribute::getProjectionMode() const + { + return mpSdrSceneAttribute->getProjectionMode(); } - ::com::sun::star::drawing::ShadeMode SdrSceneAttribute::getShadeMode() const - { - return mpSdrSceneAttribute->getShadeMode(); + ::com::sun::star::drawing::ShadeMode SdrSceneAttribute::getShadeMode() const + { + return mpSdrSceneAttribute->getShadeMode(); } - bool SdrSceneAttribute::getTwoSidedLighting() const - { - return mpSdrSceneAttribute->getTwoSidedLighting(); + bool SdrSceneAttribute::getTwoSidedLighting() const + { + return mpSdrSceneAttribute->getTwoSidedLighting(); } } // end of namespace attribute diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx index c40e35f79cf9..ea02e7978931 100644 --- a/drawinglayer/source/attribute/sdrshadowattribute.cxx +++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx @@ -51,18 +51,18 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // shadow definitions - basegfx::B2DVector maOffset; // shadow offset 1/100th mm - double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. - basegfx::BColor maColor; // color of shadow + basegfx::B2DVector maOffset; // shadow offset 1/100th mm + double mfTransparence; // [0.0 .. 1.0], 0.0==no transp. + basegfx::BColor maColor; // color of shadow ImpSdrShadowAttribute( - const basegfx::B2DVector& rOffset, - double fTransparence, + const basegfx::B2DVector& rOffset, + double fTransparence, const basegfx::BColor& rColor) - : mnRefCount(0), + : mnRefCount(0), maOffset(rOffset), mfTransparence(fTransparence), maColor(rColor) @@ -71,7 +71,7 @@ namespace drawinglayer // data read access const basegfx::B2DVector& getOffset() const { return maOffset; } - double getTransparence() const { return mfTransparence; } + double getTransparence() const { return mfTransparence; } const basegfx::BColor& getColor() const { return maColor; } bool operator==(const ImpSdrShadowAttribute& rCandidate) const @@ -80,7 +80,7 @@ namespace drawinglayer && getTransparence() == rCandidate.getTransparence() && getColor() == rCandidate.getColor()); } - + static ImpSdrShadowAttribute* get_global_default() { static ImpSdrShadowAttribute* pDefault = 0; @@ -89,7 +89,7 @@ namespace drawinglayer { pDefault = new ImpSdrShadowAttribute( basegfx::B2DVector(), - 0.0, + 0.0, basegfx::BColor()); // never delete; start with RefCount 1, not 0 @@ -101,22 +101,22 @@ namespace drawinglayer }; SdrShadowAttribute::SdrShadowAttribute( - const basegfx::B2DVector& rOffset, - double fTransparence, + const basegfx::B2DVector& rOffset, + double fTransparence, const basegfx::BColor& rColor) - : mpSdrShadowAttribute(new ImpSdrShadowAttribute( + : mpSdrShadowAttribute(new ImpSdrShadowAttribute( rOffset, fTransparence, rColor)) { } SdrShadowAttribute::SdrShadowAttribute() - : mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default()) + : mpSdrShadowAttribute(ImpSdrShadowAttribute::get_global_default()) { mpSdrShadowAttribute->mnRefCount++; } SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute& rCandidate) - : mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute) + : mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute) { mpSdrShadowAttribute->mnRefCount++; } @@ -150,7 +150,7 @@ namespace drawinglayer { delete mpSdrShadowAttribute; } - + mpSdrShadowAttribute = rCandidate.mpSdrShadowAttribute; mpSdrShadowAttribute->mnRefCount++; } @@ -173,19 +173,19 @@ namespace drawinglayer return (*rCandidate.mpSdrShadowAttribute == *mpSdrShadowAttribute); } - const basegfx::B2DVector& SdrShadowAttribute::getOffset() const - { - return mpSdrShadowAttribute->getOffset(); + const basegfx::B2DVector& SdrShadowAttribute::getOffset() const + { + return mpSdrShadowAttribute->getOffset(); } - double SdrShadowAttribute::getTransparence() const - { - return mpSdrShadowAttribute->getTransparence(); + double SdrShadowAttribute::getTransparence() const + { + return mpSdrShadowAttribute->getTransparence(); } - const basegfx::BColor& SdrShadowAttribute::getColor() const - { - return mpSdrShadowAttribute->getColor(); + const basegfx::BColor& SdrShadowAttribute::getColor() const + { + return mpSdrShadowAttribute->getColor(); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx index 667f6e1b463e..ca8fe9c9cdd7 100644 --- a/drawinglayer/source/attribute/strokeattribute.cxx +++ b/drawinglayer/source/attribute/strokeattribute.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 @@ -42,16 +42,16 @@ namespace drawinglayer { public: // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // data definitions - ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern - double mfFullDotDashLen; // sum of maDotDashArray (for convenience) + ::std::vector< double > maDotDashArray; // array of double which defines the dot-dash pattern + double mfFullDotDashLen; // sum of maDotDashArray (for convenience) ImpStrokeAttribute( const ::std::vector< double >& rDotDashArray, double fFullDotDashLen) - : mnRefCount(0), + : mnRefCount(0), maDotDashArray(rDotDashArray), mfFullDotDashLen(fFullDotDashLen) { @@ -59,7 +59,7 @@ namespace drawinglayer // data read access const ::std::vector< double >& getDotDashArray() const { return maDotDashArray; } - double getFullDotDashLen() const + double getFullDotDashLen() const { if(0.0 == mfFullDotDashLen && maDotDashArray.size()) { @@ -68,7 +68,7 @@ namespace drawinglayer const_cast< ImpStrokeAttribute* >(this)->mfFullDotDashLen = fAccumulated; } - return mfFullDotDashLen; + return mfFullDotDashLen; } bool operator==(const ImpStrokeAttribute& rCandidate) const @@ -76,7 +76,7 @@ namespace drawinglayer return (getDotDashArray() == rCandidate.getDotDashArray() && getFullDotDashLen() == rCandidate.getFullDotDashLen()); } - + static ImpStrokeAttribute* get_global_default() { static ImpStrokeAttribute* pDefault = 0; @@ -98,19 +98,19 @@ namespace drawinglayer StrokeAttribute::StrokeAttribute( const ::std::vector< double >& rDotDashArray, double fFullDotDashLen) - : mpStrokeAttribute(new ImpStrokeAttribute( + : mpStrokeAttribute(new ImpStrokeAttribute( rDotDashArray, fFullDotDashLen)) { } StrokeAttribute::StrokeAttribute() - : mpStrokeAttribute(ImpStrokeAttribute::get_global_default()) + : mpStrokeAttribute(ImpStrokeAttribute::get_global_default()) { mpStrokeAttribute->mnRefCount++; } StrokeAttribute::StrokeAttribute(const StrokeAttribute& rCandidate) - : mpStrokeAttribute(rCandidate.mpStrokeAttribute) + : mpStrokeAttribute(rCandidate.mpStrokeAttribute) { mpStrokeAttribute->mnRefCount++; } @@ -144,7 +144,7 @@ namespace drawinglayer { delete mpStrokeAttribute; } - + mpStrokeAttribute = rCandidate.mpStrokeAttribute; mpStrokeAttribute->mnRefCount++; } @@ -167,14 +167,14 @@ namespace drawinglayer return (*rCandidate.mpStrokeAttribute == *mpStrokeAttribute); } - const ::std::vector< double >& StrokeAttribute::getDotDashArray() const - { - return mpStrokeAttribute->getDotDashArray(); + const ::std::vector< double >& StrokeAttribute::getDotDashArray() const + { + return mpStrokeAttribute->getDotDashArray(); } double StrokeAttribute::getFullDotDashLen() const - { - return mpStrokeAttribute->getFullDotDashLen(); + { + return mpStrokeAttribute->getFullDotDashLen(); } } // end of namespace attribute } // end of namespace drawinglayer diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 2cce8af48e62..93757e20065f 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.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,43 +55,43 @@ namespace drawinglayer friend class ::drawinglayer::geometry::ViewInformation2D; // the refcounter. 0 means exclusively used - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; protected: // the object transformation - basegfx::B2DHomMatrix maObjectTransformation; + basegfx::B2DHomMatrix maObjectTransformation; // the view transformation - basegfx::B2DHomMatrix maViewTransformation; + basegfx::B2DHomMatrix maViewTransformation; // the ObjectToView and it's inverse, both on demand from ObjectTransformation // and ViewTransformation - basegfx::B2DHomMatrix maObjectToViewTransformation; - basegfx::B2DHomMatrix maInverseObjectToViewTransformation; + basegfx::B2DHomMatrix maObjectToViewTransformation; + basegfx::B2DHomMatrix maInverseObjectToViewTransformation; // the visible range and the on-demand one in ViewCoordinates - basegfx::B2DRange maViewport; - basegfx::B2DRange maDiscreteViewport; + basegfx::B2DRange maViewport; + basegfx::B2DRange maDiscreteViewport; // the DrawPage which is target of visualisation. This is needed e.g. for // the view-dependent decomposition of PageNumber TextFields. // This parameter is buffered here, but mainly resides in mxExtendedInformation, // so it will be interpreted, but held there. It will also not be added // to mxExtendedInformation in impFillViewInformationFromContent (it's there already) - uno::Reference< drawing::XDrawPage > mxVisualizedPage; + uno::Reference< drawing::XDrawPage > mxVisualizedPage; // the point in time - double mfViewTime; + double mfViewTime; // bitfield bool mbReducedDisplayQuality : 1; // the complete PropertyValue representation (if already created) - uno::Sequence< beans::PropertyValue > mxViewInformation; + uno::Sequence< beans::PropertyValue > mxViewInformation; // the extra PropertyValues; not represented by ViewTransformation, // Viewport, VisualizedPage or ViewTime - uno::Sequence< beans::PropertyValue > mxExtendedInformation; + uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings const ::rtl::OUString& getNamePropertyObjectTransformation() @@ -99,19 +99,19 @@ namespace drawinglayer static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyViewTransformation() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ViewTransformation")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyViewport() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Viewport")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyTime() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Time")); @@ -207,7 +207,7 @@ namespace drawinglayer (bObjectTransformationUsed ? 1 : 0) + (bViewTransformationUsed ? 1 : 0) + (bViewportUsed ? 1 : 0) + - (bTimeUsed ? 1 : 0) + + (bTimeUsed ? 1 : 0) + (bVisualizedPageUsed ? 1 : 0) + (bReducedDisplayQualityUsed ? 1 : 0) + (bExtraInformation ? mxExtendedInformation.getLength() : 0)); @@ -267,13 +267,13 @@ namespace drawinglayer public: ImpViewInformation2D( - const basegfx::B2DHomMatrix& rObjectTransformation, - const basegfx::B2DHomMatrix& rViewTransformation, - const basegfx::B2DRange& rViewport, + const basegfx::B2DHomMatrix& rObjectTransformation, + const basegfx::B2DHomMatrix& rViewTransformation, + const basegfx::B2DRange& rViewport, const uno::Reference< drawing::XDrawPage >& rxDrawPage, double fViewTime, const uno::Sequence< beans::PropertyValue >& rExtendedParameters) - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(rObjectTransformation), maViewTransformation(rViewTransformation), maObjectToViewTransformation(), @@ -290,7 +290,7 @@ namespace drawinglayer } ImpViewInformation2D(const uno::Sequence< beans::PropertyValue >& rViewParameters) - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(), maViewTransformation(), maObjectToViewTransformation(), @@ -307,7 +307,7 @@ namespace drawinglayer } ImpViewInformation2D() - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(), maViewTransformation(), maObjectToViewTransformation(), @@ -322,23 +322,23 @@ namespace drawinglayer { } - const basegfx::B2DHomMatrix& getObjectTransformation() const - { - return maObjectTransformation; + const basegfx::B2DHomMatrix& getObjectTransformation() const + { + return maObjectTransformation; } - - const basegfx::B2DHomMatrix& getViewTransformation() const - { - return maViewTransformation; + + const basegfx::B2DHomMatrix& getViewTransformation() const + { + return maViewTransformation; } - - const basegfx::B2DRange& getViewport() const - { - return maViewport; + + const basegfx::B2DRange& getViewport() const + { + return maViewport; } - const basegfx::B2DRange& getDiscreteViewport() const - { + const basegfx::B2DRange& getDiscreteViewport() const + { ::osl::Mutex m_mutex; if(maDiscreteViewport.isEmpty() && !maViewport.isEmpty()) @@ -355,7 +355,7 @@ namespace drawinglayer { ::osl::Mutex m_mutex; - if(maObjectToViewTransformation.isIdentity() && + if(maObjectToViewTransformation.isIdentity() && (!maObjectTransformation.isIdentity() || !maViewTransformation.isIdentity())) { basegfx::B2DHomMatrix aObjectToView(maViewTransformation * maObjectTransformation); @@ -369,7 +369,7 @@ namespace drawinglayer { ::osl::Mutex m_mutex; - if(maInverseObjectToViewTransformation.isIdentity() && + if(maInverseObjectToViewTransformation.isIdentity() && (!maObjectTransformation.isIdentity() || !maViewTransformation.isIdentity())) { basegfx::B2DHomMatrix aInverseObjectToView(maViewTransformation * maObjectTransformation); @@ -380,9 +380,9 @@ namespace drawinglayer return maInverseObjectToViewTransformation; } - double getViewTime() const - { - return mfViewTime; + double getViewTime() const + { + return mfViewTime; } const uno::Reference< drawing::XDrawPage >& getVisualizedPage() const @@ -445,35 +445,35 @@ namespace drawinglayer namespace geometry { ViewInformation2D::ViewInformation2D( - const basegfx::B2DHomMatrix& rObjectTransformation, - const basegfx::B2DHomMatrix& rViewTransformation, - const basegfx::B2DRange& rViewport, + const basegfx::B2DHomMatrix& rObjectTransformation, + const basegfx::B2DHomMatrix& rViewTransformation, + const basegfx::B2DRange& rViewport, const uno::Reference< drawing::XDrawPage >& rxDrawPage, double fViewTime, const uno::Sequence< beans::PropertyValue >& rExtendedParameters) - : mpViewInformation2D(new ImpViewInformation2D( - rObjectTransformation, - rViewTransformation, - rViewport, - rxDrawPage, - fViewTime, + : mpViewInformation2D(new ImpViewInformation2D( + rObjectTransformation, + rViewTransformation, + rViewport, + rxDrawPage, + fViewTime, rExtendedParameters)) { } ViewInformation2D::ViewInformation2D(const uno::Sequence< beans::PropertyValue >& rViewParameters) - : mpViewInformation2D(new ImpViewInformation2D(rViewParameters)) + : mpViewInformation2D(new ImpViewInformation2D(rViewParameters)) { } ViewInformation2D::ViewInformation2D() - : mpViewInformation2D(ImpViewInformation2D::get_global_default()) + : mpViewInformation2D(ImpViewInformation2D::get_global_default()) { mpViewInformation2D->mnRefCount++; } ViewInformation2D::ViewInformation2D(const ViewInformation2D& rCandidate) - : mpViewInformation2D(rCandidate.mpViewInformation2D) + : mpViewInformation2D(rCandidate.mpViewInformation2D) { ::osl::Mutex m_mutex; mpViewInformation2D->mnRefCount++; @@ -510,7 +510,7 @@ namespace drawinglayer { delete mpViewInformation2D; } - + mpViewInformation2D = rCandidate.mpViewInformation2D; mpViewInformation2D->mnRefCount++; @@ -566,7 +566,7 @@ namespace drawinglayer { return mpViewInformation2D->getInverseObjectToViewTransformation(); } - + const basegfx::B2DRange& ViewInformation2D::getDiscreteViewport() const { return mpViewInformation2D->getDiscreteViewport(); diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index cce7d7070716..ef2fa0da09f0 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.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,39 +56,39 @@ namespace drawinglayer friend class ::drawinglayer::geometry::ViewInformation3D; // the refcounter. 0 means exclusively used - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // the 3D transformations // Object to World. This may change and being adapted when entering 3D transformation // groups - basegfx::B3DHomMatrix maObjectTransformation; + basegfx::B3DHomMatrix maObjectTransformation; // World to Camera. This includes VRP, VPN and VUV camera coordinate system - basegfx::B3DHomMatrix maOrientation; + basegfx::B3DHomMatrix maOrientation; // Camera to Device with X,Y and Z [-1.0 .. 1.0]. This is the // 3D to 2D projection which may be parallell or perspective. When it is perspective, // the last line of the homogen matrix will NOT be unused - basegfx::B3DHomMatrix maProjection; - + basegfx::B3DHomMatrix maProjection; + // Device to View with X,Y and Z [0.0 .. 1.0]. This converts from -1 to 1 coordinates // in camera coordinate system to 0 to 1 in unit 2D coordinates. This way it stays // view-independent. To get discrete coordinates, the 2D transformation of a scene // as 2D object needs to be involved - basegfx::B3DHomMatrix maDeviceToView; + basegfx::B3DHomMatrix maDeviceToView; // Object to View is the linear combination of all four transformations. It's // buffered to avoid too much matrix multiplying and created on demand - basegfx::B3DHomMatrix maObjectToView; + basegfx::B3DHomMatrix maObjectToView; // the point in time - double mfViewTime; + double mfViewTime; // the complete PropertyValue representation (if already created) - uno::Sequence< beans::PropertyValue > mxViewInformation; + uno::Sequence< beans::PropertyValue > mxViewInformation; // the extra PropertyValues; does not contain the transformations - uno::Sequence< beans::PropertyValue > mxExtendedInformation; + uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings const ::rtl::OUString& getNamePropertyObjectTransformation() @@ -96,49 +96,49 @@ namespace drawinglayer static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyOrientation() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Orientation")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyProjection() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyProjection_30() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection30")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyProjection_31() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection31")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyProjection_32() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection32")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyProjection_33() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection33")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyDeviceToView() { static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("DeviceToView")); return s_sNameProperty; } - + const ::rtl::OUString& getNamePropertyTime() { static ::rtl::OUString s_sNamePropertyTime(RTL_CONSTASCII_USTRINGPARAM("Time")); @@ -160,7 +160,7 @@ namespace drawinglayer for(sal_Int32 a(0); a < nCount; a++) { const beans::PropertyValue& rProp = rViewParameters[a]; - + if(rProp.Name == getNamePropertyObjectTransformation()) { com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; @@ -182,7 +182,7 @@ namespace drawinglayer const double f_31(maProjection.get(3, 1)); const double f_32(maProjection.get(3, 2)); const double f_33(maProjection.get(3, 3)); - + com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; rProp.Value >>= aAffineMatrix3D; maProjection = basegfx::unotools::homMatrixFromAffineMatrix3D(aAffineMatrix3D); @@ -249,7 +249,7 @@ namespace drawinglayer const bool bDeviceToViewUsed(!maDeviceToView.isIdentity()); const bool bTimeUsed(0.0 < mfViewTime); const bool bExtraInformation(mxExtendedInformation.hasElements()); - + // projection may be defined using a frustum in which case the last line of // the 4x4 matrix is not (0,0,0,1). Since AffineMatrix3D does not support that, // these four values need to be treated extra @@ -257,7 +257,7 @@ namespace drawinglayer const bool bProjectionUsed_31(bProjectionUsed && !basegfx::fTools::equalZero(maProjection.get(3, 1))); const bool bProjectionUsed_32(bProjectionUsed && !basegfx::fTools::equalZero(maProjection.get(3, 2))); const bool bProjectionUsed_33(bProjectionUsed && !basegfx::fTools::equal(maProjection.get(3, 3), 1.0)); - + sal_uInt32 nIndex(0); const sal_uInt32 nCount( (bObjectTransformationUsed ? 1 : 0) + @@ -268,7 +268,7 @@ namespace drawinglayer (bProjectionUsed_32 ? 1 : 0) + (bProjectionUsed_33 ? 1 : 0) + (bDeviceToViewUsed ? 1 : 0) + - (bTimeUsed ? 1 : 0) + + (bTimeUsed ? 1 : 0) + (bExtraInformation ? mxExtendedInformation.getLength() : 0)); mxViewInformation.realloc(nCount); @@ -357,13 +357,13 @@ namespace drawinglayer public: ImpViewInformation3D( - const basegfx::B3DHomMatrix& rObjectTransformation, - const basegfx::B3DHomMatrix& rOrientation, - const basegfx::B3DHomMatrix& rProjection, - const basegfx::B3DHomMatrix& rDeviceToView, + const basegfx::B3DHomMatrix& rObjectTransformation, + const basegfx::B3DHomMatrix& rOrientation, + const basegfx::B3DHomMatrix& rProjection, + const basegfx::B3DHomMatrix& rDeviceToView, double fViewTime, const uno::Sequence< beans::PropertyValue >& rExtendedParameters) - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(rObjectTransformation), maOrientation(rOrientation), maProjection(rProjection), @@ -376,7 +376,7 @@ namespace drawinglayer } ImpViewInformation3D(const uno::Sequence< beans::PropertyValue >& rViewParameters) - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(), maOrientation(), maProjection(), @@ -389,7 +389,7 @@ namespace drawinglayer } ImpViewInformation3D() - : mnRefCount(0), + : mnRefCount(0), maObjectTransformation(), maOrientation(), maProjection(), @@ -416,7 +416,7 @@ namespace drawinglayer const_cast< ImpViewInformation3D* >(this)->maObjectToView = maDeviceToView * maProjection * maOrientation * maObjectTransformation; } - return maObjectToView; + return maObjectToView; } const uno::Sequence< beans::PropertyValue >& getViewInformationSequence() const @@ -471,31 +471,31 @@ namespace drawinglayer namespace geometry { ViewInformation3D::ViewInformation3D( - const basegfx::B3DHomMatrix& rObjectObjectTransformation, - const basegfx::B3DHomMatrix& rOrientation, - const basegfx::B3DHomMatrix& rProjection, - const basegfx::B3DHomMatrix& rDeviceToView, + const basegfx::B3DHomMatrix& rObjectObjectTransformation, + const basegfx::B3DHomMatrix& rOrientation, + const basegfx::B3DHomMatrix& rProjection, + const basegfx::B3DHomMatrix& rDeviceToView, double fViewTime, const uno::Sequence< beans::PropertyValue >& rExtendedParameters) - : mpViewInformation3D(new ImpViewInformation3D( - rObjectObjectTransformation, rOrientation, rProjection, + : mpViewInformation3D(new ImpViewInformation3D( + rObjectObjectTransformation, rOrientation, rProjection, rDeviceToView, fViewTime, rExtendedParameters)) { } ViewInformation3D::ViewInformation3D(const uno::Sequence< beans::PropertyValue >& rViewParameters) - : mpViewInformation3D(new ImpViewInformation3D(rViewParameters)) + : mpViewInformation3D(new ImpViewInformation3D(rViewParameters)) { } ViewInformation3D::ViewInformation3D() - : mpViewInformation3D(ImpViewInformation3D::get_global_default()) + : mpViewInformation3D(ImpViewInformation3D::get_global_default()) { mpViewInformation3D->mnRefCount++; } ViewInformation3D::ViewInformation3D(const ViewInformation3D& rCandidate) - : mpViewInformation3D(rCandidate.mpViewInformation3D) + : mpViewInformation3D(rCandidate.mpViewInformation3D) { ::osl::Mutex m_mutex; mpViewInformation3D->mnRefCount++; @@ -532,7 +532,7 @@ namespace drawinglayer { delete mpViewInformation3D; } - + mpViewInformation3D = rCandidate.mpViewInformation3D; mpViewInformation3D->mnRefCount++; 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), diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index c14fc8bfc2e6..022cd65d5ae9 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.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 primitive3d { BasePrimitive3D::BasePrimitive3D() - : BasePrimitive3DImplBase(m_aMutex) + : BasePrimitive3DImplBase(m_aMutex) { } @@ -93,7 +93,7 @@ namespace drawinglayer } BufferedDecompositionPrimitive3D::BufferedDecompositionPrimitive3D() - : BasePrimitive3D(), + : BasePrimitive3D(), maBuffered3DDecomposition() { } diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx index 328916da6dda..56b0dde49496 100644 --- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/groupprimitive3d.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 primitive3d { GroupPrimitive3D::GroupPrimitive3D( const Primitive3DSequence& rChildren ) - : BasePrimitive3D(), + : BasePrimitive3D(), maChildren(rChildren) { } diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index 4f942fae7978..519d2f833071 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.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 @@ -89,7 +89,7 @@ namespace drawinglayer // add original primitive for background aDestination.push_back(xReference); } - + if(aFillPolyPolygon.areTextureCoordinatesUsed()) { const sal_uInt32 nPolyCount(aFillPolyPolygon.count()); @@ -125,7 +125,7 @@ namespace drawinglayer else if(!b2Y && !a2N.equal(a2Candidate) && !a2X.equal(a2Candidate)) { a2Y = a2Candidate - a2N; - + const double fCross(a2X.cross(a2Y)); if(!basegfx::fTools::equalZero(fCross)) @@ -274,12 +274,12 @@ namespace drawinglayer } HatchTexturePrimitive3D::HatchTexturePrimitive3D( - const attribute::FillHatchAttribute& rHatch, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillHatchAttribute& rHatch, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter) - : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), + : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), maHatch(rHatch), maBuffered3DDecomposition() { @@ -290,7 +290,7 @@ namespace drawinglayer if(TexturePrimitive3D::operator==(rPrimitive)) { const HatchTexturePrimitive3D& rCompare = (HatchTexturePrimitive3D&)rPrimitive; - + return (getHatch() == rCompare.getHatch()); } diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx index 54d5bba3fd2d..9dd34dffec3b 100644 --- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx @@ -52,7 +52,7 @@ namespace drawinglayer { HiddenGeometryPrimitive3D::HiddenGeometryPrimitive3D( const Primitive3DSequence& rChildren) - : GroupPrimitive3D(rChildren) + : GroupPrimitive3D(rChildren) { } diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx index 948891643738..8a5c98be4dd1 100644 --- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.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 primitive3d { ModifiedColorPrimitive3D::ModifiedColorPrimitive3D( - const Primitive3DSequence& rChildren, + const Primitive3DSequence& rChildren, const basegfx::BColorModifier& rColorModifier) - : GroupPrimitive3D(rChildren), + : GroupPrimitive3D(rChildren), maColorModifier(rColorModifier) { } diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index db906e6c8e51..1ecc2ab49ee5 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.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,9 +47,9 @@ namespace drawinglayer namespace primitive3d { PolygonHairlinePrimitive3D::PolygonHairlinePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor) - : BasePrimitive3D(), + : BasePrimitive3D(), maPolygon(rPolygon), maBColor(rBColor) { @@ -61,7 +61,7 @@ namespace drawinglayer { const PolygonHairlinePrimitive3D& rCompare = (PolygonHairlinePrimitive3D&)rPrimitive; - return (getB3DPolygon() == rCompare.getB3DPolygon() + return (getB3DPolygon() == rCompare.getB3DPolygon() && getBColor() == rCompare.getBColor()); } @@ -130,15 +130,15 @@ namespace drawinglayer } } } - + return aRetval; } PolygonStrokePrimitive3D::PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive3D(), + : BufferedDecompositionPrimitive3D(), maPolygon(rPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute(rStrokeAttribute) @@ -146,9 +146,9 @@ namespace drawinglayer } PolygonStrokePrimitive3D::PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute) - : BufferedDecompositionPrimitive3D(), + : BufferedDecompositionPrimitive3D(), maPolygon(rPolygon), maLineAttribute(rLineAttribute), maStrokeAttribute() @@ -161,7 +161,7 @@ namespace drawinglayer { const PolygonStrokePrimitive3D& rCompare = (PolygonStrokePrimitive3D&)rPrimitive; - return (getB3DPolygon() == rCompare.getB3DPolygon() + return (getB3DPolygon() == rCompare.getB3DPolygon() && getLineAttribute() == rCompare.getLineAttribute() && getStrokeAttribute() == rCompare.getStrokeAttribute()); } diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 5f9c780fb3ab..dcc63dd1c3c0 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.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 namespace // anonymous namespace { Primitive3DSequence getLineTubeSegments( - sal_uInt32 nSegments, + sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial) { // static data for buffered tube primitives @@ -80,7 +80,7 @@ namespace drawinglayer const basegfx::B3DPoint aNextLeft(aRot * aLastLeft); const basegfx::B3DPoint aNextRight(aRot * aLastRight); basegfx::B3DPolygon aNewPolygon; - + aNewPolygon.append(aNextLeft); aNewPolygon.setNormal(0L, basegfx::B3DVector(aNextLeft - aLeft)); @@ -92,7 +92,7 @@ namespace drawinglayer aNewPolygon.append(aNextRight); aNewPolygon.setNormal(3L, basegfx::B3DVector(aNextRight - aRight)); - + aNewPolygon.setClosed(true); const basegfx::B3DPolyPolygon aNewPolyPolygon(aNewPolygon); @@ -108,7 +108,7 @@ namespace drawinglayer } Primitive3DSequence getLineCapSegments( - sal_uInt32 nSegments, + sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial) { // static data for buffered tube primitives @@ -138,7 +138,7 @@ namespace drawinglayer { const basegfx::B3DPoint aNext(aRot * aLast); basegfx::B3DPolygon aNewPolygon; - + aNewPolygon.append(aLast); aNewPolygon.setNormal(0L, basegfx::B3DVector(aLast - aNull)); @@ -162,11 +162,11 @@ namespace drawinglayer } Primitive3DSequence getLineJoinSegments( - sal_uInt32 nSegments, - const attribute::MaterialAttribute3D& rMaterial, + sal_uInt32 nSegments, + const attribute::MaterialAttribute3D& rMaterial, double fAngle, - double /*fDegreeStepWidth*/, - double fMiterMinimumAngle, + double /*fDegreeStepWidth*/, + double fMiterMinimumAngle, basegfx::B2DLineJoin aLineJoin) { // nSegments is for whole circle, adapt to half circle @@ -238,26 +238,26 @@ namespace drawinglayer if(bFirst || !bLast) { fPos += fInc; - + aNextPointOnXY = basegfx::B3DPoint( - cos(fPos), - sin(fPos), + cos(fPos), + sin(fPos), 0.0); - + aNextPointRotY = basegfx::B3DPoint( - aNextPointOnXY.getX() * fCos, - aNextPointOnXY.getY(), + aNextPointOnXY.getX() * fCos, + aNextPointOnXY.getY(), aNextPointOnXY.getX() * fSin); if(bMiter) { aNextMiter = basegfx::B3DPoint( - aNextPointOnXY.getX(), - aNextPointOnXY.getY(), + aNextPointOnXY.getX(), + aNextPointOnXY.getY(), fMiterSin * (aNextPointOnXY.getX() / fMiterCos)); } } - + if(bFirst) { aNewPolygon.clear(); @@ -283,7 +283,7 @@ namespace drawinglayer else if(bLast) { aNewPolygon.clear(); - + if(bMiter) { aNewPolygon.append(basegfx::B3DPoint(0.0, 1.0, 0.0)); @@ -327,7 +327,7 @@ namespace drawinglayer aNewPolygon.append(aNextPointRotY); } } - + // set normals for(sal_uInt32 b(0L); b < aNewPolygon.count(); b++) { @@ -341,7 +341,7 @@ namespace drawinglayer BasePrimitive3D* pNew = new PolyPolygonMaterialPrimitive3D(aNewPolyPolygon, rMaterial, false); aResultVector.push_back(pNew); } - + if(bMiter && aMiterPolygon.count()) { // set normals @@ -355,13 +355,13 @@ namespace drawinglayer BasePrimitive3D* pNew = new PolyPolygonMaterialPrimitive3D(aMiterPolyPolygon, rMaterial, false); aResultVector.push_back(pNew); } - + // prepare next step if(bFirst || !bLast) { aPointOnXY = aNextPointOnXY; aPointRotY = aNextPointRotY; - + if(bMiter) { aCurrMiter = aNextMiter; @@ -496,7 +496,7 @@ namespace drawinglayer aBackTrans.scale(fForwLen, getRadius(), getRadius()); aBackTrans *= aRotVector; aBackTrans.translate(aCurr.getX(), aCurr.getY(), aCurr.getZ()); - + // line end edge, build transformed primitiveVector3D TransformPrimitive3D* pNewTransformedD = new TransformPrimitive3D(aBackTrans, getLineCapSegments(nSegments, aMaterial)); aResultVector.push_back(pNewTransformedD); @@ -528,12 +528,12 @@ namespace drawinglayer } PolygonTubePrimitive3D::PolygonTubePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor, double fRadius, basegfx::B2DLineJoin aLineJoin, double fDegreeStepWidth, double fMiterMinimumAngle) - : PolygonHairlinePrimitive3D(rPolygon, rBColor), + : PolygonHairlinePrimitive3D(rPolygon, rBColor), maLast3DDecomposition(), mfRadius(fRadius), mfDegreeStepWidth(fDegreeStepWidth), diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index 0d94e75ae25a..4066dfe163a6 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.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,10 +45,10 @@ namespace drawinglayer namespace primitive3d { PolyPolygonMaterialPrimitive3D::PolyPolygonMaterialPrimitive3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, - const attribute::MaterialAttribute3D& rMaterial, + const basegfx::B3DPolyPolygon& rPolyPolygon, + const attribute::MaterialAttribute3D& rMaterial, bool bDoubleSided) - : BasePrimitive3D(), + : BasePrimitive3D(), maPolyPolygon(rPolyPolygon), maMaterial(rMaterial), mbDoubleSided(bDoubleSided) diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index a52e74057c11..287bc4e43eac 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.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 @@ -101,7 +101,7 @@ namespace drawinglayer const basegfx::B3DPoint aCenter(aRange.getCenter()); aFill = basegfx::tools::applyDefaultTextureCoordinatesSphere(aFill, aCenter, bSphereX, bSphereY); } - + if(bObjectSpecificX || bObjectSpecificY) { // object-specific @@ -119,7 +119,7 @@ namespace drawinglayer { aPoint.setX((1L == b || 2L == b) ? 1.0 : 0.0); } - + if(bObjectSpecificY) { aPoint.setY((2L == b || 3L == b) ? 1.0 : 0.0); @@ -151,20 +151,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - a3DPolyPolygonVector, - getTransform(), - getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + a3DPolyPolygonVector, + getTransform(), + getTextureSize(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - a3DPolyPolygonVector, - getTransform(), - getTextureSize(), + a3DPolyPolygonVector, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -189,11 +189,11 @@ namespace drawinglayer } SdrCubePrimitive3D::SdrCubePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute) + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute) { } diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index ae682f72a21b..a75772cf9c8d 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.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 @@ -146,7 +146,7 @@ namespace drawinglayer } Primitive3DSequence create3DPolyPolygonLinePrimitives( - const basegfx::B3DPolyPolygon& rUnitPolyPolygon, + const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine) { @@ -204,15 +204,15 @@ namespace drawinglayer } const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D( - aScaledPolyPolygon, - aSdr3DObjectAttribute.getMaterial(), + aScaledPolyPolygon, + aSdr3DObjectAttribute.getMaterial(), aSdr3DObjectAttribute.getDoubleSided())); aRetval[a] = xRef; } // look for and evtl. build texture sub-group primitive - if(!rFill.getGradient().isDefault() - || !rFill.getHatch().isDefault() + if(!rFill.getGradient().isDefault() + || !rFill.getHatch().isDefault() || !rFill.getBitmap().isDefault()) { bool bModulate(::com::sun::star::drawing::TextureMode_MODULATE == aSdr3DObjectAttribute.getTextureMode()); @@ -223,39 +223,39 @@ namespace drawinglayer { // create gradientTexture3D with sublist, add to local aRetval pNewTexturePrimitive3D = new GradientTexturePrimitive3D( - rFill.getGradient(), - aRetval, - rTextureSize, - bModulate, + rFill.getGradient(), + aRetval, + rTextureSize, + bModulate, bFilter); } else if(!rFill.getHatch().isDefault()) { // create hatchTexture3D with sublist, add to local aRetval pNewTexturePrimitive3D = new HatchTexturePrimitive3D( - rFill.getHatch(), - aRetval, - rTextureSize, - bModulate, + rFill.getHatch(), + aRetval, + rTextureSize, + bModulate, bFilter); } else // if(!rFill.getBitmap().isDefault()) { // create bitmapTexture3D with sublist, add to local aRetval basegfx::B2DRange aTexRange(0.0, 0.0, rTextureSize.getX(), rTextureSize.getY()); - + pNewTexturePrimitive3D = new BitmapTexturePrimitive3D( - rFill.getBitmap().getFillBitmapAttribute(aTexRange), - aRetval, - rTextureSize, - bModulate, + rFill.getBitmap().getFillBitmapAttribute(aTexRange), + aRetval, + rTextureSize, + bModulate, bFilter); } // exchange aRetval content with texture group const Primitive3DReference xRef(pNewTexturePrimitive3D); aRetval = Primitive3DSequence(&xRef, 1L); - + if(::com::sun::star::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) { // use modified color primitive to force textures to gray @@ -317,17 +317,17 @@ namespace drawinglayer 0.0, basegfx::BColor(), attribute::FillGradientAttribute(), - attribute::FillHatchAttribute(), + attribute::FillHatchAttribute(), attribute::SdrFillBitmapAttribute()); - + const Primitive3DReference aHidden( new HiddenGeometryPrimitive3D( create3DPolyPolygonFillPrimitives( - r3DPolyPolygonVector, - rObjectTransform, - rTextureSize, - aSdr3DObjectAttribute, - aSimplifiedFillAttribute, + r3DPolyPolygonVector, + rObjectTransform, + rTextureSize, + aSdr3DObjectAttribute, + aSimplifiedFillAttribute, attribute::FillGradientAttribute()))); return Primitive3DSequence(&aHidden, 1); diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index 4bbf11748246..8d524397818a 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.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 @@ -53,11 +53,11 @@ namespace // common helpers basegfx::B2DPolyPolygon impScalePolyPolygonOnCenter( - const basegfx::B2DPolyPolygon& rSource, + const basegfx::B2DPolyPolygon& rSource, double fScale) { basegfx::B2DPolyPolygon aRetval(rSource); - + if(!basegfx::fTools::equalZero(fScale)) { const basegfx::B2DRange aRange(basegfx::tools::getRange(rSource)); @@ -74,9 +74,9 @@ namespace } void impGetOuterPolyPolygon( - basegfx::B2DPolyPolygon& rPolygon, - basegfx::B2DPolyPolygon& rOuterPolyPolygon, - double fOffset, + basegfx::B2DPolyPolygon& rPolygon, + basegfx::B2DPolyPolygon& rOuterPolyPolygon, + double fOffset, bool bCharacterMode) { rOuterPolyPolygon = rPolygon; @@ -112,12 +112,12 @@ namespace } void impAddInBetweenFill( - basegfx::B3DPolyPolygon& rTarget, - const basegfx::B3DPolyPolygon& rPolA, + basegfx::B3DPolyPolygon& rTarget, + const basegfx::B3DPolyPolygon& rPolA, const basegfx::B3DPolyPolygon& rPolB, - double fTexVerStart, - double fTexVerStop, - bool bCreateNormals, + double fTexVerStart, + double fTexVerStop, + bool bCreateNormals, bool bCreateTextureCoordinates) { OSL_ENSURE(rPolA.count() == rPolB.count(), "impAddInBetweenFill: unequally sized polygons (!)"); @@ -149,7 +149,7 @@ namespace { const sal_uInt32 nIndexA(b); const sal_uInt32 nIndexB((b + 1L) % nPointCount); - + const basegfx::B3DPoint aStartA(aSubA.getB3DPoint(nIndexA)); const basegfx::B3DPoint aEndA(aSubA.getB3DPoint(nIndexB)); const basegfx::B3DPoint aStartB(aSubB.getB3DPoint(nIndexA)); @@ -177,7 +177,7 @@ namespace const double fEdgeLengthA(basegfx::B3DVector(aEndA - aStartA).getLength()); fPolygonPosA += fEdgeLengthA; const double fRelTexAR(fPolygonPosA * fTexHorMultiplicatorA); - + const double fRelTexBL(fPolygonPosB * fTexHorMultiplicatorB); const double fEdgeLengthB(basegfx::B3DVector(aEndB - aStartB).getLength()); fPolygonPosB += fEdgeLengthB; @@ -196,7 +196,7 @@ namespace } void impSetNormal( - basegfx::B3DPolyPolygon& rCandidate, + basegfx::B3DPolyPolygon& rCandidate, const basegfx::B3DVector& rNormal) { for(sal_uInt32 a(0L); a < rCandidate.count(); a++) @@ -213,8 +213,8 @@ namespace } void impCreateInBetweenNormals( - basegfx::B3DPolyPolygon& rPolA, - basegfx::B3DPolyPolygon& rPolB, + basegfx::B3DPolyPolygon& rPolA, + basegfx::B3DPolyPolygon& rPolB, bool bSmoothHorizontalNormals) { OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)"); @@ -295,8 +295,8 @@ namespace } void impMixNormals( - basegfx::B3DPolyPolygon& rPolA, - const basegfx::B3DPolyPolygon& rPolB, + basegfx::B3DPolyPolygon& rPolA, + const basegfx::B3DPolyPolygon& rPolB, double fWeightA) { const double fWeightB(1.0 - fWeightA); @@ -360,14 +360,14 @@ namespace drawinglayer namespace primitive3d { void createLatheSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fRotation, - sal_uInt32 nSteps, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fRotation, + sal_uInt32 nSteps, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack) { if(basegfx::fTools::equalZero(fRotation) || 0L == nSteps) @@ -453,13 +453,13 @@ namespace drawinglayer } void createExtrudeSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fDepth, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fDepth, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack) { if(basegfx::fTools::equalZero(fDepth)) @@ -499,7 +499,7 @@ namespace drawinglayer aTransformFront.translate(0.0, 0.0, fDepth); rSliceVector.push_back(Slice3D(aOuterFront, aTransformFront, SLICETYPE3D_FRONTCAP)); } - + if(bCloseBack) { const double fOffset(fDepth * fDiagonal * 0.5); @@ -529,7 +529,7 @@ namespace drawinglayer { basegfx::B3DPolyPolygon aRetval; const sal_uInt32 nNumSlices(rSliceVector.size()); - + if(nNumSlices) { const sal_uInt32 nSlideSubPolygonCount(rSliceVector[0].getB3DPolyPolygon().count()); @@ -541,12 +541,12 @@ namespace drawinglayer for(sal_uInt32 c(0); c < nSubPolygonPointCount; c++) { basegfx::B3DPolygon aNew; - + for(sal_uInt32 d(0); d < nNumSlices; d++) { - OSL_ENSURE(nSlideSubPolygonCount == rSliceVector[d].getB3DPolyPolygon().count(), + OSL_ENSURE(nSlideSubPolygonCount == rSliceVector[d].getB3DPolyPolygon().count(), "Slice PolyPolygon with different Polygon count (!)"); - OSL_ENSURE(nSubPolygonPointCount == rSliceVector[d].getB3DPolyPolygon().getB3DPolygon(b).count(), + OSL_ENSURE(nSubPolygonPointCount == rSliceVector[d].getB3DPolyPolygon().getB3DPolygon(b).count(), "Slice Polygon with different point count (!)"); aNew.append(rSliceVector[d].getB3DPolyPolygon().getB3DPolygon(b).getB3DPoint(c)); } @@ -564,7 +564,7 @@ namespace drawinglayer { basegfx::B3DPolyPolygon aRetval; const sal_uInt32 nNumSlices(rSliceVector.size()); - + for(sal_uInt32 a(0L); a < nNumSlices; a++) { aRetval.append(rSliceVector[a].getB3DPolyPolygon()); @@ -574,20 +574,20 @@ namespace drawinglayer } void extractPlanesFromSlice( - ::std::vector< basegfx::B3DPolyPolygon >& rFill, + ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, - bool bCreateNormals, - bool bSmoothHorizontalNormals, - bool bSmoothNormals, - bool bSmoothLids, + bool bCreateNormals, + bool bSmoothHorizontalNormals, + bool bSmoothNormals, + bool bSmoothLids, bool bClosed, - double fSmoothNormalsMix, - double fSmoothLidsMix, - bool bCreateTextureCoordinates, + double fSmoothNormalsMix, + double fSmoothLidsMix, + bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform) { const sal_uInt32 nNumSlices(rSliceVector.size()); - + if(nNumSlices) { // common parameters @@ -653,7 +653,7 @@ namespace drawinglayer { impCreateInBetweenNormals(aPolB, aPolA, bSmoothHorizontalNormals); } - + { const sal_uInt32 nIndPrev((a + nNumSlices - 1L) % nNumSlices); const Slice3D& rSlicePrev(rSliceVector[nIndPrev]); @@ -725,7 +725,7 @@ namespace drawinglayer } } } - + if(bHasSlant) { if(bCreateTextureCoordinates) @@ -895,14 +895,14 @@ namespace drawinglayer } void createReducedOutlines( - const geometry::ViewInformation3D& rViewInformation, + const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, - const basegfx::B3DPolygon& rLoopA, - const basegfx::B3DPolygon& rLoopB, + const basegfx::B3DPolygon& rLoopA, + const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget) { const sal_uInt32 nPointCount(rLoopA.count()); - + // with idetic polygons there are no outlines if(rLoopA != rLoopB) { @@ -972,7 +972,7 @@ namespace drawinglayer aToBeAdded.append(rLoopB.getB3DPoint(nIndexLeft)); rTarget.append(aToBeAdded); } - + if(fMaxRight != 0.0) { basegfx::B3DPolygon aToBeAdded; diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index b33bb0038a43..fd26f5e36bde 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.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,7 +92,7 @@ namespace drawinglayer // create geometry ::std::vector< basegfx::B3DPolyPolygon > aFill; - extractPlanesFromSlice(aFill, rSliceVector, + extractPlanesFromSlice(aFill, rSliceVector, bCreateNormals, getSmoothHorizontalNormals(), getSmoothNormals(), getSmoothLids(), false, 0.5, 0.6, bCreateTextureCoordiantesX || bCreateTextureCoordiantesY, aTexTransform); @@ -132,20 +132,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - aFill, - getTransform(), - getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + aFill, + getTransform(), + getTextureSize(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - aFill, - getTransform(), - getTextureSize(), + aFill, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -159,7 +159,7 @@ namespace drawinglayer const sal_uInt32 nCount(aVerLine.count()); basegfx::B3DPolyPolygon aReducedLoops; basegfx::B3DPolyPolygon aNewLineGeometry; - + // sort out doubles (front and back planes when no edge rounding is done). Since // this is a line geometry merged from PolyPolygons, loop over all Polygons for(a = 0; a < nCount; a++) @@ -167,7 +167,7 @@ namespace drawinglayer const sal_uInt32 nReducedCount(aReducedLoops.count()); const basegfx::B3DPolygon aCandidate(aVerLine.getB3DPolygon(a)); bool bAdd(true); - + if(nReducedCount) { for(sal_uInt32 b(0); bAdd && b < nReducedCount; b++) @@ -178,7 +178,7 @@ namespace drawinglayer } } } - + if(bAdd) { aReducedLoops.append(aCandidate); @@ -195,13 +195,13 @@ namespace drawinglayer // get loop pair const basegfx::B3DPolygon aCandA(aReducedLoops.getB3DPolygon(b - 1)); const basegfx::B3DPolygon aCandB(aReducedLoops.getB3DPolygon(b)); - + // for each loop pair create the connection edges createReducedOutlines( - rViewInformation, - getTransform(), + rViewInformation, + getTransform(), aCandA, - aCandB, + aCandB, aNewLineGeometry); } } @@ -209,7 +209,7 @@ namespace drawinglayer // add reduced loops themselves aNewLineGeometry.append(aReducedLoops); - // to create vertical edges at non-C1/C2 steady loops, use maCorrectedPolyPolygon + // to create vertical edges at non-C1/C2 steady loops, use maCorrectedPolyPolygon // directly since the 3D Polygons do not suport this. // // Unfortunately there is no bezier polygon provided by the chart module; one reason is @@ -222,7 +222,7 @@ namespace drawinglayer // This is all not very well designed ATM. Ideally, the ReducedLineGeometry is responsible // for creating the outer geometry edges (createReducedOutlines), but for special edges // like the vertical ones for pie center and both start/end, the incarnation with the - // knowledge about that it needs to create those and IS a pie segment -> in this case, + // knowledge about that it needs to create those and IS a pie segment -> in this case, // the chart itself. const sal_uInt32 nPolyCount(maCorrectedPolyPolygon.count()); @@ -236,7 +236,7 @@ namespace drawinglayer sal_uInt32 nIndexA(nPointCount); sal_uInt32 nIndexB(nPointCount); sal_uInt32 nIndexC(nPointCount); - + for(sal_uInt32 d(0); d < nPointCount; d++) { const sal_uInt32 nPrevInd((d + nPointCount - 1) % nPointCount); @@ -278,7 +278,7 @@ namespace drawinglayer } else if(bIndexAUsed && bIndexBUsed) { - // outer edges detected (they are approx. 90 degrees), but center one not. + // outer edges detected (they are approx. 90 degrees), but center one not. // Look with the knowledge that it's in-between the two found ones if(((nIndexA + 2) % nPointCount) == nIndexB) { @@ -303,7 +303,7 @@ namespace drawinglayer aToBeAdded.append(aEnd); aNewLineGeometry.append(aToBeAdded); } - + if(bIndexBUsed) { const basegfx::B2DPoint aPoint(aCandidate.getB2DPoint(nIndexB)); @@ -332,7 +332,7 @@ namespace drawinglayer // append loops themselves aNewLineGeometry.append(aReducedLoops); - + if(aNewLineGeometry.count()) { const Primitive3DSequence aLines(create3DPolyPolygonLinePrimitives( @@ -397,21 +397,21 @@ namespace drawinglayer } SdrExtrudePrimitive3D::SdrExtrudePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, - double fDepth, - double fDiagonal, + double fDepth, + double fDiagonal, double fBackScale, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), maCorrectedPolyPolygon(), maSlices(), maPolyPolygon(rPolyPolygon), @@ -468,7 +468,7 @@ namespace drawinglayer if(SdrPrimitive3D::operator==(rPrimitive)) { const SdrExtrudePrimitive3D& rCompare = static_cast< const SdrExtrudePrimitive3D& >(rPrimitive); - + return (getPolyPolygon() == rCompare.getPolyPolygon() && getDepth() == rCompare.getDepth() && getDiagonal() == rCompare.getDiagonal() diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 2ddccd4ea01d..dcb5409ae9b8 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.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 aTexTransform.set(0, 1, 1.0); aTexTransform.set(1, 0, 1.0); aTexTransform.set(1, 1, 0.0); - + aTexTransform.translate(0.0, -0.5); aTexTransform.scale(1.0, -1.0); aTexTransform.translate(0.0, 0.5); @@ -86,7 +86,7 @@ namespace drawinglayer // create geometry ::std::vector< basegfx::B3DPolyPolygon > aFill; - extractPlanesFromSlice(aFill, rSliceVector, + extractPlanesFromSlice(aFill, rSliceVector, bCreateNormals, getSmoothHorizontalNormals(), getSmoothNormals(), getSmoothLids(), bClosedRotation, 0.85, 0.6, bCreateTextureCoordiantesX || bCreateTextureCoordiantesY, aTexTransform); @@ -126,20 +126,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - aFill, - getTransform(), + aFill, + getTransform(), getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - aFill, - getTransform(), - getTextureSize(), + aFill, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -157,10 +157,10 @@ namespace drawinglayer { // for each loop pair create the connection edges createReducedOutlines( - rViewInformation, - getTransform(), - aHorLine.getB3DPolygon(a - 1), - aHorLine.getB3DPolygon(a), + rViewInformation, + getTransform(), + aHorLine.getB3DPolygon(a - 1), + aHorLine.getB3DPolygon(a), aNewLineGeometry); } @@ -252,23 +252,23 @@ namespace drawinglayer } SdrLathePrimitive3D::SdrLathePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments, - double fDiagonal, + double fDiagonal, double fBackScale, double fRotation, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), maCorrectedPolyPolygon(), maSlices(), maPolyPolygon(rPolyPolygon), @@ -361,7 +361,7 @@ namespace drawinglayer if(getSdr3DObjectAttribute().getReducedLineGeometry()) { if(!mpLastRLGViewInformation || - (getBuffered3DDecomposition().hasElements() + (getBuffered3DDecomposition().hasElements() && *mpLastRLGViewInformation != rViewInformation)) { // conditions of last local decomposition with reduced lines have changed. Remember @@ -373,7 +373,7 @@ namespace drawinglayer pThat->mpLastRLGViewInformation = new geometry::ViewInformation3D(rViewInformation); } } - + // no test for buffering needed, call parent return SdrPrimitive3D::get3DDecomposition(rViewInformation); } diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index 5fc1bbad3e67..46b3225c2910 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.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,20 +92,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - aFill, - getTransform(), - getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + aFill, + getTransform(), + getTextureSize(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - aFill, - getTransform(), - getTextureSize(), + aFill, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -135,11 +135,11 @@ namespace drawinglayer SdrPolyPolygonPrimitive3D::SdrPolyPolygonPrimitive3D( const basegfx::B3DPolyPolygon& rPolyPolygon3D, - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), maPolyPolygon3D(rPolyPolygon3D) { } diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx index 90b39586b297..19f436da8633 100644 --- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrprimitive3d.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,11 +92,11 @@ namespace drawinglayer } SdrPrimitive3D::SdrPrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute) - : BufferedDecompositionPrimitive3D(), + : BufferedDecompositionPrimitive3D(), maTransform(rTransform), maTextureSize(rTextureSize), maSdrLFSAttribute(rSdrLFSAttribute), diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index 1f00496678b5..b69bde3e5a6e 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.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 || ::com::sun::star::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()); // create unit geometry - basegfx::B3DPolyPolygon aFill(basegfx::tools::createSphereFillPolyPolygonFromB3DRange(aUnitRange, + basegfx::B3DPolyPolygon aFill(basegfx::tools::createSphereFillPolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments(), bCreateNormals)); // normal inversion - if(!getSdrLFSAttribute().getFill().isDefault() - && bCreateNormals - && getSdr3DObjectAttribute().getNormalsInvert() + if(!getSdrLFSAttribute().getFill().isDefault() + && bCreateNormals + && getSdr3DObjectAttribute().getNormalsInvert() && aFill.areNormalsUsed()) { // invert normals @@ -94,7 +94,7 @@ namespace drawinglayer if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY) { double fRelativeAngle(0.0); - + if(bObjectSpecificX) { // Since the texture coordinates are (for historical reasons) @@ -112,7 +112,7 @@ namespace drawinglayer const basegfx::B3DPoint aCenter(aRange.getCenter()); aFill = basegfx::tools::applyDefaultTextureCoordinatesSphere(aFill, aCenter, bSphereX || bObjectSpecificX, bSphereY || bObjectSpecificY); - + if(bObjectSpecificX) { // rotate back again @@ -140,20 +140,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - a3DPolyPolygonVector, - getTransform(), + a3DPolyPolygonVector, + getTransform(), getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - a3DPolyPolygonVector, - getTransform(), - getTextureSize(), + a3DPolyPolygonVector, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -179,13 +179,13 @@ namespace drawinglayer } SdrSpherePrimitive3D::SdrSpherePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, - const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, - sal_uInt32 nHorizontalSegments, + const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, + sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), mnHorizontalSegments(nHorizontalSegments), mnVerticalSegments(nVerticalSegments) { @@ -197,7 +197,7 @@ namespace drawinglayer { const SdrSpherePrimitive3D& rCompare = static_cast< const SdrSpherePrimitive3D& >(rPrimitive); - return (getHorizontalSegments() == rCompare.getHorizontalSegments() + return (getHorizontalSegments() == rCompare.getHorizontalSegments() && getVerticalSegments() == rCompare.getVerticalSegments()); } diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx index 282deb4332cc..02818c74afb1 100644 --- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/shadowprimitive3d.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,12 +43,12 @@ namespace drawinglayer namespace primitive3d { ShadowPrimitive3D::ShadowPrimitive3D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, - double fShadowTransparence, - bool bShadow3D, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, + double fShadowTransparence, + bool bShadow3D, const Primitive3DSequence& rChildren) - : GroupPrimitive3D(rChildren), + : GroupPrimitive3D(rChildren), maShadowTransform(rShadowTransform), maShadowColor(rShadowColor), mfShadowTransparence(fShadowTransparence), diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx index 5edd40806a21..1285549380e0 100644 --- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/textureprimitive3d.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,10 +44,10 @@ namespace drawinglayer namespace primitive3d { TexturePrimitive3D::TexturePrimitive3D( - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter) - : GroupPrimitive3D(rChildren), + : GroupPrimitive3D(rChildren), maTextureSize(rTextureSize), mbModulate(bModulate), mbFilter(bFilter) @@ -59,8 +59,8 @@ namespace drawinglayer if(GroupPrimitive3D::operator==(rPrimitive)) { const TexturePrimitive3D& rCompare = (TexturePrimitive3D&)rPrimitive; - - return (getModulate() == rCompare.getModulate() + + return (getModulate() == rCompare.getModulate() && getFilter() == rCompare.getFilter()); } @@ -76,9 +76,9 @@ namespace drawinglayer namespace primitive3d { UnifiedTransparenceTexturePrimitive3D::UnifiedTransparenceTexturePrimitive3D( - double fTransparence, + double fTransparence, const Primitive3DSequence& rChildren) - : TexturePrimitive3D(rChildren, basegfx::B2DVector(), false, false), + : TexturePrimitive3D(rChildren, basegfx::B2DVector(), false, false), mfTransparence(fTransparence) { } @@ -137,12 +137,12 @@ namespace drawinglayer namespace primitive3d { GradientTexturePrimitive3D::GradientTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter) - : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), + : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), maGradient(rGradient) { } @@ -152,7 +152,7 @@ namespace drawinglayer if(TexturePrimitive3D::operator==(rPrimitive)) { const GradientTexturePrimitive3D& rCompare = (GradientTexturePrimitive3D&)rPrimitive; - + return (getGradient() == rCompare.getGradient()); } @@ -172,11 +172,11 @@ namespace drawinglayer namespace primitive3d { BitmapTexturePrimitive3D::BitmapTexturePrimitive3D( - const attribute::FillBitmapAttribute& rFillBitmapAttribute, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, + const attribute::FillBitmapAttribute& rFillBitmapAttribute, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter) - : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), + : TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter), maFillBitmapAttribute(rFillBitmapAttribute) { } @@ -206,10 +206,10 @@ namespace drawinglayer namespace primitive3d { TransparenceTexturePrimitive3D::TransparenceTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, const basegfx::B2DVector& rTextureSize) - : GradientTexturePrimitive3D(rGradient, rChildren, rTextureSize, false, false) + : GradientTexturePrimitive3D(rGradient, rChildren, rTextureSize, false, false) { } diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx index c1d18bb22ae3..a452c28c5350 100644 --- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/transformprimitive3d.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 primitive3d { TransformPrimitive3D::TransformPrimitive3D( - const basegfx::B3DHomMatrix& rTransformation, + const basegfx::B3DHomMatrix& rTransformation, const Primitive3DSequence& rChildren) - : GroupPrimitive3D(rChildren), + : GroupPrimitive3D(rChildren), maTransformation(rTransformation) { } @@ -56,7 +56,7 @@ namespace drawinglayer if(GroupPrimitive3D::operator==(rPrimitive)) { const TransformPrimitive3D& rCompare = static_cast< const TransformPrimitive3D& >(rPrimitive); - + return (getTransformation() == rCompare.getTransformation()); } diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx index 71c46039ca26..7dce36b36472 100644 --- a/drawinglayer/source/processor2d/baseprocessor2d.cxx +++ b/drawinglayer/source/processor2d/baseprocessor2d.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,7 +46,7 @@ namespace drawinglayer } BaseProcessor2D::BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation) - : maViewInformation2D(rViewInformation) + : maViewInformation2D(rViewInformation) { } diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx index eeb9e8e5bd19..062363a536d9 100644 --- a/drawinglayer/source/processor2d/canvasprocessor.cxx +++ b/drawinglayer/source/processor2d/canvasprocessor.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 @@ -135,7 +135,7 @@ using namespace com::sun::star; delete pContent; } - + break; } } @@ -188,7 +188,7 @@ using namespace com::sun::star; basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), rTargetForm)); - + for(sal_uInt32 a(0L); a < rColors.size(); a++) { // set correct color @@ -202,14 +202,14 @@ using namespace com::sun::star; { if(a - 1L < rMatrices.size()) { - canvas::tools::setRenderStateTransform( maRenderState, + canvas::tools::setRenderStateTransform( maRenderState, rMatrices[a - 1L] ); mxCanvas->fillPolyPolygon(xPoly,maViewState,maRenderState); } } else { - canvas::tools::setRenderStateTransform( maRenderState, + canvas::tools::setRenderStateTransform( maRenderState, basegfx::B2DHomMatrix() ); mxCanvas->fillPolyPolygon(xTargetPoly,maViewState,maRenderState); } @@ -240,15 +240,15 @@ using namespace com::sun::star; if(rColors.size() > a) { const basegfx::BColor aFillColor(rColors[a]); - + maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( mxCanvas->getDevice(), aFillColor); } - - canvas::tools::setRenderStateTransform( maRenderState, + + canvas::tools::setRenderStateTransform( maRenderState, rMatrices[a] ); - + if(a) mxCanvas->fillPolyPolygon(xPoly,maViewState,maRenderState); else @@ -259,8 +259,8 @@ using namespace com::sun::star; } void canvasProcessor::impDrawGradient( - const basegfx::B2DPolyPolygon& rTargetForm, - ::drawinglayer::primitive::GradientStyle eGradientStyle, + const basegfx::B2DPolyPolygon& rTargetForm, + ::drawinglayer::primitive::GradientStyle eGradientStyle, sal_uInt32 nSteps, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, @@ -280,7 +280,7 @@ using namespace com::sun::star; nSteps == 0 || // step count is sufficiently high, such that no // discernible difference should be visible. - nSteps > 64 ) + nSteps > 64 ) { uno::Reference< rendering::XParametricPolyPolygon2DFactory > xFactory( mxCanvas->getDevice()->getParametricPolyPolygonFactory() ); @@ -290,7 +290,7 @@ using namespace com::sun::star; fprintf(stderr,"native gradient #1\n"); basegfx::B2DHomMatrix aTextureTransformation; - rendering::Texture aTexture; + rendering::Texture aTexture; aTexture.RepeatModeX = rendering::TexturingMode::CLAMP; aTexture.RepeatModeY = rendering::TexturingMode::CLAMP; @@ -309,8 +309,8 @@ using namespace com::sun::star; // Setup texture transformation // ---------------------------- - - const basegfx::B2DRange& rBounds( + + const basegfx::B2DRange& rBounds( basegfx::tools::getRange( rTargetForm )); // setup rotation angle. VCL rotates @@ -332,7 +332,7 @@ using namespace com::sun::star; // shrink texture, to account for border // (only in x direction, linear gradient // is constant in y direction, anyway) - aTextureTransformation.scale( + aTextureTransformation.scale( basegfx::pruneScaleValue(1.0 - fBorder), 1.0 ); @@ -369,7 +369,7 @@ using namespace com::sun::star; } // apply border offset values - aTextureTransformation.translate( fBorderX, + aTextureTransformation.translate( fBorderX, 0.0 ); // rotate texture according to gradient rotation @@ -381,7 +381,7 @@ using namespace com::sun::star; // bound rect (and not, due to rotation, // slightly inside), slightly enlarge the // gradient: - // + // // y/2 sin(transparence) + x/2 cos(transparence) // // (values to change are not actual @@ -390,9 +390,9 @@ using namespace com::sun::star; // the border setting to apply after that, // we multiply with that as above for // nScaleX) - const double nScale( + const double nScale( basegfx::pruneScaleValue( - fabs( rBounds.getHeight()*sin(fAngle) ) + + fabs( rBounds.getHeight()*sin(fAngle) ) + fabs( rBounds.getWidth()*cos(fAngle) ))); aTextureTransformation.scale( nScale, nScale ); @@ -437,9 +437,9 @@ using namespace com::sun::star; // zero shift. Both values will // potentially be adapted in switch // statement below. - double nOffsetX( rBounds.getWidth() * + double nOffsetX( rBounds.getWidth() * (2.0 * fOffsetX - 1.0 + fBorder)*.5 ); - double nOffsetY( rBounds.getHeight() * + double nOffsetY( rBounds.getHeight() * (2.0 * fOffsetY - 1.0 + fBorder)*.5 ); // determine type of gradient (and necessary @@ -463,12 +463,12 @@ using namespace com::sun::star; // enlarge gradient to match bound rect diagonal aTextureTransformation.translate( -0.5, -0.5 ); - const double nScale( hypot(rBounds.getWidth(), + const double nScale( hypot(rBounds.getWidth(), rBounds.getHeight()) / nScaleX ); aTextureTransformation.scale( nScale, nScale ); aTextureTransformation.translate( 0.5, 0.5 ); - aTexture.Gradient = xFactory->createEllipticalGradient( + aTexture.Gradient = xFactory->createEllipticalGradient( aEndColor, aStartColor, cssgeom::RealRectangle2D(0.0,0.0, @@ -484,7 +484,7 @@ using namespace com::sun::star; aTextureTransformation.scale( nSqrt2,nSqrt2 ); aTextureTransformation.translate( 0.5, 0.5 ); - aTexture.Gradient = xFactory->createEllipticalGradient( + aTexture.Gradient = xFactory->createEllipticalGradient( aEndColor, aStartColor, cssgeom::RealRectangle2D( rBounds.getMinX(), @@ -508,7 +508,7 @@ using namespace com::sun::star; nScaleX = nScaleY; } - aTexture.Gradient = xFactory->createRectangularGradient( + aTexture.Gradient = xFactory->createRectangularGradient( aEndColor, aStartColor, cssgeom::RealRectangle2D(0.0,0.0, @@ -518,7 +518,7 @@ using namespace com::sun::star; case ::drawinglayer::primitive::GRADIENTSTYLE_RECT: { - aTexture.Gradient = xFactory->createRectangularGradient( + aTexture.Gradient = xFactory->createRectangularGradient( aEndColor, aStartColor, cssgeom::RealRectangle2D( rBounds.getMinX(), @@ -538,7 +538,7 @@ using namespace com::sun::star; aTextureTransformation.translate( -0.5*nScaleX, -0.5*nScaleY ); aTextureTransformation.rotate( fAngle ); aTextureTransformation.translate( 0.5*nScaleX, 0.5*nScaleY ); - + aTextureTransformation.translate( nOffsetX, nOffsetY ); } break; @@ -556,15 +556,15 @@ using namespace com::sun::star; // gradient will always display at the origin, and // not within the polygon bound (which might be // miles away from the origin). - aTextureTransformation.translate( rBounds.getMinX(), + aTextureTransformation.translate( rBounds.getMinX(), rBounds.getMinY() ); - basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform, + basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform, aTextureTransformation ); uno::Sequence< rendering::Texture > aSeq(1); aSeq[0] = aTexture; - mxCanvas->fillTexturedPolyPolygon( + mxCanvas->fillTexturedPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), rTargetForm), @@ -579,8 +579,8 @@ using namespace com::sun::star; else { // make sure steps is not too high/low - nSteps = impCalcGradientSteps(nSteps, - aOutlineRangePixel, + nSteps = impCalcGradientSteps(nSteps, + aOutlineRangePixel, sal_uInt32((rStart.getMaximumDistance(rEnd) * 127.5) + 0.5)); @@ -588,7 +588,7 @@ using namespace com::sun::star; ::std::vector< basegfx::BColor > aColors; basegfx::B2DPolygon aUnitPolygon; - if( drawinglayer::primitive::GRADIENTSTYLE_RADIAL == eGradientStyle || + if( drawinglayer::primitive::GRADIENTSTYLE_RADIAL == eGradientStyle || drawinglayer::primitive::GRADIENTSTYLE_ELLIPTICAL == eGradientStyle) { const basegfx::B2DPoint aCircleCenter(0.5, 0.5); @@ -678,9 +678,9 @@ using namespace com::sun::star; aFontRequest.FontDescription.IsVertical = rFontAttrs.mbVertical ? util::TriState_YES : util::TriState_NO; // TODO(F2): improve vclenum->panose conversion - aFontRequest.FontDescription.FontDescription.Weight = + aFontRequest.FontDescription.FontDescription.Weight = rFontAttrs.mnWeight; - aFontRequest.FontDescription.FontDescription.Letterform = + aFontRequest.FontDescription.FontDescription.Letterform = rFontAttrs.mbItalic ? 9 : 0; // font matrix should only be used for glyph rotations etc. @@ -696,17 +696,17 @@ using namespace com::sun::star; return; uno::Reference<rendering::XTextLayout> xLayout( - xFont->createTextLayout( - rendering::StringContext( rTextCandidate.getText(), - 0, - rTextCandidate.getText().Len() ), + xFont->createTextLayout( + rendering::StringContext( rTextCandidate.getText(), + 0, + rTextCandidate.getText().Len() ), // TODO(F3): Is this sufficient? - rendering::TextDirection::WEAK_LEFT_TO_RIGHT, + rendering::TextDirection::WEAK_LEFT_TO_RIGHT, 0 )); if( !xLayout.is() ) return; - xLayout->applyLogicalAdvancements( + xLayout->applyLogicalAdvancements( uno::Sequence<double>(&rTextCandidate.getDXArray()[0], rTextCandidate.getDXArray().size() )); @@ -719,8 +719,8 @@ using namespace com::sun::star; aRGBColor); // get render parameters and paint - mxCanvas->drawTextLayout( xLayout, - maViewState, + mxCanvas->drawTextLayout( xLayout, + maViewState, maRenderState ); } @@ -738,7 +738,7 @@ using namespace com::sun::star; mxCanvas->drawPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolygon( mxCanvas->getDevice(), rPolygonCandidate.getB2DPolygon()), - maViewState, + maViewState, maRenderState ); } @@ -764,8 +764,8 @@ using namespace com::sun::star; aBitmapEx = BitmapEx(aChangedBitmap); } - mxCanvas->drawBitmap( - vcl::unotools::xBitmapFromBitmapEx( mxCanvas->getDevice(), + mxCanvas->drawBitmap( + vcl::unotools::xBitmapFromBitmapEx( mxCanvas->getDevice(), aBitmapEx ), maViewState, maRenderState); @@ -775,31 +775,31 @@ using namespace com::sun::star; { const fillBitmapAttribute& rFillBmpAttr( rPolyBitmapCandidate.getFillBitmap() ); const basegfx::B2DPolyPolygon& rPoly( rPolyBitmapCandidate.getB2DPolyPolygon() ); - + // TODO(Q3): Share common bmp modification code with // vclprocessor.cxx Bitmap aChangedBitmap( - impModifyBitmap(maBColorModifierStack, + impModifyBitmap(maBColorModifierStack, rFillBmpAttr.getBitmap())); rendering::Texture aTexture; const basegfx::B2DVector aBmpSize( rFillBmpAttr.getSize() ); - const basegfx::B2DRange& rBounds( + const basegfx::B2DRange& rBounds( basegfx::tools::getRange( rPoly )); basegfx::B2DHomMatrix aScale; aScale.scale( aBmpSize.getX() * rBounds.getWidth(), aBmpSize.getY() * rBounds.getHeight() ); - basegfx::unotools::affineMatrixFromHomMatrix( + basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform, aScale ); aTexture.Alpha = 1.0; - aTexture.Bitmap = - ::vcl::unotools::xBitmapFromBitmapEx( - mxCanvas->getDevice(), + aTexture.Bitmap = + ::vcl::unotools::xBitmapFromBitmapEx( + mxCanvas->getDevice(), aChangedBitmap ); aTexture.RepeatModeX = rendering::TexturingMode::REPEAT; aTexture.RepeatModeY = rendering::TexturingMode::REPEAT; @@ -807,13 +807,13 @@ using namespace com::sun::star; uno::Sequence< rendering::Texture > aSeq(1); aSeq[0] = aTexture; - mxCanvas->fillTexturedPolyPolygon( + mxCanvas->fillTexturedPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), rPoly), maViewState, maRenderState, - aSeq ); + aSeq ); } // direct draw of gradient @@ -831,11 +831,11 @@ using namespace com::sun::star; maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( mxCanvas->getDevice(), aStartColor); - + mxCanvas->drawPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), aLocalPolyPolygon), - maViewState, + maViewState, maRenderState ); } else @@ -844,7 +844,7 @@ using namespace com::sun::star; // gradient manually! impDrawGradient( aLocalPolyPolygon, rGradient.getStyle(), rGradient.getSteps(), - aStartColor, aEndColor, rGradient.getBorder(), + aStartColor, aEndColor, rGradient.getBorder(), -rGradient.getAngle(), rGradient.getOffsetX(), rGradient.getOffsetY(), false); } } @@ -863,7 +863,7 @@ using namespace com::sun::star; mxCanvas->fillPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), rPolygonCandidate.getB2DPolyPolygon()), - maViewState, + maViewState, maRenderState ); } @@ -891,8 +891,8 @@ using namespace com::sun::star; uno::Reference<rendering::XBitmapCanvas>( mxCanvas, uno::UNO_QUERY_THROW) )); - cppcanvas::RendererSharedPtr pMtfRenderer( - cppcanvas::VCLFactory::getInstance().createRenderer( + cppcanvas::RendererSharedPtr pMtfRenderer( + cppcanvas::VCLFactory::getInstance().createRenderer( pCanvas, aMetaFile, cppcanvas::Renderer::Parameters() )); @@ -912,7 +912,7 @@ using namespace com::sun::star; if(!rSubList.empty()) { // TODO(F3): cannot use state-global renderstate, when recursing! - maRenderState.Clip = + maRenderState.Clip = basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), rMaskCandidate.getMask()); @@ -945,17 +945,17 @@ using namespace com::sun::star; if(!rSubList.empty()) { basegfx::B2DRange aRange( - get2DRangeFromVector(rSubList, + get2DRangeFromVector(rSubList, getViewInformation())); aRange.transform(maWorldToView); const basegfx::B2I64Tuple& rSize( canvas::tools::spritePixelAreaFromB2DRange(aRange).getRange()); uno::Reference< rendering::XCanvas > xBitmap( - mxCanvas->getDevice()->createCompatibleAlphaBitmap( + mxCanvas->getDevice()->createCompatibleAlphaBitmap( css::geometry::IntegerSize2D(rSize.getX(), rSize.getY())), uno::UNO_QUERY_THROW); - + // remember last worldToView and add pixel offset basegfx::B2DHomMatrix aLastWorldToView(maWorldToView); basegfx::B2DHomMatrix aPixelOffset; @@ -967,9 +967,9 @@ using namespace com::sun::star; uno::Reference< rendering::XCanvas > xLastCanvas( mxCanvas ); mxCanvas = xBitmap; - // paint content to it + // paint content to it process(rSubList); - + // TODO(F3): render transparent list to transparence // channel. Note that the OutDev implementation has a // shortcoming, in that nested transparency groups @@ -977,7 +977,7 @@ using namespace com::sun::star; // process(rTransCandidate.getTransparenceList()); - // back to old OutDev and worldToView + // back to old OutDev and worldToView mxCanvas = xLastCanvas; setWorldToView(aLastWorldToView); @@ -986,7 +986,7 @@ using namespace com::sun::star; canvas::tools::setDeviceColor( maRenderState, 1.0, 1.0, 1.0, 0.5 ); // finally, draw bitmap - mxCanvas->drawBitmapModulated( + mxCanvas->drawBitmapModulated( uno::Reference< rendering::XBitmap >( xBitmap, uno::UNO_QUERY_THROW), @@ -1030,7 +1030,7 @@ using namespace com::sun::star; uno::Reference< rendering::XPolyPolygon2D > xHighlightMarkerPoly; switch(rMarkCandidate.getStyle()) { - default: + default: case MARKERSTYLE_POINT: mxCanvas->drawPoint( basegfx::unotools::point2DFromB2DPoint(aViewPos), maMarkerViewState, @@ -1041,11 +1041,11 @@ using namespace com::sun::star; if( !mxCrossMarkerPoly.is() ) { basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( + basegfx::tools::importFromSvgD( + aPoly, + rtl::OUString::createFromAscii( "m-1 0 h2 m0 -1 v2" )); - mxCrossMarkerPoly = + mxCrossMarkerPoly = basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), aPoly ); @@ -1057,11 +1057,11 @@ using namespace com::sun::star; if( !mxGluePointPoly.is() ) { basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( + basegfx::tools::importFromSvgD( + aPoly, + rtl::OUString::createFromAscii( "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" )); - mxGluePointPoly = + mxGluePointPoly = basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), aPoly ); @@ -1069,11 +1069,11 @@ using namespace com::sun::star; if( !mxGluePointHighlightPoly.is() ) { basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( + basegfx::tools::importFromSvgD( + aPoly, + rtl::OUString::createFromAscii( "m-2 -2 l4 4 m-2 2 l4 -4" )); - mxGluePointHighlightPoly = + mxGluePointHighlightPoly = basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), aPoly ); @@ -1086,15 +1086,15 @@ using namespace com::sun::star; basegfx::B2DRange aRange; rMarkCandidate.getRealtiveViewRange(aRange); const basegfx::B2DPoint aCenter(aRange.getCenter()); - + basegfx::B2DHomMatrix aTranslate; aTranslate.translate(aViewPos.getX()+aCenter.getX(), aViewPos.getY()+aCenter.getY()); - - canvas::tools::setRenderStateTransform( maMarkerRenderState, + + canvas::tools::setRenderStateTransform( maMarkerRenderState, aTranslate ); - - + + mxCanvas->drawPolyPolygon( xMarkerPoly, maMarkerViewState, maMarkerRenderState ); @@ -1245,7 +1245,7 @@ using namespace com::sun::star; } } - canvasProcessor::canvasProcessor( const ::drawinglayer::geometry::viewInformation& rViewInformation, + canvasProcessor::canvasProcessor( const ::drawinglayer::geometry::viewInformation& rViewInformation, const uno::Reference<rendering::XCanvas>& rCanvas ) : processor(rViewInformation), mxCanvas( rCanvas ), @@ -1286,7 +1286,7 @@ namespace drawinglayer { const primitive2d::Primitive2DSequence& rChildren = rMaskCandidate.getChildren(); static bool bUseMaskBitmapMethod(true); - + if(rChildren.hasElements()) { basegfx::B2DPolyPolygon aMask(rMaskCandidate.getMask()); @@ -1336,13 +1336,13 @@ namespace drawinglayer // prepare discrete offset for XBitmap, do not forget that the buffer bitmap // may be truncated to discrete visible pixels const basegfx::B2DHomMatrix aDiscreteOffset(basegfx::tools::createTranslateB2DHomMatrix( - aDiscreteRange.getMinX() > 0.0 ? -aDiscreteRange.getMinX() : 0.0, + aDiscreteRange.getMinX() > 0.0 ? -aDiscreteRange.getMinX() : 0.0, aDiscreteRange.getMinY() > 0.0 ? -aDiscreteRange.getMinY() : 0.0)); // create new local ViewInformation2D with new transformation const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation(), - aDiscreteOffset * getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation(), + aDiscreteOffset * getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), @@ -1365,17 +1365,17 @@ namespace drawinglayer // paint content process(rChildren); - + // draw mask const basegfx::BColor aBlack(0.0, 0.0, 0.0); maRenderState.DeviceColor = aBlack.colorToDoubleSequence(mxCanvas->getDevice()); - + if(getOptionsDrawinglayer().IsAntiAliasing()) { // with AA, use 8bit AlphaMask to get nice borders VirtualDevice& rTransparence = aBufferDevice.getTransparence(); rTransparence.GetCanvas()->fillPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), aMask), + basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), aMask), maViewState, maRenderState); } else @@ -1383,10 +1383,10 @@ namespace drawinglayer // No AA, use 1bit mask VirtualDevice& rMask = aBufferDevice.getMask(); rMask.GetCanvas()->fillPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), aMask), + basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), aMask), maViewState, maRenderState); } - + // back to old color stack, OutDev, Canvas and ViewTransform mpOutputDevice = pLastOutputDevice; mxCanvas = xLastCanvas; @@ -1415,10 +1415,10 @@ namespace drawinglayer // remember last current clip polygon const basegfx::B2DPolyPolygon aLastClipPolyPolygon(maClipPolyPolygon); - + if(maClipPolyPolygon.count()) { - // there is already a clip polygon set; build clipped union of + // there is already a clip polygon set; build clipped union of // current mask polygon and new one maClipPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon(aMask, maClipPolyPolygon, false, false); } @@ -1479,7 +1479,7 @@ namespace drawinglayer cppcanvas::BitmapCanvasSharedPtr pCanvas(cppcanvas::VCLFactory::getInstance().createCanvas( uno::Reference<rendering::XBitmapCanvas>(mxCanvas, uno::UNO_QUERY_THROW))); - cppcanvas::RendererSharedPtr pMtfRenderer(cppcanvas::VCLFactory::getInstance().createRenderer( + cppcanvas::RendererSharedPtr pMtfRenderer(cppcanvas::VCLFactory::getInstance().createRenderer( pCanvas, aMetaFile, cppcanvas::Renderer::Parameters())); if(pMtfRenderer) @@ -1563,9 +1563,9 @@ namespace drawinglayer maRenderState.DeviceColor = aRGBColor.colorToDoubleSequence(mxCanvas->getDevice()); // set text transformation - canvas::tools::setRenderStateTransform(maRenderState, + canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation() * rTextCandidate.getTextTransform()); - + // paint mxCanvas->drawTextLayout(xLayout, maViewState, maRenderState); } @@ -1584,11 +1584,11 @@ namespace drawinglayer // replace with color filled polygon const basegfx::BColor aModifiedColor(maBColorModifierStack.getModifiedColor(basegfx::BColor())); const basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); - + maRenderState.DeviceColor = aModifiedColor.colorToDoubleSequence(mxCanvas->getDevice()); - canvas::tools::setRenderStateTransform(maRenderState, + canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation() * rBitmapCandidate.getTransform()); - + mxCanvas->fillPolyPolygon(basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), basegfx::B2DPolyPolygon(aPolygon)), maViewState, maRenderState); } @@ -1605,8 +1605,8 @@ namespace drawinglayer const basegfx::B2DHomMatrix aNewMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aScale.getX() / aSizePixel.Width(), aScale.getY() / aSizePixel.Height(), fShearX, fRotate, aTranslate.getX(), aTranslate.getY())); - - canvas::tools::setRenderStateTransform(maRenderState, + + canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation() * aNewMatrix); mxCanvas->drawBitmap( @@ -1654,13 +1654,13 @@ namespace drawinglayer // prepare discrete offset for XBitmap, do not forget that the buffer bitmap // may be truncated to discrete visible pixels const basegfx::B2DHomMatrix aDiscreteOffset(basegfx::tools::createTranslateB2DHomMatrix( - aDiscreteRange.getMinX() > 0.0 ? -aDiscreteRange.getMinX() : 0.0, + aDiscreteRange.getMinX() > 0.0 ? -aDiscreteRange.getMinX() : 0.0, aDiscreteRange.getMinY() > 0.0 ? -aDiscreteRange.getMinY() : 0.0)); // create new local ViewInformation2D with new transformation const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation(), - aDiscreteOffset * getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation(), + aDiscreteOffset * getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), @@ -1683,7 +1683,7 @@ namespace drawinglayer // paint content process(rChildren); - + // set to mask mpOutputDevice = &aBufferDevice.getTransparence(); mxCanvas = mpOutputDevice->GetCanvas(); @@ -1730,7 +1730,7 @@ namespace drawinglayer { const attribute::LineAttribute& rLineAttribute = rPolygonStrokePrimitive.getLineAttribute(); const attribute::StrokeAttribute& rStrokeAttribute = rPolygonStrokePrimitive.getStrokeAttribute(); - + if(0.0 < rLineAttribute.getWidth() || 0 != rStrokeAttribute.getDotDashArray().size()) { rendering::StrokeAttributes aStrokeAttribute; @@ -1759,19 +1759,19 @@ namespace drawinglayer aStrokeAttribute.JoinType = rendering::PathJoinType::ROUND; break; } - + const basegfx::BColor aHairlineColor(maBColorModifierStack.getModifiedColor(rLineAttribute.getColor())); maRenderState.DeviceColor = aHairlineColor.colorToDoubleSequence(mxCanvas->getDevice()); canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation()); - + mxCanvas->strokePolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolygon(mxCanvas->getDevice(), rPolygonStrokePrimitive.getB2DPolygon()), + basegfx::unotools::xPolyPolygonFromB2DPolygon(mxCanvas->getDevice(), rPolygonStrokePrimitive.getB2DPolygon()), maViewState, maRenderState, aStrokeAttribute); bOutputDone = true; } } - + if(!bOutputDone) { // process decomposition @@ -1799,11 +1799,11 @@ namespace drawinglayer // replace with color filled polygon const basegfx::BColor aModifiedColor(maBColorModifierStack.getModifiedColor(basegfx::BColor())); const basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); - + maRenderState.DeviceColor = aModifiedColor.colorToDoubleSequence(mxCanvas->getDevice()); - canvas::tools::setRenderStateTransform(maRenderState, + canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation() * rFillBitmapPrimitive2D.getTransformation()); - + mxCanvas->fillPolyPolygon(basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( mxCanvas->getDevice(), basegfx::B2DPolyPolygon(aPolygon)), maViewState, maRenderState); } @@ -1818,21 +1818,21 @@ namespace drawinglayer const basegfx::B2DHomMatrix aTextureMatrix(basegfx::tools::createScaleTranslateB2DHomMatrix( rFillBitmapAttribute.getSize().getX(), rFillBitmapAttribute.getSize().getY(), rFillBitmapAttribute.getTopLeft().getX(), rFillBitmapAttribute.getTopLeft().getY())); - + // create and fill texture rendering::Texture aTexture; - + basegfx::unotools::affineMatrixFromHomMatrix(aTexture.AffineTransform, aTextureMatrix); aTexture.Alpha = 1.0; aTexture.Bitmap = vcl::unotools::xBitmapFromBitmapEx(mxCanvas->getDevice(), aChangedBitmapEx); aTexture.RepeatModeX = rendering::TexturingMode::REPEAT; aTexture.RepeatModeY = rendering::TexturingMode::REPEAT; - + // canvas needs a polygon to fill, create unit rectangle polygon const basegfx::B2DPolygon aOutlineRectangle(basegfx::tools::createUnitPolygon()); // set primitive's transformation as render state transform - canvas::tools::setRenderStateTransform(maRenderState, + canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation() * rFillBitmapPrimitive2D.getTransformation()); // put texture into a uno sequence for handover @@ -1842,7 +1842,7 @@ namespace drawinglayer // draw textured rectangle mxCanvas->fillTexturedPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), basegfx::B2DPolyPolygon(aOutlineRectangle)), - maViewState, maRenderState, aSeq); + maViewState, maRenderState, aSeq); } } @@ -1884,10 +1884,10 @@ namespace drawinglayer { // direct draw of PolyPolygon with color and transparence const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor())); - + // add transparence modulation value to DeviceColor uno::Sequence< double > aColor(4); - + aColor[0] = aPolygonColor.getRed(); aColor[1] = aPolygonColor.getGreen(); aColor[2] = aPolygonColor.getBlue(); @@ -1896,12 +1896,12 @@ namespace drawinglayer canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation()); mxCanvas->fillPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), pPoPoColor->getB2DPolyPolygon()), + basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), pPoPoColor->getB2DPolyPolygon()), maViewState, maRenderState); bOutputDone = true; } } - + if(!bOutputDone) { // process decomposition. This will be decomposed to an TransparencePrimitive2D @@ -1931,7 +1931,7 @@ namespace drawinglayer maRenderState.DeviceColor = aHairlineColor.colorToDoubleSequence(mxCanvas->getDevice()); canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation()); mxCanvas->drawPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolygon(mxCanvas->getDevice(), rPolygonCandidate.getB2DPolygon()), + basegfx::unotools::xPolyPolygonFromB2DPolygon(mxCanvas->getDevice(), rPolygonCandidate.getB2DPolygon()), maViewState, maRenderState); break; @@ -1941,13 +1941,13 @@ namespace drawinglayer // direct draw of PolyPolygon with color const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate = static_cast< const primitive2d::PolyPolygonColorPrimitive2D& >(rCandidate); const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolygonCandidate.getBColor())); - + maRenderState.DeviceColor = aPolygonColor.colorToDoubleSequence(mxCanvas->getDevice()); canvas::tools::setRenderStateTransform(maRenderState, getViewInformation2D().getObjectTransformation()); mxCanvas->fillPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), rPolygonCandidate.getB2DPolyPolygon()), + basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(mxCanvas->getDevice(), rPolygonCandidate.getB2DPolyPolygon()), maViewState, maRenderState); - + break; } case PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D : @@ -1961,7 +1961,7 @@ namespace drawinglayer process(rModifiedCandidate.getChildren()); maBColorModifierStack.pop(); } - + break; } case PRIMITIVE2D_ID_MASKPRIMITIVE2D : @@ -1979,8 +1979,8 @@ namespace drawinglayer // create new local ViewInformation2D with new transformation const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), @@ -2011,8 +2011,8 @@ namespace drawinglayer // create new local ViewInformation2D const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), rPagePreviewCandidate.getXDrawPage(), getViewInformation2D().getViewTime(), @@ -2030,14 +2030,14 @@ namespace drawinglayer { // MetaFile primitive impRenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); - + break; } case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D : { // PointArray primitive const primitive2d::PointArrayPrimitive2D& rPointArrayCandidate = static_cast< const primitive2d::PointArrayPrimitive2D& >(rCandidate); - + // set point color const basegfx::BColor aRGBColor(maBColorModifierStack.getModifiedColor(rPointArrayCandidate.getRGBColor())); maRenderState.DeviceColor = aRGBColor.colorToDoubleSequence(mxCanvas->getDevice()); @@ -2045,7 +2045,7 @@ namespace drawinglayer const std::vector< basegfx::B2DPoint >& rPointVector = rPointArrayCandidate.getPositions(); const sal_uInt32 nPointCount(rPointVector.size()); - + for(sal_uInt32 a(0); a < nPointCount; a++) { const basegfx::B2DPoint& rPoint = rPointVector[a]; @@ -2103,9 +2103,9 @@ namespace drawinglayer const primitive2d::ChartPrimitive2D& rChartPrimitive = static_cast< const primitive2d::ChartPrimitive2D& >(rCandidate); mpOutputDevice->Push(PUSH_MAPMODE); mpOutputDevice->SetMapMode(maOriginalMapMode); - + if(!renderChartPrimitive2D( - rChartPrimitive, + rChartPrimitive, *mpOutputDevice, getViewInformation2D())) { @@ -2124,8 +2124,8 @@ namespace drawinglayer const primitive2d::WrongSpellPrimitive2D& rWrongSpellPrimitive = static_cast< const primitive2d::WrongSpellPrimitive2D& >(rCandidate); if(!renderWrongSpellPrimitive2D( - rWrongSpellPrimitive, - *mpOutputDevice, + rWrongSpellPrimitive, + *mpOutputDevice, getViewInformation2D().getObjectToViewTransformation(), maBColorModifierStack)) { @@ -2148,7 +2148,7 @@ namespace drawinglayer { // process recursively process(rCandidate.get2DDecomposition(getViewInformation2D())); - + break; } } @@ -2158,9 +2158,9 @@ namespace drawinglayer // process support canvasProcessor2D::canvasProcessor2D( - const geometry::ViewInformation2D& rViewInformation, - OutputDevice& rOutDev) - : BaseProcessor2D(rViewInformation), + const geometry::ViewInformation2D& rViewInformation, + OutputDevice& rOutDev) + : BaseProcessor2D(rViewInformation), maOriginalMapMode(rOutDev.GetMapMode()), mpOutputDevice(&rOutDev), mxCanvas(rOutDev.GetCanvas()), diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index 11eb9ac310a4..b7089f23eb9e 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.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 namespace processor2d { ContourExtractor2D::ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation) - : BaseProcessor2D(rViewInformation), + : BaseProcessor2D(rViewInformation), maExtractedContour() { } @@ -135,8 +135,8 @@ namespace drawinglayer // create new local ViewInformation2D const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx index 3a567b532cbe..e77255f40d75 100644 --- a/drawinglayer/source/processor2d/helperchartrenderer.cxx +++ b/drawinglayer/source/processor2d/helperchartrenderer.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 @@ using namespace com::sun::star; namespace drawinglayer { bool renderChartPrimitive2D( - const primitive2d::ChartPrimitive2D& rChartCandidate, + const primitive2d::ChartPrimitive2D& rChartCandidate, OutputDevice& rOutputDevice, const geometry::ViewInformation2D& rViewInformation2D) { @@ -56,27 +56,27 @@ namespace drawinglayer { uno::Reference< lang::XMultiServiceFactory > xFact( rChartCandidate.getChartModel(), uno::UNO_QUERY ); OSL_ENSURE( xFact.is(), "Chart cannot be painted pretty!\n" ); - + if( xFact.is() ) { uno::Reference< lang::XUnoTunnel > xChartRenderer( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartRenderer" ) ) ), uno::UNO_QUERY ); OSL_ENSURE( xChartRenderer.is(), "Chart cannot be painted pretty!\n" ); - + if( xChartRenderer.is() ) { ChartPrettyPainter* pPrettyPainter = reinterpret_cast<ChartPrettyPainter*>( xChartRenderer->getSomething( ChartPrettyPainter::getUnoTunnelId() )); - + if( pPrettyPainter ) { - // create logic object range; do NOT use ObjectTransformation for this - // (rViewInformation2D.getObjectTransformation()), only the logic object + // create logic object range; do NOT use ObjectTransformation for this + // (rViewInformation2D.getObjectTransformation()), only the logic object // size is wanted basegfx::B2DRange aObjectRange(0.0, 0.0, 1.0, 1.0); aObjectRange.transform(rChartCandidate.getTransformation()); const Rectangle aRectangle( - (sal_Int32)aObjectRange.getMinX(), (sal_Int32)aObjectRange.getMinY(), + (sal_Int32)aObjectRange.getMinX(), (sal_Int32)aObjectRange.getMinY(), (sal_Int32)aObjectRange.getMaxX(), (sal_Int32)aObjectRange.getMaxY()); // #i101811# diff --git a/drawinglayer/source/processor2d/helperchartrenderer.hxx b/drawinglayer/source/processor2d/helperchartrenderer.hxx index e6dce19355c6..0f1da6e51504 100644 --- a/drawinglayer/source/processor2d/helperchartrenderer.hxx +++ b/drawinglayer/source/processor2d/helperchartrenderer.hxx @@ -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 @@ -48,7 +48,7 @@ namespace drawinglayer // Added current ViewInformation2D to take evtl. changed // ObjectTransformation into account bool renderChartPrimitive2D( - const primitive2d::ChartPrimitive2D& rChartCandidate, + const primitive2d::ChartPrimitive2D& rChartCandidate, OutputDevice& rOutputDevice, const geometry::ViewInformation2D& rViewInformation2D); diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx index a1d886790c47..a1be54991110 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.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,8 +44,8 @@ using namespace com::sun::star; namespace drawinglayer { bool renderWrongSpellPrimitive2D( - const primitive2d::WrongSpellPrimitive2D& rWrongSpellCandidate, - OutputDevice& rOutputDevice, + const primitive2d::WrongSpellPrimitive2D& rWrongSpellCandidate, + OutputDevice& rOutputDevice, const basegfx::B2DHomMatrix& rObjectToViewTransformation, const basegfx::BColorModifierStack& rBColorModifierStack) { @@ -53,9 +53,9 @@ namespace drawinglayer const basegfx::B2DVector aFontVectorPixel(aLocalTransform * basegfx::B2DVector(0.0, 1.0)); const sal_uInt32 nFontPixelHeight(basegfx::fround(aFontVectorPixel.getLength())); - static const sal_uInt32 nMinimumFontHeight(5); // #define WRONG_SHOW_MIN 5 - static const sal_uInt32 nSmallFontHeight(11); // #define WRONG_SHOW_SMALL 11 - static const sal_uInt32 nMediumFontHeight(15); // #define WRONG_SHOW_MEDIUM 15 + static const sal_uInt32 nMinimumFontHeight(5); // #define WRONG_SHOW_MIN 5 + static const sal_uInt32 nSmallFontHeight(11); // #define WRONG_SHOW_SMALL 11 + static const sal_uInt32 nMediumFontHeight(15); // #define WRONG_SHOW_MEDIUM 15 if(nFontPixelHeight > nMinimumFontHeight) { @@ -73,14 +73,14 @@ namespace drawinglayer { nWaveStyle = WAVE_SMALL; } - + // #i101075# draw it. Do not forget to use the evtl. offsetted origin of the target device, // e.g. when used with mask/transparence buffer device const Point aOrigin(rOutputDevice.GetMapMode().GetOrigin()); const basegfx::BColor aProcessedColor(rBColorModifierStack.getModifiedColor(rWrongSpellCandidate.getColor())); const bool bMapModeEnabledState(rOutputDevice.IsMapModeEnabled()); - + rOutputDevice.EnableMapMode(false); rOutputDevice.SetLineColor(Color(aProcessedColor)); rOutputDevice.SetFillColor(); diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx index 476ea4b5692c..cdc572dba08e 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx @@ -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 basegfx { namespace drawinglayer { bool renderWrongSpellPrimitive2D( - const primitive2d::WrongSpellPrimitive2D& rWrongSpellCandidate, + const primitive2d::WrongSpellPrimitive2D& rWrongSpellCandidate, OutputDevice& rOutputDevice, const basegfx::B2DHomMatrix& rObjectToViewTransformation, const basegfx::BColorModifierStack& rBColorModifierStack); diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 387bdfbf6814..8f3ad7acb179 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.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,7 +55,7 @@ namespace drawinglayer const basegfx::B2DPoint& rLogicHitPosition, double fLogicHitTolerance, bool bHitTextOnly) - : BaseProcessor2D(rViewInformation), + : BaseProcessor2D(rViewInformation), maDiscreteHitPosition(), mfDiscreteHitTolerance(0.0), mbHit(false), @@ -74,7 +74,7 @@ namespace drawinglayer else if(basegfx::fTools::more(mfDiscreteHitTolerance, 0.0)) { // generate discrete hit tolerance - mfDiscreteHitTolerance = (getViewInformation2D().getObjectToViewTransformation() + mfDiscreteHitTolerance = (getViewInformation2D().getObjectToViewTransformation() * basegfx::B2DVector(mfDiscreteHitTolerance, 0.0)).getLength(); } @@ -109,8 +109,8 @@ namespace drawinglayer { // check if a polygon edge is hit return basegfx::tools::isInEpsilonRange( - aLocalPolygon, - getDiscreteHitPosition(), + aLocalPolygon, + getDiscreteHitPosition(), fDiscreteHitTolerance); } @@ -138,10 +138,10 @@ namespace drawinglayer if(aPolygonRange.isInside(getDiscreteHitPosition())) { // if a HitTolerance is given, check for polygon edge hit in epsilon first - if(bDiscreteHitToleranceUsed && + if(bDiscreteHitToleranceUsed && basegfx::tools::isInEpsilonRange( - aLocalPolyPolygon, - getDiscreteHitPosition(), + aLocalPolyPolygon, + getDiscreteHitPosition(), fDiscreteHitTolerance)) { bRetval = true; @@ -179,7 +179,7 @@ namespace drawinglayer const basegfx::B2DPoint aRelativePoint(aInverseSceneTransform * aLogicHitPosition); // check if test point is inside scene's unified area at all - if(aRelativePoint.getX() >= 0.0 && aRelativePoint.getX() <= 1.0 + if(aRelativePoint.getX() >= 0.0 && aRelativePoint.getX() <= 1.0 && aRelativePoint.getY() >= 0.0 && aRelativePoint.getY() <= 1.0) { // get 3D view information @@ -210,9 +210,9 @@ namespace drawinglayer { // bound volumes hit, geometric cut tests needed drawinglayer::processor3d::CutFindProcessor aCutFindProcessor( - rObjectViewInformation3D, - aFront, - aBack, + rObjectViewInformation3D, + aFront, + aBack, true); aCutFindProcessor.process(rPrimitives); @@ -237,7 +237,7 @@ namespace drawinglayer // process(xExtracted2DSceneShadow); // } // } - + if(!getHit()) { // empty 3D scene; Check for border hit @@ -293,8 +293,8 @@ namespace drawinglayer // create new local ViewInformation2D containing transformation const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), @@ -315,11 +315,11 @@ namespace drawinglayer { // create hairline in discrete coordinates const primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate(static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate)); - + // use hairline test mbHit = checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(), getDiscreteHitTolerance()); } - + break; } case PRIMITIVE2D_ID_POLYGONMARKERPRIMITIVE2D : @@ -328,11 +328,11 @@ namespace drawinglayer { // handle marker like hairline; no need to decompose in dashes const primitive2d::PolygonMarkerPrimitive2D& rPolygonCandidate(static_cast< const primitive2d::PolygonMarkerPrimitive2D& >(rCandidate)); - + // use hairline test mbHit = checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(), getDiscreteHitTolerance()); } - + break; } case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D : @@ -354,10 +354,10 @@ namespace drawinglayer else { // for all other B2DLINEJOIN_* do a hairline HitTest with expanded tolerance - const basegfx::B2DVector aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation() + const basegfx::B2DVector aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation() * basegfx::B2DVector(rLineAttribute.getWidth() * 0.5, 0.0)); mbHit = checkHairlineHitWithTolerance( - rPolygonCandidate.getB2DPolygon(), + rPolygonCandidate.getB2DPolygon(), getDiscreteHitTolerance() + aDiscreteHalfLineVector.getLength()); } } @@ -368,7 +368,7 @@ namespace drawinglayer mbHit = checkHairlineHitWithTolerance(rPolygonCandidate.getB2DPolygon(), getDiscreteHitTolerance()); } } - + break; } case PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D : @@ -378,7 +378,7 @@ namespace drawinglayer // do not use decompose; just handle like a line with width const primitive2d::PolygonWavePrimitive2D& rPolygonCandidate(static_cast< const primitive2d::PolygonWavePrimitive2D& >(rCandidate)); double fLogicHitTolerance(0.0); - + // if WaveHeight, grow by it if(basegfx::fTools::more(rPolygonCandidate.getWaveHeight(), 0.0)) { @@ -391,11 +391,11 @@ namespace drawinglayer fLogicHitTolerance += rPolygonCandidate.getLineAttribute().getWidth() * 0.5; } - const basegfx::B2DVector aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation() + const basegfx::B2DVector aDiscreteHalfLineVector(getViewInformation2D().getObjectToViewTransformation() * basegfx::B2DVector(fLogicHitTolerance, 0.0)); - + mbHit = checkHairlineHitWithTolerance( - rPolygonCandidate.getB2DPolygon(), + rPolygonCandidate.getB2DPolygon(), getDiscreteHitTolerance() + aDiscreteHalfLineVector.getLength()); } @@ -407,7 +407,7 @@ namespace drawinglayer { // create filled polyPolygon in discrete coordinates const primitive2d::PolyPolygonColorPrimitive2D& rPolygonCandidate(static_cast< const primitive2d::PolyPolygonColorPrimitive2D& >(rCandidate)); - + // use fill hit test mbHit = checkFillHitWithTolerance(rPolygonCandidate.getB2DPolyPolygon(), getDiscreteHitTolerance()); } @@ -423,7 +423,7 @@ namespace drawinglayer // the children are recursively checked for hit. This may be refined for // parts where the content is completely transparent if needed. process(rTransCandidate.getChildren()); - + break; } case PRIMITIVE2D_ID_MASKPRIMITIVE2D : @@ -431,7 +431,7 @@ namespace drawinglayer // create mask in discrete coordinates; only recursively continue // with content when HitTest position is inside the mask const primitive2d::MaskPrimitive2D& rMaskCandidate(static_cast< const primitive2d::MaskPrimitive2D& >(rCandidate)); - + // use fill hit test if(checkFillHitWithTolerance(rMaskCandidate.getMask(), getDiscreteHitTolerance())) { @@ -488,7 +488,7 @@ namespace drawinglayer // the BitmapPrimitive2D HitTest to take the contained BotmapEx and it's // transparency into account const basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D())); - + if(!aRange.isEmpty()) { const primitive2d::BitmapPrimitive2D& rBitmapCandidate(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate)); @@ -498,10 +498,10 @@ namespace drawinglayer if(rSizePixel.Width() && rSizePixel.Height()) { basegfx::B2DHomMatrix aBackTransform( - getViewInformation2D().getObjectToViewTransformation() * + getViewInformation2D().getObjectToViewTransformation() * rBitmapCandidate.getTransform()); aBackTransform.invert(); - + const basegfx::B2DPoint aRelativePoint(aBackTransform * getDiscreteHitPosition()); const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0); @@ -539,7 +539,7 @@ namespace drawinglayer // - For Bitamps, the mask and/or transparence information may be used // - For MetaFiles, the MetaFile content may be used const basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D())); - + if(!aRange.isEmpty()) { const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aRange)); @@ -564,7 +564,7 @@ namespace drawinglayer process(rChildren); } } - + break; } case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D : @@ -586,14 +586,14 @@ namespace drawinglayer } } } - + break; } default : { // process recursively process(rCandidate.get2DDecomposition(getViewInformation2D())); - + break; } } diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx index 8a2461010b4a..2eb35597f235 100644 --- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx +++ b/drawinglayer/source/processor2d/linegeometryextractor2d.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,7 +46,7 @@ namespace drawinglayer namespace processor2d { LineGeometryExtractor2D::LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation) - : BaseProcessor2D(rViewInformation), + : BaseProcessor2D(rViewInformation), maExtractedHairlines(), maExtractedLineFills(), mbInLineGeometry(false) @@ -103,8 +103,8 @@ namespace drawinglayer // create new transformations for CurrentTransformation and for local ViewInformation2D const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx index ec31aa97d8de..111a6392c5c3 100644 --- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx +++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.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 @@ -53,24 +53,24 @@ namespace drawinglayer // // - TextSimplePortionPrimitive2D // - PolygonWavePrimitive2D - // - PolygonStrokePrimitive2D + // - PolygonStrokePrimitive2D // - PolygonStrokePrimitive2D - // - PolyPolygonColorPrimitive2D - // - PolyPolygonHairlinePrimitive2D - // - PolygonHairlinePrimitive2D + // - PolyPolygonColorPrimitive2D + // - PolyPolygonHairlinePrimitive2D + // - PolygonHairlinePrimitive2D // - ShadowPrimitive2D - // - ModifiedColorPrimitive2D - // - TransformPrimitive2D + // - ModifiedColorPrimitive2D + // - TransformPrimitive2D // - TextEffectPrimitive2D - // - ModifiedColorPrimitive2D - // - TransformPrimitive2D - // - GroupPrimitive2D - + // - ModifiedColorPrimitive2D + // - TransformPrimitive2D + // - GroupPrimitive2D + // encapsulate with flag and use decomposition mnInText++; process(rCandidate.get2DDecomposition(getViewInformation2D())); mnInText--; - + break; } case PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D : @@ -80,15 +80,15 @@ namespace drawinglayer // // - PolyPolygonColorPrimitive2D // - TextEffectPrimitive2D - // - ModifiedColorPrimitive2D - // - TransformPrimitive2D - // - GroupPrimitive2D - + // - ModifiedColorPrimitive2D + // - TransformPrimitive2D + // - GroupPrimitive2D + // encapsulate with flag and use decomposition mnInText++; process(rCandidate.get2DDecomposition(getViewInformation2D())); mnInText--; - + break; } @@ -179,7 +179,7 @@ namespace drawinglayer process(rModifiedColorCandidate.getChildren()); maBColorModifierStack.pop(); } - + break; } @@ -192,8 +192,8 @@ namespace drawinglayer // create new transformations for CurrentTransformation and for local ViewInformation2D const geometry::ViewInformation2D aViewInformation2D( - getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), - getViewInformation2D().getViewTransformation(), + getViewInformation2D().getObjectTransformation() * rTransformCandidate.getTransformation(), + getViewInformation2D().getViewTransformation(), getViewInformation2D().getViewport(), getViewInformation2D().getVisualizedPage(), getViewInformation2D().getViewTime(), @@ -231,7 +231,7 @@ namespace drawinglayer } TextAsPolygonExtractor2D::TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation) - : BaseProcessor2D(rViewInformation), + : BaseProcessor2D(rViewInformation), maTarget(), maBColorModifierStack(), mnInText(0) diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx index 711f2a1b60cb..db25b4204c0b 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.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,8 +44,8 @@ namespace drawinglayer { void RenderBitmapPrimitive2D_GraphicManager( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform) { // prepare attributes @@ -97,8 +97,8 @@ namespace drawinglayer } void RenderBitmapPrimitive2D_BitmapEx( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform) { // only translate and scale, use vcl's DrawBitmapEx(). @@ -139,8 +139,8 @@ namespace drawinglayer } void RenderBitmapPrimitive2D_self( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform) { // process self with free transformation (containing shear and rotate). Get dest rect in pixels. @@ -166,7 +166,7 @@ namespace drawinglayer // take a rotation of 45 degrees (sqrt(2)) as maximum expansion into account const Size aSourceSizePixel(rBitmapEx.GetSizePixel()); const double fMaximumArea( - (double)aSourceSizePixel.getWidth() * + (double)aSourceSizePixel.getWidth() * (double)aSourceSizePixel.getHeight() * 1.4142136); // 1.4142136 taken as sqrt(2.0) @@ -181,12 +181,12 @@ namespace drawinglayer aCroppedRectPixel.setWidth(basegfx::fround(aCroppedRectPixel.getWidth() * fReduceFactor)); aCroppedRectPixel.setHeight(basegfx::fround(aCroppedRectPixel.getHeight() * fReduceFactor)); } - + // build transform from pixel in aDestination to pixel in rBitmapEx // from relative in aCroppedRectPixel to relative in aDestRectPixel // No need to take bNeedToReduce into account, TopLeft is unchanged basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( - aCroppedRectPixel.Left() - aDestRectPixel.Left(), + aCroppedRectPixel.Left() - aDestRectPixel.Left(), aCroppedRectPixel.Top() - aDestRectPixel.Top())); // from relative in aDestRectPixel to absolute Logic. Here it @@ -228,7 +228,7 @@ namespace drawinglayer if(bRecordToMetaFile) { rOutDev.DrawBitmapEx( - rOutDev.PixelToLogic(aCroppedRectPixel.TopLeft()), + rOutDev.PixelToLogic(aCroppedRectPixel.TopLeft()), rOutDev.PixelToLogic(aDestSizePixel), aDestination); } @@ -236,9 +236,9 @@ namespace drawinglayer { const bool bWasEnabled(rOutDev.IsMapModeEnabled()); rOutDev.EnableMapMode(false); - + rOutDev.DrawBitmapEx( - aCroppedRectPixel.TopLeft(), + aCroppedRectPixel.TopLeft(), aDestSizePixel, aDestination); @@ -250,7 +250,7 @@ namespace drawinglayer if(bRecordToMetaFile) { rOutDev.DrawBitmapEx( - rOutDev.PixelToLogic(aCroppedRectPixel.TopLeft()), + rOutDev.PixelToLogic(aCroppedRectPixel.TopLeft()), aDestination); } else @@ -259,7 +259,7 @@ namespace drawinglayer rOutDev.EnableMapMode(false); rOutDev.DrawBitmapEx( - aCroppedRectPixel.TopLeft(), + aCroppedRectPixel.TopLeft(), aDestination); rOutDev.EnableMapMode(bWasEnabled); diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx index cca5d19f72f0..674c578cbf19 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx @@ -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,18 +44,18 @@ namespace basegfx { class B2DHomMatrix; } namespace drawinglayer { void RenderBitmapPrimitive2D_GraphicManager( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform); void RenderBitmapPrimitive2D_BitmapEx( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform); void RenderBitmapPrimitive2D_self( - OutputDevice& rOutDev, - const BitmapEx& rBitmapEx, + OutputDevice& rOutDev, + const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform); } // end of namespace drawinglayer diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx index 3e4b98655f18..0676aabc04bb 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.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 @@ -57,7 +57,7 @@ namespace drawinglayer fDeltaX = -fDeltaX; nIndX--; } - + if(fDeltaY > 0.0 && nIntY + 1L < rRead.Height()) { nIndY++; @@ -103,14 +103,14 @@ namespace drawinglayer if(!nIndX) { const BitmapColor aBottom(rRead.GetColor(nIntY + nIndY, nIntX)); - + fRBottom = aBottom.GetRed() * fColorToReal; fGBottom = aBottom.GetGreen() * fColorToReal; fBBottom = aBottom.GetBlue() * fColorToReal; } const double fMulB(1.0 - fDeltaY); - + fR = (fR * fMulB) + (fRBottom * fDeltaY); fG = (fG * fMulB) + (fGBottom * fDeltaY); fB = (fB * fMulB) + (fBBottom * fDeltaY); @@ -138,7 +138,7 @@ namespace drawinglayer fDeltaX = -fDeltaX; nIndX--; } - + if(fDeltaY > 0.0 && nIntY + 1L < rRead.Height()) { nIndY++; @@ -178,12 +178,12 @@ namespace drawinglayer if(!nIndX) { const BitmapColor aBottom(rRead.GetPixel(nIntY + nIndY, nIntX)); - + fValBottom = aBottom.GetIndex() * fColorToReal; } const double fMulB(1.0 - fDeltaY); - + fVal = (fVal * fMulB) + (fValBottom * fDeltaY); } @@ -222,7 +222,7 @@ namespace drawinglayer if(bWorkWithIndex) { BitmapColor aValue(pRead->GetPixel(nIntY, nIntX)); - + if(bSmooth) { impSmoothIndex(aValue, aSourceCoor, nIntX, nIntY, *pRead); @@ -233,7 +233,7 @@ namespace drawinglayer else { BitmapColor aValue(pRead->GetColor(nIntY, nIntX)); - + if(bSmooth) { impSmoothPoint(aValue, aSourceCoor, nIntX, nIntY, *pRead); @@ -289,8 +289,8 @@ namespace drawinglayer namespace drawinglayer { BitmapEx impTransformBitmapEx( - const BitmapEx& rSource, - const Rectangle& rCroppedRectPixel, + const BitmapEx& rSource, + const Rectangle& rCroppedRectPixel, const basegfx::B2DHomMatrix& rTransform) { // force destination to 24 bit, we want to smooth output @@ -320,7 +320,7 @@ namespace drawinglayer } BitmapEx impModifyBitmapEx( - const basegfx::BColorModifierStack& rBColorModifierStack, + const basegfx::BColorModifierStack& rBColorModifierStack, const BitmapEx& rSource) { Bitmap aChangedBitmap(rSource.GetBitmap()); @@ -329,7 +329,7 @@ namespace drawinglayer for(sal_uInt32 a(rBColorModifierStack.count()); a && !bDone; ) { const basegfx::BColorModifier& rModifier = rBColorModifierStack.getBColorModifier(--a); - + switch(rModifier.getMode()) { case basegfx::BCOLORMODIFYMODE_REPLACE : @@ -351,8 +351,8 @@ namespace drawinglayer BitmapPalette aNewPalette(pReadAccess->GetPalette()); aNewPalette[0] = BitmapColor(Color(rModifier.getBColor())); aChangedBitmap = Bitmap( - aChangedBitmap.GetSizePixel(), - aChangedBitmap.GetBitCount(), + aChangedBitmap.GetSizePixel(), + aChangedBitmap.GetBitCount(), &aNewPalette); delete pReadAccess; } @@ -367,7 +367,7 @@ namespace drawinglayer // erase bitmap, caller will know to paint direct aChangedBitmap.SetEmpty(); } - + bDone = true; break; } @@ -386,18 +386,18 @@ namespace drawinglayer { const BitmapColor aBMCol(pContent->GetColor(y, x)); const basegfx::BColor aBSource( - (double)aBMCol.GetRed() * fConvertColor, - (double)aBMCol.GetGreen() * fConvertColor, + (double)aBMCol.GetRed() * fConvertColor, + (double)aBMCol.GetGreen() * fConvertColor, (double)aBMCol.GetBlue() * fConvertColor); const basegfx::BColor aBDest(rModifier.getModifiedColor(aBSource)); - + pContent->SetPixel(y, x, BitmapColor(Color(aBDest))); } } delete pContent; } - + break; } } diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx index d1529aee6acf..4362ea66e54d 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx @@ -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 @@ -34,8 +34,8 @@ ////////////////////////////////////////////////////////////////////////////// // predefines -namespace basegfx { - class B2DHomMatrix; +namespace basegfx { + class B2DHomMatrix; class BColorModifierStack; } @@ -45,12 +45,12 @@ namespace basegfx { namespace drawinglayer { BitmapEx impTransformBitmapEx( - const BitmapEx& rSource, - const Rectangle& rCroppedRectPixel, + const BitmapEx& rSource, + const Rectangle& rCroppedRectPixel, const basegfx::B2DHomMatrix& rTransform); BitmapEx impModifyBitmapEx( - const basegfx::BColorModifierStack& rBColorModifierStack, + const basegfx::BColorModifierStack& rBColorModifierStack, const BitmapEx& rSource); } // end of namespace drawinglayer diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index d558761830bb..762b7cb2ba89 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.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,10 +41,10 @@ namespace drawinglayer { impBufferDevice::impBufferDevice( - OutputDevice& rOutDev, + OutputDevice& rOutDev, const basegfx::B2DRange& rRange, bool bAddOffsetToMapping) - : mrOutDev(rOutDev), + : mrOutDev(rOutDev), maContent(rOutDev), mpMask(0L), mpAlpha(0L) @@ -52,7 +52,7 @@ namespace drawinglayer basegfx::B2DRange aRangePixel(rRange); aRangePixel.transform(rOutDev.GetViewTransformation()); const Rectangle aRectPixel( - (sal_Int32)floor(aRangePixel.getMinX()), (sal_Int32)floor(aRangePixel.getMinY()), + (sal_Int32)floor(aRangePixel.getMinX()), (sal_Int32)floor(aRangePixel.getMinY()), (sal_Int32)ceil(aRangePixel.getMaxX()), (sal_Int32)ceil(aRangePixel.getMaxY())); const Point aEmptyPoint; maDestPixel = Rectangle(aEmptyPoint, rOutDev.GetOutputSizePixel()); @@ -63,7 +63,7 @@ namespace drawinglayer maContent.SetOutputSizePixel(maDestPixel.GetSize(), false); // #i93485# assert when copying from window to VDev is used - OSL_ENSURE(rOutDev.GetOutDevType() != OUTDEV_WINDOW, + OSL_ENSURE(rOutDev.GetOutDevType() != OUTDEV_WINDOW, "impBufferDevice render helper: Copying from Window to VDev, this should be avoided (!)"); const bool bWasEnabledSrc(rOutDev.IsMapModeEnabled()); @@ -101,7 +101,7 @@ namespace drawinglayer mrOutDev.EnableMapMode(false); maContent.EnableMapMode(false); - Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel)); + Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel)); if(bDoSaveForVisualControl) { @@ -113,19 +113,19 @@ namespace drawinglayer { mpAlpha->EnableMapMode(false); const AlphaMask aAlphaMask(mpAlpha->GetBitmap(aEmptyPoint, aSizePixel)); - + if(bDoSaveForVisualControl) { SvFileStream aNew((const String&)String(ByteString( "c:\\transparence.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); aNew << aAlphaMask.GetBitmap(); } - + mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask)); } else if(mpMask) { mpMask->EnableMapMode(false); - const Bitmap aMask(mpMask->GetBitmap(aEmptyPoint, aSizePixel)); + const Bitmap aMask(mpMask->GetBitmap(aEmptyPoint, aSizePixel)); if(bDoSaveForVisualControl) { @@ -150,7 +150,7 @@ namespace drawinglayer } VirtualDevice& impBufferDevice::getMask() - { + { if(!mpMask) { mpMask = new VirtualDevice(mrOutDev, 1); @@ -163,8 +163,8 @@ namespace drawinglayer return *mpMask; } - VirtualDevice& impBufferDevice::getTransparence() - { + VirtualDevice& impBufferDevice::getTransparence() + { if(!mpAlpha) { mpAlpha = new VirtualDevice(); diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx index adf54a42671e..21cf3f4fb631 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx @@ -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,15 +43,15 @@ namespace drawinglayer { class impBufferDevice { - OutputDevice& mrOutDev; - VirtualDevice maContent; - VirtualDevice* mpMask; - VirtualDevice* mpAlpha; - Rectangle maDestPixel; + OutputDevice& mrOutDev; + VirtualDevice maContent; + VirtualDevice* mpMask; + VirtualDevice* mpAlpha; + Rectangle maDestPixel; public: impBufferDevice( - OutputDevice& rOutDev, + OutputDevice& rOutDev, const basegfx::B2DRange& rRange, bool bAddOffsetToMapping); ~impBufferDevice(); diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx index 15475db15746..46786d72f3b5 100644 --- a/drawinglayer/source/processor2d/vclhelpergradient.cxx +++ b/drawinglayer/source/processor2d/vclhelpergradient.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 @@ -199,8 +199,8 @@ namespace drawinglayer { void impDrawGradientToOutDev( OutputDevice& rOutDev, - const basegfx::B2DPolyPolygon& rTargetForm, - attribute::GradientStyle eGradientStyle, + const basegfx::B2DPolyPolygon& rTargetForm, + attribute::GradientStyle eGradientStyle, sal_uInt32 nSteps, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, diff --git a/drawinglayer/source/processor2d/vclhelpergradient.hxx b/drawinglayer/source/processor2d/vclhelpergradient.hxx index 562eb7e53865..c47c27829a74 100644 --- a/drawinglayer/source/processor2d/vclhelpergradient.hxx +++ b/drawinglayer/source/processor2d/vclhelpergradient.hxx @@ -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 @@ -36,9 +36,9 @@ // predefines class OutputDevice; -namespace basegfx { - class B2DPolyPolygon; - class BColor; +namespace basegfx { + class B2DPolyPolygon; + class BColor; } ////////////////////////////////////////////////////////////////////////////// @@ -48,8 +48,8 @@ namespace drawinglayer { void impDrawGradientToOutDev( OutputDevice& rOutDev, - const basegfx::B2DPolyPolygon& rTargetForm, - attribute::GradientStyle eGradientStyle, + const basegfx::B2DPolyPolygon& rTargetForm, + attribute::GradientStyle eGradientStyle, sal_uInt32 nSteps, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 55b63a8cd7ff..cfd0f476ebf7 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.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 @@ -107,8 +107,8 @@ namespace { // #112245# helper to split line polygon in half void splitLinePolygon( - const basegfx::B2DPolygon& rBasePolygon, - basegfx::B2DPolygon& o_aLeft, + const basegfx::B2DPolygon& rBasePolygon, + basegfx::B2DPolygon& o_aLeft, basegfx::B2DPolygon& o_aRight) { const sal_uInt32 nCount(rBasePolygon.count()); @@ -116,7 +116,7 @@ namespace if(nCount) { const sal_uInt32 nHalfCount((nCount - 1) >> 1); - + o_aLeft = basegfx::B2DPolygon(rBasePolygon, 0, nHalfCount + 1); o_aLeft.setClosed(false); @@ -130,7 +130,7 @@ namespace if(rBasePolygon.areControlPointsUsed()) { o_aRight.setControlPoints( - o_aRight.count() - 1, + o_aRight.count() - 1, rBasePolygon.getPrevControlPoint(0), rBasePolygon.getNextControlPoint(0)); } @@ -181,16 +181,16 @@ namespace // clip in left and right const basegfx::B2DPolyPolygon aLeft( basegfx::tools::clipPolygonOnParallelAxis( - aCandidate, - false, - true, + aCandidate, + false, + true, aCenter.getX(), false)); const basegfx::B2DPolyPolygon aRight( basegfx::tools::clipPolygonOnParallelAxis( - aCandidate, - false, - false, + aCandidate, + false, + false, aCenter.getX(), false)); @@ -202,19 +202,19 @@ namespace // clip in top and bottom const basegfx::B2DPolyPolygon aTop( basegfx::tools::clipPolygonOnParallelAxis( - aCandidate, - true, - true, + aCandidate, + true, + true, aCenter.getY(), false)); const basegfx::B2DPolyPolygon aBottom( basegfx::tools::clipPolygonOnParallelAxis( - aCandidate, - true, - false, + aCandidate, + true, + false, aCenter.getY(), false)); - + aSplitted.append(aTop); aSplitted.append(aBottom); } @@ -242,23 +242,23 @@ namespace drawinglayer namespace processor2d { Rectangle VclMetafileProcessor2D::impDumpToMetaFile( - const primitive2d::Primitive2DSequence& rContent, + const primitive2d::Primitive2DSequence& rContent, GDIMetaFile& o_rContentMetafile) { // Prepare VDev, MetaFile and connections OutputDevice* pLastOutputDevice = mpOutputDevice; GDIMetaFile* pLastMetafile = mpMetaFile; basegfx::B2DRange aPrimitiveRange(primitive2d::getB2DRangeFromPrimitive2DSequence(rContent, getViewInformation2D())); - + // transform primitive range with current transformation (e.g shadow offset) aPrimitiveRange.transform(maCurrentTransformation); - + const Rectangle aPrimitiveRectangle( basegfx::fround(aPrimitiveRange.getMinX()), basegfx::fround(aPrimitiveRange.getMinY()), basegfx::fround(aPrimitiveRange.getMaxX()), basegfx::fround(aPrimitiveRange.getMaxY())); VirtualDevice aContentVDev; MapMode aNewMapMode(pLastOutputDevice->GetMapMode()); - + mpOutputDevice = &aContentVDev; mpMetaFile = &o_rContentMetafile; aContentVDev.EnableOutput(false); @@ -287,7 +287,7 @@ namespace drawinglayer } void VclMetafileProcessor2D::impConvertFillGradientAttributeToVCLGradient( - Gradient& o_rVCLGradient, + Gradient& o_rVCLGradient, const attribute::FillGradientAttribute& rFiGrAtt, bool bIsTransparenceGradient) { @@ -354,7 +354,7 @@ namespace drawinglayer if(pSvtGraphicFill && !mnSvtGraphicFillCount) { SvMemoryStream aMemStm; - + aMemStm << *pSvtGraphicFill; mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END))); mnSvtGraphicFillCount++; @@ -372,10 +372,10 @@ namespace drawinglayer } SvtGraphicStroke* VclMetafileProcessor2D::impTryToCreateSvtGraphicStroke( - const basegfx::B2DPolygon& rB2DPolygon, - const basegfx::BColor* pColor, - const attribute::LineAttribute* pLineAttribute, - const attribute::StrokeAttribute* pStrokeAttribute, + const basegfx::B2DPolygon& rB2DPolygon, + const basegfx::BColor* pColor, + const attribute::LineAttribute* pLineAttribute, + const attribute::StrokeAttribute* pStrokeAttribute, const attribute::LineStartEndAttribute* pStart, const attribute::LineStartEndAttribute* pEnd) { @@ -386,7 +386,7 @@ namespace drawinglayer basegfx::BColor aStrokeColor; basegfx::B2DPolyPolygon aStartArrow; basegfx::B2DPolyPolygon aEndArrow; - + if(pColor) { aStrokeColor = *pColor; @@ -407,9 +407,9 @@ namespace drawinglayer if(pStart && pStart->isActive()) { fPolyLength = basegfx::tools::getLength(rB2DPolygon); - + aStartArrow = basegfx::tools::createAreaGeometryForLineStartEnd( - rB2DPolygon, pStart->getB2DPolyPolygon(), true, pStart->getWidth(), + rB2DPolygon, pStart->getB2DPolyPolygon(), true, pStart->getWidth(), fPolyLength, pStart->isCentered() ? 0.5 : 0.0, 0); } @@ -421,7 +421,7 @@ namespace drawinglayer } aEndArrow = basegfx::tools::createAreaGeometryForLineStartEnd( - rB2DPolygon, pEnd->getB2DPolyPolygon(), false, pEnd->getWidth(), + rB2DPolygon, pEnd->getB2DPolyPolygon(), false, pEnd->getWidth(), fPolyLength, pEnd->isCentered() ? 0.5 : 0.0, 0); } } @@ -478,7 +478,7 @@ namespace drawinglayer // This is a partial fix. When a object transformation is used which // e.g. contains a scaleX != scaleY, an unproportional scaling would // have to be applied to the evtl. existing fat line. The current - // concept of PDF export and SvtGraphicStroke usage does simply not + // concept of PDF export and SvtGraphicStroke usage does simply not // allow handling such definitions. The only clean way would be to // add the transformation to SvtGraphicStroke and to handle it there basegfx::B2DPolygon aB2DPolygon(rB2DPolygon); @@ -507,7 +507,7 @@ namespace drawinglayer if(pSvtGraphicStroke && !mnSvtGraphicStrokeCount) { SvMemoryStream aMemStm; - + aMemStm << *pSvtGraphicStroke; mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END))); mnSvtGraphicStrokeCount++; @@ -528,7 +528,7 @@ namespace drawinglayer uno::Reference< ::com::sun::star::i18n::XBreakIterator > VclMetafileProcessor2D::mxBreakIterator; VclMetafileProcessor2D::VclMetafileProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev) - : VclProcessor2D(rViewInformation, rOutDev), + : VclProcessor2D(rViewInformation, rOutDev), mpMetaFile(rOutDev.GetConnectMetaFile()), mnSvtGraphicFillCount(0), mnSvtGraphicStrokeCount(0), @@ -590,7 +590,7 @@ namespace drawinglayer Similar to pathfill, but using SvtGraphicStroke instead. It also has two producers where one is also the GDIMetaFile::Rotate. Another user is MetaCommentAction::Move which modifies the contained path accordingly. - The other one is SdrObject::Imp_DrawLineGeometry. It's done when MetaFile is set at OutDev and + The other one is SdrObject::Imp_DrawLineGeometry. It's done when MetaFile is set at OutDev and only when geometry is a single polygon (!). I see no reason for that; in the PS exporter this would hinder to make use of PolyPolygon strokes. I will need to add support at: PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D @@ -600,12 +600,12 @@ namespace drawinglayer Okay, base implementation done based on those three primitives. FIELD_SEQ_BEGIN, FIELD_SEQ_END - + Used from slideshow for URLs, created from diverse SvxField implementations inside createBeginComment()/createEndComment(). createBeginComment() is used from editeng\impedit3.cxx inside ImpEditEngine::Paint. Created TextHierarchyFieldPrimitive2D and added needed infos there; it is an group primitive and wraps - text primitives (but is not limited to that). It contains the field type if special actions for the + text primitives (but is not limited to that). It contains the field type if special actions for the support of FIELD_SEQ_BEGIN/END are needed; this is the case for Page and URL fields. If more is needed, it may be supported there. FIELD_SEQ_BEGIN;PageField @@ -617,7 +617,7 @@ namespace drawinglayer XTEXT_EOC(i) end of character XTEXT_EOW(i) end of word XTEXT_EOS(i) end of sentence - + this three are with index and are created with the help of a i18n::XBreakIterator in ImplDrawWithComments. Simplifying, moving out text painting, reworking to create some data structure for holding those TEXT infos. @@ -630,7 +630,7 @@ namespace drawinglayer XTEXT_EOL() end of line XTEXT_EOP() end of paragraph - + First try with boolean marks at TextDecoratedPortionPrimitive2D did not work too well, i decided to solve it with structure. I added the TextHierarchyPrimitives for this, namely: @@ -647,13 +647,13 @@ namespace drawinglayer XTEXT_PAINTSHAPE_BEGIN, XTEXT_PAINTSHAPE_END Supported now by the TextHierarchyBlockPrimitive2D. - + EPSReplacementGraphic: Only used in goodies\source\filter.vcl\ieps\ieps.cxx and svx\source\xml\xmlgrhlp.cxx to hold the original EPS which was imported in the same MetaFile as first 2 entries. Only used to export the original again (if exists). Not necessary to support with MetaFuleRenderer. - + XTEXT_SCROLLRECT, XTEXT_PAINTRECT Currently used to get extra MetaFile infos using GraphicExporter which again uses SdrTextObj::GetTextScrollMetaFileAndRectangle(). ATM works with primitives since @@ -668,7 +668,7 @@ namespace drawinglayer was explicitely created for the printer already again to some default maximum bitmap sizes. Nothing to do here for the primitive renderer. - + Support for vcl::PDFExtOutDevData: PL knows that SJ did that stuff, it's used to hold a pointer to PDFExtOutDevData at the OutDev. When set, some extra data is written there. Trying simple PDF export and @@ -677,7 +677,7 @@ namespace drawinglayer the SdXImpressDocument::render and thus uses the VclMetafileProcessor2D. I will check if i get a PDFExtOutDevData at the target output device. Indeed, i get one. Checking what all may be done when that extra-device-info is there. - + All in all i have to talk to SJ. I will need to emulate some of those actions, but i need to discuss which ones. In the future, all those infos would be taken from the primitive sequence anyways, @@ -714,8 +714,8 @@ namespace drawinglayer as intended, the original file is exported. Works, Done. - - + + To be done: - Maybe there are more places to take care of for vcl::PDFExtOutDevData! @@ -740,10 +740,10 @@ namespace drawinglayer bool bUsingPDFExtOutDevData(false); basegfx::B2DVector aTranslate, aScale; static bool bSuppressPDFExtOutDevDataSupport(false); - + if(mpPDFExtOutDevData && !bSuppressPDFExtOutDevDataSupport) { - // emulate data handling from UnoControlPDFExportContact, original see + // emulate data handling from UnoControlPDFExportContact, original see // svtools/source/graphic/grfmgr.cxx const Graphic& rGraphic = rGraphicPrimitive.getGraphicObject().GetGraphic(); @@ -771,10 +771,10 @@ namespace drawinglayer if(bUsingPDFExtOutDevData) { - // emulate data handling from UnoControlPDFExportContact, original see + // emulate data handling from UnoControlPDFExportContact, original see // svtools/source/graphic/grfmgr.cxx const basegfx::B2DRange aCurrentRange( - aTranslate.getX(), aTranslate.getY(), + aTranslate.getX(), aTranslate.getY(), aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY()); const Rectangle aCurrentRect( sal_Int32(floor(aCurrentRange.getMinX())), sal_Int32(floor(aCurrentRange.getMinY())), @@ -792,7 +792,7 @@ namespace drawinglayer { const MapMode aMapMode100thmm(MAP_100TH_MM); const Size aBitmapSize(Application::GetDefaultDevice()->LogicToLogic( - rGraphicPrimitive.getGraphicObject().GetPrefSize(), + rGraphicPrimitive.getGraphicObject().GetPrefSize(), rGraphicPrimitive.getGraphicObject().GetPrefMapMode(), aMapMode100thmm)); const double fDivX(aBitmapSize.Width() - rAttr.GetLeftCrop() - rAttr.GetRightCrop()); const double fDivY(aBitmapSize.Height() - rAttr.GetTopCrop() - rAttr.GetBottomCrop()); @@ -823,7 +823,7 @@ namespace drawinglayer aCurrentRect, aCropRect); } - + break; } case PRIMITIVE2D_ID_CONTROLPRIMITIVE2D : @@ -838,8 +838,8 @@ namespace drawinglayer try { uno::Reference< beans::XPropertySet > xModelProperties(rXControl->getModel(), uno::UNO_QUERY); - uno::Reference< beans::XPropertySetInfo > xPropertyInfo(xModelProperties.is() - ? xModelProperties->getPropertySetInfo() + uno::Reference< beans::XPropertySetInfo > xPropertyInfo(xModelProperties.is() + ? xModelProperties->getPropertySetInfo() : uno::Reference< beans::XPropertySetInfo >()); const ::rtl::OUString sPrintablePropertyName(RTL_CONSTASCII_USTRINGPARAM("Printable")); @@ -867,25 +867,25 @@ namespace drawinglayer // form control support now as follows ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget > pPDFControl; ::toolkitform::describePDFControl(rXControl, pPDFControl); - + if(pPDFControl.get()) { // still need to fill in the location (is a class Rectangle) const basegfx::B2DRange aRangeLogic(rControlPrimitive.getB2DRange(getViewInformation2D())); const Rectangle aRectLogic( - (sal_Int32)floor(aRangeLogic.getMinX()), (sal_Int32)floor(aRangeLogic.getMinY()), + (sal_Int32)floor(aRangeLogic.getMinX()), (sal_Int32)floor(aRangeLogic.getMinY()), (sal_Int32)ceil(aRangeLogic.getMaxX()), (sal_Int32)ceil(aRangeLogic.getMaxY())); pPDFControl->Location = aRectLogic; - + Size aFontSize(pPDFControl->TextFont.GetSize()); aFontSize = mpOutputDevice->LogicToLogic(aFontSize, MapMode(MAP_POINT), mpOutputDevice->GetMapMode()); pPDFControl->TextFont.SetSize(aFontSize); - + mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::Form); mpPDFExtOutDevData->CreateControl(*pPDFControl.get()); mpPDFExtOutDevData->EndStructureElement(); - // no normal paint needed (see original UnoControlPDFExportContact::do_PaintObject); + // no normal paint needed (see original UnoControlPDFExportContact::do_PaintObject); // do not process recursively bDoProcessRecursively = false; } @@ -896,7 +896,7 @@ namespace drawinglayer // to false. } } - + // #i93169# used flag the wrong way; true means that nothing was done yet if(bDoProcessRecursively) { @@ -916,11 +916,11 @@ namespace drawinglayer // get position const basegfx::B2DHomMatrix aObjectToDiscrete(getViewInformation2D().getObjectToViewTransformation() * rControlPrimitive.getTransform()); const basegfx::B2DPoint aTopLeftDiscrete(aObjectToDiscrete * basegfx::B2DPoint(0.0, 0.0)); - + // draw it xControlView->draw(basegfx::fround(aTopLeftDiscrete.getX()), basegfx::fround(aTopLeftDiscrete.getY())); bDoProcessRecursively = false; - + // restore original graphics xControlView->setGraphics(xOriginalGraphics); } @@ -937,7 +937,7 @@ namespace drawinglayer process(rControlPrimitive.get2DDecomposition(getViewInformation2D())); } } - + break; } case PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D : @@ -982,7 +982,7 @@ namespace drawinglayer // emulate data handling from ImpEditEngine::Paint const basegfx::B2DRange aViewRange(primitive2d::getB2DRangeFromPrimitive2DSequence(rContent, getViewInformation2D())); const Rectangle aRectLogic( - (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), + (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), (sal_Int32)ceil(aViewRange.getMaxX()), (sal_Int32)ceil(aViewRange.getMaxY())); vcl::PDFExtOutDevBookmarkEntry aBookmark; aBookmark.nLinkId = mpPDFExtOutDevData->CreateLink(aRectLogic); @@ -997,7 +997,7 @@ namespace drawinglayer { const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate); static const ByteString aCommentString("XTEXT_EOL"); - + // process recursively and add MetaFile comment process(rLinePrimitive.get2DDecomposition(getViewInformation2D())); mpMetaFile->AddAction(new MetaCommentAction(aCommentString)); @@ -1010,7 +1010,7 @@ namespace drawinglayer // "XTEXT_EOC" is used, use here, too. const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate); static const ByteString aCommentString("XTEXT_EOC"); - + // process recursively and add MetaFile comment process(rBulletPrimitive.get2DDecomposition(getViewInformation2D())); mpMetaFile->AddAction(new MetaCommentAction(aCommentString)); @@ -1135,7 +1135,7 @@ namespace drawinglayer splitLinePolygon(rBasePolygon, aLeft, aRight); const primitive2d::PolygonHairlinePrimitive2D aPLeft(aLeft, rHairlinePrimitive.getBColor()); const primitive2d::PolygonHairlinePrimitive2D aPRight(aRight, rHairlinePrimitive.getBColor()); - + processBasePrimitive2D(aPLeft); processBasePrimitive2D(aPRight); } @@ -1145,8 +1145,8 @@ namespace drawinglayer // support SvtGraphicStroke MetaCommentAction const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rHairlinePrimitive.getBColor())); SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( - rHairlinePrimitive.getB2DPolygon(), - &aLineColor, + rHairlinePrimitive.getB2DPolygon(), + &aLineColor, 0, 0, 0, 0); impStartSvtGraphicStroke(pSvtGraphicStroke); @@ -1170,7 +1170,7 @@ namespace drawinglayer aLeft, rStrokePrimitive.getLineAttribute(), rStrokePrimitive.getStrokeAttribute()); const primitive2d::PolygonStrokePrimitive2D aPRight( aRight, rStrokePrimitive.getLineAttribute(), rStrokePrimitive.getStrokeAttribute()); - + processBasePrimitive2D(aPLeft); processBasePrimitive2D(aPRight); } @@ -1178,9 +1178,9 @@ namespace drawinglayer { // support SvtGraphicStroke MetaCommentAction SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( - rBasePolygon, 0, - &rStrokePrimitive.getLineAttribute(), - &rStrokePrimitive.getStrokeAttribute(), + rBasePolygon, 0, + &rStrokePrimitive.getLineAttribute(), + &rStrokePrimitive.getStrokeAttribute(), 0, 0); impStartSvtGraphicStroke(pSvtGraphicStroke); @@ -1199,7 +1199,7 @@ namespace drawinglayer else { basegfx::tools::applyLineDashing( - rBasePolygon, rStroke.getDotDashArray(), + rBasePolygon, rStroke.getDotDashArray(), &aHairLinePolyPolygon, 0, rStroke.getFullDotDashLen()); } @@ -1207,7 +1207,7 @@ namespace drawinglayer mpOutputDevice->SetLineColor(Color(aHairlineColor)); mpOutputDevice->SetFillColor(); aHairLinePolyPolygon.transform(maCurrentTransformation); - + // #i113922# LineWidth needs to be transformed, too const basegfx::B2DVector aDiscreteUnit(maCurrentTransformation * basegfx::B2DVector(rLine.getWidth(), 0.0)); const double fDiscreteLineWidth(aDiscreteUnit.getLength()); @@ -1234,7 +1234,7 @@ namespace drawinglayer impEndSvtGraphicStroke(pSvtGraphicStroke); } - + break; } case PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D : @@ -1250,18 +1250,18 @@ namespace drawinglayer splitLinePolygon(rBasePolygon, aLeft, aRight); const attribute::LineStartEndAttribute aEmpty; const primitive2d::PolygonStrokeArrowPrimitive2D aPLeft( - aLeft, - rStrokeArrowPrimitive.getLineAttribute(), + aLeft, + rStrokeArrowPrimitive.getLineAttribute(), rStrokeArrowPrimitive.getStrokeAttribute(), rStrokeArrowPrimitive.getStart(), aEmpty); const primitive2d::PolygonStrokeArrowPrimitive2D aPRight( - aRight, - rStrokeArrowPrimitive.getLineAttribute(), + aRight, + rStrokeArrowPrimitive.getLineAttribute(), rStrokeArrowPrimitive.getStrokeAttribute(), aEmpty, rStrokeArrowPrimitive.getEnd()); - + processBasePrimitive2D(aPLeft); processBasePrimitive2D(aPRight); } @@ -1269,10 +1269,10 @@ namespace drawinglayer { // support SvtGraphicStroke MetaCommentAction SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke( - rBasePolygon, 0, - &rStrokeArrowPrimitive.getLineAttribute(), - &rStrokeArrowPrimitive.getStrokeAttribute(), - &rStrokeArrowPrimitive.getStart(), + rBasePolygon, 0, + &rStrokeArrowPrimitive.getLineAttribute(), + &rStrokeArrowPrimitive.getStrokeAttribute(), + &rStrokeArrowPrimitive.getStart(), &rStrokeArrowPrimitive.getEnd()); impStartSvtGraphicStroke(pSvtGraphicStroke); @@ -1301,7 +1301,7 @@ namespace drawinglayer const primitive2d::PolyPolygonBitmapPrimitive2D aSplitted( aLocalPolyPolygon, rBitmapCandidate.getFillBitmap()); - + processBasePrimitive2D(aSplitted); } else @@ -1341,7 +1341,7 @@ namespace drawinglayer // scale values are divided by bitmap pixel sizes aTransform.matrix[0] = aFillBitmapSize.getX() / aBmpSizePixel.Width(); aTransform.matrix[4] = aFillBitmapSize.getY() / aBmpSizePixel.Height(); - + // translates are absolute aTransform.matrix[2] = aFillBitmapTopLeft.getX(); aTransform.matrix[5] = aFillBitmapTopLeft.getY(); @@ -1380,6 +1380,7 @@ namespace drawinglayer { // need to handle PolyPolygonHatchPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate); + const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch(); basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon()); // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points @@ -1387,8 +1388,20 @@ namespace drawinglayer while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon)) ; + if(rFillHatchAttribute.isFillBackground()) + { + // with fixing #i111954# (see below) the possible background + // fill of a hatched object was lost.Generate a background fill + // primitive and render it + const primitive2d::Primitive2DReference xBackground( + new primitive2d::PolyPolygonColorPrimitive2D( + aLocalPolyPolygon, + rHatchCandidate.getBackgroundColor())); + + process(primitive2d::Primitive2DSequence(&xBackground, 1)); + } + SvtGraphicFill* pSvtGraphicFill = 0; - const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch(); aLocalPolyPolygon.transform(maCurrentTransformation); if(!mnSvtGraphicFillCount && aLocalPolyPolygon.count()) @@ -1398,7 +1411,7 @@ namespace drawinglayer switch(rFillHatchAttribute.getStyle()) { - default: // attribute::HATCHSTYLE_SINGLE : + default: // attribute::HATCHSTYLE_SINGLE : { eHatch = SvtGraphicFill::hatchSingle; break; @@ -1416,7 +1429,7 @@ namespace drawinglayer } SvtGraphicFill::Transform aTransform; - + // scale aTransform.matrix[0] *= rFillHatchAttribute.getDistance(); aTransform.matrix[4] *= rFillHatchAttribute.getDistance(); @@ -1426,7 +1439,7 @@ namespace drawinglayer aTransform.matrix[1] *= -sin(rFillHatchAttribute.getAngle()); aTransform.matrix[3] *= sin(rFillHatchAttribute.getAngle()); aTransform.matrix[4] *= cos(rFillHatchAttribute.getAngle()); - + pSvtGraphicFill = new SvtGraphicFill( PolyPolygon(aLocalPolyPolygon), Color(), @@ -1455,8 +1468,8 @@ namespace drawinglayer attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE : HATCH_TRIPLE); - mpOutputDevice->DrawHatch(aToolsPolyPolygon, - Hatch(aHatchStyle, + mpOutputDevice->DrawHatch(aToolsPolyPolygon, + Hatch(aHatchStyle, Color(rFillHatchAttribute.getColor()), basegfx::fround(rFillHatchAttribute.getDistance()), basegfx::fround(rFillHatchAttribute.getAngle() / F_PI1800))); @@ -1481,7 +1494,7 @@ namespace drawinglayer Gradient aVCLGradient; impConvertFillGradientAttributeToVCLGradient(aVCLGradient, rGradientCandidate.getFillGradient(), false); aLocalPolyPolygon.transform(maCurrentTransformation); - + // #i82145# ATM VCL printing of gradients using curved shapes does not work, // i submitted the bug with the given ID to THB. When that task is fixed it is // necessary to again remove this subdivision since it decreases possible @@ -1512,7 +1525,7 @@ namespace drawinglayer eGrad = SvtGraphicFill::gradientRectangular; break; } - + pSvtGraphicFill = new SvtGraphicFill( aToolsPolyPolygon, Color(), @@ -1607,14 +1620,14 @@ namespace drawinglayer // prepare new mask polygon and rescue current one aMask.transform(maCurrentTransformation); const basegfx::B2DPolyPolygon aLastClipPolyPolygon(maClipPolyPolygon); - + if(maClipPolyPolygon.count()) { - // there is already a clip polygon set; build clipped union of + // there is already a clip polygon set; build clipped union of // current mask polygon and new one maClipPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon( - aMask, - maClipPolyPolygon, + aMask, + maClipPolyPolygon, true, // #i106516# we want the inside of aMask, not the outside false); } @@ -1636,7 +1649,7 @@ namespace drawinglayer // recursively paint content process(rMaskCandidate.getChildren()); - + if(maClipPolyPolygon.count()) { // restore VCL clip region @@ -1671,7 +1684,7 @@ namespace drawinglayer { aInvisibleRange.transform(maCurrentTransformation); const Rectangle aRectLogic( - (sal_Int32)floor(aInvisibleRange.getMinX()), (sal_Int32)floor(aInvisibleRange.getMinY()), + (sal_Int32)floor(aInvisibleRange.getMinX()), (sal_Int32)floor(aInvisibleRange.getMinY()), (sal_Int32)ceil(aInvisibleRange.getMaxX()), (sal_Int32)ceil(aInvisibleRange.getMaxY())); mpOutputDevice->SetFillColor(); @@ -1718,7 +1731,7 @@ namespace drawinglayer // single transparent PolyPolygon identified, use directly const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor())); basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon()); - + // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points // per polygon. Split polygon until there are less than that while(fillPolyPolygonNeededToBeSplit(aLocalPolyPolygon)) @@ -1758,7 +1771,7 @@ namespace drawinglayer // call VCL directly; encapsulate with SvtGraphicFill impStartSvtGraphicFill(pSvtGraphicFill); mpOutputDevice->DrawTransparent( - PolyPolygon(aLocalPolyPolygon), + PolyPolygon(aLocalPolyPolygon), nTransPercentVcl); impEndSvtGraphicFill(pSvtGraphicFill); } @@ -1795,10 +1808,10 @@ namespace drawinglayer aVCLGradient.SetStartIntensity(100); aVCLGradient.SetEndIntensity(100); aVCLGradient.SetSteps(2); - + // render it to VCL mpOutputDevice->DrawTransparent( - aContentMetafile, aPrimitiveRectangle.TopLeft(), + aContentMetafile, aPrimitiveRectangle.TopLeft(), aPrimitiveRectangle.GetSize(), aVCLGradient); } } @@ -1841,10 +1854,10 @@ namespace drawinglayer // re-create a VCL-gradient from FillGradientPrimitive2D Gradient aVCLGradient; impConvertFillGradientAttributeToVCLGradient(aVCLGradient, pFiGradient->getFillGradient(), true); - + // render it to VCL mpOutputDevice->DrawTransparent( - aContentMetafile, aPrimitiveRectangle.TopLeft(), + aContentMetafile, aPrimitiveRectangle.TopLeft(), aPrimitiveRectangle.GetSize(), aVCLGradient); } else @@ -1865,7 +1878,7 @@ namespace drawinglayer basegfx::B2DRange aViewRange(primitive2d::getB2DRangeFromPrimitive2DSequence(rContent, getViewInformation2D())); aViewRange.transform(maCurrentTransformation); const Rectangle aRectLogic( - (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), + (sal_Int32)floor(aViewRange.getMinX()), (sal_Int32)floor(aViewRange.getMinY()), (sal_Int32)ceil(aViewRange.getMaxX()), (sal_Int32)ceil(aViewRange.getMaxY())); const Rectangle aRectPixel(mpOutputDevice->LogicToPixel(aRectLogic)); const Size aSizePixel(aRectPixel.GetSize()); @@ -1898,12 +1911,12 @@ namespace drawinglayer // except new transformation and range const geometry::ViewInformation2D aViewInfo( getViewInformation2D().getObjectTransformation(), - aViewTransform, - aViewRange, + aViewTransform, + aViewRange, getViewInformation2D().getVisualizedPage(), - getViewInformation2D().getViewTime(), + getViewInformation2D().getViewTime(), getViewInformation2D().getExtendedInformationSequence()); - + VclPixelProcessor2D aBufferProcessor(aViewInfo, aBufferDevice); // draw content using pixel renderer @@ -1965,7 +1978,7 @@ namespace drawinglayer const primitive2d::ChartPrimitive2D& rChartPrimitive = static_cast< const primitive2d::ChartPrimitive2D& >(rCandidate); if(!renderChartPrimitive2D( - rChartPrimitive, + rChartPrimitive, *mpOutputDevice, getViewInformation2D())) { @@ -1989,7 +2002,7 @@ namespace drawinglayer // proccess childs normally process(rStructureTagCandidate.getChildren()); - + if(mpPDFExtOutDevData && bTagUsed) { // write end tag diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 573006c602ce..dfa39831a007 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.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 namespace processor2d { VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev) - : VclProcessor2D(rViewInformation, rOutDev), + : VclProcessor2D(rViewInformation, rOutDev), maOriginalMapMode(rOutDev.GetMapMode()) { // prepare maCurrentTransformation matrix with viewTransformation to target directly to pixels @@ -121,8 +121,8 @@ namespace drawinglayer const primitive2d::WrongSpellPrimitive2D& rWrongSpellPrimitive = static_cast< const primitive2d::WrongSpellPrimitive2D& >(rCandidate); if(!renderWrongSpellPrimitive2D( - rWrongSpellPrimitive, - *mpOutputDevice, + rWrongSpellPrimitive, + *mpOutputDevice, maCurrentTransformation, maBColorModifierStack)) { @@ -153,10 +153,10 @@ namespace drawinglayer { process(rCandidate.get2DDecomposition(getViewInformation2D())); } - + // restore DrawMode mpOutputDevice->SetDrawMode(nOriginalDrawMode); - + break; } case PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D : @@ -240,12 +240,12 @@ namespace drawinglayer // direct draw of MetaFile RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); } - + if(bForceLineSnap) { mpOutputDevice->SetAntialiasing(nOldAntiAliase); } - + break; } case PRIMITIVE2D_ID_MASKPRIMITIVE2D : @@ -299,10 +299,10 @@ namespace drawinglayer const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor())); mpOutputDevice->SetFillColor(Color(aPolygonColor)); mpOutputDevice->SetLineColor(); - + basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon()); aLocalPolyPolygon.transform(maCurrentTransformation); - + mpOutputDevice->DrawTransparent(aLocalPolyPolygon, rUniTransparenceCandidate.getTransparence()); bDrawTransparentUsed = true; break; @@ -310,10 +310,10 @@ namespace drawinglayer // #i# need to wait for #i101378# which is in CWS vcl112 to directly paint transparent hairlines //case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D: //{ - // // single transparent PolygonHairlinePrimitive2D identified, use directly - // const primitive2d::PolygonHairlinePrimitive2D* pPoHair = static_cast< const primitive2d::PolygonHairlinePrimitive2D* >(pBasePrimitive); - // OSL_ENSURE(pPoHair, "OOps, PrimitiveID and PrimitiveType do not match (!)"); - // break; + // // single transparent PolygonHairlinePrimitive2D identified, use directly + // const primitive2d::PolygonHairlinePrimitive2D* pPoHair = static_cast< const primitive2d::PolygonHairlinePrimitive2D* >(pBasePrimitive); + // OSL_ENSURE(pPoHair, "OOps, PrimitiveID and PrimitiveType do not match (!)"); + // break; //} } } @@ -385,17 +385,17 @@ namespace drawinglayer // it does not need to be painted at all. uno::Reference< awt::XWindow2 > xControlWindow(rXControl, uno::UNO_QUERY_THROW); const bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is() && xControlWindow->isVisible()); - + if(!bControlIsVisibleAsChildWindow) { // draw it. Do not forget to use the evtl. offsetted origin of the target device, // e.g. when used with mask/transparence buffer device const Point aOrigin(mpOutputDevice->GetMapMode().GetOrigin()); xControlView->draw( - aOrigin.X() + basegfx::fround(aTopLeftPixel.getX()), + aOrigin.X() + basegfx::fround(aTopLeftPixel.getX()), aOrigin.Y() + basegfx::fround(aTopLeftPixel.getY())); } - + // restore original graphics xControlView->setGraphics(xOriginalGraphics); } @@ -403,7 +403,7 @@ namespace drawinglayer catch(const uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); - + // process recursively and use the decomposition as Bitmap process(rCandidate.get2DDecomposition(getViewInformation2D())); } @@ -441,7 +441,7 @@ namespace drawinglayer // the right and bottom pixels. The used method evaluates that and takes the correct action, // including calling recursively with decomposition if line is wide enough const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive = static_cast< const primitive2d::PolygonStrokePrimitive2D& >(rCandidate); - + RenderPolygonStrokePrimitive2D(rPolygonStrokePrimitive); } @@ -457,16 +457,16 @@ namespace drawinglayer const primitive2d::ChartPrimitive2D& rChartPrimitive = static_cast< const primitive2d::ChartPrimitive2D& >(rCandidate); mpOutputDevice->Push(PUSH_MAPMODE); mpOutputDevice->SetMapMode(maOriginalMapMode); - + if(!renderChartPrimitive2D( - rChartPrimitive, + rChartPrimitive, *mpOutputDevice, getViewInformation2D())) { // fallback to decomposition (MetaFile) process(rChartPrimitive.get2DDecomposition(getViewInformation2D())); } - + mpOutputDevice->Pop(); break; } @@ -476,19 +476,19 @@ namespace drawinglayer if(bForceIgnoreHatchSmoothing || getOptionsDrawinglayer().IsAntiAliasing()) { - // if AA is used (or ignore smoothing is on), there is no need to smooth + // if AA is used (or ignore smoothing is on), there is no need to smooth // hatch painting, use decomposition process(rCandidate.get2DDecomposition(getViewInformation2D())); } else { - // without AA, use VCL to draw the hatch. It snaps hatch distances to the next pixel - // and forces hatch distance to be >= 3 pixels to make the hatch display look smoother. + // without AA, use VCL to draw the hatch. It snaps hatch distances to the next pixel + // and forces hatch distance to be >= 3 pixels to make the hatch display look smoother. // This is wrong in principle, but looks nicer. This could also be done here directly // without VCL usage if needed const primitive2d::FillHatchPrimitive2D& rFillHatchPrimitive = static_cast< const primitive2d::FillHatchPrimitive2D& >(rCandidate); const attribute::FillHatchAttribute& rFillHatchAttributes = rFillHatchPrimitive.getFillHatch(); - + // create hatch polygon in range size and discrete coordinates basegfx::B2DRange aHatchRange(rFillHatchPrimitive.getObjectRange()); aHatchRange.transform(maCurrentTransformation); @@ -498,7 +498,7 @@ namespace drawinglayer { // #i111846# background fill is active; draw fill polygon const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rFillHatchPrimitive.getBColor())); - + mpOutputDevice->SetFillColor(Color(aPolygonColor)); mpOutputDevice->SetLineColor(); mpOutputDevice->DrawPolygon(aHatchPolygon); diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index d2cbe1665f46..0823d8512fb3 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.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 @@ -129,9 +129,9 @@ namespace drawinglayer { // Get the VCL font (use FontHeight as FontWidth) Font aFont(primitive2d::getVclFontFromFontAttribute( - rTextCandidate.getFontAttribute(), - aFontScaling.getX(), - aFontScaling.getY(), + rTextCandidate.getFontAttribute(), + aFontScaling.getX(), + aFontScaling.getY(), fRotate, rTextCandidate.getLocale())); @@ -141,7 +141,7 @@ namespace drawinglayer if( pTCPP != NULL ) { - + // set the color of text decorations const basegfx::BColor aTextlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getTextlineColor()); mpOutputDevice->SetTextLineColor( Color(aTextlineColor) ); @@ -164,8 +164,8 @@ namespace drawinglayer aFont.SetUnderline( eFontUnderline ); if( pTCPP->getWordLineMode() ) aFont.SetWordLineMode( true ); -//TODO: ??? if( pTCPP->getUnderlineAbove() ) -// aFont.SetUnderlineAbove( true ); +//TODO: ??? if( pTCPP->getUnderlineAbove() ) +// aFont.SetUnderlineAbove( true ); } // set Strikeout attribute @@ -181,11 +181,11 @@ namespace drawinglayer default: DBG_WARNING1( "DrawingLayer: Unknown EmphasisMark style (%d)!", pTCPP->getTextEmphasisMark() ); // fall through - case primitive2d::TEXT_EMPHASISMARK_NONE: eFontEmphasisMark = EMPHASISMARK_NONE; break; - case primitive2d::TEXT_EMPHASISMARK_DOT: eFontEmphasisMark = EMPHASISMARK_DOT; break; - case primitive2d::TEXT_EMPHASISMARK_CIRCLE: eFontEmphasisMark = EMPHASISMARK_CIRCLE; break; - case primitive2d::TEXT_EMPHASISMARK_DISC: eFontEmphasisMark = EMPHASISMARK_DISC; break; - case primitive2d::TEXT_EMPHASISMARK_ACCENT: eFontEmphasisMark = EMPHASISMARK_ACCENT; break; + case primitive2d::TEXT_EMPHASISMARK_NONE: eFontEmphasisMark = EMPHASISMARK_NONE; break; + case primitive2d::TEXT_EMPHASISMARK_DOT: eFontEmphasisMark = EMPHASISMARK_DOT; break; + case primitive2d::TEXT_EMPHASISMARK_CIRCLE: eFontEmphasisMark = EMPHASISMARK_CIRCLE; break; + case primitive2d::TEXT_EMPHASISMARK_DISC: eFontEmphasisMark = EMPHASISMARK_DISC; break; + case primitive2d::TEXT_EMPHASISMARK_ACCENT: eFontEmphasisMark = EMPHASISMARK_ACCENT; break; } if( eFontEmphasisMark != EMPHASISMARK_NONE ) @@ -206,9 +206,9 @@ namespace drawinglayer default: DBG_WARNING1( "DrawingLayer: Unknown Relief style (%d)!", pTCPP->getTextRelief() ); // fall through - case primitive2d::TEXT_RELIEF_NONE: eFontRelief = RELIEF_NONE; break; - case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = RELIEF_EMBOSSED; break; - case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = RELIEF_ENGRAVED; break; + case primitive2d::TEXT_RELIEF_NONE: eFontRelief = RELIEF_NONE; break; + case primitive2d::TEXT_RELIEF_EMBOSSED: eFontRelief = RELIEF_EMBOSSED; break; + case primitive2d::TEXT_RELIEF_ENGRAVED: eFontRelief = RELIEF_ENGRAVED; break; } if( eFontRelief != RELIEF_NONE ) @@ -228,7 +228,7 @@ namespace drawinglayer const basegfx::B2DVector aPixelVector(maCurrentTransformation * basegfx::B2DVector(1.0, 0.0)); const double fPixelVectorFactor(aPixelVector.getLength()); - for(::std::vector< double >::const_iterator aStart(rTextCandidate.getDXArray().begin()); + for(::std::vector< double >::const_iterator aStart(rTextCandidate.getDXArray().begin()); aStart != rTextCandidate.getDXArray().end(); aStart++) { aTransformedDXArray.push_back(basegfx::fround((*aStart) * fPixelVectorFactor)); @@ -281,7 +281,7 @@ namespace drawinglayer if(aTransformedDXArray.size()) { mpOutputDevice->DrawTextArray( - aStartPoint, + aStartPoint, aText, pDXArray, nPos, @@ -290,7 +290,7 @@ namespace drawinglayer else { mpOutputDevice->DrawText( - aStartPoint, + aStartPoint, aText, nPos, nLen); @@ -330,7 +330,7 @@ namespace drawinglayer const basegfx::B2DRange& rDiscreteViewport = getViewInformation2D().getDiscreteViewport(); basegfx::B2DPolyPolygon aLocalPolyPolygon(basegfx::tools::clipPolygonOnRange( aLocalPolygon, rDiscreteViewport, true, false)); - + if(aLocalPolyPolygon.count()) { // subdivide @@ -352,7 +352,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { const basegfx::B2DPolygon aTempPolygon(aB2DTrapezoidVector[a].getB2DPolygon()); - + if(bShowOutlinesThere) { mpOutputDevice->SetFillColor(Color(aHairlineColor)); @@ -538,7 +538,7 @@ namespace drawinglayer // nBWidth, nBHeight is the pixel size of the neede bitmap. To not need to scale it // in vcl many times, create a size-optimized version const Size aNeededBitmapSizePixel(nBWidth, nBHeight); - + if(aNeededBitmapSizePixel != aBitmapEx.GetSizePixel()) { aBitmapEx.Scale(aNeededBitmapSizePixel); @@ -650,7 +650,7 @@ namespace drawinglayer { // with tiling, fill the whole PolyPolygon with the modifier color basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolyPolygon); - + aLocalPolyPolygon.transform(maCurrentTransformation); mpOutputDevice->SetLineColor(); mpOutputDevice->SetFillColor(Color(rTopmostModifier.getBColor())); @@ -659,7 +659,7 @@ namespace drawinglayer else { // without tiling, only the area common to the bitmap tile and the - // PolyPolygon is filled. Create the bitmap tile area in object + // PolyPolygon is filled. Create the bitmap tile area in object // coordinates. For this, the object transformation needs to be created // from the already scaled PolyPolygon. The tile area in object // coordinates wil always be non-rotated, so it's not necessary to @@ -724,7 +724,7 @@ namespace drawinglayer const basegfx::B2DRange& rDiscreteViewport = getViewInformation2D().getDiscreteViewport(); aLocalPolyPolygon = basegfx::tools::clipPolyPolygonOnRange( aLocalPolyPolygon, rDiscreteViewport, true, false); - + if(aLocalPolyPolygon.count()) { // subdivide @@ -745,7 +745,7 @@ namespace drawinglayer for(sal_uInt32 a(0); a < nCount; a++) { const basegfx::B2DPolygon aTempPolygon(aB2DTrapezoidVector[a].getB2DPolygon()); - + if(bShowOutlinesThere) { mpOutputDevice->SetFillColor(Color(aPolygonColor)); @@ -768,7 +768,7 @@ namespace drawinglayer { mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon); - if(mnPolygonStrokePrimitive2D + if(mnPolygonStrokePrimitive2D && getOptionsDrawinglayer().IsAntiAliasing() && (mpOutputDevice->GetAntialiasing() & ANTIALIASING_ENABLE_B2DDRAW)) { @@ -803,7 +803,7 @@ namespace drawinglayer aScale = basegfx::absolute(aScale); fRotate += F_PI; } - + // get BoundRect basegfx::B2DRange aOutlineRange(rMetaCandidate.getB2DRange(getViewInformation2D())); aOutlineRange.transform(maCurrentTransformation); @@ -953,7 +953,7 @@ namespace drawinglayer // use decomposition process(rTransCandidate.get2DDecomposition(getViewInformation2D())); } - else + else { if(0.0 == rTransCandidate.getTransparence()) { @@ -975,7 +975,7 @@ namespace drawinglayer // paint content to it process(rTransCandidate.getChildren()); - + // back to old OutDev mpOutputDevice = pLastOutputDevice; @@ -1101,19 +1101,19 @@ namespace drawinglayer { // get discrete half size const basegfx::B2DVector aDiscreteHalfSize( - (aBitmapSize.getWidth() - 1.0) * 0.5, + (aBitmapSize.getWidth() - 1.0) * 0.5, (aBitmapSize.getHeight() - 1.0) * 0.5); const bool bWasEnabled(mpOutputDevice->IsMapModeEnabled()); - // do not forget evtl. moved origin in target device MapMode when + // do not forget evtl. moved origin in target device MapMode when // switching it off; it would be missing and lead to wrong positions. // All his could be done using logic sizes and coordinates, too, but // we want a 1:1 bitmap rendering here, so it's more safe and faster // to work with switching off MapMode usage completely. const Point aOrigin(mpOutputDevice->GetMapMode().GetOrigin()); - + mpOutputDevice->EnableMapMode(false); - + for(std::vector< basegfx::B2DPoint >::const_iterator aIter(rPositions.begin()); aIter != rPositions.end(); aIter++) { const basegfx::B2DPoint aDiscreteTopLeft((maCurrentTransformation * (*aIter)) - aDiscreteHalfSize); @@ -1232,22 +1232,22 @@ namespace drawinglayer const double fDistance((fDiscreteLineWidth - 1.0) * 0.5); mpOutputDevice->DrawPolyLine(aCandidate, 0.0); - + aMat.set(0, 2, -fDistance); aMat.set(1, 2, 0.0); aCandidate.transform(aMat); mpOutputDevice->DrawPolyLine(aCandidate, 0.0); - + aMat.set(0, 2, fDistance); aMat.set(1, 2, -fDistance); aCandidate.transform(aMat); mpOutputDevice->DrawPolyLine(aCandidate, 0.0); - + aMat.set(0, 2, fDistance); aMat.set(1, 2, fDistance); aCandidate.transform(aMat); mpOutputDevice->DrawPolyLine(aCandidate, 0.0); - + aMat.set(0, 2, -fDistance); aMat.set(1, 2, fDistance); aCandidate.transform(aMat); @@ -1311,16 +1311,16 @@ namespace drawinglayer } } } - + if(!bDone) { // remeber that we enter a PolygonStrokePrimitive2D decomposition, // used for AA thick line drawing mnPolygonStrokePrimitive2D++; - + // line width is big enough for standard filled polygon visualisation or zero process(rPolygonStrokeCandidate.get2DDecomposition(getViewInformation2D())); - + // leave PolygonStrokePrimitive2D mnPolygonStrokePrimitive2D--; } @@ -1332,7 +1332,7 @@ namespace drawinglayer // primitive to handle embedded Eps data. On some devices, this can be // painted directly (mac, printer). // To be able to handle the replacement correctly, i need to handle it myself - // since DrawEPS will not be able e.g. to rotate the replacement. To be able + // since DrawEPS will not be able e.g. to rotate the replacement. To be able // to do that, i added a boolean return to OutputDevice::DrawEPS(..) // to know when EPS was handled directly already. basegfx::B2DRange aRange(0.0, 0.0, 1.0, 1.0); @@ -1482,7 +1482,7 @@ namespace drawinglayer VclProcessor2D::VclProcessor2D( const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev) - : BaseProcessor2D(rViewInformation), + : BaseProcessor2D(rViewInformation), mpOutputDevice(&rOutDev), maBColorModifierStack(), maCurrentTransformation(), diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx index ef89074852cc..9636c6b295a4 100644 --- a/drawinglayer/source/processor3d/baseprocessor3d.cxx +++ b/drawinglayer/source/processor3d/baseprocessor3d.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,7 +46,7 @@ namespace drawinglayer } BaseProcessor3D::BaseProcessor3D(const geometry::ViewInformation3D& rViewInformation) - : maViewInformation3D(rViewInformation) + : maViewInformation3D(rViewInformation) { } @@ -59,7 +59,7 @@ namespace drawinglayer if(rSource.hasElements()) { const sal_Int32 nCount(rSource.getLength()); - + for(sal_Int32 a(0L); a < nCount; a++) { // get reference @@ -94,7 +94,7 @@ namespace drawinglayer namespace processor3d { CollectingProcessor3D::CollectingProcessor3D(const geometry::ViewInformation3D& rViewInformation) - : BaseProcessor3D(rViewInformation), + : BaseProcessor3D(rViewInformation), maPrimitive3DSequence() { } diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 4589d21dab16..2b1f67e94a52 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.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,8 +45,8 @@ namespace drawinglayer { namespace processor3d { - CutFindProcessor::CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, - const basegfx::B3DPoint& rFront, + CutFindProcessor::CutFindProcessor(const geometry::ViewInformation3D& rViewInformation, + const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, bool bAnyHit) : BaseProcessor3D(rViewInformation), @@ -72,7 +72,7 @@ namespace drawinglayer { case PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D : { - // transform group. + // transform group. const primitive3d::TransformPrimitive3D& rPrimitive = static_cast< const primitive3d::TransformPrimitive3D& >(rCandidate); // remember old and transform front, back to object coordinates @@ -93,7 +93,7 @@ namespace drawinglayer aLastViewInformation3D.getViewTime(), aLastViewInformation3D.getExtendedInformationSequence()); updateViewInformation(aNewViewInformation3D); - + // #i102956# remember needed back-transform for found cuts (combine from right side) const basegfx::B3DHomMatrix aLastCombinedTransform(maCombinedTransform); maCombinedTransform = maCombinedTransform * rPrimitive.getTransformation(); @@ -182,7 +182,7 @@ namespace drawinglayer { const basegfx::B3DPolygon aPolygon(rPolyPolygon.getB3DPolygon(0)); const sal_uInt32 nPointCount(aPolygon.count()); - + if(nPointCount > 2) { const basegfx::B3DVector aPlaneNormal(aPolygon.getNormal()); @@ -208,7 +208,7 @@ namespace drawinglayer } } } - + break; } default : diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 624a25ff8c36..8768d25dc3cf 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.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 @@ -227,15 +227,15 @@ namespace drawinglayer if(rFillBitmapAttribute.getTiling()) { mpGeoTexSvx.reset(new texture::GeoTexSvxBitmapTiled( - rFillBitmapAttribute.getBitmapEx().GetBitmap(), - rFillBitmapAttribute.getTopLeft() * rPrimitive.getTextureSize(), + rFillBitmapAttribute.getBitmapEx().GetBitmap(), + rFillBitmapAttribute.getTopLeft() * rPrimitive.getTextureSize(), rFillBitmapAttribute.getSize() * rPrimitive.getTextureSize())); } else { mpGeoTexSvx.reset(new texture::GeoTexSvxBitmap( - rFillBitmapAttribute.getBitmapEx().GetBitmap(), - rFillBitmapAttribute.getTopLeft() * rPrimitive.getTextureSize(), + rFillBitmapAttribute.getBitmapEx().GetBitmap(), + rFillBitmapAttribute.getTopLeft() * rPrimitive.getTextureSize(), rFillBitmapAttribute.getSize() * rPrimitive.getTextureSize())); } @@ -285,7 +285,7 @@ namespace drawinglayer if(a2DRange.overlaps(maRasterRange)) { const attribute::MaterialAttribute3D aMaterial(maBColorModifierStack.getModifiedColor(rPrimitive.getBColor())); - + rasterconvertB3DPolygon(aMaterial, aHairline); } } @@ -299,7 +299,7 @@ namespace drawinglayer // #i98295# get ShadeMode. Correct early when only flat is possible due to missing normals const ::com::sun::star::drawing::ShadeMode aShadeMode( - aFill.areNormalsUsed() ? + aFill.areNormalsUsed() ? getSdrSceneAttribute().getShadeMode() : ::com::sun::star::drawing::ShadeMode_FLAT); if(bPaintIt) @@ -379,7 +379,7 @@ namespace drawinglayer for(sal_uInt32 a(0L); a < aFill.count(); a++) { basegfx::B3DPolygon aPartFill(aFill.getB3DPolygon(a)); - + for(sal_uInt32 b(0L); b < aPartFill.count(); b++) { // solve color model. Transform normal to eye coor @@ -420,11 +420,11 @@ namespace drawinglayer // draw it to ZBuffer const attribute::MaterialAttribute3D aMaterial( - maBColorModifierStack.getModifiedColor(aObjectColor), - rPrimitive.getMaterial().getSpecular(), - rPrimitive.getMaterial().getEmission(), + maBColorModifierStack.getModifiedColor(aObjectColor), + rPrimitive.getMaterial().getSpecular(), + rPrimitive.getMaterial().getEmission(), rPrimitive.getMaterial().getSpecularIntensity()); - + rasterconvertB3DPolyPolygon(aMaterial, aFill); } } @@ -538,7 +538,7 @@ namespace drawinglayer const geometry::ViewInformation3D& rViewInformation, const attribute::SdrSceneAttribute& rSdrSceneAttribute, const attribute::SdrLightingAttribute& rSdrLightingAttribute) - : BaseProcessor3D(rViewInformation), + : BaseProcessor3D(rViewInformation), mrSdrSceneAttribute(rSdrSceneAttribute), mrSdrLightingAttribute(rSdrLightingAttribute), maRasterRange(), diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index 827bee0173ce..7a422bc8d8e6 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.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 @@ -134,7 +134,7 @@ namespace drawinglayer // TexturePrimitive3D: Process children, do not try to decompose const primitive3d::TexturePrimitive3D& rTexturePrimitive = static_cast< const primitive3d::TexturePrimitive3D& >(rCandidate); const primitive3d::Primitive3DSequence aChildren(rTexturePrimitive.getChildren()); - + if(aChildren.hasElements()) { process(aChildren); @@ -158,7 +158,7 @@ namespace drawinglayer Geometry2DExtractingProcessor::Geometry2DExtractingProcessor( const geometry::ViewInformation3D& rViewInformation, const basegfx::B2DHomMatrix& rObjectTransformation) - : BaseProcessor3D(rViewInformation), + : BaseProcessor3D(rViewInformation), maPrimitive2DSequence(), maObjectTransformation(rObjectTransformation), maBColorModifierStack() diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index b7f7447051da..2a71d97a299c 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.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,7 +87,7 @@ namespace drawinglayer BasePrimitive2DVector aNewSubList; BasePrimitive2DVector* pLastTargetSequence = mpPrimitive2DSequence; mpPrimitive2DSequence = &aNewSubList; - + // activate convert const bool bLastConvert(mbConvert); mbConvert = true; @@ -107,8 +107,8 @@ namespace drawinglayer // create 2d shadow primitive with result. This also fetches all entries // from aNewSubList, so there is no need to delete them primitive2d::BasePrimitive2D* pNew = new primitive2d::ShadowPrimitive2D( - rPrimitive.getShadowTransform(), - rPrimitive.getShadowColor(), + rPrimitive.getShadowTransform(), + rPrimitive.getShadowColor(), getPrimitive2DSequenceFromBasePrimitive2DVector(aNewSubList)); if(basegfx::fTools::more(rPrimitive.getShadowTransparence(), 0.0)) @@ -116,9 +116,9 @@ namespace drawinglayer // create simpleTransparencePrimitive, add created primitives const primitive2d::Primitive2DReference xRef(pNew); const primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&xRef, 1); - + pNew = new primitive2d::UnifiedTransparencePrimitive2D( - aNewTransPrimitiveVector, + aNewTransPrimitiveVector, rPrimitive.getShadowTransparence()); } @@ -148,13 +148,13 @@ namespace drawinglayer maWorldToEye = getViewInformation3D().getOrientation() * getViewInformation3D().getObjectTransformation(); maEyeToView = getViewInformation3D().getDeviceToView() * getViewInformation3D().getProjection(); } - + // let break down process(rPrimitive.getChildren()); // restore transformations updateViewInformation(aLastViewInformation3D); - + if(mbShadowProjectionIsValid) { // update buffered WorldToEye and EyeToView @@ -188,7 +188,7 @@ namespace drawinglayer a2DHairline.transform(getObjectTransformation()); mpPrimitive2DSequence->push_back( new primitive2d::PolygonHairlinePrimitive2D( - a2DHairline, + a2DHairline, maPrimitiveColor)); } } @@ -219,7 +219,7 @@ namespace drawinglayer a2DFill.transform(getObjectTransformation()); mpPrimitive2DSequence->push_back( new primitive2d::PolyPolygonColorPrimitive2D( - a2DFill, + a2DFill, maPrimitiveColor)); } } @@ -240,7 +240,7 @@ namespace drawinglayer const basegfx::B3DVector& rLightNormal, double fShadowSlant, const basegfx::B3DRange& rContained3DRange) - : BaseProcessor3D(rViewInformation), + : BaseProcessor3D(rViewInformation), maPrimitive2DSequence(), mpPrimitive2DSequence(&maPrimitive2DSequence), maObjectTransformation(rObjectTransformation), @@ -282,7 +282,7 @@ namespace drawinglayer Shadow3DExtractingProcessor::~Shadow3DExtractingProcessor() { - OSL_ENSURE(0 == maPrimitive2DSequence.size(), + OSL_ENSURE(0 == maPrimitive2DSequence.size(), "OOps, someone used Shadow3DExtractingProcessor, but did not fetch the results (!)"); for(sal_uInt32 a(0); a < maPrimitive2DSequence.size(); a++) { @@ -331,8 +331,8 @@ namespace drawinglayer return aRetval; } - const primitive2d::Primitive2DSequence Shadow3DExtractingProcessor::getPrimitive2DSequence() const - { + const primitive2d::Primitive2DSequence Shadow3DExtractingProcessor::getPrimitive2DSequence() const + { return getPrimitive2DSequenceFromBasePrimitive2DVector(maPrimitive2DSequence); } diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index fe48b14e5530..340c8d459660 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.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 @@ -89,9 +89,9 @@ namespace for(sal_uInt32 d(0); d < mnAntiAlialize; d++) { const basegfx::BPixel& rPixel(rRaster.getBPixel(nIndex++)); - nRed = nRed + rPixel.getRed(); - nGreen = nGreen + rPixel.getGreen(); - nBlue = nBlue + rPixel.getBlue(); + nRed = nRed + rPixel.getRed(); + nGreen = nGreen + rPixel.getGreen(); + nBlue = nBlue + rPixel.getBlue(); nOpacity = nOpacity + rPixel.getOpacity(); } @@ -99,12 +99,12 @@ namespace } nOpacity = nOpacity / nDivisor; - + if(nOpacity) { pContent->SetPixel(y, x, BitmapColor( - (sal_uInt8)(nRed / nDivisor), - (sal_uInt8)(nGreen / nDivisor), + (sal_uInt8)(nRed / nDivisor), + (sal_uInt8)(nGreen / nDivisor), (sal_uInt8)(nBlue / nDivisor))); pAlpha->SetPixel(y, x, BitmapColor(255 - (sal_uInt8)nOpacity)); } @@ -114,7 +114,7 @@ namespace else { sal_uInt32 nIndex(0L); - + for(sal_uInt32 y(0L); y < nHeight; y++) { for(sal_uInt32 x(0L); x < nWidth; x++) @@ -150,27 +150,27 @@ namespace class ZBufferRasterConverter3D : public basegfx::RasterConverter3D { private: - const drawinglayer::processor3d::DefaultProcessor3D& mrProcessor; - basegfx::BZPixelRaster& mrBuffer; + const drawinglayer::processor3d::DefaultProcessor3D& mrProcessor; + basegfx::BZPixelRaster& mrBuffer; // interpolators for a single line span - basegfx::ip_single maIntZ; - basegfx::ip_triple maIntColor; - basegfx::ip_triple maIntNormal; - basegfx::ip_double maIntTexture; - basegfx::ip_triple maIntInvTexture; + basegfx::ip_single maIntZ; + basegfx::ip_triple maIntColor; + basegfx::ip_triple maIntNormal; + basegfx::ip_double maIntTexture; + basegfx::ip_triple maIntInvTexture; // current material to use for ratsreconversion const drawinglayer::attribute::MaterialAttribute3D* mpCurrentMaterial; // bitfield // some boolean flags for line span interpolator usages - unsigned mbModifyColor : 1; - unsigned mbUseTex : 1; - unsigned mbHasTexCoor : 1; - unsigned mbHasInvTexCoor : 1; - unsigned mbUseNrm : 1; - unsigned mbUseCol : 1; + unsigned mbModifyColor : 1; + unsigned mbUseTex : 1; + unsigned mbHasTexCoor : 1; + unsigned mbHasInvTexCoor : 1; + unsigned mbUseNrm : 1; + unsigned mbUseCol : 1; void getTextureCoor(basegfx::B2DPoint& rTarget) const { @@ -233,7 +233,7 @@ private: // e.g. bitmap textures have transparent parts mrProcessor.getGeoTexSvx()->modifyBColor(aTexCoor, rColor, fOpacity); } - + if(basegfx::fTools::more(fOpacity, 0.0) && mrProcessor.getTransparenceGeoTexSvx().get()) { // calc opacity. Object has a 2nd texture, a transparence texture @@ -249,10 +249,10 @@ private: { // blend texture with phong rColor = mrProcessor.getSdrLightingAttribute().solveColorModel( - basegfx::B3DVector(maIntNormal.getX().getVal(), maIntNormal.getY().getVal(), maIntNormal.getZ().getVal()), - rColor, - mpCurrentMaterial->getSpecular(), - mpCurrentMaterial->getEmission(), + basegfx::B3DVector(maIntNormal.getX().getVal(), maIntNormal.getY().getVal(), maIntNormal.getZ().getVal()), + rColor, + mpCurrentMaterial->getSpecular(), + mpCurrentMaterial->getEmission(), mpCurrentMaterial->getSpecularIntensity()); } else if(mbUseCol) @@ -273,10 +273,10 @@ private: { // modify color with phong rColor = mrProcessor.getSdrLightingAttribute().solveColorModel( - basegfx::B3DVector(maIntNormal.getX().getVal(), maIntNormal.getY().getVal(), maIntNormal.getZ().getVal()), - rColor, - mpCurrentMaterial->getSpecular(), - mpCurrentMaterial->getEmission(), + basegfx::B3DVector(maIntNormal.getX().getVal(), maIntNormal.getY().getVal(), maIntNormal.getZ().getVal()), + rColor, + mpCurrentMaterial->getSpecular(), + mpCurrentMaterial->getEmission(), mpCurrentMaterial->getSpecularIntensity()); } else if(mbUseCol) @@ -359,7 +359,7 @@ private: rCA.getZ().getVal(), (rCB.getZ().getVal() - rCA.getZ().getVal()) * xInvDelta); } } - + virtual void processLineSpan(const basegfx::RasterConversionLineEntry3D& rA, const basegfx::RasterConversionLineEntry3D& rB, sal_Int32 nLine, sal_uInt32 nSpanCount); public: @@ -397,11 +397,11 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi if(nXA < nXB) { - // prepare the span interpolators + // prepare the span interpolators setupLineSpanInterpolators(rA, rB); - // bring span interpolators to start condition by incrementing with the possible difference of - // clamped and non-clamped XStart. Interpolators are setup relying on double precision + // bring span interpolators to start condition by incrementing with the possible difference of + // clamped and non-clamped XStart. Interpolators are setup relying on double precision // X-values, so that difference is the correct value to compensate for possible clampings incrementLineSpanInterpolators(static_cast<double>(nXA) - rA.getX().getVal()); @@ -420,7 +420,7 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi { // detect color and opacity for this pixel const sal_uInt16 nOpacity(::std::max((sal_Int16)0, static_cast< sal_Int16 >(decideColorAndOpacity(aNewColor) * 255.0))); - + if(nOpacity > 0) { // avoid color overrun @@ -444,7 +444,7 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi rDest.setRed((sal_uInt8)(((rDest.getRed() * nTransparence) + ((sal_uInt16)(255.0 * aNewColor.getRed()) * nOpacity)) >> 8)); rDest.setGreen((sal_uInt8)(((rDest.getGreen() * nTransparence) + ((sal_uInt16)(255.0 * aNewColor.getGreen()) * nOpacity)) >> 8)); rDest.setBlue((sal_uInt8)(((rDest.getBlue() * nTransparence) + ((sal_uInt16)(255.0 * aNewColor.getBlue()) * nOpacity)) >> 8)); - + if(0xff != rDest.getOpacity()) { // both are transparent, mix new opacity by using @@ -479,7 +479,7 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi // paint transparent rasterprimitives from back to front to ensure that the // mixing happens from back to front. For that purpose, transparent // rasterprimitives are held in this class during the processing run, remember -// all data and will be rendered +// all data and will be rendered class RasterPrimitive3D { @@ -660,17 +660,17 @@ namespace drawinglayer } } } - + ZBufferProcessor3D::ZBufferProcessor3D( const geometry::ViewInformation3D& rViewInformation3D, - const geometry::ViewInformation2D& rViewInformation2D, + const geometry::ViewInformation2D& rViewInformation2D, const attribute::SdrSceneAttribute& rSdrSceneAttribute, const attribute::SdrLightingAttribute& rSdrLightingAttribute, double fSizeX, double fSizeY, const basegfx::B2DRange& rVisiblePart, sal_uInt16 nAntiAlialize) - : DefaultProcessor3D(rViewInformation3D, rSdrSceneAttribute, rSdrLightingAttribute), + : DefaultProcessor3D(rViewInformation3D, rSdrSceneAttribute, rSdrLightingAttribute), mpBZPixelRaster(0), maInvEyeToView(), mpZBufferRasterConverter3D(0), @@ -718,8 +718,8 @@ namespace drawinglayer // step two: // // bring from [0.0 .. 1.0] in X,Y and Z to view cordinates - // - // #i102611# + // + // #i102611# // also: scale Z to [1.5 .. 65534.5]. Normally, a range of [0.0 .. 65535.0] // could be used, but a 'unused' value is needed, so '0' is used what reduces // the range to [1.0 .. 65535.0]. It has also shown that small numerical errors @@ -797,7 +797,7 @@ namespace drawinglayer // paint each one by setting the remembered data and calling // the render method const RasterPrimitive3D& rCandidate = (*mpRasterPrimitive3Ds)[a]; - + mpGeoTexSvx = rCandidate.getGeoTexSvx(); mpTransparenceGeoTexSvx = rCandidate.getTransparenceGeoTexSvx(); mbModulate = rCandidate.getModulate(); @@ -807,13 +807,13 @@ namespace drawinglayer if(rCandidate.getIsLine()) { rasterconvertB3DPolygon( - rCandidate.getMaterial(), + rCandidate.getMaterial(), rCandidate.getPolyPolygon().getB3DPolygon(0)); } else { rasterconvertB3DPolyPolygon( - rCandidate.getMaterial(), + rCandidate.getMaterial(), rCandidate.getPolyPolygon()); } } diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index 07a5000ce201..f3b2db62ad5f 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.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 @@ -109,7 +109,7 @@ namespace drawinglayer } GeoTexSvxGradient::GeoTexSvxGradient(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder) - : maTargetRange(rTargetRange), + : maTargetRange(rTargetRange), maStart(rStart), maEnd(rEnd), mfBorder(fBorder) @@ -142,7 +142,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientLinear::GeoTexSvxGradientLinear(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createLinearODFGradientInfo(maGradientInfo, rTargetRange, @@ -197,7 +197,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientAxial::GeoTexSvxGradientAxial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createAxialODFGradientInfo(maGradientInfo, rTargetRange, @@ -252,7 +252,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientRadial::GeoTexSvxGradientRadial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createRadialODFGradientInfo(maGradientInfo, rTargetRange, @@ -299,7 +299,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientElliptical::GeoTexSvxGradientElliptical(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createEllipticalODFGradientInfo(maGradientInfo, rTargetRange, @@ -366,7 +366,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientSquare::GeoTexSvxGradientSquare(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createSquareODFGradientInfo(maGradientInfo, rTargetRange, @@ -414,7 +414,7 @@ namespace drawinglayer namespace texture { GeoTexSvxGradientRect::GeoTexSvxGradientRect(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rTargetRange, rStart, rEnd, nSteps, fBorder) { basegfx::tools::createRectangularODFGradientInfo(maGradientInfo, rTargetRange, @@ -481,7 +481,7 @@ namespace drawinglayer namespace texture { GeoTexSvxHatch::GeoTexSvxHatch(const basegfx::B2DRange& rTargetRange, double fDistance, double fAngle) - : mfDistance(0.1), + : mfDistance(0.1), mfAngle(fAngle), mnSteps(10L) { @@ -572,7 +572,7 @@ namespace drawinglayer namespace texture { GeoTexSvxTiled::GeoTexSvxTiled(const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize) - : maTopLeft(rTopLeft), + : maTopLeft(rTopLeft), maSize(rSize) { if(basegfx::fTools::lessOrEqual(maSize.getX(), 0.0)) diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index ac667f5660df..f93e85fd91da 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.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 @@ -40,7 +40,7 @@ namespace drawinglayer namespace texture { GeoTexSvxMono::GeoTexSvxMono(const basegfx::BColor& rSingleColor, double fOpacity) - : maSingleColor(rSingleColor), + : maSingleColor(rSingleColor), mfOpacity(fOpacity) { } @@ -48,7 +48,7 @@ namespace drawinglayer bool GeoTexSvxMono::operator==(const GeoTexSvx& rGeoTexSvx) const { const GeoTexSvxMono* pCompare = dynamic_cast< const GeoTexSvxMono* >(&rGeoTexSvx); - return (pCompare + return (pCompare && maSingleColor == pCompare->maSingleColor && mfOpacity == pCompare->mfOpacity); } @@ -72,7 +72,7 @@ namespace drawinglayer namespace texture { GeoTexSvxBitmap::GeoTexSvxBitmap(const Bitmap& rBitmap, const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize) - : maBitmap(rBitmap), + : maBitmap(rBitmap), mpRead(0L), maTopLeft(rTopLeft), maSize(rSize), @@ -116,8 +116,8 @@ namespace drawinglayer const double fConvertColor(1.0 / 255.0); const BitmapColor aBMCol(mpRead->GetColor(nY, nX)); const basegfx::BColor aBSource( - (double)aBMCol.GetRed() * fConvertColor, - (double)aBMCol.GetGreen() * fConvertColor, + (double)aBMCol.GetRed() * fConvertColor, + (double)aBMCol.GetGreen() * fConvertColor, (double)aBMCol.GetBlue() * fConvertColor); rBColor = aBSource; @@ -154,7 +154,7 @@ namespace drawinglayer namespace texture { GeoTexSvxBitmapTiled::GeoTexSvxBitmapTiled(const Bitmap& rBitmap, const basegfx::B2DPoint& rTopLeft, const basegfx::B2DVector& rSize) - : GeoTexSvxBitmap(rBitmap, rTopLeft, rSize) + : GeoTexSvxBitmap(rBitmap, rTopLeft, rSize) { } @@ -183,7 +183,7 @@ namespace drawinglayer namespace texture { GeoTexSvxMultiHatch::GeoTexSvxMultiHatch(const primitive3d::HatchTexturePrimitive3D& rPrimitive, double fLogicPixelSize) - : mfLogicPixelSize(fLogicPixelSize), + : mfLogicPixelSize(fLogicPixelSize), mp0(0L), mp1(0L), mp2(0L) @@ -244,7 +244,7 @@ namespace drawinglayer rfOpacity = 0.0; } } - + void GeoTexSvxMultiHatch::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const { if(mbFillBackground || impIsOnHatch(rUV)) |