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

[Caolán McNamara]

 sc/source/ui/unoobj/cellsuno.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 83f977c7f40d1a5fb975b8ce7c9958c992dba3f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 23 10:24:49 2016 +0100

    Resolves: tdf#100460 queryContentCells doesn't count annotations...
    
    since
    
    commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094
    Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Date:   Thu Feb 23 23:36:49 2012 +0100
    
        remove mpNote from ScBaseCell
    
    Change-Id: I281a207e26aec8886b1f46b9279e1135b61586da

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 46c69d2..3801f5b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3601,7 +3601,17 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
                 if (bAdd)
                     aMarkData.SetMultiMarkArea(aIter.GetPos());
             }
+        }
+
+        if (nContentFlags & sheet::CellFlags::ANNOTATION)
+        {
+            std::vector<sc::NoteEntry> aNotes;
+            rDoc.GetNotesInRange(aRanges, aNotes);
 
+            for (const auto& i : aNotes)
+            {
+                aMarkData.SetMultiMarkArea(i.maPos);
+            }
         }
 
         ScRangeList aNewRanges;