summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-23 10:24:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-23 15:42:23 +0100
commit83f977c7f40d1a5fb975b8ce7c9958c992dba3f1 (patch)
tree318887d7e95e4c24a964134b4408d3dc80e85c83
parent7000e1a0640156645252d15d505949bff3d1eb4a (diff)
Resolves: tdf#100460 queryContentCells doesn't count annotations...
since commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094 Author: Markus Mohrhard <markus.mohrhard@googlemail.com> Date: Thu Feb 23 23:36:49 2012 +0100 remove mpNote from ScBaseCell Change-Id: I281a207e26aec8886b1f46b9279e1135b61586da
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 46c69d29beff..3801f5b2a314 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;