[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/source drawinglayer/Library_drawinglayer.mk drawinglayer/source include/drawinglayer include/svx include/vcl svx/inc svx/Library_svxcore.mk svx/source unusedcode.easy
Zolnai Tamás
zolnaitamas2000 at gmail.com
Sun Jun 14 08:46:06 PDT 2015
chart2/inc/pch/precompiled_chartopengl.hxx | 1
chart2/source/view/main/OpenglShapeFactory.cxx | 1
drawinglayer/Library_drawinglayer.mk | 1
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 1
drawinglayer/source/primitive2d/openglprimitive2d.cxx | 32 ----
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 6
drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 -
drawinglayer/source/processor2d/vclprocessor2d.hxx | 2
include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx | 1
include/drawinglayer/primitive2d/openglprimitive2d.hxx | 41 ------
include/svx/svdobj.hxx | 1
include/svx/unoshape.hxx | 10 -
include/vcl/opengl/IOpenGLRenderer.hxx | 47 -------
svx/Library_svxcore.mk | 3
svx/inc/pch/precompiled_svxcore.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx | 36 -----
svx/inc/svdoopengl.hxx | 51 -------
svx/source/items/svxitems.src | 8 -
svx/source/sdr/contact/viewcontactofopenglobj.cxx | 44 ------
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx | 54 --------
svx/source/svdraw/svdobj.cxx | 3
svx/source/svdraw/svdoopengl.cxx | 65 ----------
svx/source/unodraw/unomod.cxx | 4
svx/source/unodraw/unopage.cxx | 3
svx/source/unodraw/unoprov.cxx | 1
svx/source/unodraw/unoshap4.cxx | 11 -
unusedcode.easy | 2
27 files changed, 4 insertions(+), 437 deletions(-)
New commits:
commit 0bf12a06b6344659fe964955a022c7f367598634
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Sun Jun 14 12:22:01 2015 +0200
Remove unused OpenGLObject
Change-Id: I5c4832bd076cc5f05f936ac0d6a80027344e40ff
diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx b/chart2/inc/pch/precompiled_chartopengl.hxx
index ffcb6ed..c46509d 100644
--- a/chart2/inc/pch/precompiled_chartopengl.hxx
+++ b/chart2/inc/pch/precompiled_chartopengl.hxx
@@ -55,7 +55,6 @@
#include <tools/gen.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/graph.hxx>
-#include <vcl/opengl/IOpenGLRenderer.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/openglwin.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 55774a9..5c9f756 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -47,7 +47,6 @@
#include <rtl/math.hxx>
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
-#include <vcl/opengl/IOpenGLRenderer.hxx>
#include <vcl/openglwin.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index a4ef767..690c73a 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 89f8ef1..83c8108 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 3ed333b..0000000
--- 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 3f204e3..dd200ab 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 d8fee13..da8c358 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 a527bb2..c4b0120 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;
diff --git a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 3c4afe5..9e78c8c 100644
--- a/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -103,7 +103,6 @@
#define PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68)
#define PRIMITIVE2D_ID_POLYPOLYGONSELECTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 69)
#define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 70)
-#define PRIMITIVE2D_ID_OPENGLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 71)
// When you add a new primitive, please update the drawinglayer::primitive2d::idToString() function
// in drawinglayer/source/primitive2d/baseprimitive2d.cxx.
diff --git a/include/drawinglayer/primitive2d/openglprimitive2d.hxx b/include/drawinglayer/primitive2d/openglprimitive2d.hxx
deleted file mode 100644
index 2086bcf..0000000
--- a/include/drawinglayer/primitive2d/openglprimitive2d.hxx
+++ /dev/null
@@ -1,41 +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_DRAWINGLAYER_PRIMITIVE2D_OPENGLPRIMITIVE2D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_OPENGLPRIMITIVE2D_HXX
-
-#include <tools/gen.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-namespace drawinglayer {
-namespace primitive2d {
-
-/// 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; }
-
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
- /// provide unique ID
- DeclPrimitive2DIDBlock()
-
-private:
- Point m_aPos;
-};
-
-} // namespace primitive2d
-} // namespace drawinglayer
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index d7f71d5..83ac171 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -139,7 +139,6 @@ enum SdrObjKind {
OBJ_CUSTOMSHAPE=33, /// custom shape
OBJ_MEDIA =34, /// media shape
OBJ_TABLE =35, /// table
- OBJ_OPENGL =36, /// opengl graphic
OBJ_MAXI
};
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 9ca963b..a4d4f9b 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -882,16 +882,6 @@ private:
OUString referer_;
};
-class SVX_DLLPUBLIC SvxOpenGLObject : public SvxShape
-{
-public:
- SvxOpenGLObject( SdrObject* pObj ) throw() : SvxShape(pObj){}
- virtual ~SvxOpenGLObject() throw() {}
-
- void setRenderer(IOpenGLRenderer* pRenderer);
- IOpenGLRenderer* getRenderer();
-};
-
/*
* This is a really ugly hack for the chart2 OpenGL backend
* SvxShapeGroup::add only accepts objects derived from SvxShape and silently drops
diff --git a/include/vcl/opengl/IOpenGLRenderer.hxx b/include/vcl/opengl/IOpenGLRenderer.hxx
deleted file mode 100644
index f8c0116..0000000
--- a/include/vcl/opengl/IOpenGLRenderer.hxx
+++ /dev/null
@@ -1,47 +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_VCL_OPENGL_IOPENGLRENDERER_HXX
-#define INCLUDED_VCL_OPENGL_IOPENGLRENDERER_HXX
-
-class IOpenGLInfoProvider
-{
-public:
- virtual ~IOpenGLInfoProvider() {}
-
- virtual bool isOpenGLInitialized() = 0;
-};
-
-class IOpenGLRenderer
-{
-public:
- IOpenGLRenderer():
- mpInfoProvider(NULL) {}
- virtual ~IOpenGLRenderer() {}
-
- bool isOpenGLInitialized()
- {
- if(mpInfoProvider)
- return mpInfoProvider->isOpenGLInitialized();
-
- return false;
- }
-
- void setInfoProvider(IOpenGLInfoProvider* pInfo)
- {
- mpInfoProvider = pInfo;
- }
-
-private:
- IOpenGLInfoProvider* mpInfoProvider;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index c73b42f..4b4cb11 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 641fc12..48875a7 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 5e38278..0000000
--- 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 e30baea..0000000
--- 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 75768ac..0000000
--- 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 68d7ba1..0000000
--- 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 378abaf..55f661d 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 1b33983..0000000
--- 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 2366f55..38ecbac 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 f0a125e..ba10d1b 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 80bf3e7..3196ced 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 9f07d79..8089ad3 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: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 949dbfa..bf3c1ab 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -48,8 +48,6 @@ SvpSalInstance::PostedEventsInQueue()
SvtAccessibilityOptions::IsModified() const
SvtListener::IsListening(SvtBroadcaster&) const
SvxColorTabPage::GetPropertyList(XPropertyListType)
-SvxOpenGLObject::getRenderer()
-SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
Test::testCopyPasteSkipEmptyConditionalFormatting()
Test::testPerf()
Test::testSharedFormulaMoveBlock()
commit dd79dbedd6c7f889f5e39f146a1927d235bc8a59
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Sun Jun 14 11:14:52 2015 +0200
Avoid duplicated attribute names in RID_ATTR_NAMES
It causes trouble to localiztation tools and also
makes hard to distinguish these items on the UI.
e.g. Edit -> Find & Replace -> Other options
-> Attributes.
Change-Id: Ie7a17e02947200a570b5e6209c8a99d1883a6860
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 3121ea9..6687cfd 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -44,7 +44,7 @@ StringArray RID_ATTR_NAMES
< "Effects" ; SID_ATTR_CHAR_CASEMAP ; > ;
< "Language"; SID_ATTR_CHAR_LANGUAGE ; > ;
< "Position" ; SID_ATTR_CHAR_ESCAPEMENT ; > ;
- < "Blinking" ; SID_ATTR_CHAR_AUTOKERN ; > ;
+ < "Character blinking" ; SID_ATTR_CHAR_AUTOKERN ; > ;
< "Character set color" ; SID_ATTR_CHAR_CHARSETCOLOR ; > ;
< "Overline" ; SID_ATTR_CHAR_OVERLINE ; > ;
< "Paragraph" ; SID_ATTR_PARA ; > ;
@@ -55,8 +55,8 @@ StringArray RID_ATTR_NAMES
< "Do not split paragraph"; SID_ATTR_PARA_SPLIT ; > ;
< "Orphans" ; SID_ATTR_PARA_ORPHANS ; > ;
< "Widows" ; SID_ATTR_PARA_WIDOWS ; > ;
- < "Spacing" ; SID_ATTR_PARA_ULSPACE ; > ;
- < "Indent" ; SID_ATTR_PARA_LRSPACE ; > ;
+ < "Paragraph spacing" ; SID_ATTR_PARA_ULSPACE ; > ;
+ < "Paragraph indent" ; SID_ATTR_PARA_LRSPACE ; > ;
< "Indent" ; SID_ATTR_LRSPACE ; > ;
< "Spacing" ; SID_ATTR_ULSPACE ; > ;
< "Page" ; SID_ATTR_PAGE ; > ;
@@ -81,7 +81,7 @@ StringArray RID_ATTR_NAMES
< "Hanging punctuation" ; SID_ATTR_PARA_HANGPUNCTUATION ; > ;
< "Forbidden characters" ; SID_ATTR_PARA_FORBIDDEN_RULES ; > ;
< "Rotation" ; SID_ATTR_CHAR_ROTATED ; > ;
- < "Scale" ; SID_ATTR_CHAR_SCALEWIDTH ; > ;
+ < "Character scaling" ; SID_ATTR_CHAR_SCALEWIDTH ; > ;
< "Relief" ; SID_ATTR_CHAR_RELIEF ; > ;
< "Vertical text alignment" ; SID_PARA_VERTALIGN ; > ;
};
More information about the Libreoffice-commits
mailing list