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>

8 files changed, 2 insertions, 32 deletions

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7ed776f80eac..b1cbc0215531 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -162,7 +162,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/sdr/contact/viewobjectcontactofpageobj \
     svx/source/sdr/contact/viewobjectcontactofe3dscene \
     svx/source/sdr/contact/viewcontactofgraphic \
-    svx/source/sdr/contact/viewcontactofopenglobj \
     svx/source/sdr/contact/viewobjectcontactredirector \
     svx/source/sdr/contact/viewcontactofsdrcircobj \
     svx/source/sdr/contact/viewcontactofgroup \
diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx
index 258fcdd72246..5d711e97edde 100644
--- a/svx/inc/svdoopengl.hxx
+++ b/svx/inc/svdoopengl.hxx
@@ -23,7 +23,7 @@ namespace sdr { namespace contact {
 
 class IOpenGLRenderer;
 
-class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject, public IOpenGLInfoProvider
+class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject
 {
 public:
     SdrOpenGLObj();
@@ -37,8 +37,6 @@ public:
     void setRenderer(IOpenGLRenderer* pRenderer);
     IOpenGLRenderer* getRenderer();
 
-    virtual bool isOpenGLInitialized() SAL_OVERRIDE;
-
 private:
 
     OpenGLContext* mpContext;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 96db7302698f..8d299e33203a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -128,7 +128,6 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/xpoly.hxx>
 #include <rtl/strbuf.hxx>
-#include <svdoopengl.hxx>
 
 using namespace ::com::sun::star;
 
@@ -3405,7 +3404,6 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S
             case sal_uInt16(OBJ_MEDIA      ): pObj=new SdrMediaObj();               break;
 #endif
             case sal_uInt16(OBJ_TABLE      ): pObj=new ::sdr::table::SdrTableObj(pModel);   break;
-            case sal_uInt16(OBJ_OPENGL     ): pObj=new SdrOpenGLObj;                break;
         }
     }
 
diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx
index f1e8398cf057..3139780bbb7c 100644
--- a/svx/source/svdraw/svdoopengl.cxx
+++ b/svx/source/svdraw/svdoopengl.cxx
@@ -16,7 +16,6 @@
 
 SdrOpenGLObj::SdrOpenGLObj()
   : SdrObject(),
-    IOpenGLInfoProvider(),
     mpContext(NULL)
 {
 #if HAVE_FEATURE_DESKTOP
@@ -31,7 +30,7 @@ SdrOpenGLObj::~SdrOpenGLObj()
 
 sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact()
 {
-    return new sdr::contact::ViewContactOfOpenGLObj(*this);
+    return NULL;
 }
 
 OpenGLContext* SdrOpenGLObj::getOpenGLContext()
@@ -53,7 +52,6 @@ void SdrOpenGLObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fra
 void SdrOpenGLObj::setRenderer(IOpenGLRenderer* pRenderer)
 {
     mpRenderer.reset(pRenderer);
-    mpRenderer->setInfoProvider(this);
 }
 
 IOpenGLRenderer* SdrOpenGLObj::getRenderer()
@@ -61,9 +59,4 @@ IOpenGLRenderer* SdrOpenGLObj::getRenderer()
     return mpRenderer.get();
 }
 
-bool SdrOpenGLObj::isOpenGLInitialized()
-{
-    return mpContext && mpContext->isInitialized();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 223b73a3b152..b710a2e02d8c 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -489,10 +489,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
         {
             nType = OBJ_TABLE;
         }
-        else if( aTypeName.startsWith( "OpenGLObject" ) )
-        {
-            nType = OBJ_OPENGL;
-        }
         else
         {
             throw lang::ServiceNotRegisteredException();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index ecca282afbd3..d061fd94355e 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -788,9 +788,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
                 case OBJ_TABLE:
                     pRet = new SvxTableShape( pObj );
                     break;
-                case OBJ_OPENGL:
-                    pRet = new SvxOpenGLObject( pObj );
-                    break;
                 default: // unbekanntes 2D-Objekt auf der Page
                     OSL_FAIL("Nicht implementierter Starone-Shape erzeugt! [CL]");
                     pRet = new SvxShapeText( pObj );
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index b3bdd2c176a3..1beea0386ea4 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -847,7 +847,6 @@ namespace {
               { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DLatheObject"),  E3D_LATHEOBJ_ID   | E3D_INVENTOR_FLAG },
               { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DExtrudeObject"),    E3D_EXTRUDEOBJ_ID | E3D_INVENTOR_FLAG },
               { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DPolygonObject"),    E3D_POLYGONOBJ_ID | E3D_INVENTOR_FLAG },
-              { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OpenGLObject"),        OBJ_OPENGL },
           };
           for (sal_uInt32 i = 0; i < sizeof(aInit)/sizeof(aInit[0]); i++)
               aImpl[OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 16c032908f43..a926ab3208cc 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -975,14 +975,4 @@ SvxDummyShapeContainer::~SvxDummyShapeContainer() throw()
 {
 }
 
-void SvxOpenGLObject::setRenderer(IOpenGLRenderer* pRenderer)
-{
-    static_cast<SdrOpenGLObj*>(GetSdrObject())->setRenderer(pRenderer);
-}
-
-IOpenGLRenderer* SvxOpenGLObject::getRenderer()
-{
-    return static_cast<SdrOpenGLObj*>(GetSdrObject())->getRenderer();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */