diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 12:37:48 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 12:37:48 +0100 |
| commit | 58112fde9a4bfdd102964c2f97eb3a227c970214 (patch) | |
| tree | 64f0ac5be16c6c4257b86fc12989d5e22f4cb5ff | |
| parent | 7ac363afbb51a37e287762b1fc2a08d98557e991 (diff) | |
| parent | 022cb8bfea71cdf4e2b0ea2c91ff9807961a543a (diff) | |
CWS-TOOLING: integrate CWS d2v02
| -rw-r--r-- | vcl/unx/source/app/randrwrapper.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/source/app/randrwrapper.cxx index 8d01b64d4680..4fbe5db97ab9 100644 --- a/vcl/unx/source/app/randrwrapper.cxx +++ b/vcl/unx/source/app/randrwrapper.cxx @@ -161,7 +161,13 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) : if( ! m_bValid ) { rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libXrandr.so.2" ) ); - m_pRandRLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT ); + // load and resolve dependencies immediately + // rationale: there are older distributions where libXrandr.so.2 is not linked + // with libXext.so, resulting in a missing symbol and terminating the office + // obviously they expected libXext to be linked in global symbolspace (that is + // linked by the application), which is not the case with us (because we want + // to be able to run in headless mode even without an installed X11 library) + m_pRandRLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW ); initFromModule(); } if( m_bValid ) |