[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sc/source

[Markus Mohrhard]

 sc/source/ui/drawfunc/fuins2.cxx |    5 ++---
 sc/source/ui/view/tabvwsh4.cxx   |    2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fe82e6739251deec9e0e449d7e613bb603e5b6f6
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Tue Jul 15 13:07:24 2014 +0200

    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 <zolnaitamas2...@gmail.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Michael Meeks <michael.me...@collabora.com>
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 866d537..9a4bba5 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 01c171d..54bde9f 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

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits