diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 12:22:01 +0200 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 17:44:54 +0200 |
commit | 0bf12a06b6344659fe964955a022c7f367598634 (patch) | |
tree | 54236f4823c8d68c0f7ccdc778246c23df3cd109 /drawinglayer | |
parent | dd79dbedd6c7f889f5e39f146a1927d235bc8a59 (diff) |
Remove unused OpenGLObject
Change-Id: I5c4832bd076cc5f05f936ac0d6a80027344e40ff
Diffstat (limited to 'drawinglayer')
6 files changed, 0 insertions, 52 deletions
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index a4ef767f78e2..690c73aaccd9 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -91,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/metafileprimitive2d \ drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ drawinglayer/source/primitive2d/objectinfoprimitive2d \ - drawinglayer/source/primitive2d/openglprimitive2d \ drawinglayer/source/primitive2d/pagepreviewprimitive2d \ drawinglayer/source/primitive2d/patternfillprimitive2d \ drawinglayer/source/primitive2d/pointarrayprimitive2d \ diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 89f8ef19e6f6..83c8108df8b6 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -357,7 +357,6 @@ namespace drawinglayer case PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D: return OUString("OBJECTINFO"); case PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D: return OUString("POLYPOLYGONSELECTION"); case PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D: return OUString("CLIPPEDBORDERLINE"); - case PRIMITIVE2D_ID_OPENGLPRIMITIVE2D: return OUString("OPENGL"); default: return OUString::number((nId >> 16) & 0xFF) + "|" + OUString::number(nId & 0xFF); } } diff --git a/drawinglayer/source/primitive2d/openglprimitive2d.cxx b/drawinglayer/source/primitive2d/openglprimitive2d.cxx deleted file mode 100644 index 3ed333b830a5..000000000000 --- a/drawinglayer/source/primitive2d/openglprimitive2d.cxx +++ /dev/null @@ -1,32 +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 <drawinglayer/primitive2d/openglprimitive2d.hxx> -#include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> - -using namespace drawinglayer::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) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 3f204e3d1fa4..dd200abc6e6c 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -44,7 +44,6 @@ #include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> -#include <drawinglayer/primitive2d/openglprimitive2d.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/i18n/BreakIterator.hpp> @@ -2142,11 +2141,6 @@ namespace drawinglayer RenderEpsPrimitive2D(static_cast< const primitive2d::EpsPrimitive2D& >(rCandidate)); break; } - case PRIMITIVE2D_ID_OPENGLPRIMITIVE2D: - { - RenderOpenGLPrimitive2D(static_cast< const primitive2d::OpenGLPrimitive2D& >(rCandidate)); - break; - } default : { // process recursively diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index d8fee138000d..da8c35870d9e 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -66,8 +66,6 @@ #include <basegfx/polygon/b2dtrapezoid.hxx> // <- for test -#include <drawinglayer/primitive2d/openglprimitive2d.hxx> - using namespace com::sun::star; namespace @@ -1596,14 +1594,6 @@ namespace drawinglayer } } - void VclProcessor2D::RenderOpenGLPrimitive2D(const primitive2d::OpenGLPrimitive2D& rCandidate) - { - // Just draw a dummy rect to see primitive rendering is working. - mpOutputDevice->SetLineColor(COL_BLACK); - mpOutputDevice->SetFillColor(COL_RED); - mpOutputDevice->DrawRect(Rectangle(rCandidate.getPos(),Size(2000,2000))); - } - // process support VclProcessor2D::VclProcessor2D( diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/drawinglayer/source/processor2d/vclprocessor2d.hxx index a527bb27c5e3..c4b012008337 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx @@ -53,7 +53,6 @@ namespace drawinglayer { namespace primitive2d { class EpsPrimitive2D; class SvgLinearAtomPrimitive2D; class SvgRadialAtomPrimitive2D; - class OpenGLPrimitive2D; }} @@ -109,7 +108,6 @@ namespace drawinglayer void RenderSvgLinearAtomPrimitive2D(const primitive2d::SvgLinearAtomPrimitive2D& rCandidate); void RenderSvgRadialAtomPrimitive2D(const primitive2d::SvgRadialAtomPrimitive2D& rCandidate); void RenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rPolygonCandidate); - void RenderOpenGLPrimitive2D(const primitive2d::OpenGLPrimitive2D& rCandidate); // DrawMode adaption support void adaptLineToFillDrawMode() const; |