mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ooo/OOO330_m10'

Browse Source
This commit is contained in:
Jan Holesovsky
2010-10-13 11:30:59 +02:00
parent 8694d2bc19 b52411d425
commit 1c5abcbd60
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configmgr/source/configurationprovider.cxx
View File

@@ -242,7 +242,7 @@ Service::createInstanceWithArguments(
if (nodepath.getLength() == 0) { if (nodepath.getLength() == 0) {
badNodePath(); badNodePath();
} }
// For backwards compatibility, allow a notepath that misses the leading // For backwards compatibility, allow a nodepath that misses the leading
// slash: // slash:
if (nodepath[0] != '/') { if (nodepath[0] != '/') {
nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath; nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
@@ -457,7 +457,8 @@ Factory::createInstanceWithArgumentsAndContext(
" arguments")), " arguments")),
0); 0);
} }
// For backwards compatibility, allow "Locale" in any case: // For backwards compatibility, allow "Locale" and (ignored)
// "EnableAsync" in any case:
if (name.equalsIgnoreAsciiCaseAsciiL( if (name.equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("locale"))) RTL_CONSTASCII_STRINGPARAM("locale")))
{ {
@@ -472,8 +473,9 @@ Factory::createInstanceWithArgumentsAndContext(
" one, non-empty, string Locale argument")), " one, non-empty, string Locale argument")),
0); 0);
} }
} else { } else if (!name.equalsIgnoreAsciiCaseAsciiL(
//TODO RTL_CONSTASCII_STRINGPARAM("enableasync")))
{
throw css::uno::Exception( throw css::uno::Exception(
rtl::OUString( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( RTL_CONSTASCII_USTRINGPARAM(

2
desktop/scripts/soffice.sh
View File

@@ -121,7 +121,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
fi fi
fi fi

2
desktop/scripts/unopkg.sh
View File

@@ -57,7 +57,7 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
fi fi
fi fi

2
svx/source/dialog/sendreportunx.cxx
View File

@@ -244,7 +244,7 @@ namespace svx{
int ret = -1; int ret = -1;
rtl::OUString path1( rtl::OUString path1(
RTL_CONSTASCII_USTRINGPARAM( RTL_CONSTASCII_USTRINGPARAM(
"$BRAND_BASE_DIR/program/crash_report.bin")); "$BRAND_BASE_DIR/program/crashrep"));
rtl::Bootstrap::expandMacros(path1); rtl::Bootstrap::expandMacros(path1);
rtl::OString path2; rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==

6
svx/source/gengal/gengal.sh
View File

@@ -67,17 +67,17 @@ case $sd_platform in
;; ;;
Darwin) Darwin)
DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH+:${DYLD_LIBRARY_PATH}} DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
export DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH
;; ;;
HP-UX) HP-UX)
SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}} SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
export SHLIB_PATH export SHLIB_PATH
;; ;;
*) *)
LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
;; ;;
esac esac