diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 12:02:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-03 06:57:24 +0100 |
| commit | ee69f5e0758a2a1842362bf403dc62746437f358 (patch) | |
| tree | 84c157f09ac3ae45a98563f2541070f388be5d37 /reportdesign | |
| parent | 08b8b55d9d540fcd29d18dd8883d24de457e2675 (diff) | |
drop old tools/gen methods
Change-Id: I9b9d1503b476f84e91fa283e523875b562c6b837
Reviewed-on: https://gerrit.libreoffice.org/50166
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 5e48c8c209f3..341dc465a397 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -770,9 +770,9 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, bool bMove = true; - auto aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Bottom)); + auto aGetFun = ::std::mem_fn(&tools::Rectangle::Bottom); auto aSetFun = ::std::mem_fn(&tools::Rectangle::SetBottom); - auto aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Top)); + auto aRefFun = ::std::mem_fn(&tools::Rectangle::Top); TRectangleMap::const_iterator aRectIter = aSortRectangles.begin(); TRectangleMap::const_iterator aRectEnd = aSortRectangles.end(); for (;aRectIter != aRectEnd ; ++aRectIter) @@ -791,9 +791,9 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, switch(_nControlModification) { case ControlModification::TOP : - aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Top)); + aGetFun = ::std::mem_fn(&tools::Rectangle::Top); aSetFun = ::std::mem_fn(&tools::Rectangle::SetTop); - aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Bottom)); + aRefFun = ::std::mem_fn(&tools::Rectangle::Bottom); pValue = &nYMov; break; case ControlModification::BOTTOM: @@ -806,18 +806,18 @@ void OViewsWindow::alignMarkedObjects(ControlModification _nControlModification, bMove = false; break; case ControlModification::RIGHT : - aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Right)); + aGetFun = ::std::mem_fn(&tools::Rectangle::Right); aSetFun = ::std::mem_fn(&tools::Rectangle::SetRight); - aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Left)); + aRefFun = ::std::mem_fn(&tools::Rectangle::Left); break; case ControlModification::CENTER_HORIZONTAL: nXMov = aCenter.X() - aObjRect.Center().X(); bMove = false; break; case ControlModification::LEFT : - aGetFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Left)); + aGetFun = ::std::mem_fn(&tools::Rectangle::Left); aSetFun = ::std::mem_fn(&tools::Rectangle::SetLeft); - aRefFun = ::std::mem_fn(static_cast<long(tools::Rectangle:: *)() const>(&tools::Rectangle::Right)); + aRefFun = ::std::mem_fn(&tools::Rectangle::Right); break; default: bMove = false; |