sb123: merged in DEV300_m88

2 files changed, 6 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;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 950169395c95..5a30d97118c5 100755
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1043,6 +1043,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
 {
     if( nAspect == embed::Aspects::MSOLE_CONTENT )
     {
+        ControllerLockGuard aLockGuard( this );
         bool bChanged =
             (m_aVisualAreaSize.Width != aSize.Width ||
              m_aVisualAreaSize.Height != aSize.Height);