Kaydet (Commit) 8d509d69 authored tarafından Zolnai Tamás's avatar Zolnai Tamás Kaydeden (comit) Markus Mohrhard

This OpenGL window is useless

Change-Id: Ied9914c9a317dc3945c29b984d2a68957275fc52
üst 4e96f7ff
......@@ -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;
......
......@@ -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 )
......
......@@ -244,11 +244,6 @@ ErrCode ScTabViewShell::DoVerb(long nVerb)
return nErr;
}
void ScTabViewShell::Initialize()
{
AddOpenGLChartWindows();
}
void ScTabViewShell::DeactivateOle()
{
// deactivate inplace editing if currently active
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment