diff options
author | Noel Power <noel.power@novell.com> | 2010-10-13 15:17:05 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2010-10-13 15:17:05 +0100 |
commit | 209f1d111d675fe2eb5afd8d5d7e941ded4d4932 (patch) | |
tree | a582e78dfd42eb5e4f168d5c497ec07835586c0b | |
parent | ace843304cba4ea36bba8e2d6898be426837ee6c (diff) | |
parent | c011c9b56f1db02c4f339024888586a26291f2e3 (diff) |
Merge branch 'master' of ssh://noelp@git.freedesktop.org/git/libreoffice/libs-core
-rw-r--r-- | configmgr/source/configurationprovider.cxx | 10 | ||||
-rw-r--r-- | desktop/scripts/soffice.sh | 4 | ||||
-rw-r--r-- | desktop/scripts/unopkg.sh | 2 | ||||
-rw-r--r-- | editeng/source/items/svxfont.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/sendreportunx.cxx | 2 | ||||
-rw-r--r-- | svx/source/gengal/gengal.sh | 6 |
6 files changed, 14 insertions, 12 deletions
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 9727ad9b5d..273a803716 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -242,7 +242,7 @@ Service::createInstanceWithArguments( if (nodepath.getLength() == 0) { badNodePath(); } - // For backwards compatibility, allow a notepath that misses the leading + // For backwards compatibility, allow a nodepath that misses the leading // slash: if (nodepath[0] != '/') { nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath; @@ -457,7 +457,8 @@ Factory::createInstanceWithArgumentsAndContext( " arguments")), 0); } - // For backwards compatibility, allow "Locale" in any case: + // For backwards compatibility, allow "Locale" and (ignored) + // "EnableAsync" in any case: if (name.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("locale"))) { @@ -472,8 +473,9 @@ Factory::createInstanceWithArgumentsAndContext( " one, non-empty, string Locale argument")), 0); } - } else { - //TODO + } else if (!name.equalsIgnoreAsciiCaseAsciiL( + RTL_CONSTASCII_STRINGPARAM("enableasync"))) + { throw css::uno::Exception( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index fdd8077105..f7d4a76a90 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -57,7 +57,7 @@ cd "$sd_cwd" # linked build needs additional settings if [ -e ooenv ] ; then - source ooenv + . ./ooenv fi sd_binary=`basename "$0"`.bin @@ -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 \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` 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 fi fi diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 5a8ee262ae..3f064448f5 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -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 \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` 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 fi fi diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index afb4f51da7..38795f0554 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -47,7 +47,7 @@ #define MINKERNPERCENT 5 // prop. Groesse der Kleinbuchstaben bei Kapitaelchen -#define KAPITAELCHENPROP 66 +#define KAPITAELCHENPROP 80 #ifndef REDUCEDSVXFONT const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Leerzeichen diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 5dfe4e2c10..2362cc3bea 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -244,7 +244,7 @@ namespace svx{ int ret = -1; rtl::OUString path1( RTL_CONSTASCII_USTRINGPARAM( - "$BRAND_BASE_DIR/program/crash_report.bin")); + "$BRAND_BASE_DIR/program/crashrep")); rtl::Bootstrap::expandMacros(path1); rtl::OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh index 38e680e476..2fccd222fc 100644 --- a/svx/source/gengal/gengal.sh +++ b/svx/source/gengal/gengal.sh @@ -67,17 +67,17 @@ case $sd_platform in ;; 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 ;; 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 ;; *) - 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 ;; esac |