[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 31 18:37:54 UTC 2018


 sc/source/core/data/document.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9858b7004856a632778dde0dc7edddb14b673194
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Aug 30 12:59:06 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Aug 31 20:37:28 2018 +0200

    tdf#112454 Also consider last SCTAB in loop
    
    Since 'rRange.aEnd.Tab()' is valid, it needs to
    be included in the loop to get a valid result.
    
    Reviewed-on: https://gerrit.libreoffice.org/59798
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34)
    
     Conflicts:
            sc/source/core/data/document.cxx
    
    Backported.
    
    Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510
    Reviewed-on: https://gerrit.libreoffice.org/59878
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2d1834d57cd9..941657c0545b 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6725,7 +6725,7 @@ bool ScDocument::ContainsNotesInRange( const ScRangeList& rRange ) const
     for( size_t i = 0; i < rRange.size(); ++i)
     {
         const ScRange* pRange = rRange[i];
-        for( SCTAB nTab = pRange->aStart.Tab(); nTab < pRange->aEnd.Tab(); ++nTab )
+        for( SCTAB nTab = pRange->aStart.Tab(); nTab <= pRange->aEnd.Tab(); ++nTab )
         {
             bool bContainsNote = maTabs[nTab]->ContainsNotesInRange( *pRange );
             if(bContainsNote)


More information about the Libreoffice-commits mailing list