[PATCH libreoffice-4-0] correctly delete note captions, fdo#64068

[Markus Mohrhard (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4066

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/4066/1

correctly delete note captions, fdo#64068

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

Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
---
M sc/source/core/data/table2.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 47cd340..00d0632 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -565,7 +565,9 @@
     {
         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() );

-- 
To view, visit https://gerrit.libreoffice.org/4066
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad48f6dbb7f1587985f8da9eba3886dfd4068de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard <markus.mohrhard at googlemail.com>