diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-05 14:14:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-05 14:16:58 +0100 |
| commit | eb4f15d704f9506b4a0d7a8e6d4f650d9f3dd26c (patch) | |
| tree | 99f461df46bed0f82120c4e20d61d3650bb21f50 /sw | |
| parent | 09442a04624cd09f7c693cd7e64e0259f17b2d6b (diff) | |
sw: revert use of invalid (erased) iterator
(regression from commit d75b9fd582f0aa83bd2fc99028b3f83eb7171d61)
Change-Id: I6e67ebfbac20b42c0ff8580b575793daec46b68d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/blink.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index e17a7603fb61..9588973deec3 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -23,7 +23,7 @@ #include "blink.hxx" #include "porlin.hxx" #include "porlay.hxx" -#include <o3tl/make_unique.hxx> + // Visible time #define BLINK_ON_TIME 2400L // Invisible time @@ -147,8 +147,9 @@ void SwBlink::Replace( const SwLinePortion* pOld, const SwLinePortion* pNew ) SwBlinkSet::iterator it = m_List.find( pBlinkPortion ); if (it != m_List.end()) { + std::unique_ptr<SwBlinkPortion> pTmp(new SwBlinkPortion(it->get(), pNew)); m_List.erase( it ); - m_List.insert(o3tl::make_unique<SwBlinkPortion>(it->get(), pNew)); + m_List.insert(std::move(pTmp)); } } |