[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/text/blink.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eb4f15d704f9506b4a0d7a8e6d4f650d9f3dd26c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 5 14:14:56 2016 +0100

    sw: revert use of invalid (erased) iterator
    
    (regression from commit d75b9fd582f0aa83bd2fc99028b3f83eb7171d61)
    
    Change-Id: I6e67ebfbac20b42c0ff8580b575793daec46b68d

diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index e17a760..9588973 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));
     }
 }