vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit b0b85e3154183f18fa9d2b82fe5edb5f70094b0b
Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com>
Date: Wed Mar 23 13:26:05 2016 +0700
Change #include <cairo-svg.h> to <cairo.h>
Since we don't need cairo's svg feature, and we build internal cairo
with --disable-svg. Also remove commented-out codes which use svg.
Change-Id: I5a8e8c672588bb6eca28696f21221770972ec3d3
Reviewed-on: https://gerrit.libreoffice.org/23456
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit f9ddd6e317a7bfd662516d197c3caea976aef3b3)
Reviewed-on: https://gerrit.libreoffice.org/24890
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 885145c..bc4e012 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -13,7 +13,7 @@
#include "salbmp.hxx"
#include <vcl/salbtype.hxx>
-#include <cairo-svg.h>
+#include <cairo.h>
OpenGLX11CairoTextRender::OpenGLX11CairoTextRender(X11SalGraphics& rParent)
: X11CairoTextRender(rParent)
@@ -22,9 +22,6 @@
OpenGLX11CairoTextRender::OpenGLX11CairoTextRender(X11SalGraphics& rParent)
cairo_t* OpenGLX11CairoTextRender::getCairoContext()
{
- // static size_t id = 0;
- // OString aFileName = OString("/tmp/libo_logs/text_rendering") +
OString::number(id++) + OString(".svg");
- // cairo_surface_t* surface = cairo_svg_surface_create(aFileName.getStr(),
GetWidth(), GetHeight());
cairo_surface_t* surface = nullptr;
OpenGLSalGraphicsImpl *pImpl = dynamic_cast< OpenGLSalGraphicsImpl*
>(mrParent.GetImpl());
if( pImpl )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
