[Libreoffice-commits] core.git: include/svx svx/Library_svxcore.mk svx/source

[Zolnai Tamás]

 include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |    4 ----
 svx/Library_svxcore.mk                                   |    3 ---
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx  |    3 ---
 3 files changed, 10 deletions(-)

New commits:
commit 10be411f33c69db83cc5de410eaddf2d297608ae
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Mar 21 17:34:19 2014 +0100

    Remove opengl usage from svx until we can't solve building problems
    
    Change-Id: I45b2e0f772f7bcc47bc2e0ce2c7639ef775b379b

diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
index 00e1dff..8781aa4 100644
--- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <vcl/OpenGLContext.hxx>
 
 class Window;
 
@@ -26,9 +25,6 @@ public:
 
 protected:
     Window* getWindow() const;
-
-private:
-    OpenGLContext m_aOpenGLContext;
 };
 
 } // namespace sdr
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index b3c3521..f26479c 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
     utl \
     vcl \
     xo \
-    $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
 	$(gb_UWINAPI) \
 ))
 
@@ -83,8 +82,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	boost_headers \
 	icuuc \
 	icu_headers \
-	mesa_headers \
-	glew \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 1689468..2cf0086 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -18,9 +18,6 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
     ObjectContact& rObjectContact, ViewContact& rViewContact )
     : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
 {
-    m_aOpenGLContext.init(getWindow());
-    // Set a dummy size to make the window visible
-    m_aOpenGLContext.setWinSize(Size(200,200));
 }
 
 ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()