strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb83 (1.15.16); FILE MERGED

Browse source 
2008/01/23 15:18:11 sb 1.15.16.1: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
This commit is contained in:
Vladimir Glazounov 2008-03-18 12:47:17 +00:00
parent a155dae456
commit 544f1d2694
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/source/deployment/misc/dp_misc.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dp_misc.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: hr $ $Date: 2007-11-01 14:27:39 $
* last change: $Author: vg $ $Date: 2008-03-18 13:47:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -97,7 +97,7 @@ struct UnoRc : public rtl::StaticWithInit<
const boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
const boost::shared_ptr<rtl::Bootstrap> operator () () {
OUString unorc( RTL_CONSTASCII_USTRINGPARAM(
"$ORIGIN/" SAL_CONFIGFILE("uno")) );
"$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")) );
::rtl::Bootstrap::expandMacros( unorc );
::boost::shared_ptr< ::rtl::Bootstrap > ret(
new ::rtl::Bootstrap( unorc ) );
@ -395,7 +395,7 @@ OUString getExtensionDefaultUpdateURL()
{
::rtl::OUString sUrl(
RTL_CONSTASCII_USTRINGPARAM(
"${$SYSBINDIR/" SAL_CONFIGFILE("version")
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:ExtensionUpdateURL"));
::rtl::Bootstrap::expandMacros(sUrl);
return sUrl;