diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:44:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:44:58 +0000 |
| commit | ec21509a051577b6aa5811c459d3bfe22618510f (patch) | |
| tree | a1eab26a2beb6de8d5b2dd8fca004efff332b350 /svx/source/dialog/sendreportunx.cxx | |
| parent | INTEGRATION: CWS sb83 (1.19.114); FILE MERGED (diff) | |
| download | core-ec21509a051577b6aa5811c459d3bfe22618510f.tar.gz core-ec21509a051577b6aa5811c459d3bfe22618510f.zip | |
INTEGRATION: CWS sb83 (1.5.636); FILE MERGED
2008/02/14 13:04:07 sb 1.5.636.2: #i84200# for now, move crash reporter to brand layer
2008/02/12 08:41:58 sb 1.5.636.1: #i84200# call crash_report with full path
Diffstat (limited to 'svx/source/dialog/sendreportunx.cxx')
| -rw-r--r-- | svx/source/dialog/sendreportunx.cxx | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 988aef275215..c0f62f7b5cfc 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sendreportunx.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:38:04 $ + * last change: $Author: vg $ $Date: 2008-03-18 12:44:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,6 +37,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "docrecovery.hxx" +#include "osl/file.hxx" +#include "rtl/bootstrap.hxx" +#include "rtl/strbuf.hxx" +#include "tools/appendunixshellword.hxx" #include <string> #include <stdio.h> #include <stdlib.h> @@ -244,7 +248,24 @@ namespace svx{ #endif } - int ret = system( "crash_report -load -send -noui" ); + int ret = -1; + rtl::OUString path1( + RTL_CONSTASCII_USTRINGPARAM( + "$BRAND_BASE_DIR/program/crash_report")); + rtl::Bootstrap::expandMacros(path1); + rtl::OString path2; + if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == + osl::FileBase::E_None) && + path1.convertToString( + &path2, osl_getThreadTextEncoding(), + (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | + RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) + { + rtl::OStringBuffer cmd; + tools::appendUnixShellWord(&cmd, path2); + cmd.append(RTL_CONSTASCII_STRINGPARAM(" -load -send -noui")); + ret = system(cmd.makeStringAndClear().getStr()); + } if ( szBodyFile[0] ); unlink( szBodyFile ); |