diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-05-17 04:32:58 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-29 17:40:25 +0200 |
| commit | 43d23a24fde16addb37376a92d36dba78263614a (patch) | |
| tree | 763f4b8b9ef75da93dd6ee92b337affd0f1762dd /sc/source | |
| parent | 235fa0334e0b45c736b636ba1689e2f8c7458697 (diff) | |
opengl charts: Move the init from sc to chart2, to have the right parent.
Conflicts:
chart2/source/view/charttypes/GL3DBarChart.cxx
Change-Id: I1e23329345e00e7d8e1f269c832e84d015824c0a
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index fa9dbfdfd6f5..0a7703d78142 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -544,22 +544,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* ScDocument& rScDoc = pScDocSh->GetDocument(); bool bUndo (rScDoc.IsUndoEnabled()); - Window* pParentWindow = rData.GetActiveWin(); - OpenGLWindow* pChildWindow = new OpenGLWindow(pParentWindow); - Size aWindowSize = pChildWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); - pChildWindow->SetSizePixel(aWindowSize); - pChildWindow->Show(); - uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( xChartModel, uno::UNO_QUERY_THROW ); - sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(pChildWindow); - x3DWindowProvider->setWindow(nWindowPtr); - ScGridWindow* pGridWindow = dynamic_cast<ScGridWindow*>(pParentWindow); - if(pGridWindow) - { - pGridWindow->AddChildWindow(pChildWindow); - } - else - SAL_WARN("sc", "not a grid window. You are in serious trouble"); - if( pReqArgs ) { const SfxPoolItem* pItem; @@ -634,7 +618,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // get chart position (from window size and data range) aStart = pViewSh->GetChartInsertPos( aSize, aPositionRange ); } - pChildWindow->SetPosPixel(pChildWindow->LogicToPixel(aStart, MapMode(MAP_100TH_MM))); Rectangle aRect (aStart, aSize); SdrOle2Obj* pObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect); @@ -729,7 +712,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* sal_Int16 nDialogRet = xDialog->execute(); if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL ) { - pGridWindow->DeleteChildWindow(pChildWindow); // leave OLE inplace mode and unmark OSL_ASSERT( pViewShell ); OSL_ASSERT( pView ); |