include/svx/svddrag.hxx | 23 +++++------ include/svx/svdmodel.hxx | 8 ++-- sd/source/ui/animations/motionpathtag.cxx | 2 - sd/source/ui/annotations/annotationtag.cxx | 2 - svx/source/engine3d/dragmt3d.cxx | 2 - svx/source/svdraw/svddrag.cxx | 12 +++--- svx/source/svdraw/svddrgmt.cxx | 58 ++++++++++++++--------------- svx/source/svdraw/svdmodel.cxx | 14 +++---- svx/source/svdraw/svdomeas.cxx | 2 - svx/source/svdraw/svdopath.cxx | 22 +++++------ svx/source/svdraw/svdtext.cxx | 4 +- 11 files changed, 74 insertions(+), 75 deletions(-)
New commits: commit 078ee7560d4c7ac3883c0a625023ad22ec8dc326 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Dec 12 11:24:23 2017 +0200 sal_uIntPtr->sal_Int32 in SdrModel Change-Id: I7cf53514641c52f3ebb503251e25df90bd6db8c7 Reviewed-on: https://gerrit.libreoffice.org/46310 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 6808db46cc3f..d7924d795a80 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -164,7 +164,7 @@ protected: SdrOutliner* pDrawOutliner; // an Outliner for outputting text SdrOutliner* pHitTestOutliner;// an Outliner for the HitTest SdrOutliner* pChainingOutliner; // an Outliner for chaining overflowing text - sal_uIntPtr nDefTextHgt; // Default text height in logical units + sal_Int32 mnDefTextHgt; // Default text height in logical units VclPtr<OutputDevice> pRefOutDev; // ReferenceDevice for the EditEngine rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool; SfxStyleSheet* pDefaultStyleSheet; @@ -287,7 +287,7 @@ public: const SdrTextObj* GetFormattingTextObj() const; // put the TextDefaults (Font,Height,Color) in a Set void SetTextDefaults() const; - static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ); + static void SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ); SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj) const; TextChain * GetTextChain() const; @@ -298,8 +298,8 @@ public: // If a new MapMode is set on the RefDevice (or similar) void RefDeviceChanged(); // not yet implemented // default font height in logical units - void SetDefaultFontHeight(sal_uIntPtr nVal); - sal_uIntPtr GetDefaultFontHeight() const { return nDefTextHgt; } + void SetDefaultFontHeight(sal_Int32 nVal); + sal_Int32 GetDefaultFontHeight() const { return mnDefTextHgt; } // default tabulator width for the EditEngine void SetDefaultTabulator(sal_uInt16 nVal); sal_uInt16 GetDefaultTabulator() const { return nDefaultTabulator; } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 95532a7b6b34..1290930214a8 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -185,9 +185,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // using static SdrEngineDefaults only if default SvxFontHeight item is not available const SfxPoolItem* pPoolItem = pItemPool->GetPoolDefaultItem( EE_CHAR_FONTHEIGHT ); if ( pPoolItem ) - nDefTextHgt = static_cast<const SvxFontHeightItem*>(pPoolItem)->GetHeight(); + mnDefTextHgt = static_cast<const SvxFontHeightItem*>(pPoolItem)->GetHeight(); else - nDefTextHgt = SdrEngineDefaults::GetFontHeight(); + mnDefTextHgt = SdrEngineDefaults::GetFontHeight(); pItemPool->SetPoolDefaultItem( makeSdrTextWordWrapItem( false ) ); @@ -689,10 +689,10 @@ SdrPage* SdrModel::AllocPage(bool bMasterPage) void SdrModel::SetTextDefaults() const { - SetTextDefaults( pItemPool, nDefTextHgt ); + SetTextDefaults( pItemPool, mnDefTextHgt ); } -void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ) +void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ) { // set application-language specific dynamic pool language defaults SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ; @@ -889,10 +889,10 @@ void SdrModel::RefDeviceChanged() ImpReformatAllTextObjects(); } -void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal) +void SdrModel::SetDefaultFontHeight(sal_Int32 nVal) { - if (nVal!=nDefTextHgt) { - nDefTextHgt=nVal; + if (nVal!=mnDefTextHgt) { + mnDefTextHgt=nVal; Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange)); ImpReformatAllTextObjects(); } diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 1b7c81b037ec..48621a84560d 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -137,8 +137,8 @@ void SdrText::SetModel( SdrModel* pNewModel ) // Now move the OutlinerParaObject into a new Pool. // TODO: We should compare the DefTab and RefDevice of both Models to // see whether we need to use AutoGrow! - sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight(); - sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight(); + sal_Int32 nOldFontHgt=pOldModel->GetDefaultFontHeight(); + sal_Int32 nNewFontHgt=pNewModel->GetDefaultFontHeight(); bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt; bool bSetHgtItem=bDefHgtChanged && !bHgtSet; if (bSetHgtItem) commit cf4cf3ed0d9f57981b3fd15d64ef1c53bc16c0f1 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Dec 12 10:52:31 2017 +0200 sal_uIntPtr->sal_Int32 in SdrDragStat also fix the X& X() methods to be normal void SetX(X const &) methods Change-Id: Id2999b09535ce560110eda646d3d5bbbedf87326 Reviewed-on: https://gerrit.libreoffice.org/46309 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index fab14eb2230a..d8dc4acbc1a9 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -76,7 +76,6 @@ class SVX_DLLPUBLIC SdrDragStat final std::unique_ptr<SdrDragStatUserData> mpUserData; // Userdata void Clear(); - Point& Pnt(sal_uIntPtr nNum) { return mvPnts[nNum]; } public: SdrDragStat() { Reset(); } @@ -86,21 +85,21 @@ public: void SetView(SdrView* pV) { pView=pV; } SdrPageView* GetPageView() const { return pPageView; } void SetPageView(SdrPageView* pPV) { pPageView=pPV; } - const Point& GetPoint(sal_uIntPtr nNum) const { return mvPnts[nNum]; } - sal_uIntPtr GetPointCount() const { return mvPnts.size(); } - const Point& GetStart() const { return GetPoint(0); } - Point& Start() { return Pnt(0); } - const Point& GetPrev() const { return GetPoint(GetPointCount()-(GetPointCount()>=2 ? 2:1)); } - Point& Prev() { return Pnt(GetPointCount()-(GetPointCount()>=2 ? 2:1)); } + const Point& GetPoint(sal_Int32 nNum) const { return mvPnts[nNum]; } + sal_Int32 GetPointCount() const { return mvPnts.size(); } + const Point& GetStart() const { return mvPnts[0]; } + void SetStart(const Point &pt) { mvPnts[0] = pt; } + const Point& GetPrev() const { return mvPnts[GetPointCount()-(GetPointCount()>=2 ? 2:1)]; } + void SetPrev(const Point &pt) { mvPnts[GetPointCount()-(GetPointCount()>=2 ? 2:1)] = pt; } const Point& GetPos0() const { return aPos0; } - const Point& GetNow() const { return GetPoint(GetPointCount()-1); } - Point& Now() { return Pnt(GetPointCount()-1); } + const Point& GetNow() const { return mvPnts.back(); } + void SetNow(Point const &pt) { mvPnts.back() = pt; } const Point& GetRealNow() const { return aRealNow; } - Point& RealNow() { return aRealNow; } + void SetRealNow(Point const &pt) { aRealNow = pt; } const Point& GetRef1() const { return aRef1; } - Point& Ref1() { return aRef1; } + void SetRef1(const Point &pt) { aRef1 = pt; } const Point& GetRef2() const { return aRef2; } - Point& Ref2() { return aRef2; } + void SetRef2(const Point &pt) { aRef2 = pt; } const SdrHdl* GetHdl() const { return pHdl; } void SetHdl(SdrHdl* pH) { pHdl=pH; } SdrDragStatUserData* GetUser() const { return mpUserData.get(); } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index c4e7a8c30191..c99e729f9fe7 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -179,7 +179,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) SdrPathObj* pPathObj = mxTag->getPathObj(); if( pPathObj ) { - const Point aRef( DragStat().Ref1() ); + const Point aRef( DragStat().GetRef1() ); basegfx::B2DHomMatrix aTrans(basegfx::utils::createTranslateB2DHomMatrix(-aRef.X(), -aRef.Y())); aTrans.scale(double(aXFact), double(aYFact)); aTrans.translate(aRef.X(), aRef.Y()); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 5a85e257bc1b..b607a3a4bfad 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -112,7 +112,7 @@ AnnotationDragMove::AnnotationDragMove(SdrDragView& rNewView, const rtl::Referen bool AnnotationDragMove::BeginSdrDrag() { - DragStat().Ref1()=GetDragHdl()->GetPos(); + DragStat().SetRef1(GetDragHdl()->GetPos()); DragStat().SetShown(!DragStat().IsShown()); maOrigin = GetDragHdl()->GetPos(); diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 159126fb1f5d..1f9c9f92c634 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -114,7 +114,7 @@ bool E3dDragMethod::BeginSdrDrag() if(E3dDragConstraint::Z == meConstraint) { const sal_uInt32 nCnt(maGrp.size()); - DragStat().Ref1() = maFullBound.Center(); + DragStat().SetRef1( maFullBound.Center() ); for(sal_uInt32 nOb(0); nOb < nCnt; nOb++) { diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index 6d16aa3ccb0f..e2d5cb5e5d39 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -58,30 +58,30 @@ void SdrDragStat::Reset() void SdrDragStat::Reset(const Point& rPnt) { Reset(); - Start()=rPnt; + SetStart(rPnt); aPos0=rPnt; - RealNow()=rPnt; + SetRealNow(rPnt); } void SdrDragStat::NextMove(const Point& rPnt) { aPos0=GetNow(); - RealNow()=rPnt; - Now()=GetRealNow(); + SetRealNow(rPnt); + SetNow(GetRealNow()); } void SdrDragStat::NextPoint() { Point aPnt(GetNow()); mvPnts.emplace_back(GetRealNow()); - Prev()=aPnt; + SetPrev(aPnt); } void SdrDragStat::PrevPoint() { if (mvPnts.size()>=2) { // one has to remain at all times mvPnts.erase(mvPnts.begin()+mvPnts.size()-2); - Now() = GetRealNow(); + SetNow( GetRealNow() ); } } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index a12282d804f9..536c27e1b271 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -949,7 +949,7 @@ bool SdrDragMovHdl::BeginSdrDrag() if( !GetDragHdl() ) return false; - DragStat().Ref1()=GetDragHdl()->GetPos(); + DragStat().SetRef1(GetDragHdl()->GetPos()); DragStat().SetShown(!DragStat().IsShown()); SdrHdlKind eKind=GetDragHdl()->GetKind(); SdrHdl* pH1=GetHdlList().GetHdl(SdrHdlKind::Ref1); @@ -1808,7 +1808,7 @@ bool SdrDragResize::BeginSdrDrag() if (pRefHdl!=nullptr && !getSdrDragView().IsResizeAtCenter()) { // Calc hack to adjust for calc grid - DragStat().Ref1()=pRefHdl->GetPos() - getSdrDragView().GetGridOffset(); + DragStat().SetRef1(pRefHdl->GetPos() - getSdrDragView().GetGridOffset()); } else { @@ -1817,11 +1817,11 @@ bool SdrDragResize::BeginSdrDrag() if (pRef1!=nullptr && pRef2!=nullptr) { - DragStat().Ref1()=tools::Rectangle(pRef1->GetPos(),pRef2->GetPos()).Center(); + DragStat().SetRef1(tools::Rectangle(pRef1->GetPos(),pRef2->GetPos()).Center()); } else { - DragStat().Ref1()=GetMarkedRect().Center(); + DragStat().SetRef1(GetMarkedRect().Center()); } } @@ -1833,9 +1833,9 @@ bool SdrDragResize::BeginSdrDrag() basegfx::B2DHomMatrix SdrDragResize::getCurrentTransformation() { basegfx::B2DHomMatrix aRetval(basegfx::utils::createTranslateB2DHomMatrix( - -DragStat().Ref1().X(), -DragStat().Ref1().Y())); + -DragStat().GetRef1().X(), -DragStat().GetRef1().Y())); aRetval.scale(double(aXFact), double(aYFact)); - aRetval.translate(DragStat().Ref1().X(), DragStat().Ref1().Y()); + aRetval.translate(DragStat().GetRef1().X(), DragStat().GetRef1().Y()); return aRetval; } @@ -2023,7 +2023,7 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt) void SdrDragResize::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { - rTarget.Resize(DragStat().Ref1(),aXFact,aYFact); + rTarget.Resize(DragStat().GetRef1(),aXFact,aYFact); } bool SdrDragResize::EndSdrDrag(bool bCopy) @@ -2032,15 +2032,15 @@ bool SdrDragResize::EndSdrDrag(bool bCopy) if (IsDraggingPoints()) { - getSdrDragView().ResizeMarkedPoints(DragStat().Ref1(),aXFact,aYFact); + getSdrDragView().ResizeMarkedPoints(DragStat().GetRef1(),aXFact,aYFact); } else if (IsDraggingGluePoints()) { - getSdrDragView().ResizeMarkedGluePoints(DragStat().Ref1(),aXFact,aYFact,bCopy); + getSdrDragView().ResizeMarkedGluePoints(DragStat().GetRef1(),aXFact,aYFact,bCopy); } else { - getSdrDragView().ResizeMarkedObj(DragStat().Ref1(),aXFact,aYFact,bCopy); + getSdrDragView().ResizeMarkedObj(DragStat().GetRef1(),aXFact,aYFact,bCopy); } return true; @@ -2100,7 +2100,7 @@ bool SdrDragRotate::BeginSdrDrag() if (nullptr != pH) { Show(); - DragStat().Ref1()=pH->GetPos(); + DragStat().SetRef1(pH->GetPos()); nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1()); return true; } @@ -2112,7 +2112,7 @@ bool SdrDragRotate::BeginSdrDrag() if(!aLocalMarkRect.IsEmpty()) { Show(); - DragStat().Ref1() = aLocalMarkRect.Center(); + DragStat().SetRef1(aLocalMarkRect.Center()); nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1()); return true; } @@ -2255,7 +2255,7 @@ bool SdrDragShear::BeginSdrDrag() if (pRefHdl!=nullptr) { - DragStat().Ref1()=pRefHdl->GetPos(); + DragStat().SetRef1(pRefHdl->GetPos()); nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1()); } else @@ -2528,8 +2528,8 @@ bool SdrDragMirror::BeginSdrDrag() if (pH1!=nullptr && pH2!=nullptr) { - DragStat().Ref1()=pH1->GetPos(); - DragStat().Ref2()=pH2->GetPos(); + DragStat().SetRef1(pH1->GetPos()); + DragStat().SetRef2(pH2->GetPos()); Ref1()=pH1->GetPos(); Ref2()=pH2->GetPos(); aDif=pH2->GetPos()-pH1->GetPos(); @@ -2633,8 +2633,8 @@ bool SdrDragGradient::BeginSdrDrag() if(pIAOHandle) { // save old values - DragStat().Ref1() = pIAOHandle->GetPos(); - DragStat().Ref2() = pIAOHandle->Get2ndPos(); + DragStat().SetRef1( pIAOHandle->GetPos() ); + DragStat().SetRef2( pIAOHandle->Get2ndPos() ); // what was hit? bool bHit(false); @@ -2706,27 +2706,27 @@ void SdrDragGradient::MoveSdrDrag(const Point& rPnt) { if(pIAOHandle->IsMoveFirstHandle()) { - pIAOHandle->SetPos(DragStat().Ref1() + aMoveDiff); + pIAOHandle->SetPos(DragStat().GetRef1() + aMoveDiff); if(pIAOHandle->GetColorHdl1()) - pIAOHandle->GetColorHdl1()->SetPos(DragStat().Ref1() + aMoveDiff); + pIAOHandle->GetColorHdl1()->SetPos(DragStat().GetRef1() + aMoveDiff); } else { - pIAOHandle->Set2ndPos(DragStat().Ref2() + aMoveDiff); + pIAOHandle->Set2ndPos(DragStat().GetRef2() + aMoveDiff); if(pIAOHandle->GetColorHdl2()) - pIAOHandle->GetColorHdl2()->SetPos(DragStat().Ref2() + aMoveDiff); + pIAOHandle->GetColorHdl2()->SetPos(DragStat().GetRef2() + aMoveDiff); } } else { - pIAOHandle->SetPos(DragStat().Ref1() + aMoveDiff); - pIAOHandle->Set2ndPos(DragStat().Ref2() + aMoveDiff); + pIAOHandle->SetPos(DragStat().GetRef1() + aMoveDiff); + pIAOHandle->Set2ndPos(DragStat().GetRef2() + aMoveDiff); if(pIAOHandle->GetColorHdl1()) - pIAOHandle->GetColorHdl1()->SetPos(DragStat().Ref1() + aMoveDiff); + pIAOHandle->GetColorHdl1()->SetPos(DragStat().GetRef1() + aMoveDiff); if(pIAOHandle->GetColorHdl2()) - pIAOHandle->GetColorHdl2()->SetPos(DragStat().Ref2() + aMoveDiff); + pIAOHandle->GetColorHdl2()->SetPos(DragStat().GetRef2() + aMoveDiff); } // new state @@ -2748,14 +2748,14 @@ bool SdrDragGradient::EndSdrDrag(bool /*bCopy*/) void SdrDragGradient::CancelSdrDrag() { // restore old values - pIAOHandle->SetPos(DragStat().Ref1()); - pIAOHandle->Set2ndPos(DragStat().Ref2()); + pIAOHandle->SetPos(DragStat().GetRef1()); + pIAOHandle->Set2ndPos(DragStat().GetRef2()); if(pIAOHandle->GetColorHdl1()) - pIAOHandle->GetColorHdl1()->SetPos(DragStat().Ref1()); + pIAOHandle->GetColorHdl1()->SetPos(DragStat().GetRef1()); if(pIAOHandle->GetColorHdl2()) - pIAOHandle->GetColorHdl2()->SetPos(DragStat().Ref2()); + pIAOHandle->GetColorHdl2()->SetPos(DragStat().GetRef2()); // new state pIAOHandle->FromIAOToItem(getSdrDragView().GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(), true, false); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 2f6152df4d9b..c8ea551e235a 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -958,7 +958,7 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) aPt2=rStat.GetNow(); if (pView!=nullptr && pView->IsCreate1stPointAsCenter()) { aPt1+=aPt1; - aPt1-=rStat.Now(); + aPt1-=rStat.GetNow(); } SetTextDirty(); SetBoundRectDirty(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index b6344c3ad804..d9bc1287e904 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -730,8 +730,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // let the alternative that allows fewer correction win if (nX1<nX2) bPnt2=false; else bPnt1=false; } - if (bPnt1) rDrag.Now()=aNeuPos1; - if (bPnt2) rDrag.Now()=aNeuPos2; + if (bPnt1) rDrag.SetNow(aNeuPos1); + if (bPnt2) rDrag.SetNow(aNeuPos2); } rDrag.SetActionRect(tools::Rectangle(rDrag.GetNow(),rDrag.GetNow())); @@ -752,7 +752,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const aPt=mpSdrPathDragData->aXP[nNextPnt]; aPt+=mpSdrPathDragData->aXP[nPrevPnt]; aPt/=2; - rDrag.Now()=aPt; + rDrag.SetNow(aPt); } } @@ -1326,12 +1326,12 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) bool bFreeHand=IsFreeHand(pU->eAktKind); rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE)); - rXPoly[nActPoint]=rStat.Now(); + rXPoly[nActPoint]=rStat.GetNow(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE && rXPoly.GetPointCount()>=1) { - Point aPt(rStat.Start()); + Point aPt(rStat.GetStart()); if (pView!=nullptr && pView->IsCreate1stPointAsCenter()) { aPt+=aPt; - aPt-=rStat.Now(); + aPt-=rStat.GetNow(); } rXPoly[0]=aPt; } @@ -1346,7 +1346,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) if (nMinDist<1) nMinDist=1; Point aPt0(rXPoly[nActPoint-1]); - Point aPt1(rStat.Now()); + Point aPt1(rStat.GetNow()); long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx; long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy; if (dx<nMinDist && dy<nMinDist) return false; @@ -1364,7 +1364,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) rXPoly.SetFlags(nActPoint-3,PolyFlags::Smooth); } } - rXPoly[nActPoint+1]=rStat.Now(); + rXPoly[nActPoint+1]=rStat.GetNow(); rStat.NextPoint(); } else { pU->nBezierStartPoint=nActPoint; @@ -1400,7 +1400,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) bool bIncomp=pView!=nullptr && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; - rXPoly[nActPoint]=rStat.Now(); + rXPoly[nActPoint]=rStat.GetNow(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) { if (rStat.GetPointCount()>=2) eCmd=SdrCreateCmd::ForceEnd; bRet = eCmd==SdrCreateCmd::ForceEnd; @@ -1422,7 +1422,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (eCmd==SdrCreateCmd::NextPoint || eCmd==SdrCreateCmd::NextObject) { // don't allow two consecutive points to occupy the same position - if (nActPoint==0 || rStat.Now()!=rXPoly[nActPoint-1]) { + if (nActPoint==0 || rStat.GetNow()!=rXPoly[nActPoint-1]) { if (bIncomp) { if (pU->nBezierStartPoint>nActPoint) pU->nBezierStartPoint=nActPoint; if (IsBezier(pU->eAktKind) && nActPoint-pU->nBezierStartPoint>=3 && ((nActPoint-pU->nBezierStartPoint)%3)==0) { @@ -1536,7 +1536,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount(); if (nLocalActPoint>0) { nLocalActPoint--; - rLocalXPoly[nLocalActPoint]=rStat.Now(); + rLocalXPoly[nLocalActPoint]=rStat.GetNow(); } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits