summaryrefslogtreecommitdiff
path: root/chart2/source/controller
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 13:32:40 +0200
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 13:32:40 +0200
commit83c5da00495c220ef852d53ab41fdcbbe16eb750 (patch)
tree7225890197380b171d579c97d34256d51ece7fa4 /chart2/source/controller
parent0badf8094b28ceb44f2e65787eed93982fe0c0ea (diff)
parentc548b0b0b38ad2b1a7184a4ffc97ca26958b0389 (diff)
DEV300: changesets OOO330 up to m8
Notes
Notes: split repo tag: calc_ooo/DEV300_m88
Diffstat (limited to 'chart2/source/controller')
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index ffe752f43a7a..779e3c32f1e7 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -827,16 +827,14 @@ bool ChartController::executeDispatch_Delete()
else
{
//remove additional shape
- uno::Reference< drawing::XShape > xShape( m_aSelection.getSelectedAdditionalShape() );
- if( xShape.is() )
+ impl_ClearSelection();
{
- impl_ClearSelection();
+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ if ( m_pDrawViewWrapper )
{
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
- if( m_pDrawViewWrapper )
- m_pDrawViewWrapper->UnmarkAll();
+ m_pDrawViewWrapper->DeleteMarked();
+ bReturn = true;
}
- bReturn = DrawModelWrapper::removeShape( xShape );
}
}
return bReturn;