summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-05-28 02:15:52 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-05-28 02:20:54 +0200
commit34af6ec157eb82af02bf14387167beb2c4ae48ec (patch)
tree02def8457239c985288063e23b6ffd4208537bb9
parentc8879374b3b4b68e22f896ca32bb2203de586111 (diff)
correctly delete note captions, fdo#64068
This fixes fdo#64068 and correctly without reintroducing the crash with Undo/Redo. Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
-rw-r--r--sc/source/core/data/table2.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0f5d458a38b2..5df2ac12f636 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -578,7 +578,9 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
{
ScRange* pRange = aRangeList[i];
if (nDelFlag & IDF_NOTE && pRange)
- maNotes.erase(pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row(), true);
+ {
+ maNotes.erase(pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row(), nDelFlag & IDF_NOCAPTIONS);
+ }
if((nDelFlag & IDF_ATTRIB) && pRange && pRange->aStart.Tab() == nTab)
mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() );