vcl/headless/svpgdi.cxx | 4 +++- vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit b0175cf3b698122dc3c8ef19d4336949c1c3529f Author: Jan Holesovsky <[email protected]> AuthorDate: Fri Nov 9 19:20:31 2018 +0100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Fri Nov 9 19:53:39 2018 +0100 custom widgets: Use only with LibreOfficeKit. Change-Id: I9f8f25ee72e93fdf575312b6b0c5d32be9ea45cc Reviewed-on: https://gerrit.libreoffice.org/63209 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Tomaž Vajngerl <[email protected]> diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 0fa655f96a92..26b0312ed74a 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -35,6 +35,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <comphelper/lok.hxx> #include <cairo.h> @@ -559,7 +560,8 @@ SvpSalGraphics::SvpSalGraphics() , m_ePaintMode(PaintMode::Over) , m_aTextRenderImpl(*this) { - m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this)); + if (comphelper::LibreOfficeKit::isActive()) + m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this)); } SvpSalGraphics::~SvpSalGraphics() diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 95c9cf73df15..da01f85b7cdb 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -3375,9 +3375,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) mpFrame( pFrame ), mpWindow( pWindow ) { - /* Set Custom Widget Draw*/ - m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this)); - if (style_loaded) return; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
