diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-06-15 22:24:46 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2014-07-07 12:54:09 +0000 |
commit | cd3e7bd7acaa29d19a57326f6080926321b78c23 (patch) | |
tree | 830bb2752cfdfbe28431e6ca47a0cb07657d040e /drawinglayer/source/processor2d | |
parent | 2a356a1a3fb89fb737ad02d7f864e521cb954a8a (diff) |
Make OpenGL 2D rendering working again.
Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26
Reviewed-on: https://gerrit.libreoffice.org/10075
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit d72d80aa8393c9416423602779cb63b22141033a)
Reviewed-on: https://gerrit.libreoffice.org/10089
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'drawinglayer/source/processor2d')
-rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 6 | ||||
-rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 10 | ||||
-rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.hxx | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 4ea56e581c59..d17d0ec250cc 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 7c538ed67bb2..97e088c54a06 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 @@ -1588,14 +1586,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 70de6a19aca1..7c822a55cb4d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx @@ -52,7 +52,6 @@ namespace drawinglayer { namespace primitive2d { class EpsPrimitive2D; class SvgLinearAtomPrimitive2D; class SvgRadialAtomPrimitive2D; - class OpenGLPrimitive2D; }} @@ -108,7 +107,7 @@ 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; |