diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-28 02:15:52 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-28 02:20:19 +0200 |
commit | 86079e8823119599fb81ec6cfd1225d4b37cc525 (patch) | |
tree | 51a8ff06a3206f371a7c74403f5b798e53c300c8 /sc/source/core/data/table2.cxx | |
parent | 2686d737c0e2695e274da55a3f3e147a24f77e29 (diff) |
correctly delete note captions, fdo#64068
This fixes fdo#64068 and correctly without reintroducing the crash with
Undo/Redo.
Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
Diffstat (limited to 'sc/source/core/data/table2.cxx')
-rw-r--r-- | sc/source/core/data/table2.cxx | 4 |
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() ); |