Kaydet (Commit) 5b483ed1 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Cell note deletion should happen even when no cells exist in the column.

This fixes one of the API test breakages.

Change-Id: I8168d490ec5d519e151a74fb8c4343337262f15b
üst f068f1ae
...@@ -600,14 +600,18 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag) ...@@ -600,14 +600,18 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag)
aBlockPos.miCellTextAttrPos = maCellTextAttrs.begin(); aBlockPos.miCellTextAttrPos = maCellTextAttrs.begin();
aBlockPos.miCellNotePos = maCellNotes.begin(); aBlockPos.miCellNotePos = maCellNotes.begin();
if ( nDelFlag & IDF_NOTE )
DeleteCellNotes( aBlockPos, nStartRow, nEndRow );
// Delete the cells for real. // Delete the cells for real.
std::for_each(aSpans.begin(), aSpans.end(), EmptyCells(aBlockPos, *this)); std::for_each(aSpans.begin(), aSpans.end(), EmptyCells(aBlockPos, *this));
CellStorageModified(); CellStorageModified();
} }
if (nDelFlag & IDF_NOTE)
{
sc::ColumnBlockPosition aBlockPos;
aBlockPos.miCellNotePos = maCellNotes.begin();
DeleteCellNotes(aBlockPos, nStartRow, nEndRow);
}
if ( nDelFlag & IDF_EDITATTR ) if ( nDelFlag & IDF_EDITATTR )
{ {
OSL_ENSURE( nContFlag == 0, "DeleteArea: Wrong Flags" ); OSL_ENSURE( nContFlag == 0, "DeleteArea: Wrong Flags" );
......
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