summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-05 10:46:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-05 16:11:08 +0100
commite2553f5cc4a3cdcb09c1b291082b81d0a5a43b17 (patch)
treee1f082beb4aa85c576af164e729d84f76d95ab81 /extensions
parent3ea3c081721439644850ded0fe375b12e2e9b95c (diff)
Replace deprecated std::mem_fun et al in extensions
(as std::mem_fun is gone by default at least from recent libc++ in C++17 mode) Change-Id: I109dd7e04ed2914eb8768bb8139758b5ad60dadc Reviewed-on: https://gerrit.libreoffice.org/45862 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx6
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 4f8c355c4439..cb266a4780ce 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -273,7 +273,7 @@ namespace pcr
}
- void OPropertyEditor::Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction)
+ void OPropertyEditor::Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction)
{
// forward this to all our pages
sal_uInt16 nCount = m_aTabControl->GetPageCount();
@@ -288,12 +288,12 @@ namespace pcr
void OPropertyEditor::EnableUpdate()
{
- Update(std::mem_fun(&OBrowserListBox::EnableUpdate));
+ Update(std::mem_fn(&OBrowserListBox::EnableUpdate));
}
void OPropertyEditor::DisableUpdate()
{
- Update(std::mem_fun(&OBrowserListBox::DisableUpdate));
+ Update(std::mem_fn(&OBrowserListBox::DisableUpdate));
}
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 8b49ea967e0a..5469e372f795 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -120,7 +120,7 @@ namespace pcr
OBrowserPage* getPage( const OUString& _rPropertyName );
const OBrowserPage* getPage( const OUString& _rPropertyName ) const;
- void Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction);
+ void Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction);
typedef void (OPropertyEditor::*PageOperation)( OBrowserPage&, const void* );
void forEachPage( PageOperation _pOperation );