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 /svx | |
| parent | ace843304cba4ea36bba8e2d6898be426837ee6c (diff) | |
| parent | c011c9b56f1db02c4f339024888586a26291f2e3 (diff) | |
Merge branch 'master' of ssh://noelp@git.freedesktop.org/git/libreoffice/libs-core
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/sendreportunx.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gengal/gengal.sh | 6 |
2 files changed, 4 insertions, 4 deletions
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 |