Make OpenGL 2D rendering working again.

Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26
Reviewed-on: https://gerrit.libreoffice.org/10075
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

6 files changed, 2 insertions, 82 deletions

diff --git a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 3c4afe5e0bd5..3cb208baef00 100644
--- a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -103,9 +103,6 @@
 #define PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D                (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68)
 #define PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D      (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 69)
 #define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D         (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 70)
-#define PRIMITIVE2D_ID_OPENGLPRIMITIVE2D                    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 71)
-// When you add a new primitive, please update the drawinglayer::primitive2d::idToString() function
-// in drawinglayer/source/primitive2d/baseprimitive2d.cxx.
 
 #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DRAWINGLAYER_PRIMITIVETYPES2D_HXX
 
diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx b/include/drawinglayer/primitive2d/openglprimitive2d.hxx
deleted file mode 100644
index 2086bcf487f1..000000000000
--- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OPENGLPRIMITIVE2D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OPENGLPRIMITIVE2D_HXX
-
-#include <tools/gen.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-namespace drawinglayer {
-namespace primitive2d {
-
-/// Primitive to hold data necessary for openGL objects
-class DRAWINGLAYER_DLLPUBLIC OpenGLPrimitive2D : public BasePrimitive2D
-{
-public:
-    explicit OpenGLPrimitive2D(const Point& rPos);
-
-    const Point& getPos() const { return m_aPos; }
-
-    virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-    /// provide unique ID
-    DeclPrimitive2DIDBlock()
-
-private:
-    Point m_aPos;
-};
-
-} // namespace primitive2d
-} // namespace drawinglayer
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index d93decd9f01c..c81e9b7029e8 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -134,7 +134,6 @@ enum SdrObjKind {OBJ_NONE       = 0,  // abstract object (SdrObject)
                  OBJ_CUSTOMSHAPE=33,  // custom shape
                  OBJ_MEDIA      =34,  // media shape
                  OBJ_TABLE      =35,  // table
-                 OBJ_OPENGL     =36,  // opengl graphic
                  OBJ_MAXI};
 
 enum SdrUserCallType {SDRUSERCALL_MOVEONLY,         // only moved, size unchanged
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 54caa3364eac..df86d5c9900a 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -879,16 +879,6 @@ private:
     OUString referer_;
 };
 
-class SVX_DLLPUBLIC SvxOpenGLObject : public SvxShape
-{
-public:
-    SvxOpenGLObject( SdrObject* pObj ) throw() : SvxShape(pObj){}
-    virtual ~SvxOpenGLObject() throw() {}
-
-    void setRenderer(IOpenGLRenderer* pRenderer);
-    IOpenGLRenderer* getRenderer();
-};
-
 /*
  * This is a really ugly hack for the chart2 OpenGL backend
  * SvxShapeGroup::add only accepts objects derived from SvxShape and silently drops
diff --git a/include/vcl/opengl/IOpenGLRenderer.hxx b/include/vcl/opengl/IOpenGLRenderer.hxx
index f8c0116d6c98..9514187b9c5f 100644
--- a/include/vcl/opengl/IOpenGLRenderer.hxx
+++ b/include/vcl/opengl/IOpenGLRenderer.hxx
@@ -10,36 +10,12 @@
 #ifndef INCLUDED_VCL_OPENGL_IOPENGLRENDERER_HXX
 #define INCLUDED_VCL_OPENGL_IOPENGLRENDERER_HXX
 
-class IOpenGLInfoProvider
-{
-public:
-    virtual ~IOpenGLInfoProvider() {}
-
-    virtual bool isOpenGLInitialized() = 0;
-};
-
 class IOpenGLRenderer
 {
 public:
-    IOpenGLRenderer():
-        mpInfoProvider(NULL) {}
-    virtual ~IOpenGLRenderer() {}
-
-    bool isOpenGLInitialized()
-    {
-        if(mpInfoProvider)
-            return mpInfoProvider->isOpenGLInitialized();
-
-        return false;
-    }
-
-    void setInfoProvider(IOpenGLInfoProvider* pInfo)
-    {
-        mpInfoProvider = pInfo;
-    }
+    virtual ~IOpenGLRenderer() {};
+    virtual void operator()() = 0;
 
-private:
-    IOpenGLInfoProvider* mpInfoProvider;
 };
 
 #endif
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 608c9cb2ef19..8a7eb5597da7 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -167,7 +167,6 @@ public:
     }
 
     static SystemWindowData generateWinData(Window* pParent);
-
 private:
     SAL_DLLPRIVATE bool initWindow();
     SAL_DLLPRIVATE bool ImplInit();