[Libreoffice-commits] core.git: chart2/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Sun Mar 26 00:01:26 UTC 2017
chart2/source/controller/main/ChartController.cxx | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 83c1a3235d8d803872e1d57a292d3cdc48dae928
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Mar 24 12:34:06 2017 +0100
Remove obsolete code
now that the ChartController doesnt own the VCL window anymore.
Change-Id: I2fefa73181a61b2a7828b36e70480b59aa7838f4
Reviewed-on: https://gerrit.libreoffice.org/35640
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 0f879f60259e..3d163b791e1a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -441,17 +441,10 @@ void SAL_CALL ChartController::attachFrame(
pParent = VCLUnoHelper::GetWindow( xContainerWindow ).get();
}
- auto pChartWindow(GetChartWindow());
- if(pChartWindow)
- {
- //@todo delete ...
- pChartWindow->clear();
- m_apDropTargetHelper.reset();
- }
{
// calls to VCL
SolarMutexGuard aSolarGuard;
- pChartWindow = VclPtr<ChartWindow>::Create(this,pParent,pParent?pParent->GetStyle():0);
+ auto pChartWindow = VclPtr<ChartWindow>::Create(this,pParent,pParent?pParent->GetStyle():0);
pChartWindow->SetBackground();//no Background
m_xViewWindow.set( pChartWindow->GetComponentInterface(), uno::UNO_QUERY );
pChartWindow->Show();
More information about the Libreoffice-commits
mailing list