include/svx/svdedtv.hxx | 2 +- svx/source/svdraw/svdedtv2.cxx | 2 +- sw/source/core/draw/dview.cxx | 4 ++-- sw/source/core/inc/dview.hxx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 65102921c710651bc11cf357878bd0af76d2dd78 Author: Noel Grandin <[email protected]> Date: Fri Dec 15 14:54:04 2017 +0200 sal_uIntPtr->size_t in ObjOrderChanged to match the other position parameters used in SdrObject Change-Id: I100f4fb99f902bb6261b5470dd6b5553aefd764d Reviewed-on: https://gerrit.libreoffice.org/46586 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index ce94834724d6..0c1e2f6a9dc1 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -383,7 +383,7 @@ public: // Next method is called, if via ToTop, ToBtm, ... the // sequence of object has been changed. It is called after // each SdrObjList::SetObjectOrdNum(nOldPos,nNewPos); - virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos); + virtual void ObjOrderChanged(SdrObject* pObj, size_t nOldPos, size_t nNewPos); // If one or more objects of the type SdrGrafObj or SdrOle2Obj // are marked and these are capable to deliver a StarView-metafile, diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index adbe04295a1c..5d5e7dfaa631 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -56,7 +56,7 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const return nullptr; } -void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/) +void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, size_t /*nOldPos*/, size_t /*nNewPos*/) { } diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index e34e167822e9..ef557e8ecd9e 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -421,8 +421,8 @@ void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj, } // --> adjustment and re-factoring of method -void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ) +void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos, + size_t nNewPos ) { // nothing to do for group members if ( pObj->GetUpGroup() ) diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 94ae194b8f60..aeb1e864fc4f 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -90,8 +90,8 @@ public: // Override to reuse edit background color in active text edit view (OutlinerView) virtual void ModelHasChanged() override; - virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ) override; + virtual void ObjOrderChanged( SdrObject* pObj, size_t nOldPos, + size_t nNewPos ) override; virtual bool TakeDragLimit(SdrDragMode eMode, tools::Rectangle& rRect) const override; virtual void MakeVisible( const tools::Rectangle&, vcl::Window &rWin ) override; virtual void CheckPossibilities() override; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
