diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-28 02:15:52 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-28 09:31:40 +0000 |
| commit | 276508a97d9d5a03169d3d8906e5a6d3ff3d0b0b (patch) | |
| tree | fe11fc056db75ecfbbc7960077fd87ee9e0417cd | |
| parent | d2fcf1ec2e1363d568f1f2023e21013b968f4354 (diff) | |
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 <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
| -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 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() ); |