summaryrefslogtreecommitdiff
path: root/svx/source/engine3d
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-13 08:40:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-13 09:41:54 +0100
commitf6b3b696ad9d454f7acbe930439cccc052e9fce2 (patch)
treecd80ccb808ac73ace9c905bd3cb36d69f7210be2 /svx/source/engine3d
parent21b0bd63a41bda1153bb6173ec23ecdd13353999 (diff)
loplugin:singlevalfields in svx
Change-Id: I94d21bb868c54638b843c6abaab370a05ec3471e Reviewed-on: https://gerrit.libreoffice.org/63317 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx3
2 files changed, 1 insertions, 4 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 85df3f93938e..8d0a72d11923 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -92,7 +92,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF))
, bUpdate(false)
, eViewType(ViewType3D::Geo)
- , pVDev(nullptr)
, pBindings(pInBindings)
, mpImpl(new Svx3DWinImpl)
, ePoolUnit(MapUnit::MapMM)
@@ -324,7 +323,6 @@ Svx3DWin::~Svx3DWin()
void Svx3DWin::dispose()
{
- pVDev.disposeAndClear();
pModel.reset();
pControllerItem.reset();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index a601f1b27791..ce6e3c831027 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1255,7 +1255,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
}
// do not mask the allowed rotations
- eConstraint = E3dDragConstraint(eConstraint& eDragConstraint);
+ eConstraint &= E3dDragConstraint::XYZ;
pForcedMeth = new E3dDragRotate(*this, GetMarkedObjectList(), eConstraint, IsSolidDragging());
}
break;
@@ -1506,7 +1506,6 @@ void E3dView::ResetCreationActive ()
void E3dView::InitView ()
{
- eDragConstraint = E3dDragConstraint::XYZ;
aDefaultLightColor = COL_WHITE;
aDefaultAmbientColor = COL_BLACK;
mpMirrorOverlay = nullptr;