diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-08 08:49:10 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-03-08 09:47:20 +0100 |
| commit | a2bf2ca1e3d398db0caa07fce4d135e6dc8b2f27 (patch) | |
| tree | 8f1b64694bee143f6b60d55e774836aa254cd516 /vcl/headless | |
| parent | 1e21df65c89de18c26d4602e1b8744c49f9ae183 (diff) | |
make it possible to use FileDefinitionWidgetDraw in more backends
Change-Id: I8871eb49e11d8c72c469230967c3c979091a0f9b
Reviewed-on: https://gerrit.libreoffice.org/68898
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index a2b7e7933c22..08cb2bfec940 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -27,8 +27,6 @@ #include <headless/CustomWidgetDraw.hxx> #include <saldatabasic.hxx> -#include <FileDefinitionWidgetDraw.hxx> - #include <sal/log.hxx> #include <tools/helpers.hxx> #include <o3tl/safeint.hxx> @@ -601,12 +599,11 @@ SvpSalGraphics::SvpSalGraphics() , m_ePaintMode(PaintMode::Over) , m_aTextRenderImpl(*this) { - bool bFileDefinitionsWidgetDraw = !!getenv("VCL_DRAW_WIDGETS_FROM_FILE"); - - if (bFileDefinitionsWidgetDraw) - m_pWidgetDraw.reset(new vcl::FileDefinitionWidgetDraw(*this)); - else if (comphelper::LibreOfficeKit::isActive()) - m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this)); + if (!initWidgetDrawBackends()) + { + if (comphelper::LibreOfficeKit::isActive()) + m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this)); + } } SvpSalGraphics::~SvpSalGraphics() |