diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-05-26 14:37:24 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-05-26 16:50:41 +0200 |
| commit | a65cba8e5bafb183924c1a8ff34382c99f1381cc (patch) | |
| tree | 12343cbe3bd05dd3bcf5b8b5ba74a94ac78937c9 /vcl | |
| parent | d5bae5b7954a9e6b3cdaccc318080be8d9ae6672 (diff) | |
make disabling of Skia override forcing it (tdf#133399)
Makes more sense if it's disabled because the VCL backend doesn't
actually support Skia.
Change-Id: I3f14c6ae1172c0a2cba3bf19c4cb5288e214eb2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94861
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/skia/SkiaHelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 3331cb7cb2b4..5fec448830c7 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -232,8 +232,8 @@ bool isVCLSkiaEnabled() /* * There are a number of cases that these environment variables cover: - * * SAL_FORCESKIA forces Skia independent of any other option - * * SAL_DISABLESKIA avoids the use of Skia if SAL_FORCESKIA is not set + * * SAL_FORCESKIA forces Skia if disabled by UI options or blacklisted + * * SAL_DISABLESKIA avoids the use of Skia regardless of any option */ bSet = true; @@ -241,7 +241,7 @@ bool isVCLSkiaEnabled() bool bRet = false; bool bSupportsVCLSkia = supportsVCLSkia(); - if (bForceSkia) + if (bForceSkia && bSupportsVCLSkia) { bRet = true; // don't actually block if blacklisted, but log it if enabled, and also get the vendor id |