19 files changed, 51 insertions, 2 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 2a5aa5b17230..eca9ed891a6d 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -56,6 +56,7 @@
 #include "cliputil.hxx"
 #include "clipparam.hxx"
 #include "markdata.hxx"
+#include <gridwin.hxx>
 
 #define ScCellShell
 #define CellMovement
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 3cccca4debf1..8781fb7909e0 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -83,6 +83,7 @@
 #include <cellvalue.hxx>
 #include <tokenarray.hxx>
 #include <formulacell.hxx>
+#include <gridwin.hxx>
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index 239c8094fbd5..7c37d61416eb 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -18,6 +18,7 @@
 #include "rangelst.hxx"
 #include "viewutil.hxx"
 #include "markdata.hxx"
+#include <gridwin.hxx>
 
 #include <vcl/waitobj.hxx>
 
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index ad38c2cbaebc..d5e280d66a1c 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -39,6 +39,7 @@
 #include "scmod.hxx"
 #include "globstr.hrc"
 #include "chartarr.hxx"
+#include <gridwin.hxx>
 
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 7cb29367aa52..fed79b5a8d8a 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -69,6 +69,7 @@
 #include "tabvwsh.hxx"
 #include "editutil.hxx"
 #include "globstr.hrc"
+#include <gridwin.hxx>
 
 #define ScEditShell
 #include "scslots.hxx"
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 52d19072bde7..378e469b8bc5 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -30,6 +30,7 @@
 #include "docsh.hxx"
 #include "tabprotection.hxx"
 #include "markdata.hxx"
+#include <gridwin.hxx>
 
 #if defined WNT
 #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index ae2849a254c2..03e407373f4e 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -34,6 +34,7 @@
 #include "scmod.hxx"
 #include "editable.hxx"
 #include "undoblk.hxx"
+#include <gridwin.hxx>
 #include <refupdatecontext.hxx>
 
 SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index c6c41c029226..e6092771e0f2 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -33,6 +33,7 @@
 #include "clipparam.hxx"
 #include "dragdata.hxx"
 #include "markdata.hxx"
+#include <gridwin.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0541d05e46e0..286f1c1fef12 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -863,7 +863,7 @@ double ScTabView::GetPendingRelTabBarWidth() const
     return mfPendingTabBarWidth;
 }
 
-Window* ScTabView::GetActiveWin()
+ScGridWindow* ScTabView::GetActiveWin()
 {
     ScSplitPos ePos = aViewData.GetActivePart();
     OSL_ENSURE(pGridWin[ePos],"kein aktives Fenster");
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 1542a0045e21..a2810c1b942a 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -41,6 +41,7 @@
 #include "sc.hrc"
 #include "scmod.hxx"
 #include "appoptio.hxx"
+#include <gridwin.hxx>
 
 // Create default drawing objects via keyboard
 #include <svx/svdpagv.hxx>
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 955d9bffe080..01c171df774d 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -39,6 +39,7 @@
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
+#include <vcl/openglwin.hxx>
 
 #include "tabvwsh.hxx"
 #include "sc.hrc"
@@ -88,8 +89,10 @@
 #include "preview.hxx"
 #include "docoptio.hxx"
 #include <documentlinkmgr.hxx>
+#include <gridwin.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/chart2/X3DChartWindowProvider.hpp>
 
 extern SfxViewShell* pScActiveViewShell;            // global.cxx
 
@@ -529,6 +532,30 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
     //! if ViewData has more tables than document, remove tables in ViewData
 }
 
+void ScTabViewShell::AddOpenGLChartWindows()
+{
+    ScDocument* pDoc = GetViewData()->GetDocument();
+    ScGridWindow* pParentWindow = GetActiveWin();
+
+    std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> > aCharts = pDoc->GetAllCharts();
+
+    for(std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> >::iterator itr = aCharts.begin(),
+            itrEnd = aCharts.end(); itr != itrEnd; ++itr)
+    {
+        OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow);
+        pOpenGLWindow->Show(false);
+        Size aSize = itr->second.GetSize();
+
+        pOpenGLWindow->SetSizePixel(aSize);
+        Point aPos = itr->second.TopLeft();
+        pOpenGLWindow->SetPosPixel(aPos);
+        pParentWindow->AddChildWindow(pOpenGLWindow);
+        uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( itr->first, uno::UNO_QUERY_THROW );
+        sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(pOpenGLWindow);
+        x3DWindowProvider->setWindow(nWindowPtr);
+    }
+}
+
 // DoReadUserData is also called from ctor when switching from print preview
 
 void ScTabViewShell::DoReadUserData( const OUString& rData )
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 7d7011490571..3871bc8dce35 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -58,6 +58,7 @@
 #include "chartarr.hxx"
 #include "drawview.hxx"
 #include "ChartRangeSelectionListener.hxx"
+#include <gridwin.hxx>
 
 #include <tools/urlobj.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
@@ -243,6 +244,11 @@ ErrCode ScTabViewShell::DoVerb(long nVerb)
     return nErr;
 }
 
+void ScTabViewShell::Initialize()
+{
+    AddOpenGLChartWindows();
+}
+
 void ScTabViewShell::DeactivateOle()
 {
     // deactivate inplace editing if currently active
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index eac3ea425d6a..f3431d332125 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -28,6 +28,7 @@
 #include "scmod.hxx"
 #include "docsh.hxx"
 #include "sc.hrc"
+#include <gridwin.hxx>
 
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 545db9f8d965..2629d49c5eae 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -40,6 +40,7 @@
 #include "inputhdl.hxx"
 #include <svx/srchdlg.hxx>
 #include "document.hxx"
+#include <gridwin.hxx>
 
 OUString ScTabViewShell::GetSelectionText( bool bWholeWord )
 {
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 53ede02ca239..a2457bd312b8 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -34,6 +34,7 @@ using namespace com::sun::star;
 #include "document.hxx"
 #include "drawview.hxx"
 #include "globstr.hrc"
+#include <gridwin.hxx>
 #include <avmedia/mediawindow.hxx>
 
 void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rURL,
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 50e7b12d6087..90f1377fdf0c 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -58,6 +58,7 @@
 #include "markdata.hxx"
 #include "stlalgorithm.hxx"
 #include "ViewSettingsSequenceDefines.hxx"
+#include <gridwin.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <boost/checked_delete.hpp>
 #include <comphelper/processfactory.hxx>
@@ -2115,7 +2116,7 @@ Window* ScViewData::GetDialogParent()
     return pViewShell->GetDialogParent();
 }
 
-Window* ScViewData::GetActiveWin()
+ScGridWindow* ScViewData::GetActiveWin()
 {
     OSL_ENSURE( pView, "GetActiveWin() ohne View" );
     return pView->GetActiveWin();
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 2f7375e3919e..d82e72558612 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -65,6 +65,7 @@
 #include "undodat.hxx"
 #include "drawview.hxx"
 #include "cliputil.hxx"
+#include <gridwin.hxx>
 #include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 2e0575941e42..73432c6c9f3b 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -67,6 +67,7 @@
 #include "compiler.hxx"
 #include "tokenarray.hxx"
 #include <refupdatecontext.hxx>
+#include <gridwin.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index ba35fe6c0612..4cf39cf8a205 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -46,6 +46,7 @@
 #include "docsh.hxx"
 #include "convuno.hxx"
 #include "dragdata.hxx"
+#include <gridwin.hxx>
 
 extern Point aDragStartDiff;