[PUSHED-3-5] fdo#42961 Don't let env vars interfere with internal bootstrap vars

[Jean-Baptiste Faure]

Le 15/03/2012 11:04, Michael Meeks a écrit :
> 
> On Thu, 2012-03-15 at 09:53 +0100, Stephan Bergmann wrote:
>> Please consider the below fix for 
>> <https://bugs.freedesktop.org/show_bug.cgi?id=42961> "Setting $DATA 
>> causes LibreOffice to crash" for inclusion in libreoffice-3-5.  Not sure 
>> it is worth it including it in libreoffice-3-4 (the bug should be in at 
>> least since OOo 3.3).
> 
> 	Gosh; this URL construction is a rather cumbersome and unreadable way
> of doing it - 
> 
>    if (ini.getFrom("SCHEMA", RTL_BOOTSTRAP_NO_ENVIRONMENT)) 
> 
> 	ONO ? :-) Could we not move to that ? or at least plan that for
> LibreOffice4 :-)
> 

Hi,

It seems this commit make LO 3.5 build fail in configmgr. After a make
clean, I get the following error messages :

Compiling: configmgr/source/components.cxx
/home/jbf/LibO/lo35/configmgr/source/components.cxx: In member function
‘void configmgr::Components::parseXcsXcuIniLayer(int, const
rtl::OUString&, bool)’:
/home/jbf/LibO/lo35/configmgr/source/components.cxx:848:50: erreur:
invalid conversion from ‘const char*’ to ‘sal_Int32 {aka int}’
[-fpermissive]
/home/jbf/LibO/lo35/solver/unxlngx6.pro/inc/rtl/ustrbuf.hxx:115:14:
erreur:   initializing argument 1 of
‘rtl::OUStringBuffer::OUStringBuffer(sal_Int32)’ [-fpermissive]
/home/jbf/LibO/lo35/configmgr/source/components.cxx:862:71: erreur:
invalid conversion from ‘const char*’ to ‘sal_Unicode {aka short
unsigned int}’ [-fpermissive]
/home/jbf/LibO/lo35/solver/unxlngx6.pro/inc/rtl/ustring.hxx:139:14:
erreur:   initializing argument 1 of
‘rtl::OUString::OUString(sal_Unicode)’ [-fpermissive]
/home/jbf/LibO/lo35/configmgr/source/components.cxx:868:67: erreur:
invalid conversion from ‘const char*’ to ‘sal_Unicode {aka short
unsigned int}’ [-fpermissive]
/home/jbf/LibO/lo35/solver/unxlngx6.pro/inc/rtl/ustring.hxx:139:14:
erreur:   initializing argument 1 of
‘rtl::OUString::OUString(sal_Unicode)’ [-fpermissive]
dmake:  Error code 1, while making '../unxlngx6.pro/slo/components.obj'


Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.