incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ariel Constenla-Haile <ariel.constenla.ha...@gmail.com>
Subject [CODE] DLLPOSTFIX issue in vcl unx desktop detection
Date Tue, 04 Oct 2011 14:57:02 GMT
Hi there,

Linux desktop detection is broken due to the changes with the
DLLPOSTFIX:

1) SAL_DLLPOSTFIX as defined in
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?view=markup#l174
   -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" expands to ".so" and breaks loading
   the desktop detector library
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx?view=markup#l138
          OUStringBuffer aModName( 128 );
          aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
          aModName.appendAscii( SAL_DLLPOSTFIX ); // .so
          aModName.appendAscii( SAL_DLLEXTENSION ); // .so
          OUString aModule = aModName.makeStringAndClear();
  the module name will result in libdesktop_detector.so.so

2) loading the detected vcl plugin is also broken:
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/plugadapt/salplug.cxx?view=markup#l66
   the module name misses the SAL_DLLEXTENSION
          OUStringBuffer aModName( 128 );
          aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
          aModName.append( rModuleBase );
          aModName.appendAscii( SAL_DLLPOSTFIX );
          OUString aModule = aModName.makeStringAndClear();
   Loading worked by luck because SAL_DLLPOSTFIX was defined as ".so"

The attached patch solves the issue defining SAL_DLLPOSTFIX as an empty string,
and adding the extension to the vcl plugin module name.

Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

Mime
View raw message