diff options
Diffstat (limited to 'drawinglayer/source/primitive2d')
44 files changed, 64 insertions, 156 deletions
diff --git a/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx b/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx index c352c70c6d39..896f85d81f1e 100644 --- a/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx @@ -27,11 +27,7 @@ namespace drawinglayer::primitive2d { -BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D() - : BasePrimitive2D() - , maBuffered2DDecomposition() -{ -} +BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D() {} void BufferedDecompositionPrimitive2D::get2DDecomposition( Primitive2DDecompositionVisitor& rVisitor, diff --git a/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx index aa48a965e692..b3aed429ba0c 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx @@ -28,8 +28,7 @@ namespace drawinglayer::primitive2d { PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor) - : BasePrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maBColor(rBColor) { } diff --git a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx index cbf9e8902bb0..115acc0adde6 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx @@ -47,8 +47,7 @@ void PolyPolygonGradientPrimitive2D::create2DDecomposition( PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maDefinitionRange(rPolyPolygon.getB2DRange()) , maFillGradient(rFillGradient) { @@ -57,8 +56,7 @@ PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D( PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maDefinitionRange(rDefinitionRange) , maFillGradient(rFillGradient) { diff --git a/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx index c857ba5c8e3d..a65d1d08a0f0 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx @@ -98,8 +98,7 @@ void PolyPolygonGraphicPrimitive2D::create2DDecomposition( PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const attribute::FillGraphicAttribute& rFillGraphic) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maDefinitionRange(rDefinitionRange) , maFillGraphic(rFillGraphic) { diff --git a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx index e4c73f9191a5..5bc291676dbc 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx @@ -45,8 +45,7 @@ void PolyPolygonHairlinePrimitive2D::create2DDecomposition( PolyPolygonHairlinePrimitive2D::PolyPolygonHairlinePrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maBColor(rBColor) { } diff --git a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx index dd0495739fec..a868ce5b71c1 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx @@ -47,8 +47,7 @@ void PolyPolygonHatchPrimitive2D::create2DDecomposition( PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBackgroundColor, const attribute::FillHatchAttribute& rFillHatch) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maDefinitionRange(rPolyPolygon.getB2DRange()) , maBackgroundColor(rBackgroundColor) , maFillHatch(rFillHatch) @@ -58,8 +57,7 @@ PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D( PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rBackgroundColor, const attribute::FillHatchAttribute& rFillHatch) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maDefinitionRange(rDefinitionRange) , maBackgroundColor(rBackgroundColor) , maFillHatch(rFillHatch) diff --git a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx index b545ec9465fa..2381ed8f866c 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx @@ -47,8 +47,7 @@ void PolyPolygonMarkerPrimitive2D::create2DDecomposition( PolyPolygonMarkerPrimitive2D::PolyPolygonMarkerPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maRGBColorA(rRGBColorA) , maRGBColorB(rRGBColorB) , mfDiscreteDashLength(fDiscreteDashLength) diff --git a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx index 7be684c2f71e..821cc2da9772 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx @@ -72,8 +72,7 @@ void PolyPolygonSelectionPrimitive2D::create2DDecomposition( PolyPolygonSelectionPrimitive2D::PolyPolygonSelectionPrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rColor, double fTransparence, double fDiscreteGrow, bool bFill) - : DiscreteMetricDependentPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maColor(rColor) , mfTransparence(fTransparence) , mfDiscreteGrow(fabs(fDiscreteGrow)) diff --git a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx index 53abec1138c3..91093f37278d 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx @@ -46,8 +46,7 @@ void PolyPolygonStrokePrimitive2D::create2DDecomposition( PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maLineAttribute(rLineAttribute) , maStrokeAttribute(rStrokeAttribute) { @@ -55,10 +54,8 @@ PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D( PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D( const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute) - : BufferedDecompositionPrimitive2D() - , maPolyPolygon(rPolyPolygon) + : maPolyPolygon(rPolyPolygon) , maLineAttribute(rLineAttribute) - , maStrokeAttribute() { } diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 827e9b81d05d..2b5c3c4c7c9f 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -126,8 +126,7 @@ namespace drawinglayer::primitive2d const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack, const animation::AnimationEntry& rAnimationEntry, const Primitive2DContainer& rChildren) - : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/), - maMatrixStack() + : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/) { // copy matrices to locally pre-decomposed matrix stack const sal_uInt32 nCount(rmMatrixStack.size()); diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index e05b4b9cb239..90ff831da005 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -42,10 +42,8 @@ namespace drawinglayer::primitive2d BackgroundColorPrimitive2D::BackgroundColorPrimitive2D( const basegfx::BColor& rBColor, double fTransparency) - : BufferedDecompositionPrimitive2D(), - maBColor(rBColor), - mfTransparency(fTransparency), - maLastViewport() + : maBColor(rBColor), + mfTransparency(fTransparency) { } diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index 0848193d3c65..0a06010d31e2 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -27,8 +27,7 @@ namespace drawinglayer::primitive2d { BitmapPrimitive2D::BitmapPrimitive2D(const css::uno::Reference<css::awt::XBitmap>& rXBitmap, const basegfx::B2DHomMatrix& rTransform) - : BasePrimitive2D() - , maXBitmap(rXBitmap) + : maXBitmap(rXBitmap) , maTransform(rTransform) { } diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index e1e6002c35cf..71657876bcfd 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -267,8 +267,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DPoint& rEnd, const std::vector< BorderLine >& rBorderLines, const drawinglayer::attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive2D(), - maStart(rStart), + : maStart(rStart), maEnd(rEnd), maBorderLines(rBorderLines), maStrokeAttribute(rStrokeAttribute) diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 5421a696742b..c5ece360e5e8 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -243,11 +243,8 @@ namespace drawinglayer::primitive2d ControlPrimitive2D::ControlPrimitive2D( const basegfx::B2DHomMatrix& rTransform, const uno::Reference< awt::XControlModel >& rxControlModel) - : BufferedDecompositionPrimitive2D(), - maTransform(rTransform), - mxControlModel(rxControlModel), - mxXControl(), - maLastViewScaling() + : maTransform(rTransform), + mxControlModel(rxControlModel) { } @@ -255,11 +252,9 @@ namespace drawinglayer::primitive2d const basegfx::B2DHomMatrix& rTransform, const uno::Reference< awt::XControlModel >& rxControlModel, const uno::Reference< awt::XControl >& rxXControl) - : BufferedDecompositionPrimitive2D(), - maTransform(rTransform), + : maTransform(rTransform), mxControlModel(rxControlModel), - mxXControl(rxXControl), - maLastViewScaling() + mxXControl(rxXControl) { } diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index 9389fd3aec00..8a86f83204bd 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -73,8 +73,7 @@ namespace drawinglayer::primitive2d DiscreteBitmapPrimitive2D::DiscreteBitmapPrimitive2D( const BitmapEx& rBitmapEx, const basegfx::B2DPoint& rTopLeft) - : ObjectAndViewTransformationDependentPrimitive2D(), - maBitmapEx(rBitmapEx), + : maBitmapEx(rBitmapEx), maTopLeft(rTopLeft) { } diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index 36b97c99d8f2..36ba083dfdc4 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -29,15 +29,7 @@ namespace drawinglayer::primitive2d { DiscreteShadow::DiscreteShadow(const BitmapEx& rBitmapEx) - : maBitmapEx(rBitmapEx), - maTopLeft(), - maTop(), - maTopRight(), - maRight(), - maBottomRight(), - maBottom(), - maBottomLeft(), - maLeft() + : maBitmapEx(rBitmapEx) { const Size& rBitmapSize = getBitmapEx().GetSizePixel(); @@ -265,8 +257,7 @@ namespace drawinglayer::primitive2d DiscreteShadowPrimitive2D::DiscreteShadowPrimitive2D( const basegfx::B2DHomMatrix& rTransform, const DiscreteShadow& rDiscreteShadow) - : DiscreteMetricDependentPrimitive2D(), - maTransform(rTransform), + : maTransform(rTransform), maDiscreteShadow(rDiscreteShadow) { } diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index e681e31c2084..fd2510915811 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -76,15 +76,12 @@ namespace drawinglayer::primitive2d const basegfx::B3DVector& rLightNormal, double fShadowSlant, const basegfx::B3DRange& rScene3DRange) - : BufferedDecompositionPrimitive2D(), - mxChildren3D(rxChildren3D), + : mxChildren3D(rxChildren3D), maObjectTransformation(rObjectTransformation), maViewInformation3D(rViewInformation3D), maLightNormal(rLightNormal), mfShadowSlant(fShadowSlant), maScene3DRange(rScene3DRange), - maShadowPrimitives(), - maB2DRange(), mbShadow3DChecked(false) { maLightNormal.normalize(); diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index ea22e529e22e..9e876dad5376 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -44,8 +44,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DHomMatrix& rEpsTransform, const GfxLink& rGfxLink, const GDIMetaFile& rMetaFile) - : BufferedDecompositionPrimitive2D(), - maEpsTransform(rEpsTransform), + : maEpsTransform(rEpsTransform), maGfxLink(rGfxLink), maMetaFile(rMetaFile) { diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index 10fff2638865..489c45cbd1cc 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -287,8 +287,7 @@ namespace drawinglayer::primitive2d FillGradientPrimitive2D::FillGradientPrimitive2D( const basegfx::B2DRange& rOutputRange, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D(), - maOutputRange(rOutputRange), + : maOutputRange(rOutputRange), maDefinitionRange(rOutputRange), maFillGradient(rFillGradient) { @@ -298,8 +297,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DRange& rOutputRange, const basegfx::B2DRange& rDefinitionRange, const attribute::FillGradientAttribute& rFillGradient) - : BufferedDecompositionPrimitive2D(), - maOutputRange(rOutputRange), + : maOutputRange(rOutputRange), maDefinitionRange(rDefinitionRange), maFillGradient(rFillGradient) { diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index c8f1aa6f92d2..b710657f404d 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -93,8 +93,7 @@ namespace drawinglayer::primitive2d FillGraphicPrimitive2D::FillGraphicPrimitive2D( const basegfx::B2DHomMatrix& rTransformation, const attribute::FillGraphicAttribute& rFillGraphic) - : BufferedDecompositionPrimitive2D(), - maTransformation(rTransformation), + : maTransformation(rTransformation), maFillGraphic(rFillGraphic) { } diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index ec81e9ec0d41..d527b9cf2539 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -131,8 +131,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DRange& rOutputRange, const basegfx::BColor& rBColor, const attribute::FillHatchAttribute& rFillHatch) - : DiscreteMetricDependentPrimitive2D(), - maOutputRange(rOutputRange), + : maOutputRange(rOutputRange), maDefinitionRange(rOutputRange), maFillHatch(rFillHatch), maBColor(rBColor) @@ -144,8 +143,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rBColor, const attribute::FillHatchAttribute& rFillHatch) - : DiscreteMetricDependentPrimitive2D(), - maOutputRange(rOutputRange), + : maOutputRange(rOutputRange), maDefinitionRange(rDefinitionRange), maFillHatch(rFillHatch), maBColor(rBColor) diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 0319c50a7f8e..4a1121366092 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -172,8 +172,7 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr) - : BufferedDecompositionPrimitive2D() - , maTransform(rTransform) + : maTransform(rTransform) , maGraphicObject(rGraphicObject) , maGraphicAttr(rGraphicAttr) { @@ -181,10 +180,8 @@ GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject) - : BufferedDecompositionPrimitive2D() - , maTransform(rTransform) + : maTransform(rTransform) , maGraphicObject(rGraphicObject) - , maGraphicAttr() { } diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index e8174733bf34..3896108a660c 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -369,8 +369,6 @@ namespace drawinglayer::primitive2d maVirtualDevice(*Application::GetDefaultDevice()), maVirtualDeviceMask(*Application::GetDefaultDevice()), mnNextFrameToPrepare(SAL_MAX_UINT32), - maBufferedFirstFrame(), - maBufferedPrimitives(), mbBufferingAllowed(false), mbHugeSize(false) { diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index 4c560109ec1e..a43e8af9fb71 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -259,8 +259,7 @@ namespace drawinglayer::primitive2d sal_uInt32 nSubdivisionsY, const basegfx::BColor& rBColor, const BitmapEx& rCrossMarker) - : BufferedDecompositionPrimitive2D(), - maTransform(rTransform), + : maTransform(rTransform), mfWidth(fWidth), mfHeight(fHeight), mfSmallestViewDistance(fSmallestViewDistance), @@ -268,9 +267,7 @@ namespace drawinglayer::primitive2d mnSubdivisionsX(nSubdivisionsX), mnSubdivisionsY(nSubdivisionsY), maBColor(rBColor), - maCrossMarker(rCrossMarker), - maLastObjectToViewTransformation(), - maLastViewport() + maCrossMarker(rCrossMarker) { } diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index 28f4f064608e..95870c0de6de 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -27,8 +27,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d { GroupPrimitive2D::GroupPrimitive2D( const Primitive2DContainer& rChildren ) - : BasePrimitive2D(), - maChildren(rChildren) + : maChildren(rChildren) { } diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index d43440fead63..71b372d36164 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -127,15 +127,12 @@ namespace drawinglayer::primitive2d const basegfx::BColor& rRGBColA, const basegfx::BColor& rRGBColB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D(), - maPosition(rPosition), + : maPosition(rPosition), maDirection(rDirection), meStyle(eStyle), maRGBColA(rRGBColA), maRGBColB(rRGBColB), - mfDiscreteDashLength(fDiscreteDashLength), - maLastObjectToViewTransformation(), - maLastViewport() + mfDiscreteDashLength(fDiscreteDashLength) { } diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index 46d27c3eaa74..be7080769aea 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -72,8 +72,7 @@ namespace drawinglayer::primitive2d MarkerArrayPrimitive2D::MarkerArrayPrimitive2D( const std::vector< basegfx::B2DPoint >& rPositions, const BitmapEx& rMarker) - : BufferedDecompositionPrimitive2D(), - maPositions(rPositions), + : maPositions(rPositions), maMarker(rMarker) { } diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 349e8b1a113c..665622527e87 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -96,8 +96,7 @@ namespace drawinglayer::primitive2d const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder, const Graphic &rSnapshot) - : BufferedDecompositionPrimitive2D(), - maTransform(rTransform), + : maTransform(rTransform), maURL(rURL), maBackgroundColor(rBackgroundColor), mnDiscreteBorder(nDiscreteBorder), diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 22ef460ec205..2c880122b928 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -88,8 +88,7 @@ namespace drawinglayer::primitive2d MetafilePrimitive2D::MetafilePrimitive2D( const basegfx::B2DHomMatrix& rMetaFileTransform, const GDIMetaFile& rMetaFile) - : BufferedDecompositionPrimitive2D(), - maMetaFileTransform(rMetaFileTransform), + : maMetaFileTransform(rMetaFileTransform), maMetaFile(rMetaFile) { } diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index 456b02333858..d8fc5af94995 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -106,8 +106,7 @@ namespace drawinglayer::primitive2d double fContentWidth, double fContentHeight, const Primitive2DContainer& rPageContent) - : BufferedDecompositionPrimitive2D(), - mxDrawPage(rxDrawPage), + : mxDrawPage(rxDrawPage), maPageContent(rPageContent), maTransform(rTransform), mfContentWidth(fContentWidth), diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index 45776edc50d5..ded9fb15eb3b 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -264,8 +264,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DPolyPolygon& rMask, const Primitive2DContainer& rChildren, const basegfx::B2DRange& rReferenceRange) - : BufferedDecompositionPrimitive2D(), - maMask(rMask), + : maMask(rMask), maChildren(rChildren), maReferenceRange(rReferenceRange), mnDiscreteWidth(0), diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index d616b26226fd..7c69ab687675 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -29,10 +29,8 @@ namespace drawinglayer::primitive2d PointArrayPrimitive2D::PointArrayPrimitive2D( const std::vector< basegfx::B2DPoint >& rPositions, const basegfx::BColor& rRGBColor) - : BasePrimitive2D(), - maPositions(rPositions), - maRGBColor(rRGBColor), - maB2DRange() + : maPositions(rPositions), + maRGBColor(rRGBColor) { } diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 17e63883c94b..9919658940e1 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -33,8 +33,7 @@ namespace drawinglayer::primitive2d { PolygonHairlinePrimitive2D::PolygonHairlinePrimitive2D(const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rBColor) - : BasePrimitive2D() - , maPolygon(rPolygon) + : maPolygon(rPolygon) , maBColor(rBColor) { } @@ -115,12 +114,10 @@ PolygonMarkerPrimitive2D::PolygonMarkerPrimitive2D(const basegfx::B2DPolygon& rP const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength) - : BufferedDecompositionPrimitive2D() - , maPolygon(rPolygon) + : maPolygon(rPolygon) , maRGBColorA(rRGBColorA) , maRGBColorB(rRGBColorB) , mfDiscreteDashLength(fDiscreteDashLength) - , maLastInverseObjectToViewTransformation() { } @@ -273,8 +270,7 @@ void PolygonStrokePrimitive2D::create2DDecomposition( PolygonStrokePrimitive2D::PolygonStrokePrimitive2D( const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute) - : BufferedDecompositionPrimitive2D() - , maPolygon(rPolygon) + : maPolygon(rPolygon) , maLineAttribute(rLineAttribute) , maStrokeAttribute(rStrokeAttribute) { @@ -286,10 +282,8 @@ PolygonStrokePrimitive2D::PolygonStrokePrimitive2D( PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute) - : BufferedDecompositionPrimitive2D() - , maPolygon(rPolygon) + : maPolygon(rPolygon) , maLineAttribute(rLineAttribute) - , maStrokeAttribute() { // MM01: keep these - these are no curve-decompposers but just checks // simplify curve segments: moved here to not need to use it diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 9c8cc2b39c71..a1a38aa735af 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -570,18 +570,14 @@ namespace drawinglayer::primitive2d const attribute::SdrLightingAttribute& rSdrLightingAttribute, const basegfx::B2DHomMatrix& rObjectTransformation, const geometry::ViewInformation3D& rViewInformation3D) - : BufferedDecompositionPrimitive2D(), - mxChildren3D(rxChildren3D), + : mxChildren3D(rxChildren3D), maSdrSceneAttribute(rSdrSceneAttribute), maSdrLightingAttribute(rSdrLightingAttribute), maObjectTransformation(rObjectTransformation), maViewInformation3D(rViewInformation3D), - maShadowPrimitives(), mbShadow3DChecked(false), mfOldDiscreteSizeX(0.0), - mfOldDiscreteSizeY(0.0), - maOldUnitVisiblePart(), - maOldRenderedBitmap() + mfOldDiscreteSizeY(0.0) { } diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 80f6a475b106..203a38cae222 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -350,7 +350,6 @@ namespace drawinglayer::primitive2d : maGradientTransform(rGradientTransform), maPolyPolygon(rPolyPolygon), maGradientEntries(rGradientEntries), - maMirroredGradientEntries(), maStart(rStart), maSpreadMethod(aSpreadMethod), mbPreconditionsChecked(false), @@ -567,8 +566,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DPoint& rEnd, bool bUseUnitCoordinates, SpreadMethod aSpreadMethod) - : BufferedDecompositionPrimitive2D(), - SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod), + : SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod), maEnd(rEnd) { } @@ -795,8 +793,7 @@ namespace drawinglayer::primitive2d bool bUseUnitCoordinates, SpreadMethod aSpreadMethod, const basegfx::B2DPoint* pFocal) - : BufferedDecompositionPrimitive2D(), - SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod), + : SvgGradientHelper(rGradientTransform, rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod), mfRadius(fRadius), maFocal(rStart), maFocalVector(0.0, 0.0), @@ -914,8 +911,7 @@ namespace drawinglayer::primitive2d SvgLinearAtomPrimitive2D::SvgLinearAtomPrimitive2D( const basegfx::BColor& aColorA, double fOffsetA, const basegfx::BColor& aColorB, double fOffsetB) - : DiscreteMetricDependentPrimitive2D(), - maColorA(aColorA), + : maColorA(aColorA), maColorB(aColorB), mfOffsetA(fOffsetA), mfOffsetB(fOffsetB) @@ -1010,8 +1006,7 @@ namespace drawinglayer::primitive2d SvgRadialAtomPrimitive2D::SvgRadialAtomPrimitive2D( const basegfx::BColor& aColorA, double fScaleA, const basegfx::B2DVector& rTranslateA, const basegfx::BColor& aColorB, double fScaleB, const basegfx::B2DVector& rTranslateB) - : DiscreteMetricDependentPrimitive2D(), - maColorA(aColorA), + : maColorA(aColorA), maColorB(aColorB), mfScaleA(fScaleA), mfScaleB(fScaleB) @@ -1042,8 +1037,7 @@ namespace drawinglayer::primitive2d SvgRadialAtomPrimitive2D::SvgRadialAtomPrimitive2D( const basegfx::BColor& aColorA, double fScaleA, const basegfx::BColor& aColorB, double fScaleB) - : DiscreteMetricDependentPrimitive2D(), - maColorA(aColorA), + : maColorA(aColorA), maColorB(aColorB), mfScaleA(fScaleA), mfScaleB(fScaleB) diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index df37aa01356e..3b53d18a6e8a 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -30,9 +30,6 @@ namespace drawinglayer::primitive2d { TextBreakupHelper::TextBreakupHelper(const TextSimplePortionPrimitive2D& rSource) : mrSource(rSource), - mxResult(), - maTextLayouter(), - maDecTrans(), mbNoDXArray(false) { maDecTrans = mrSource.getTextTransform(); diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index 7b2839803adf..79872474b69d 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -164,8 +164,7 @@ TextEffectPrimitive2D::TextEffectPrimitive2D(const Primitive2DContainer& rTextCo const basegfx::B2DPoint& rRotationCenter, double fDirection, TextEffectStyle2D eTextEffectStyle2D) - : BufferedDecompositionPrimitive2D() - , maTextContent(rTextContent) + : maTextContent(rTextContent) , maRotationCenter(rRotationCenter) , mfDirection(fDirection) , meTextEffectStyle2D(eTextEffectStyle2D) diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index 18895f9a7aae..b7d4218f04fd 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -95,8 +95,7 @@ namespace drawinglayer::primitive2d const FieldType& rFieldType, const std::vector< std::pair< OUString, OUString>>* pNameValue) : GroupPrimitive2D(rChildren), - meType(rFieldType), - meNameValue() + meType(rFieldType) { if (nullptr != pNameValue) { diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 933476b2045a..0a0ab23b7d22 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -155,8 +155,7 @@ void releaseGlobalVirtualDevice() } // end of anonymous namespace TextLayouterDevice::TextLayouterDevice() - : maSolarGuard() - , mrDevice(acquireGlobalVirtualDevice()) + : mrDevice(acquireGlobalVirtualDevice()) { } diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index 6d2293f77f7a..32ab7982015a 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -253,8 +253,7 @@ namespace drawinglayer::primitive2d double fHeight, TextLine eTextLine, const basegfx::BColor& rLineColor) - : BufferedDecompositionPrimitive2D(), - maObjectTransformation(rObjectTransformation), + : maObjectTransformation(rObjectTransformation), mfWidth(fWidth), mfOffset(fOffset), mfHeight(fHeight), diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 48fe07ac8987..67deaed3649f 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -204,8 +204,7 @@ TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D( const attribute::FontAttribute& rFontAttribute, const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, bool bFilled, tools::Long nWidthToFill, const Color& rTextFillColor) - : BufferedDecompositionPrimitive2D() - , maTextTransform(rNewTransform) + : maTextTransform(rNewTransform) , maText(rText) , mnTextPosition(nTextPosition) , mnTextLength(nTextLength) @@ -216,7 +215,6 @@ TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D( , mbFilled(bFilled) , mnWidthToFill(nWidthToFill) , maTextFillColor(rTextFillColor) - , maB2DRange() { #if OSL_DEBUG_LEVEL > 0 const sal_Int32 aStringLength(getText().getLength()); diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 62ad88fe70e9..0ddbedae0c16 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -35,8 +35,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DHomMatrix& rObjectTransformation, double fWidth, const basegfx::BColor& rFontColor) - : BufferedDecompositionPrimitive2D(), - maObjectTransformation(rObjectTransformation), + : maObjectTransformation(rObjectTransformation), mfWidth(fWidth), maFontColor(rFontColor) { diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index 04df87823e9b..6e7e134f2fa2 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -221,8 +221,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DRange& rObjectRange, const BitmapEx& rBitmapEx, WallpaperStyle eWallpaperStyle) - : ViewTransformationDependentPrimitive2D(), - maObjectRange(rObjectRange), + : maObjectRange(rObjectRange), maBitmapEx(rBitmapEx), meWallpaperStyle(eWallpaperStyle) { diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index 4b71a4d9ab9c..11a5b1929870 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -72,8 +72,7 @@ namespace drawinglayer::primitive2d double fStart, double fStop, const basegfx::BColor& rColor) - : BufferedDecompositionPrimitive2D(), - maTransformation(rTransformation), + : maTransformation(rTransformation), mfStart(fStart), mfStop(fStop), maColor(rColor) |