From c70f5f32e2537639c7ad7e6e63fb760fd7a4ed90 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Feb 2019 13:30:30 +0200 Subject: use clear() instead of erase(begin, end) Change-Id: Ie1dcff4c2e5f52521b4172ef5726413a9d048214 Reviewed-on: https://gerrit.libreoffice.org/67961 Tested-by: Jenkins Reviewed-by: Noel Grandin --- forms/source/component/EventThread.cxx | 4 ++-- helpcompiler/source/HelpCompiler.cxx | 2 +- sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2 +- sw/source/ui/frmdlg/frmpage.cxx | 8 ++++---- unoxml/source/dom/elementlist.cxx | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index a44349e36bc1..e252fcc1d03f 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -74,8 +74,8 @@ void OComponentEventThread::impl_clearEventQueue() for ( auto& rEvent : m_aEvents ) delete rEvent; m_aEvents.clear(); - m_aControls.erase( m_aControls.begin(), m_aControls.end() ); - m_aFlags.erase( m_aFlags.begin(), m_aFlags.end() ); + m_aControls.clear(); + m_aFlags.clear(); } void OComponentEventThread::disposing( const EventObject& evt ) diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index 08c2149d8516..2ec197fe4bd1 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -298,7 +298,7 @@ static void trim(std::string& str) str.erase(0, pos); } else - str.erase(str.begin(), str.end()); + str.clear(); } void myparser::traverse( xmlNodePtr parentNode ) diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index 7d1f9c5a0562..b3a9cc154e37 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -119,7 +119,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine ) // Prevent buffer from growing massively large. if ( aRead > MAX_LINE_LENGTH ) { - aBuffer.erase( aBuffer.begin(), aBuffer.end() ); + aBuffer.clear(); return 0; } aRead += aRet; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 52f4f97474e9..1c19855bd28b 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2935,10 +2935,10 @@ void SwFrameAddPage::Reset(const SfxItemSet *rSet ) } else m_xPrevLB->set_active(0); - aPrevPageFrames.erase(aPrevPageFrames.begin(), aPrevPageFrames.end()); - aNextPageFrames.erase(aNextPageFrames.begin(), aNextPageFrames.end()); - aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end()); - aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end()); + aPrevPageFrames.clear(); + aNextPageFrames.clear(); + aThisPageFrames.clear(); + aRemainFrames.clear(); m_pWrtSh->GetConnectableFrameFormats(*pFormat, sPrevChain, true, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 7f47c7c0856e..6d47e55c023d 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -120,7 +120,7 @@ namespace DOM { return; } else { - m_nodevector.erase(m_nodevector.begin(), m_nodevector.end()); + m_nodevector.clear(); m_bRebuild = false; // don't rebuild until tree is mutated } } -- cgit