Kaydet (Commit) e2553f5c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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/45862Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 3ea3c081
...@@ -273,7 +273,7 @@ namespace pcr ...@@ -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 // forward this to all our pages
sal_uInt16 nCount = m_aTabControl->GetPageCount(); sal_uInt16 nCount = m_aTabControl->GetPageCount();
...@@ -288,12 +288,12 @@ namespace pcr ...@@ -288,12 +288,12 @@ namespace pcr
void OPropertyEditor::EnableUpdate() void OPropertyEditor::EnableUpdate()
{ {
Update(std::mem_fun(&OBrowserListBox::EnableUpdate)); Update(std::mem_fn(&OBrowserListBox::EnableUpdate));
} }
void OPropertyEditor::DisableUpdate() void OPropertyEditor::DisableUpdate()
{ {
Update(std::mem_fun(&OBrowserListBox::DisableUpdate)); Update(std::mem_fn(&OBrowserListBox::DisableUpdate));
} }
......
...@@ -120,7 +120,7 @@ namespace pcr ...@@ -120,7 +120,7 @@ namespace pcr
OBrowserPage* getPage( const OUString& _rPropertyName ); OBrowserPage* getPage( const OUString& _rPropertyName );
const OBrowserPage* getPage( const OUString& _rPropertyName ) const; 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* ); typedef void (OPropertyEditor::*PageOperation)( OBrowserPage&, const void* );
void forEachPage( PageOperation _pOperation ); void forEachPage( PageOperation _pOperation );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment