summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-05 11:01:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-05 16:17:19 +0100
commite2e8d201bb09e1bb4e654dcb7a701fe9840dbd94 (patch)
treed1d807d5ae1b0aed0f40a191ed1bb1927690f38e
parentf5bd4b833cfca5be288b937f1783180597c6e9bd (diff)
Replace deprecated std::mem_fun et al in svx
(as std::mem_fun is gone by default at least from recent libc++ in C++17 mode) Change-Id: I7b2b6d20a7d89ed109bdce1f31cba660d9cdb9a0 Reviewed-on: https://gerrit.libreoffice.org/45866 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--svx/source/form/filtnav.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 989019e0a702..8a280a0a4a1a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1702,9 +1702,9 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
if ( !getSelectedFilterItems( aItemList ) )
break;
- ::std::mem_fun1_t<SvTreeListEntry*,FmFilterNavigator,SvTreeListEntry*> getter = ::std::mem_fun(&FmFilterNavigator::getNextEntry);
+ ::std::function<SvTreeListEntry*(FmFilterNavigator *, SvTreeListEntry*)> getter = ::std::mem_fn(&FmFilterNavigator::getNextEntry);
if ( rKeyCode.GetCode() == KEY_UP )
- getter = ::std::mem_fun(&FmFilterNavigator::getPrevEntry);
+ getter = ::std::mem_fn(&FmFilterNavigator::getPrevEntry);
SvTreeListEntry* pTarget = getter( this, nullptr );
if ( !pTarget )