diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-15 13:07:24 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-07-15 16:00:08 +0000 |
| commit | fe82e6739251deec9e0e449d7e613bb603e5b6f6 (patch) | |
| tree | e7503dc576fc9eec8c74615613d26013b74f6fd3 | |
| parent | f7005e2a21d974f0b195e950a967a09b6a0d2520 (diff) | |
remove the OpenGLWindow from charts
It is not necessary after disabling the 3D OpenGL charts.
Change-Id: I40fd398f2bcc5fc0d774e116ea243572cc36844d
Reviewed-on: https://gerrit.libreoffice.org/10325
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 866d5370f11a..9a4bba5bf89c 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -549,7 +549,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* ScDocShell* pScDocSh = pData->GetDocShell(); ScDocument* pScDoc = pScDocSh->GetDocument(); bool bUndo (pScDoc->IsUndoEnabled()); - +#if 0 Window* pParentWindow = pData->GetActiveWin(); OpenGLWindow* pChildWindow = new OpenGLWindow(pParentWindow); Size aWindowSize = pChildWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) ); @@ -565,6 +565,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } else SAL_WARN("sc", "not a grid window. You are in serious trouble"); +#endif if( pReqArgs ) { @@ -640,7 +641,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); @@ -735,7 +735,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 ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 01c171df774d..54bde9ff7425 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -534,6 +534,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper void ScTabViewShell::AddOpenGLChartWindows() { +#if 0 ScDocument* pDoc = GetViewData()->GetDocument(); ScGridWindow* pParentWindow = GetActiveWin(); @@ -554,6 +555,7 @@ void ScTabViewShell::AddOpenGLChartWindows() sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(pOpenGLWindow); x3DWindowProvider->setWindow(nWindowPtr); } +#endif } // DoReadUserData is also called from ctor when switching from print preview |