include/svx/svdsnpv.hxx | 3 -
svx/source/svdraw/svdsnpv.cxx | 66 ++++++++++++++++++------------------------
2 files changed, 29 insertions(+), 40 deletions(-)
New commits:
commit af75d7a4c99414fabbd31b9df590266d28574fb1
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Mon May 25 05:12:49 2015 -0500
SdrSnapView: initializae members in the constructor
remove ClearVars() which was only
use by the constructor
instead initialize properly things in the constructor itself
Change-Id: I20a0ea26c5dce680844f81cf85ee72e1809a7068
Reviewed-on: https://gerrit.libreoffice.org/15890
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index fb2fc32..268171a 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -91,9 +91,6 @@ protected:
bool bHlplFixed : 1; // sal_True=
fixed auxiliary lines, so it isn't movable
bool bEliminatePolyPoints : 1;
-private:
- SVX_DLLPRIVATE void ClearVars();
-
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid
incomplete incarnations which may get casted to SdrView
SdrSnapView(SdrModel* pModel1, OutputDevice* pOut = 0L);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 070f4c4..ba2cc9d 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -174,44 +174,36 @@ void ImplHelpLineOverlay::SetPosition(const
basegfx::B2DPoint& rNewPosition)
}
-void SdrSnapView::ClearVars()
+SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut)
+ : SdrPaintView(pModel1,pOut)
+ , mpPageOriginOverlay(0L)
+ , mpHelpLineOverlay(0L)
+ , nMagnSizPix(4)
+ , nSnapAngle(1500)
+ , nEliminatePolyPointLimitAngle(0)
+ , eCrookMode(SDRCROOK_ROTATE)
+ , bSnapEnab(true)
+ , bGridSnap(true)
+ , bSnapTo1Pix(true)
+ , bBordSnap(true)
+ , bHlplSnap(true)
+ , bOFrmSnap(true)
+ , bOPntSnap(false)
+ , bOConSnap(true)
+ , bMoveMFrmSnap(true)
+ , bMoveOFrmSnap(true)
+ , bMoveOPntSnap(true)
+ , bMoveOConSnap(true)
+ , bMoveSnapOnlyTopLeft(false)
+ , bOrtho(false)
+ , bBigOrtho(true)
+ , bAngleSnapEnab(false)
+ , bMoveOnlyDragging(false)
+ , bSlantButShear(false)
+ , bCrookNoContortion(false)
+ , bHlplFixed(false)
+ , bEliminatePolyPoints(false)
{
- nMagnSizPix=4;
- bSnapEnab=true;
- bGridSnap=true;
- bSnapTo1Pix=true;
- bBordSnap=true;
- bHlplSnap=true;
- bOFrmSnap=true;
- bOPntSnap=false;
- bOConSnap=true;
- bMoveMFrmSnap=true;
- bMoveOFrmSnap=true;
- bMoveOPntSnap=true;
- bMoveOConSnap=true;
- bMoveSnapOnlyTopLeft=false;
- bOrtho=false;
- bBigOrtho=true;
- nSnapAngle=1500;
- bAngleSnapEnab=false;
- bMoveOnlyDragging=false;
- bSlantButShear=false;
- bCrookNoContortion=false;
- eCrookMode=SDRCROOK_ROTATE;
- bHlplFixed=false;
- bEliminatePolyPoints=false;
- nEliminatePolyPointLimitAngle=0;
-
- BrkSetPageOrg();
- BrkDragHelpLine();
-}
-
-SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut):
- SdrPaintView(pModel1,pOut),
- mpPageOriginOverlay(0L),
- mpHelpLineOverlay(0L)
-{
- ClearVars();
}
SdrSnapView::~SdrSnapView()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
