diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-03 00:30:28 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-03 11:21:58 +0000 |
| commit | d75600ef299b2a8c7b269936acebe646a16e62a5 (patch) | |
| tree | 0440ddd0f54858403ebd84c9f73f109c152be43a /cui/source | |
| parent | adf39dbade8652ceca9007484bfa20f04c5ebec0 (diff) | |
tdf#93870 - GL accel. via VCL canvas for presentations when GL enabled.
Change-Id: Ia31a88cb3d9e6baa987b22f77f407a3f592031f1
Reviewed-on: https://gerrit.libreoffice.org/18285
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/18295
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/about.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index e5732b226690..4121887933ff 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -48,7 +48,7 @@ #include <rtl/ustrbuf.hxx> #include <vcl/bitmap.hxx> #include <officecfg/Office/Common.hxx> -#include <vcl/opengl/OpenGLHelper.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -297,7 +297,7 @@ OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } - if (OpenGLHelper::isVCLOpenGLEnabled()) + if (OpenGLWrapper::isVCLOpenGLEnabled()) { sVersion += "-GL"; } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index c0ed6d50fc03..f2761e52005a 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -90,6 +90,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/IconThemeInfo.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> #include "optgdlg.hxx" #include <svx/ofaitem.hxx> @@ -548,7 +549,10 @@ CanvasSettings::CanvasSettings() : bool CanvasSettings::IsHardwareAccelerationAvailable() const { - if( !mbHWAccelChecked ) + if( OpenGLWrapper::isVCLOpenGLEnabled() ) + mbHWAccelAvailable = false; + + else if( !mbHWAccelChecked ) { mbHWAccelChecked = true; |