Kaydet (Commit) 86079e88 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

correctly delete note captions, fdo#64068

This fixes fdo#64068 and correctly without reintroducing the crash with
Undo/Redo.

Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
üst 2686d737
...@@ -578,7 +578,9 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark ) ...@@ -578,7 +578,9 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
{ {
ScRange* pRange = aRangeList[i]; ScRange* pRange = aRangeList[i];
if (nDelFlag & IDF_NOTE && pRange) 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) if((nDelFlag & IDF_ATTRIB) && pRange && pRange->aStart.Tab() == nTab)
mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() ); mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment