summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-01 11:40:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-08 08:03:03 +0200
commit1a6397030381a45f27ab7a2a02e6e6d0f9987c84 (patch)
tree6e342854037b3b845215af09f36407495550254d /svx/source/svdraw
parent781544497a0913037bba160a4cf6b643e5ca1d1a (diff)
loplugin:constfields in svx
Change-Id: I643e8686e015ca85dd96221f1c93038f4fddf27b Reviewed-on: https://gerrit.libreoffice.org/61182 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.cxx17
-rw-r--r--svx/source/svdraw/svdpdf.hxx9
-rw-r--r--svx/source/svdraw/svdsnpv.cxx6
9 files changed, 17 insertions, 33 deletions
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 94de57531ff0..7e7c2880351b 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 bSlant;
+ bool const bSlant;
public:
SdrDragShear(SdrDragView& rNewView,bool bSlant1);
@@ -121,7 +121,7 @@ private:
SdrHdlGradient* pIAOHandle;
// is this for gradient (or for transparency)?
- bool bIsGradient : 1;
+ bool const bIsGradient : 1;
public:
SdrDragGradient(SdrDragView& rNewView, bool bGrad = true);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index bde1c7236b46..a10fe457c4a2 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -394,7 +394,7 @@ namespace
drawinglayer::primitive2d::Primitive2DContainer maLastTextPrimitives;
/// bitfield
- bool mbVisualizeSurroundingFrame : 1;
+ bool const mbVisualizeSurroundingFrame : 1;
// geometry creation for OverlayObject, can use local *Last* values
virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index a3bd9b16ef40..0f98e4c1927d 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 maScaleRect;
+ tools::Rectangle const 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 mnLayer;
+ SdrLayerID const mnLayer;
Color maOldLineColor;
sal_Int32 mnLineWidth;
basegfx::B2DLineJoin maLineJoin;
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 7cdf414996f2..69ecdbcf63d6 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -78,7 +78,7 @@
class SdrHdlBitmapSet
{
// the bitmap holding all information
- BitmapEx maMarkersBitmap;
+ BitmapEx const 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 16f21be65a76..affec3af91e0 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -70,7 +70,7 @@ class ImplMarkingOverlay
basegfx::B2DPoint maSecondPosition;
// A flag to remember if the action is for unmarking.
- bool mbUnmarking : 1;
+ bool const 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 3bd275795bdb..ffd4c1ac84af 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -102,7 +102,7 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
sal_uInt16 nNextNextPnt0;
bool bEliminate; // delete point? (is set by MovDrag)
- bool mbMultiPointDrag;
+ bool const mbMultiPointDrag;
const XPolyPolygon maOrig;
XPolyPolygon maMove;
std::vector<SdrHdl*> maHandles;
@@ -496,7 +496,7 @@ class ImpPathForDragAndCreate
{
SdrPathObj& mrSdrPathObject;
XPolyPolygon aPathPolygon;
- SdrObjKind meObjectKind;
+ SdrObjKind const meObjectKind;
std::unique_ptr<ImpSdrPathDragData>
mpSdrPathDragData;
bool mbCreating;
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 8f859672c336..1f55fb709d1f 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -125,7 +125,6 @@ ImpSdrPdfImport::ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const tools:
, mnLayer(nLay)
, maOldLineColor()
, mnLineWidth(0)
- , maLineJoin(basegfx::B2DLineJoin::NONE)
, maLineCap(css::drawing::LineCap_BUTT)
, maDash(css::drawing::DashStyle_RECT, 0, 0, 0, 0, 0)
, mbMov(false)
@@ -384,21 +383,7 @@ void ImpSdrPdfImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr)
mpLineAttr->Put(XLineStyleItem(drawing::LineStyle_NONE));
}
- switch (maLineJoin)
- {
- case basegfx::B2DLineJoin::NONE:
- mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_NONE));
- break;
- case basegfx::B2DLineJoin::Bevel:
- mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_BEVEL));
- break;
- case basegfx::B2DLineJoin::Miter:
- mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_MITER));
- break;
- case basegfx::B2DLineJoin::Round:
- mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_ROUND));
- break;
- }
+ mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_NONE));
// Add LineCap support
mpLineAttr->Put(XLineCapItem(maLineCap));
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index a17a739c4332..462b8f6451bb 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -160,19 +160,18 @@ class ImpSdrPdfImport final
::std::vector<SdrObject*> maTmpList;
ScopedVclPtr<VirtualDevice> mpVD;
- tools::Rectangle maScaleRect;
+ tools::Rectangle const maScaleRect;
const std::shared_ptr<css::uno::Sequence<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 mnLayer;
+ SdrLayerID const mnLayer;
Color maOldLineColor;
sal_Int32 mnLineWidth;
- basegfx::B2DLineJoin maLineJoin;
- css::drawing::LineCap maLineCap;
- XDash maDash;
+ css::drawing::LineCap const maLineCap;
+ XDash const maDash;
bool mbMov;
bool mbSize;
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 55664027168a..dd43290445c2 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* mpPageView;
- sal_uInt16 mnHelpLineNumber;
- SdrHelpLineKind meHelpLineKind;
+ SdrPageView* const mpPageView;
+ sal_uInt16 const mnHelpLineNumber;
+ SdrHelpLineKind const meHelpLineKind;
public:
ImplHelpLineOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos,