summaryrefslogtreecommitdiff
path: root/include/svx/sdr
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-13 10:40:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-13 19:21:28 +0100
commitb4cb9bc2b80e316ff615e14c4a5ae2a1ab492f91 (patch)
tree3bde5c701091b9ec1dd02ffbeed5ab621514a247 /include/svx/sdr
parentdf3e1b7bbd126ed114015070bf68db30fbe9516e (diff)
Revert "loplugin:constfields in svx"
This reverts commit 1a6397030381a45f27ab7a2a02e6e6d0f9987c84. Change-Id: Iaa706bb4ea3144ef57ab359b982400abc589b97e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90454 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/sdr')
-rw-r--r--include/svx/sdr/overlay/overlayanimatedbitmapex.hxx18
-rw-r--r--include/svx/sdr/overlay/overlaybitmapex.hxx12
-rw-r--r--include/svx/sdr/overlay/overlaymanager.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaypolypolygon.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayselection.hxx4
5 files changed, 19 insertions, 19 deletions
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 35079a47e4c7..80059b791ba1 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -31,21 +31,21 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmaps
- BitmapEx const maBitmapEx1;
- BitmapEx const maBitmapEx2;
+ BitmapEx maBitmapEx1;
+ BitmapEx maBitmapEx2;
// position of the basePosition inside the Bitmaps, in pixels
- sal_uInt16 const mnCenterX1;
- sal_uInt16 const mnCenterY1;
- sal_uInt16 const mnCenterX2;
- sal_uInt16 const mnCenterY2;
+ sal_uInt16 mnCenterX1;
+ sal_uInt16 mnCenterY1;
+ sal_uInt16 mnCenterX2;
+ sal_uInt16 mnCenterY2;
// #i53216# added CursorBlinkTime (in ms)
- sal_uInt32 const mnBlinkTime;
+ sal_uInt32 mnBlinkTime;
// optional shear and rotation
- double const mfShearX;
- double const mfRotation;
+ double mfShearX;
+ double mfRotation;
// Flag to remember which state to draw. Inited with false (0)
bool mbOverlayState : 1;
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index a0022e1c7bda..fbfce1ee3a61 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -31,16 +31,16 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition
{
// the Bitmap itself
- BitmapEx const maBitmapEx;
+ BitmapEx maBitmapEx;
// position of the basePosition inside the Bitmap, in pixels
- sal_uInt16 const mnCenterX;
- sal_uInt16 const mnCenterY;
+ sal_uInt16 mnCenterX;
+ sal_uInt16 mnCenterY;
// optional transparency, shear and rotation
- double const mfAlpha;
- double const mfShearX;
- double const mfRotation;
+ double mfAlpha;
+ double mfShearX;
+ double mfRotation;
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index c3b9b340ab35..f75f42107520 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -69,7 +69,7 @@ namespace sdr
sal_uInt32 mnStripeLengthPixel; // defaults to 4L
// hold an incarnation of Drawinglayer configuration options
- SvtOptionsDrawinglayer const maDrawinglayerOpt;
+ SvtOptionsDrawinglayer maDrawinglayerOpt;
// hold buffered the logic length of discrete vector (1.0, 0.0) and the
// view transformation belonging to it. Update happens in getDiscreteOne()
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index 80442723395d..88c7404e6a3d 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -31,7 +31,7 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject
{
// geometry
- basegfx::B2DPolyPolygon const maLinePolyPolygon;
+ basegfx::B2DPolyPolygon maLinePolyPolygon;
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index ec328f81da71..dc40a87597dd 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -38,7 +38,7 @@ namespace sdr
class SVXCORE_DLLPUBLIC OverlaySelection final : public OverlayObject
{
// type of overlay
- OverlayType const meOverlayType;
+ OverlayType meOverlayType;
// geometry of overlay
std::vector< basegfx::B2DRange > maRanges;
@@ -49,7 +49,7 @@ namespace sdr
OverlayType maLastOverlayType;
sal_uInt16 mnLastTransparence;
- bool const mbBorder : 1;
+ bool mbBorder : 1;
// geometry creation for OverlayObject, can use local *Last* values
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;