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

[Stephan Bergmann]

On 03/15/2012 04:09 PM, Jean-Baptiste Faure wrote:
> Le 15/03/2012 11:04, Michael Meeks a écrit :
> 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]

Ah, sure, the master commit would have needed tweaking when 
cherry-picked into -3-5.  Fixed now as 
<http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=90e2949099586e98619561dc781cc4deb8fc1ef0> 
"Adapt prev 4f78696117ebe4f729880b5d9bfc2f5817b73543 to 3.5 rtl::OUString."

Stephan