This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 626d4a66f3 Cleanup
626d4a66f3 is described below
commit 626d4a66f3f6c54c10812e6d4be505fbbe2b4298
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Mar 23 01:01:38 2025 +0100
Cleanup
(cherry picked from commit 6cc09340e5cc7d17e2d1477592f3858af983bf6d)
---
.../primitive2d/discretebitmapprimitive2d.hxx | 38 ++---
.../primitive2d/discreteshadowprimitive2d.hxx | 50 +++---
.../primitive2d/discretebitmapprimitive2d.cxx | 6 +-
.../primitive2d/discreteshadowprimitive2d.cxx | 181 ++++++++++-----------
4 files changed, 127 insertions(+), 148 deletions(-)
diff --git
a/main/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
b/main/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
index b0caf2a196..f5301b2497 100644
---
a/main/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
+++
b/main/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX
#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX
@@ -28,55 +26,51 @@
#include <drawinglayer/primitive2d/primitivetools2d.hxx>
#include <vcl/bitmapex.hxx>
-//////////////////////////////////////////////////////////////////////////////
// DiscreteBitmapPrimitive2D class
namespace drawinglayer
{
namespace primitive2d
{
- /** DiscreteBitmapPrimitive2D class
+ /** DiscreteBitmapPrimitive2D class
- This class defines a view-dependent BitmapPrimitive which has a
+ This class defines a view-dependent BitmapPrimitive
which has a
logic position for the top-left position and is always
to be
painted in 1:1 pixel resolution. It will never be
sheared, rotated
or scaled with the view.
- */
+ */
class DRAWINGLAYER_DLLPUBLIC DiscreteBitmapPrimitive2D : public
ObjectAndViewTransformationDependentPrimitive2D
{
private:
- /// the RGBA Bitmap-data
+ // the RGBA Bitmap-data
BitmapEx
maBitmapEx;
- /** the top-left object position */
+ // the top-left object position
basegfx::B2DPoint
maTopLeft;
protected:
- /// local decomposition.
+ // local decomposition.
virtual Primitive2DSequence create2DDecomposition(const
geometry::ViewInformation2D& rViewInformation) const;
public:
- /// constructor
+ // constructor
DiscreteBitmapPrimitive2D(
- const BitmapEx& rBitmapEx,
+ const BitmapEx& rBitmapEx,
const basegfx::B2DPoint& rTopLeft);
- /// data read access
+ // data read access
const BitmapEx& getBitmapEx() const { return
maBitmapEx; }
const basegfx::B2DPoint& getTopLeft() const { return
maTopLeft; }
- /// compare operator
+ // compare operator
virtual bool operator==(const BasePrimitive2D&
rPrimitive) const;
- /// provide unique ID
+ // provide unique ID
DeclPrimitrive2DIDBlock()
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-
#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git
a/main/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
b/main/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
index 2cf07499e1..43780cc883 100644
---
a/main/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
+++
b/main/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
@@ -29,7 +27,6 @@
#include <vcl/bitmapex.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-//////////////////////////////////////////////////////////////////////////////
// DiscreteShadowPrimitive2D class
namespace drawinglayer
@@ -38,14 +35,14 @@ namespace drawinglayer
{
/** DiscreteShadow data class
- */
+ */
class DRAWINGLAYER_DLLPUBLIC DiscreteShadow
{
private:
- /// the original shadow BitmapEx in a special form
+ // the original shadow BitmapEx in a special form
BitmapEx
maBitmapEx;
- /// buffered extracted parts of CombinedShadow for
easier usage
+ // buffered extracted parts of CombinedShadow for
easier usage
BitmapEx
maTopLeft;
BitmapEx maTop;
BitmapEx
maTopRight;
@@ -56,19 +53,19 @@ namespace drawinglayer
BitmapEx maLeft;
public:
- /// constructor
+ // constructor
DiscreteShadow(const BitmapEx& rBitmapEx);
- /// data read access
+ // data read access
const BitmapEx& getBitmapEx() const { return
maBitmapEx; }
- /// compare operator
+ // compare operator
bool operator==(const DiscreteShadow& rCompare) const
{
return getBitmapEx() == rCompare.getBitmapEx();
}
- /// helper accesses which create on-demand needed
segments
+ // helper accesses which create on-demand needed
segments
const BitmapEx& getTopLeft() const;
const BitmapEx& getTop() const;
const BitmapEx& getTopRight() const;
@@ -81,45 +78,42 @@ namespace drawinglayer
/** DiscreteShadowPrimitive2D class
- */
+ */
class DRAWINGLAYER_DLLPUBLIC DiscreteShadowPrimitive2D : public
DiscreteMetricDependentPrimitive2D
{
- private:
+ private:
// the object transformation of the rectangular object
basegfx::B2DHomMatrix maTransform;
// the bitmap shadow data
- DiscreteShadow maDiscreteShadow;
+ DiscreteShadow
maDiscreteShadow;
protected:
- /// create local decomposition
+ // create local decomposition
virtual Primitive2DSequence create2DDecomposition(const
geometry::ViewInformation2D& rViewInformation) const;
- public:
- /// constructor
+ public:
+ // constructor
DiscreteShadowPrimitive2D(
const basegfx::B2DHomMatrix& rTransform,
const DiscreteShadow& rDiscreteShadow);
- /// data read access
+ // data read access
const basegfx::B2DHomMatrix& getTransform() const {
return maTransform; }
const DiscreteShadow& getDiscreteShadow() const {
return maDiscreteShadow; }
- /// compare operator
+ // compare operator
virtual bool operator==(const BasePrimitive2D&
rPrimitive) const;
- /// get range
+ // get range
virtual basegfx::B2DRange getB2DRange(const
geometry::ViewInformation2D& rViewInformation) const;
- /// provide unique ID
+ // provide unique ID
DeclPrimitrive2DIDBlock()
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-
#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
b/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index 7b989b4834..62a97fb247 100644
--- a/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/main/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -28,8 +26,6 @@
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
namespace drawinglayer
{
namespace primitive2d
@@ -53,7 +49,7 @@ namespace drawinglayer
// get size and position in world coordinates
const basegfx::B2DVector
aWorldSize(aInverseViewTransformation * aDiscreteSize);
- const basegfx::B2DPoint
aWorldTopLeft(getObjectTransformation() * getTopLeft());
+ const basegfx::B2DPoint
aWorldTopLeft(getObjectTransformation() * getTopLeft());
// build object matrix in world coordinates so
that the top-left
// position remains, but eventual
transformations (e.g. rotations)
diff --git a/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
b/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 83792917a4..af239a59ab 100644
--- a/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -31,8 +29,6 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
namespace drawinglayer
{
namespace primitive2d
@@ -48,13 +44,13 @@ namespace drawinglayer
maBottomLeft(),
maLeft()
{
- const Size& rBitmapSize = getBitmapEx().GetSizePixel();
+ const Size& rBitmapSize = getBitmapEx().GetSizePixel();
- if(rBitmapSize.Width() != rBitmapSize.Height() ||
rBitmapSize.Width() < 7)
- {
- OSL_ENSURE(false, "DiscreteShadowPrimitive2D: wrong bitmap
format (!)");
- maBitmapEx = BitmapEx();
- }
+ if(rBitmapSize.Width() != rBitmapSize.Height() ||
rBitmapSize.Width() < 7)
+ {
+ OSL_ENSURE(false, "DiscreteShadowPrimitive2D:
wrong bitmap format (!)");
+ maBitmapEx = BitmapEx();
+ }
}
const BitmapEx& DiscreteShadow::getTopLeft() const
@@ -64,7 +60,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopLeft
= getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maTopLeft.Crop(
- Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter
* 2) + 1)));
+ Rectangle(Point(0, 0), Size((nQuarter *
2) + 1, (nQuarter * 2) + 1)));
}
return maTopLeft;
@@ -77,7 +73,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTop =
getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTop.Crop(
- Rectangle(Point((nQuarter * 2) + 1, 0), Size(1,
nQuarter)));
+ Rectangle(Point((nQuarter * 2) + 1, 0),
Size(1, nQuarter)));
}
return maTop;
@@ -90,7 +86,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopRight
= getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maTopRight.Crop(
- Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter *
2) + 1, (nQuarter * 2) + 1)));
+ Rectangle(Point((nQuarter * 2) + 2, 0),
Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopRight;
@@ -103,7 +99,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maRight =
getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maRight.Crop(
- Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1),
Size(nQuarter, 1)));
+ Rectangle(Point((nQuarter * 3) + 3,
(nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maRight;
@@ -116,7 +112,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow*
>(this)->maBottomRight = getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maBottomRight.Crop(
- Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2),
Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
+ Rectangle(Point((nQuarter * 2) + 2,
(nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomRight;
@@ -129,7 +125,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottom =
getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maBottom.Crop(
- Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3),
Size(1, nQuarter)));
+ Rectangle(Point((nQuarter * 2) + 1,
(nQuarter * 3) + 3), Size(1, nQuarter)));
}
return maBottom;
@@ -142,7 +138,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow*
>(this)->maBottomLeft = getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maBottomLeft.Crop(
- Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter *
2) + 1, (nQuarter * 2) + 1)));
+ Rectangle(Point(0, (nQuarter * 2) + 2),
Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomLeft;
@@ -155,7 +151,7 @@ namespace drawinglayer
const sal_Int32
nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maLeft =
getBitmapEx();
const_cast< DiscreteShadow*
>(this)->maLeft.Crop(
- Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter,
1)));
+ Rectangle(Point(0, (nQuarter * 2) + 1),
Size(nQuarter, 1)));
}
return maLeft;
@@ -171,101 +167,101 @@ namespace drawinglayer
namespace primitive2d
{
Primitive2DSequence
DiscreteShadowPrimitive2D::create2DDecomposition(const
geometry::ViewInformation2D& /*rViewInformation*/) const
- {
- Primitive2DSequence xRetval;
-
- if(!getDiscreteShadow().getBitmapEx().IsEmpty())
- {
+ {
+ Primitive2DSequence xRetval;
+
+ if(!getDiscreteShadow().getBitmapEx().IsEmpty())
+ {
const sal_Int32
nQuarter((getDiscreteShadow().getBitmapEx().GetSizePixel().Width() - 3) >> 2);
- const basegfx::B2DVector aScale(getTransform() *
basegfx::B2DVector(1.0, 1.0));
- const double fSingleX(getDiscreteUnit() / aScale.getX());
- const double fSingleY(getDiscreteUnit() / aScale.getY());
- const double fBorderX(fSingleX * nQuarter);
- const double fBorderY(fSingleY * nQuarter);
- const double fBigLenX((fBorderX * 2.0) + fSingleX);
- const double fBigLenY((fBorderY * 2.0) + fSingleY);
+ const basegfx::B2DVector aScale(getTransform()
* basegfx::B2DVector(1.0, 1.0));
+ const double fSingleX(getDiscreteUnit() /
aScale.getX());
+ const double fSingleY(getDiscreteUnit() /
aScale.getY());
+ const double fBorderX(fSingleX * nQuarter);
+ const double fBorderY(fSingleY * nQuarter);
+ const double fBigLenX((fBorderX * 2.0) +
fSingleX);
+ const double fBigLenY((fBorderY * 2.0) +
fSingleY);
- xRetval.realloc(8);
+ xRetval.realloc(8);
// TopLeft
xRetval[0] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getTopLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
- fBigLenY,
- -fBorderX,
- -fBorderY)));
+ fBigLenX,
+ fBigLenY,
+ -fBorderX,
+ -fBorderY)));
// Top
xRetval[1] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getTop(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
- fBorderY,
- fBorderX + fSingleX,
- -fBorderY)));
+ 1.0 - (2.0 * (fBorderX
+ fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
+ -fBorderY)));
// TopRight
xRetval[2] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getTopRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
- fBigLenY,
- 1.0 - fBorderX,
- -fBorderY)));
-
+ fBigLenX,
+ fBigLenY,
+ 1.0 - fBorderX,
+ -fBorderY)));
+
// Right
xRetval[3] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX,
- 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
- 1.0 + fSingleX,
- fBorderY + fSingleY)));
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY
+ fSingleY)) + fSingleY,
+ 1.0 + fSingleX,
+ fBorderY + fSingleY)));
// BottomRight
xRetval[4] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottomRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
- fBigLenY,
- 1.0 - (fBorderX + fSingleX) + fSingleX,
- 1.0 - (fBorderY + fSingleY) + fSingleY)));
+ fBigLenX,
+ fBigLenY,
+ 1.0 - (fBorderX +
fSingleX) + fSingleX,
+ 1.0 - (fBorderY +
fSingleY) + fSingleY)));
// Bottom
xRetval[5] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottom(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
- fBorderY,
- fBorderX + fSingleX,
- 1.0 + fSingleY)));
+ 1.0 - (2.0 * (fBorderX
+ fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
+ 1.0 + fSingleY)));
// BottomLeft
xRetval[6] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottomLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
- fBigLenY,
- -fBorderX,
- 1.0 - fBorderY)));
+ fBigLenX,
+ fBigLenY,
+ -fBorderX,
+ 1.0 - fBorderY)));
// Left
xRetval[7] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX,
- 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
- -fBorderX,
- fBorderY + fSingleY)));
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY
+ fSingleY)) + fSingleY,
+ -fBorderX,
+ fBorderY + fSingleY)));
// put all in object transformation to get to
target positions
const Primitive2DReference xTransformed(
@@ -274,21 +270,21 @@ namespace drawinglayer
xRetval));
xRetval = Primitive2DSequence(&xTransformed, 1);
- }
+ }
- return xRetval;
- }
+ return xRetval;
+ }
DiscreteShadowPrimitive2D::DiscreteShadowPrimitive2D(
const basegfx::B2DHomMatrix& rTransform,
const DiscreteShadow& rDiscreteShadow)
- : DiscreteMetricDependentPrimitive2D(),
- maTransform(rTransform),
- maDiscreteShadow(rDiscreteShadow)
- {
- }
+ : DiscreteMetricDependentPrimitive2D(),
+ maTransform(rTransform),
+ maDiscreteShadow(rDiscreteShadow)
+ {
+ }
- bool DiscreteShadowPrimitive2D::operator==(const BasePrimitive2D&
rPrimitive) const
+ bool DiscreteShadowPrimitive2D::operator==(const
BasePrimitive2D& rPrimitive) const
{
if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive))
{
@@ -303,26 +299,26 @@ namespace drawinglayer
basegfx::B2DRange DiscreteShadowPrimitive2D::getB2DRange(const
geometry::ViewInformation2D& rViewInformation) const
{
- if(getDiscreteShadow().getBitmapEx().IsEmpty())
- {
+ if(getDiscreteShadow().getBitmapEx().IsEmpty())
+ {
// no graphics without valid bitmap definition
- return basegfx::B2DRange();
- }
- else
- {
+ return basegfx::B2DRange();
+ }
+ else
+ {
// prepare normal objectrange
- basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0);
- aRetval.transform(getTransform());
+ basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0);
+ aRetval.transform(getTransform());
// extract discrete shadow size and grow
- const basegfx::B2DVector
aScale(rViewInformation.getViewTransformation() * basegfx::B2DVector(1.0, 1.0));
+ const basegfx::B2DVector
aScale(rViewInformation.getViewTransformation() * basegfx::B2DVector(1.0, 1.0));
const sal_Int32
nQuarter((getDiscreteShadow().getBitmapEx().GetSizePixel().Width() - 3) >> 2);
- const double fGrowX((1.0 / aScale.getX()) * nQuarter);
- const double fGrowY((1.0 / aScale.getY()) * nQuarter);
+ const double fGrowX((1.0 / aScale.getX()) *
nQuarter);
+ const double fGrowY((1.0 / aScale.getY()) *
nQuarter);
aRetval.grow(std::max(fGrowX, fGrowY));
-
- return aRetval;
- }
+
+ return aRetval;
+ }
}
// provide unique ID
@@ -331,5 +327,4 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
