[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Sep 20 15:40:09 UTC 2018


 svl/source/items/itemiter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 760d6f55c847a4ebc9b7780e4443af47cdd1367d
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Aug 21 15:37:51 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 20 17:39:43 2018 +0200

    svl: fix SfxItemIter on empty item set
    
    The problem is that IsAtEnd { return m_nCurrent == m_nEnd; } is never
    true because of the odd initialisation with m_nEnd > m_nStart.
    
    Change-Id: I477b0f111e2c2f47fe093800710a9b28ca8a5925
    (cherry picked from commit 54d627e0c2ef64a8b09bc744384f6e3dd1d29d22)
    Reviewed-on: https://gerrit.libreoffice.org/60747
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index 2cc6ae36212d..cbe0f2f8ed03 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -27,7 +27,7 @@ SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
 {
     if (!m_rSet.m_nCount)
     {
-        m_nStart = 1;
+        m_nStart = 0;
         m_nEnd = 0;
     }
     else


More information about the Libreoffice-commits mailing list