diff options
| author | Eike Rathke <erack@redhat.com> | 2015-09-10 15:52:21 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-11 09:42:00 +0000 |
| commit | a07333a3f88ab39db554751146687fa6351d2ea0 (patch) | |
| tree | 8d8e46120e5934b2dc5a3b38fe03cdfdcf71552b /sc/source/core/data/column3.cxx | |
| parent | d5220fcd4d2583ce7fdfaad4cc5ea2ca881f8c37 (diff) | |
Resolves: tdf#92995 do not delete caption objects that are held by Undo
Drag&Drop Undo is a special case of ownership..
Change-Id: I2fe7769c4d84efe09d432335d5d8e72d506bf7a1
(cherry picked from commit 44f34c1163882c2e3086282374fee9cd55ee211f)
Reviewed-on: https://gerrit.libreoffice.org/18474
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/core/data/column3.cxx')
| -rw-r--r-- | sc/source/core/data/column3.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index d50e4436222a..2b8bdac7332d 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -684,7 +684,10 @@ void ScColumn::DeleteArea( } if (nDelFlag & IDF_NOTE) - DeleteCellNotes(aBlockPos, nStartRow, nEndRow); + { + bool bForgetCaptionOwnership = ((nDelFlag & IDF_FORGETCAPTIONS) != IDF_NONE); + DeleteCellNotes(aBlockPos, nStartRow, nEndRow, bForgetCaptionOwnership); + } if ( nDelFlag & IDF_EDITATTR ) { |