diff options
| -rw-r--r-- | include/svx/sdr/contact/viewcontactofopenglobj.hxx (renamed from include/svx/sdr/contact/viewcontactofopengl.hxx) | 6 | ||||
| -rw-r--r-- | include/svx/svdoopengl.hxx | 4 | ||||
| -rw-r--r-- | svx/Library_svxcore.mk | 2 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofopenglobj.cxx (renamed from svx/source/sdr/contact/viewcontactofopengl.cxx) | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/sdr/contact/viewcontactofopengl.hxx b/include/svx/sdr/contact/viewcontactofopenglobj.hxx index e5fae8b54845..0ac95ce70766 100644 --- a/include/svx/sdr/contact/viewcontactofopengl.hxx +++ b/include/svx/sdr/contact/viewcontactofopenglobj.hxx @@ -17,11 +17,11 @@ class SdrOpenGLObj; namespace sdr { namespace contact { -class ViewContactOfOpenGL : public ViewContactOfSdrObj +class ViewContactOfOpenGLObj : public ViewContactOfSdrObj { public: - explicit ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj); - virtual ~ViewContactOfOpenGL(); + explicit ViewContactOfOpenGLObj(SdrOpenGLObj& rOpenGLObj); + virtual ~ViewContactOfOpenGLObj(); protected: virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx index 6a6b1d1265c5..03d740512963 100644 --- a/include/svx/svdoopengl.hxx +++ b/include/svx/svdoopengl.hxx @@ -11,14 +11,14 @@ #define INCLUDED_SVX_SVDO_OPENGL_HXX #include <svx/svdobj.hxx> -#include <svx/sdr/contact/viewcontactofopengl.hxx> +#include <svx/sdr/contact/viewcontactofopenglobj.hxx> class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject { public: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() { - return new sdr::contact::ViewContactOfOpenGL(*this); + return new sdr::contact::ViewContactOfOpenGLObj(*this); } }; diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 4b59047b94e9..39f15b2a6146 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -159,7 +159,7 @@ $(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/viewcontactofopengl \ + svx/source/sdr/contact/viewcontactofopenglobj \ svx/source/sdr/contact/viewobjectcontactredirector \ svx/source/sdr/contact/viewcontactofsdrcircobj \ svx/source/sdr/contact/viewcontactofgroup \ diff --git a/svx/source/sdr/contact/viewcontactofopengl.cxx b/svx/source/sdr/contact/viewcontactofopenglobj.cxx index 054fb99c7a57..25d5ef2b72e4 100644 --- a/svx/source/sdr/contact/viewcontactofopengl.cxx +++ b/svx/source/sdr/contact/viewcontactofopenglobj.cxx @@ -8,23 +8,23 @@ */ #include <com/sun/star/drawing/XShape.hpp> -#include <svx/sdr/contact/viewcontactofopengl.hxx> +#include <svx/sdr/contact/viewcontactofopenglobj.hxx> #include <drawinglayer/primitive2d/openglprimitive2d.hxx> #include <svx/svdoopengl.hxx> #include <tools/gen.hxx> using namespace sdr::contact; -ViewContactOfOpenGL::ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj) +ViewContactOfOpenGLObj::ViewContactOfOpenGLObj(SdrOpenGLObj& rOpenGLObj) : ViewContactOfSdrObj(rOpenGLObj) { } -ViewContactOfOpenGL::~ViewContactOfOpenGL() +ViewContactOfOpenGLObj::~ViewContactOfOpenGLObj() { } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOpenGL::createViewIndependentPrimitive2DSequence() const +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); |