[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Jul 15 12:55:56 PDT 2012


 sw/source/core/inc/rolbck.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3669bb966f709089f43111b5ca1057bfe4a22697
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 15 20:46:27 2012 +0100

    Resolves: fdo#52013 use vector::insert instead
    
    Change-Id: Ie12e5b11196b1b0f919bd18f28a0b86f60cc6513
    Signed-off-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index efb6f41..cd5a947 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -402,7 +402,8 @@ public:
     {
         SwpHstry::iterator itSourceBegin = pIns->m_SwpHstry.begin() + nStart;
         SwpHstry::iterator itSourceEnd = pIns->m_SwpHstry.end();
-        std::copy( itSourceBegin, itSourceEnd, m_SwpHstry.begin() + nPos );
+        if (itSourceBegin == itSourceEnd) return;
+        m_SwpHstry.insert(m_SwpHstry.begin() + nPos, itSourceBegin, itSourceEnd);
         pIns->m_SwpHstry.erase( itSourceBegin, itSourceEnd );
     }
 


More information about the Libreoffice-commits mailing list