From 24da9e2538dc8f80fb6ac6d498992f9093495b22 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 19 Mar 2014 11:11:15 +0100 Subject: Use sane indentation in new files. Change-Id: Ida89284c00946d3972c4e45a5453ccfdff99713f --- .../source/primitive2d/openglprimitive2d.cxx | 32 +++++++++----------- .../drawinglayer/primitive2d/openglprimitive2d.hxx | 33 ++++++++++----------- include/svx/sdr/contact/viewcontactofopengl.hxx | 28 +++++++++--------- svx/source/sdr/contact/viewcontactofopengl.cxx | 34 +++++++++------------- 4 files changed, 57 insertions(+), 70 deletions(-) diff --git a/drawinglayer/source/primitive2d/openglprimitive2d.cxx b/drawinglayer/source/primitive2d/openglprimitive2d.cxx index 48724dfcf5b3..3ed333b830a5 100644 --- a/drawinglayer/source/primitive2d/openglprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/openglprimitive2d.cxx @@ -10,29 +10,23 @@ #include #include +using namespace drawinglayer::primitive2d; -namespace drawinglayer +OpenGLPrimitive2D::OpenGLPrimitive2D(const Point& rPos) + : m_aPos(rPos) { - namespace primitive2d - { - - OpenGLPrimitive2D::OpenGLPrimitive2D(const Point& rPos) - : m_aPos(rPos) - { - } - - bool OpenGLPrimitive2D::operator==( const BasePrimitive2D& rPrimitive ) const - { - if(BasePrimitive2D::operator==(rPrimitive)) - { - const OpenGLPrimitive2D& rCompare = static_cast< const OpenGLPrimitive2D& >(rPrimitive); - return m_aPos == rCompare.getPos(); - } - return false; - } +} - ImplPrimitive2DIDBlock(OpenGLPrimitive2D, PRIMITIVE2D_ID_OPENGLPRIMITIVE2D) +bool OpenGLPrimitive2D::operator==( const BasePrimitive2D& rPrimitive ) const +{ + if(BasePrimitive2D::operator==(rPrimitive)) + { + const OpenGLPrimitive2D& rCompare = static_cast< const OpenGLPrimitive2D& >(rPrimitive); + return m_aPos == rCompare.getPos(); } + return false; } +ImplPrimitive2DIDBlock(OpenGLPrimitive2D, PRIMITIVE2D_ID_OPENGLPRIMITIVE2D) + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx b/include/drawinglayer/primitive2d/openglprimitive2d.hxx index c251dcb06e4f..832a657c46ef 100644 --- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/openglprimitive2d.hxx @@ -13,29 +13,28 @@ #include #include -namespace drawinglayer -{ - namespace primitive2d - { +namespace drawinglayer { +namespace primitive2d { - class DRAWINGLAYER_DLLPUBLIC OpenGLPrimitive2D : public BasePrimitive2D - { - public: - explicit OpenGLPrimitive2D(const Point& rPos); +/// 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; } + const Point& getPos() const { return m_aPos; } - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; - /// provide unique ID - DeclPrimitive2DIDBlock() + /// provide unique ID + DeclPrimitive2DIDBlock() - private: - Point m_aPos; - }; +private: + Point m_aPos; +}; - } -} +} // namespace primitive2d +} // namespace drawinglayer #endif diff --git a/include/svx/sdr/contact/viewcontactofopengl.hxx b/include/svx/sdr/contact/viewcontactofopengl.hxx index ad96b0c03ea4..e5fae8b54845 100644 --- a/include/svx/sdr/contact/viewcontactofopengl.hxx +++ b/include/svx/sdr/contact/viewcontactofopengl.hxx @@ -14,21 +14,21 @@ class SdrOpenGLObj; -namespace sdr +namespace sdr { +namespace contact { + +class ViewContactOfOpenGL : public ViewContactOfSdrObj { - namespace contact - { - class ViewContactOfOpenGL : public ViewContactOfSdrObj - { - public: - explicit ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj); - virtual ~ViewContactOfOpenGL(); - - protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; - }; - } -} +public: + explicit ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj); + virtual ~ViewContactOfOpenGL(); + +protected: + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; +}; + +} // namespace contact +} // namespace sdr #endif diff --git a/svx/source/sdr/contact/viewcontactofopengl.cxx b/svx/source/sdr/contact/viewcontactofopengl.cxx index 34630ec5bfa6..054fb99c7a57 100644 --- a/svx/source/sdr/contact/viewcontactofopengl.cxx +++ b/svx/source/sdr/contact/viewcontactofopengl.cxx @@ -13,32 +13,26 @@ #include #include +using namespace sdr::contact; -namespace sdr +ViewContactOfOpenGL::ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj) + : ViewContactOfSdrObj(rOpenGLObj) { - namespace contact - { - - ViewContactOfOpenGL::ViewContactOfOpenGL(SdrOpenGLObj& rOpenGLObj) - : ViewContactOfSdrObj(rOpenGLObj) - { - } +} - ViewContactOfOpenGL::~ViewContactOfOpenGL() - { - } +ViewContactOfOpenGL::~ViewContactOfOpenGL() +{ +} - drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOpenGL::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); +drawinglayer::primitive2d::Primitive2DSequence ViewContactOfOpenGL::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)); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::OpenGLPrimitive2D(aPos)); - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); - } - } + return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3