diff options
9 files changed, 20 insertions, 22 deletions
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 578637677055..3b967fb092b5 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -220,7 +220,7 @@ namespace drawinglayer return xRetval; } - Primitive2DReference ControlPrimitive2D::createPlaceholderDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DReference ControlPrimitive2D::createPlaceholderDecomposition() const { // create a gray placeholder hairline polygon in object size basegfx::B2DRange aObjectRange(0.0, 0.0, 1.0, 1.0); @@ -242,7 +242,7 @@ namespace drawinglayer if(!xReference.is()) { - xReference = createPlaceholderDecomposition(rViewInformation); + xReference = createPlaceholderDecomposition(); } rContainer.push_back(xReference); diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index 8b557ceb83c3..52642107069e 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -36,7 +36,7 @@ namespace drawinglayer { namespace primitive2d { - bool Embedded3DPrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const + bool Embedded3DPrimitive2D::impGetShadow3D() const { osl::MutexGuard aGuard( m_aMutex ); @@ -126,7 +126,7 @@ namespace drawinglayer // check for 3D shadows and their 2D projections. If those exist, they need to be // taken into account - if(impGetShadow3D(rViewInformation)) + if(impGetShadow3D()) { const basegfx::B2DRange aShadow2DRange(maShadowPrimitives.getB2DRange(rViewInformation)); diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 030c6985f321..32b3bc7c4c05 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -136,7 +136,7 @@ namespace drawinglayer { namespace primitive2d { - bool ScenePrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const + bool ScenePrimitive2D::impGetShadow3D() const { ::osl::MutexGuard aGuard( m_aMutex ); @@ -225,7 +225,7 @@ namespace drawinglayer { // create 2D shadows from contained 3D primitives. This creates the shadow primitives on demand and tells if // there are some or not. Do this at start, the shadow might still be visible even when the scene is not - if(impGetShadow3D(rViewInformation)) + if(impGetShadow3D()) { // test visibility const basegfx::B2DRange aShadow2DRange(maShadowPrimitives.getB2DRange(rViewInformation)); @@ -513,12 +513,12 @@ namespace drawinglayer return aRetval; } - Primitive2DContainer ScenePrimitive2D::getShadow2D(const geometry::ViewInformation2D& rViewInformation) const + Primitive2DContainer ScenePrimitive2D::getShadow2D() const { Primitive2DContainer aRetval; // create 2D shadows from contained 3D primitives - if(impGetShadow3D(rViewInformation)) + if(impGetShadow3D()) { // add extracted 2d shadows (before 3d scene creations itself) aRetval = maShadowPrimitives; @@ -619,7 +619,7 @@ namespace drawinglayer aRetval.transform(rViewInformation.getInverseObjectToViewTransformation()); // expand by evtl. existing shadow primitives - if(impGetShadow3D(rViewInformation)) + if(impGetShadow3D()) { const basegfx::B2DRange aShadow2DRange(maShadowPrimitives.getB2DRange(rViewInformation)); diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index 16228d263e8f..c9d9f52d9dfa 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.cxx @@ -148,7 +148,7 @@ namespace drawinglayer // 2D Scene primitive containing 3D stuff; extract 2D contour in world coordinates const primitive2d::ScenePrimitive2D& rScenePrimitive2DCandidate(static_cast< const primitive2d::ScenePrimitive2D& >(rCandidate)); const primitive2d::Primitive2DContainer xExtracted2DSceneGeometry(rScenePrimitive2DCandidate.getGeometry2D()); - const primitive2d::Primitive2DContainer xExtracted2DSceneShadow(rScenePrimitive2DCandidate.getShadow2D(getViewInformation2D())); + const primitive2d::Primitive2DContainer xExtracted2DSceneShadow(rScenePrimitive2DCandidate.getShadow2D()); // process content if(!xExtracted2DSceneGeometry.empty()) diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index 75565008b103..d5bcfd8553e9 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -68,7 +68,6 @@ namespace drawinglayer const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, - sal_uInt32 /* nSteps */, double fBorder) : GeoTexSvx(), maGradientInfo(), @@ -108,7 +107,7 @@ namespace drawinglayer sal_uInt32 nSteps, double fBorder, double fAngle) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder), + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder), mfUnitMinX(0.0), mfUnitWidth(1.0), mfUnitMaxY(1.0) @@ -203,7 +202,7 @@ namespace drawinglayer sal_uInt32 nSteps, double fBorder, double fAngle) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder), + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder), mfUnitMinX(0.0), mfUnitWidth(1.0) { @@ -287,7 +286,7 @@ namespace drawinglayer double fBorder, double fOffsetX, double fOffsetY) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { maGradientInfo = basegfx::tools::createRadialODFGradientInfo( rDefinitionRange, @@ -344,7 +343,7 @@ namespace drawinglayer double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { maGradientInfo = basegfx::tools::createEllipticalODFGradientInfo( rDefinitionRange, @@ -420,7 +419,7 @@ namespace drawinglayer double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { maGradientInfo = basegfx::tools::createSquareODFGradientInfo( rDefinitionRange, @@ -478,7 +477,7 @@ namespace drawinglayer double fOffsetX, double fOffsetY, double fAngle) - : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, nSteps, fBorder) + : GeoTexSvxGradient(rDefinitionRange, rStart, rEnd, fBorder) { maGradientInfo = basegfx::tools::createRectangularODFGradientInfo( rDefinitionRange, diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 71341298fd8e..9bd3783e07a9 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -59,7 +59,7 @@ namespace drawinglayer /// single local decompositions, used from create2DDecomposition() Primitive2DReference createBitmapDecomposition(const geometry::ViewInformation2D& rViewInformation) const; - Primitive2DReference createPlaceholderDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + Primitive2DReference createPlaceholderDecomposition() const; protected: /// local decomposition diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 42fecfd3421d..6a91960858eb 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -78,7 +78,7 @@ namespace drawinglayer bool mbShadow3DChecked : 1; /// private helpers - bool impGetShadow3D(const geometry::ViewInformation2D& rViewInformation) const; + bool impGetShadow3D() const; protected: /// local decomposition. diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 141bd68d55d6..8adafda0e137 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -89,7 +89,7 @@ namespace drawinglayer BitmapEx maOldRenderedBitmap; /// private helpers - bool impGetShadow3D(const geometry::ViewInformation2D& rViewInformation) const; + bool impGetShadow3D() const; void calculateDiscreteSizes( const geometry::ViewInformation2D& rViewInformation, basegfx::B2DRange& rDiscreteRange, @@ -107,7 +107,7 @@ namespace drawinglayer helper is useful e.g. for Contour extraction or HitTests. */ Primitive2DContainer getGeometry2D() const; - Primitive2DContainer getShadow2D(const geometry::ViewInformation2D& rViewInformation) const; + Primitive2DContainer getShadow2D() const; /** Fast HitTest which uses the last buffered BitmapEx from the last rendered area if available. The return value describes if the check diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 95bd5daf5d8e..105a9240b9a9 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -84,7 +84,6 @@ namespace drawinglayer const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, - sal_uInt32 nSteps, double fBorder); virtual ~GeoTexSvxGradient() override; |