chart2/source/controller/main/ChartController.cxx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 60708af4a7ed48028cf3158d1101568aa5b0da81
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Mar 5 08:47:27 2017 +0000
Revert "tdf#99352: ensure ChartController is disposing its VclPtrs on
DeInitVCL"
The original patch crashes charts on disposing, e.g. during the UI testing.
This reverts commit 926c0d73e82bb1d5644c49fb95c56e241b6c8f34.
Change-Id: I93cb5c41e3705a487d2547b55eac761c6952049c
Reviewed-on: https://gerrit.libreoffice.org/34900
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 93798c0..0322808 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -79,7 +79,6 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-
// this is needed to properly destroy the unique_ptr to the AcceleratorExecute
// object in the DTOR
#include <svtools/acceleratorexecute.hxx>
@@ -442,15 +441,15 @@ void SAL_CALL ChartController::attachFrame(
pParent = VCLUnoHelper::GetWindow( xContainerWindow ).get();
}
+ if(m_pChartWindow)
+ {
+ //@todo delete ...
+ m_pChartWindow->clear();
+ m_apDropTargetHelper.reset();
+ }
{
// calls to VCL
SolarMutexGuard aSolarGuard;
- if(m_pChartWindow)
- {
- //@todo delete ...
- m_pChartWindow->clear();
- m_apDropTargetHelper.reset();
- }
m_pChartWindow =
VclPtr<ChartWindow>::Create(this,pParent,pParent?pParent->GetStyle():0);
m_pChartWindow->SetBackground();//no Background
m_xViewWindow.set( m_pChartWindow->GetComponentInterface(),
uno::UNO_QUERY );
@@ -765,9 +764,7 @@ void ChartController::impl_deleteDrawViewController()
void SAL_CALL ChartController::dispose()
{
- SolarMutexGuard aSolarGuard;
m_bDisposed = true;
- m_pChartWindow.disposeAndClear();
if (getModel().is())
{
@@ -821,12 +818,15 @@ void SAL_CALL ChartController::dispose()
xViewBroadcaster->removeModeChangeListener(this);
impl_invalidateAccessible();
+ SolarMutexGuard aSolarGuard;
impl_deleteDrawViewController();
m_pDrawModelWrapper.reset();
m_apDropTargetHelper.reset();
//the accessible view is disposed within window destructor of
m_pChartWindow
+ m_pChartWindow->clear();
+ m_pChartWindow = nullptr;//m_pChartWindow is deleted via UNO due
to dispose of m_xViewWindow (triggered by Framework (Controller pretends to be
XWindow also))
m_xViewWindow->dispose();
m_xChartView.clear();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
