diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 13:11:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 13:11:07 +0000 |
| commit | 10620d3c72ef8bd2ef28290a34b114c82a2d4125 (patch) | |
| tree | ae763153f171412e32c627674adcbfeb32ca1c0f /crashrep/source/unx | |
| parent | 5733061a36aead10dab8ada4b679d25d028d57a8 (diff) | |
INTEGRATION: CWS ooo11rc (1.6.6); FILE MERGED
2003/06/30 15:20:40 hro 1.6.6.3: #i16056# Changed bootstrap key names for error report to 'ErrorReportServer' and 'ErrorReportPort'
2003/06/30 14:40:04 hro 1.6.6.2: #i15843# Include <vcl/version.h> to avoid build errors
2003/06/23 12:16:50 svesik 1.6.6.1: _version.h lives inside vcl, so needs vcl/ when being included
Diffstat (limited to 'crashrep/source/unx')
| -rwxr-xr-x | crashrep/source/unx/main.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx index 70d9371a7ef6..393380534e3f 100755 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx @@ -2,9 +2,9 @@ * * $RCSfile: main.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2003-07-01 07:25:51 $ + * last change: $Author: vg $ $Date: 2003-07-02 14:11:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ #include <interface.hxx> #include <cstdio> #include <sys/utsname.h> -#include <_version.h> +#include <vcl/_version.h> #include <errno.h> #include <string> #include <string.h> @@ -1032,9 +1032,9 @@ static bool setup_version() g_buildid = get_profile_string( "bootstraprc", "Bootstrap", "BuildId" ); g_strDefaultLanguage = get_script_string( "instdb.ins", "DefaultLanguage" ); - g_strReportServer = get_profile_string( "bootstraprc", "ErrorReport", "Server" ); + g_strReportServer = get_profile_string( "bootstraprc", "ErrorReport", "ErrorReportServer" ); - string strReportPort = get_profile_string( "bootstraprc", "ErrorReport", "Port", "80" ); + string strReportPort = get_profile_string( "bootstraprc", "ErrorReport", "ErrorReportPort", "80" ); char *endptr = NULL; unsigned short uReportPort = (unsigned short)strtoul( strReportPort.c_str(), &endptr, 10 ); g_uReportPort = uReportPort ? uReportPort : 80; |