summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-08-11 14:27:16 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-08-29 17:40:29 +0200
commit8d509d69b434bd70b61cb6eed8b8dc21707726a3 (patch)
tree06960ae502e442781b37b5e7e2fb2f7854ce5984 /sc/source
parent4e96f7ffdb5d7b84ea70888626523dcdc5dfe0ac (diff)
This OpenGL window is useless
Change-Id: Ied9914c9a317dc3945c29b984d2a68957275fc52
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx3
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx33
-rw-r--r--sc/source/ui/view/tabvwshb.cxx5
3 files changed, 0 insertions, 41 deletions
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index d29222fb5dd8..b20b82973be0 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -189,8 +189,6 @@ private:
void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rSettings );
- void AddOpenGLChartWindows();
-
DECL_LINK( SimpleRefClose, void* );
DECL_LINK( SimpleRefDone, OUString* );
DECL_LINK( SimpleRefAborted, OUString* );
@@ -327,7 +325,6 @@ public:
ObjectSelectionType GetCurObjectSelectionType() { return eCurOST; }
virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE;
- virtual void Initialize() SAL_OVERRIDE;
void StopEditShell();
bool IsDrawTextShell() const;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 2fc38495a3cb..bcc679e7babf 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -571,39 +571,6 @@ bool isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram>& xDiagram )
}
-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)
- {
- if(!itr->first.is())
- return;
- OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow);
-
- pOpenGLWindow->Show(false);
- Size aSize = itr->second.GetSize();
- Size aWindowSize = pOpenGLWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) );
-
- pOpenGLWindow->SetSizePixel(aWindowSize);
- Point aPos = itr->second.TopLeft();
- pOpenGLWindow->SetPosPixel(pOpenGLWindow->LogicToPixel(aPos, MapMode(MAP_100TH_MM)));
- 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);
-
- if(isGL3DDiagram(itr->first->getFirstDiagram()))
- {
- x3DWindowProvider->update();
- }
- }
-}
-
// 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 858bfa773ee7..e42950bdc9e0 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -244,11 +244,6 @@ ErrCode ScTabViewShell::DoVerb(long nVerb)
return nErr;
}
-void ScTabViewShell::Initialize()
-{
- AddOpenGLChartWindows();
-}
-
void ScTabViewShell::DeactivateOle()
{
// deactivate inplace editing if currently active