[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/filter/excel/excdoc.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 7586a2ebb8eacae6b45910cb248694c27dfdb901
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Feb 8 11:37:46 2014 -0500

    fdo#74521: Only pick cell notes for that sheet, and skip the rest.
    
    Change-Id: I06a069e835eb7f2f90d34f4fcdfd935aff0234de
    (cherry picked from commit 771b9d2718f28beedbc1a913e8965cdd1fc75a88)
    Reviewed-on: https://gerrit.libreoffice.org/7945
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index a8bfbf7..9cf433d 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -421,7 +421,12 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
     rDoc.GetAllNoteEntries(aNotes);
     std::vector<sc::NoteEntry>::const_iterator it = aNotes.begin(), itEnd = aNotes.end();
     for (; it != itEnd; ++it)
+    {
+        if (it->maPos.Tab() != mnScTab)
+            continue;
+
         mxNoteList->AppendNewRecord(new XclExpNote(GetRoot(), it->maPos, it->mpNote, OUString()));
+    }
 
     if( GetOutput() != EXC_OUTPUT_BINARY )
     {