vcl/unx/generic/app/saldisp.cxx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
New commits: commit 37800290245fd0462295a8bbaabd9d761929fa65 Author: Jan Holesovsky <ke...@collabora.com> Date: Fri Nov 14 17:04:25 2014 +0100 vcl: Stop-gap solution to start the gen / kde / kde4 plugins again. Change-Id: Ie538049aa8c4c0812d28b5c1bf91425822c55617 diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index d3aca4f..ffd12d7 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -73,6 +73,7 @@ #include <poll.h> #include <boost/scoped_array.hpp> +#include <com/sun/star/uno/DeploymentException.hpp> #include <officecfg/Office/Common.hxx> using namespace vcl_sal; @@ -191,9 +192,15 @@ bool SalDisplay::BestVisual( Display *pDisplay, if( nVID && sal_GetVisualInfo( pDisplay, nVID, rVI ) ) return rVI.visualid == nDefVID; - bool bUseOpenGL = officecfg::Office::Common::VCL::UseOpenGL::get(); - if( bUseOpenGL && OpenGLHelper::GetVisualInfo( pDisplay, nScreen, rVI ) ) - return rVI.visualid == nDefVID; + try { + bool bUseOpenGL = officecfg::Office::Common::VCL::UseOpenGL::get(); + if( bUseOpenGL && OpenGLHelper::GetVisualInfo( pDisplay, nScreen, rVI ) ) + return rVI.visualid == nDefVID; + } + catch (const css::uno::DeploymentException&) + { + // too early to try to access configmgr + } XVisualInfo aVI; aVI.screen = nScreen; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits