Kaydet (Commit) 47cf5156 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Consistent naming: ViewContactOfOpenGL{->Obj}

Change-Id: I6bacdba00dfd81442919bce768ef2e7a9f8ce86e
üst efdc2b2f
......@@ -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;
......
......@@ -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);
}
};
......
......@@ -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 \
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment