summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
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 /svx/source/svdraw
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 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svddrgm1.hxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
-rw-r--r--svx/source/svdraw/svdfmtf.hxx4
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/svdraw/svdpdf.hxx6
-rw-r--r--svx/source/svdraw/svdsnpv.cxx6
8 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 02cbe111de10..8a0fcca1a745 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -76,7 +76,7 @@ private:
bool bVertical; // contort vertically
bool bResize; // shear and resize
bool bUpSideDown; // mirror and shear/slant
- bool const bSlant;
+ bool bSlant;
public:
SdrDragShear(SdrDragView& rNewView,bool bSlant1);
@@ -121,7 +121,7 @@ private:
SdrHdlGradient* pIAOHandle;
// is this for gradient (or for transparency)?
- bool const bIsGradient : 1;
+ bool bIsGradient : 1;
public:
SdrDragGradient(SdrDragView& rNewView, bool bGrad = true);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index d55d2964a46f..c5ddfef3dac4 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -414,7 +414,7 @@ protected:
drawinglayer::primitive2d::Primitive2DContainer maLastTextPrimitives;
/// bitfield
- bool const mbVisualizeSurroundingFrame : 1;
+ bool mbVisualizeSurroundingFrame : 1;
// geometry creation for OverlayObject, can use local *Last* values
virtual drawinglayer::primitive2d::Primitive2DContainer
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 909df89360be..0e788bcd5ad0 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -47,13 +47,13 @@ class ImpSdrGDIMetaFileImport final
{
::std::vector< SdrObject* > maTmpList;
ScopedVclPtr<VirtualDevice> mpVD;
- tools::Rectangle const maScaleRect;
+ tools::Rectangle maScaleRect;
size_t mnMapScalingOfs; // from here on, not edited with MapScaling
std::unique_ptr<SfxItemSet> mpLineAttr;
std::unique_ptr<SfxItemSet> mpFillAttr;
std::unique_ptr<SfxItemSet> mpTextAttr;
SdrModel* mpModel;
- SdrLayerID const mnLayer;
+ SdrLayerID mnLayer;
Color maOldLineColor;
sal_Int32 mnLineWidth;
basegfx::B2DLineJoin maLineJoin;
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index bba86e63805f..fab9f7b03d73 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -78,7 +78,7 @@ namespace {
class SdrHdlBitmapSet
{
// the bitmap holding all information
- BitmapEx const maMarkersBitmap;
+ BitmapEx maMarkersBitmap;
// the cropped Bitmaps for reusage
::std::vector< BitmapEx > maRealMarkers;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 9ec4d346ad51..b08023a3fe0a 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -72,7 +72,7 @@ class ImplMarkingOverlay
basegfx::B2DPoint maSecondPosition;
// A flag to remember if the action is for unmarking.
- bool const mbUnmarking : 1;
+ bool mbUnmarking : 1;
public:
ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking);
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index f179033b822f..4ff57d767470 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -95,7 +95,7 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
sal_uInt16 nNextNextPnt0;
bool bEliminate; // delete point? (is set by MovDrag)
- bool const mbMultiPointDrag;
+ bool mbMultiPointDrag;
const XPolyPolygon maOrig;
XPolyPolygon maMove;
std::vector<SdrHdl*> maHandles;
@@ -495,7 +495,7 @@ class ImpPathForDragAndCreate
{
SdrPathObj& mrSdrPathObject;
XPolyPolygon aPathPolygon;
- SdrObjKind const meObjectKind;
+ SdrObjKind meObjectKind;
std::unique_ptr<ImpSdrPathDragData>
mpSdrPathDragData;
bool mbCreating;
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index b7ff8beb7d71..74c17c1690b5 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -157,18 +157,18 @@ class ImpSdrPdfImport final
::std::vector<SdrObject*> maTmpList;
ScopedVclPtr<VirtualDevice> mpVD;
- tools::Rectangle const maScaleRect;
+ tools::Rectangle maScaleRect;
const std::shared_ptr<std::vector<sal_Int8>> mpPdfData;
size_t mnMapScalingOfs; // from here on, not edited with MapScaling
std::unique_ptr<SfxItemSet> mpLineAttr;
std::unique_ptr<SfxItemSet> mpFillAttr;
std::unique_ptr<SfxItemSet> mpTextAttr;
SdrModel* mpModel;
- SdrLayerID const mnLayer;
+ SdrLayerID mnLayer;
Color maOldLineColor;
sal_Int32 mnLineWidth;
static constexpr css::drawing::LineCap gaLineCap = css::drawing::LineCap_BUTT;
- XDash const maDash;
+ XDash maDash;
bool mbMov;
bool mbSize;
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 804832e8bd3b..1fd9ac204fbe 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -101,9 +101,9 @@ class ImplHelpLineOverlay
basegfx::B2DPoint maPosition;
// HelpLine specific stuff
- SdrPageView* const mpPageView;
- sal_uInt16 const mnHelpLineNumber;
- SdrHelpLineKind const meHelpLineKind;
+ SdrPageView* mpPageView;
+ sal_uInt16 mnHelpLineNumber;
+ SdrHelpLineKind meHelpLineKind;
public:
ImplHelpLineOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos,