Kaydet (Commit) 34669e63 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

preserve selection if chart creation is cancelled, cp#1000052

Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c
üst d9cde132
......@@ -443,6 +443,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
// get range
OUString aRangeString;
ScRange aPositionRange; // cell range for chart positioning
ScMarkData aMark = pViewSh->GetViewData()->GetMarkData();
if( pReqArgs )
{
const SfxPoolItem* pItem;
......@@ -453,15 +454,14 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
}
else
{
ScMarkData& rMark = pViewSh->GetViewData()->GetMarkData();
bool bAutomaticMark = false;
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
if ( !aMark.IsMarked() && !aMark.IsMultiMarked() )
{
pViewSh->GetViewData()->GetView()->MarkDataArea( true );
bAutomaticMark = true;
}
ScMarkData aMultiMark( rMark );
ScMarkData aMultiMark( aMark );
aMultiMark.MarkToMulti();
ScRangeList aRanges;
......@@ -730,6 +730,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
// leave the draw shell
pViewShell->SetDrawShell( false );
// reset marked cell area
pViewSh->GetViewData()->GetViewShell()->SetMarkData(aMark);
}
else
{
......
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