randrwrapper.cxx (c82f2877) randrwrapper.cxx (aa150a94)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 138 unchanged lines hidden (view full) ---

147 m_pXRRConfigCurrentConfiguration( NULL ),
148 m_pXRRRootToScreen( NULL ),
149 m_bValid( false )
150{
151 // first try in process space (e.g. gtk links that ?)
152 initFromModule();
153 if( ! m_bValid )
154 {
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 138 unchanged lines hidden (view full) ---

147 m_pXRRConfigCurrentConfiguration( NULL ),
148 m_pXRRRootToScreen( NULL ),
149 m_bValid( false )
150{
151 // first try in process space (e.g. gtk links that ?)
152 initFromModule();
153 if( ! m_bValid )
154 {
155 rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libXrandr.so.2" ) );
156 // load and resolve dependencies immediately
157 // rationale: there are older distributions where libXrandr.so.2 is not linked
158 // with libXext.so, resulting in a missing symbol and terminating the office
159 // obviously they expected libXext to be linked in global symbolspace (that is
160 // linked by the application), which is not the case with us (because we want
161 // to be able to run in headless mode even without an installed X11 library)
155 // load and resolve dependencies immediately
156 // rationale: there are older distributions where libXrandr.so.2 is not linked
157 // with libXext.so, resulting in a missing symbol and terminating the office
158 // obviously they expected libXext to be linked in global symbolspace (that is
159 // linked by the application), which is not the case with us (because we want
160 // to be able to run in headless mode even without an installed X11 library)
162 m_pRandRLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW );
161 m_pRandRLib = osl_loadAsciiModule( "libXrandr.so.2", SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW );
163 initFromModule();
164 }
165 if( m_bValid )
166 {
167 int nEventBase = 0, nErrorBase = 0;
168 if( ! m_pXRRQueryExtension( pDisplay, &nEventBase, &nErrorBase ) )
169 m_bValid = false;
170 }

--- 186 unchanged lines hidden --- 		162 initFromModule();
163 }
164 if( m_bValid )
165 {
166 int nEventBase = 0, nErrorBase = 0;
167 if( ! m_pXRRQueryExtension( pDisplay, &nEventBase, &nErrorBase ) )
168 m_bValid = false;
169 }

--- 186 unchanged lines hidden ---