diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-09-01 12:21:08 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-09-23 23:25:48 +0200 |
| commit | 971947b38d1dbc6213e55403cf482a530cd9b449 (patch) | |
| tree | e8f7db58df68ab79cdf53e832555e5ca9576b667 /vcl | |
| parent | 06283e7b00f9f7b7ad1a3e30d2dcb85c8d550588 (diff) | |
tdf#101822 Revert "vcl: Stop-gap solution to ...
... start the gen / kde / kde4 plugins again."
The patch was just hiding the real bug and introducing others,
Ihe original bug is now fixed in all the X11 based VCL plugins,
so it can be reverted.
This reverts commit 37800290245fd0462295a8bbaabd9d761929fa65.
Conflicts:
vcl/unx/generic/app/saldisp.cxx
Change-Id: I95bea07e29293aaab178e30b5fb3cfe089d2d28f
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 2f21308ceea9..ed1fb53ef200 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -77,7 +77,6 @@ #include <memory> #include <vector> -#include <com/sun/star/uno/DeploymentException.hpp> #include <officecfg/Office/Common.hxx> /* From <X11/Intrinsic.h> */ @@ -223,15 +222,9 @@ bool SalDisplay::BestVisual( Display *pDisplay, if( nVID && sal_GetVisualInfo( pDisplay, nVID, rVI ) ) return rVI.visualid == nDefVID; - try { - bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled(); - if (bUseOpenGL && BestOpenGLVisual(pDisplay, nScreen, rVI)) - return rVI.visualid == nDefVID; - } - catch (const css::uno::DeploymentException&) - { - // too early to try to access configmgr - } + bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled(); + if (bUseOpenGL && BestOpenGLVisual(pDisplay, nScreen, rVI)) + return rVI.visualid == nDefVID; XVisualInfo aVI; aVI.screen = nScreen; |