From 276508a97d9d5a03169d3d8906e5a6d3ff3d0b0b Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 28 May 2013 02:15:52 +0200 Subject: correctly delete note captions, fdo#64068 This fixes fdo#64068 and correctly without reintroducing the crash with Undo/Redo. Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de Reviewed-on: https://gerrit.libreoffice.org/4066 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- sc/source/core/data/table2.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 47cd340e4811..00d0632e2a40 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -565,7 +565,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() ); -- cgit v1.2.3