diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/Library_svxcore.mk | 3 | ||||
-rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx | 36 | ||||
-rw-r--r-- | svx/inc/svdoopengl.hxx | 51 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofopenglobj.cxx | 44 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx | 54 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdoopengl.cxx | 65 | ||||
-rw-r--r-- | svx/source/unodraw/unomod.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 3 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 11 |
12 files changed, 0 insertions, 277 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index c73b42f17b8a..4b4cb1153fb5 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -172,7 +172,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 \ @@ -207,7 +206,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/sdr/contact/viewcontactofsdrmeasureobj \ svx/source/sdr/contact/objectcontactofobjlistpainter \ svx/source/sdr/contact/viewobjectcontactofe3d \ - svx/source/sdr/contact/viewobjectcontactofopenglobj \ svx/source/sdr/event/eventhandler \ svx/source/sdr/overlay/overlayline \ svx/source/sdr/overlay/overlaycrosshair \ @@ -310,7 +308,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/svdraw/svdomeas \ svx/source/svdraw/svdomedia \ svx/source/svdraw/svdoole2 \ - svx/source/svdraw/svdoopengl \ svx/source/svdraw/svdopage \ svx/source/svdraw/svdopath \ svx/source/svdraw/svdorect \ diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 641fc127430a..48875a7a60a9 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -508,7 +508,6 @@ #include <drawinglayer/primitive2d/metafileprimitive2d.hxx> #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> -#include <drawinglayer/primitive2d/openglprimitive2d.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -810,7 +809,6 @@ #include <vcl/metric.hxx> #include <vcl/mnemonic.hxx> #include <vcl/msgbox.hxx> -#include <vcl/opengl/IOpenGLRenderer.hxx> #include <vcl/outdev.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <vcl/region.hxx> diff --git a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx deleted file mode 100644 index 5e3827812845..000000000000 --- a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx +++ /dev/null @@ -1,36 +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_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX -#define INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX - -#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> -#include <vcl/opengl/OpenGLContext.hxx> - -namespace vcl { class Window; } - -namespace sdr { -namespace contact { - -class ViewObjectContactOfOpenGLObj : public ViewObjectContactOfSdrObj -{ -public: - ViewObjectContactOfOpenGLObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfOpenGLObj(); - -private: - vcl::Window* getWindow() const; -}; - -} // namespace sdr -} // namespace contact - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx deleted file mode 100644 index e30baeacfd0a..000000000000 --- a/svx/inc/svdoopengl.hxx +++ /dev/null @@ -1,51 +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_SVX_INC_SVDOOPENGL_HXX -#define INCLUDED_SVX_INC_SVDOOPENGL_HXX - -#include <svx/svdobj.hxx> -#include <vcl/opengl/OpenGLContext.hxx> - -#include <vcl/opengl/IOpenGLRenderer.hxx> - -#include <boost/scoped_ptr.hpp> - -namespace sdr { namespace contact { - class ViewContact; -} } - -class IOpenGLRenderer; - -class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject, public IOpenGLInfoProvider -{ -public: - SdrOpenGLObj(); - virtual ~SdrOpenGLObj(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; - - OpenGLContext* getOpenGLContext() { return mpContext;} - - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; - - void setRenderer(IOpenGLRenderer* pRenderer); - IOpenGLRenderer* getRenderer(); - - virtual bool isOpenGLInitialized() SAL_OVERRIDE; - -private: - - OpenGLContext* mpContext; - - boost::scoped_ptr<IOpenGLRenderer> mpRenderer; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofopenglobj.cxx b/svx/source/sdr/contact/viewcontactofopenglobj.cxx deleted file mode 100644 index 75768ac708a5..000000000000 --- a/svx/source/sdr/contact/viewcontactofopenglobj.cxx +++ /dev/null @@ -1,44 +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/. - */ - -#include <com/sun/star/drawing/XShape.hpp> -#include <sdr/contact/viewcontactofopenglobj.hxx> -#include <sdr/contact/viewobjectcontactofopenglobj.hxx> -#include <drawinglayer/primitive2d/openglprimitive2d.hxx> -#include <svdoopengl.hxx> -#include <tools/gen.hxx> - -using namespace sdr::contact; - -ViewContactOfOpenGLObj::ViewContactOfOpenGLObj(SdrOpenGLObj& rOpenGLObj) - : ViewContactOfSdrObj(rOpenGLObj) -{ -} - -ViewContactOfOpenGLObj::~ViewContactOfOpenGLObj() -{ -} - -ViewObjectContact& ViewContactOfOpenGLObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) -{ - return *( new ViewObjectContactOfOpenGLObj( rObjectContact, *this ) ); -} - -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOpenGLObj::createViewIndependentPrimitive2DSequence() const -{ - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape(GetSdrObject().getUnoShape(), com::sun::star::uno::UNO_QUERY); - const Point aPos(xShape->getPosition().X,xShape->getPosition().Y); - - const drawinglayer::primitive2d::Primitive2DReference xReference( - new drawinglayer::primitive2d::OpenGLPrimitive2D(aPos)); - - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx deleted file mode 100644 index 68d7ba130b2f..000000000000 --- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx +++ /dev/null @@ -1,54 +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/. - */ - -#include <config_features.h> - -#include <sdr/contact/viewobjectcontactofopenglobj.hxx> -#include <sdr/contact/viewcontactofopenglobj.hxx> - -#include <svdoopengl.hxx> -#include <vcl/outdev.hxx> -#include <vcl/window.hxx> - -using namespace sdr::contact; - - -ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj( - ObjectContact& rObjectContact, ViewContact& rViewContact ) - : ViewObjectContactOfSdrObj( rObjectContact, rViewContact ) -{ -#if HAVE_FEATURE_DESKTOP - OpenGLContext* pContext = static_cast<SdrOpenGLObj&>(static_cast<ViewContactOfSdrObj&>(rViewContact).GetSdrObject()).getOpenGLContext(); - if (pContext) - pContext->init(getWindow()); -#endif -} - -ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() -{ -} - -vcl::Window* ViewObjectContactOfOpenGLObj::getWindow() const -{ - vcl::Window* pRetval = 0; - - boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); - if( oPageOutputDev ) - { - if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType()) - { - pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); - } - } - - return pRetval; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 378abafcde19..55f661d245b9 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -132,7 +132,6 @@ #include <svx/svdglue.hxx> #include <svx/svdsob.hxx> #include <rtl/strbuf.hxx> -#include <svdoopengl.hxx> #include <svdobjplusdata.hxx> #include <svdobjuserdatalist.hxx> @@ -3245,7 +3244,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; } } @@ -3333,7 +3331,6 @@ SdrObject* SdrObjFactory::MakeNewObject( 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 deleted file mode 100644 index 1b3398359c83..000000000000 --- a/svx/source/svdraw/svdoopengl.cxx +++ /dev/null @@ -1,65 +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/. - */ - -#include <config_features.h> - -#include <svdoopengl.hxx> -#include <sdr/contact/viewcontactofopenglobj.hxx> - -#include <vcl/opengl/IOpenGLRenderer.hxx> - -SdrOpenGLObj::SdrOpenGLObj() - : SdrObject(), - IOpenGLInfoProvider(), - mpContext(NULL) -{ -#if HAVE_FEATURE_DESKTOP - mpContext = new OpenGLContext; -#endif -} - -SdrOpenGLObj::~SdrOpenGLObj() -{ - delete mpContext; -} - -sdr::contact::ViewContact* SdrOpenGLObj::CreateObjectSpecificViewContact() -{ - return new sdr::contact::ViewContactOfOpenGLObj(*this); -} - - -void SdrOpenGLObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) -{ - SdrObject::NbcResize(rRef, xFact, yFact); - - // now pass the information to the OpenGL context - if (mpContext) - mpContext->setWinSize(aOutRect.GetSize()); - - SAL_WARN("svx.opengl", "resized opengl drawinglayer object"); -} - -void SdrOpenGLObj::setRenderer(IOpenGLRenderer* pRenderer) -{ - mpRenderer.reset(pRenderer); - mpRenderer->setInfoProvider(this); -} - -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 2366f55b9a4b..38ecbace9dea 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -488,10 +488,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 f0a125e7704c..ba10d1b88d05 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -778,9 +778,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: // unknown 2D-object on page OSL_FAIL("Not implemented Starone-Shape created! [CL]"); pRet = new SvxShapeText( pObj ); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 80bf3e7c8e50..3196ced5b3c8 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -846,7 +846,6 @@ const UHashMapImpl& GetUHashImpl() { 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++) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 9f07d79327cf..8089ad3b0930 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -51,7 +51,6 @@ #include "svx/svdview.hxx" #include "svdglob.hxx" #include "svx/svdstr.hrc" -#include <svdoopengl.hxx> #include <vcl/wmf.hxx> #include <svtools/embedhlp.hxx> @@ -1019,14 +1018,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: */ |