From f12d670a9413f1b3a890913b4dd202578e6353d8 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 25 Jun 2003 09:14:18 +0000 Subject: INTEGRATION: CWS crashrep08 (1.1.6); FILE MERGED 2003/06/17 10:23:34 hro 1.1.6.1: #110256# Product name in XML content must not contain a version number --- crashrep/source/win32/soreport.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'crashrep/source') diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index d4d2207bc8d5..d4f2adf9af9b 100755 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -59,7 +59,6 @@ using namespace ::std; string g_strDefaultLanguage; -string g_strProductKey; FILE *g_fpStackFile = NULL; DWORD g_dwExceptionCode = 0; @@ -472,6 +471,7 @@ BOOL WriteReportFile( CrashReportParams *pParams ) TCHAR tszUserName[256] = TEXT(""); DWORD dwUserNameSize = elementsof(tszUserName); const char *pszUserType = getenv( "STAROFFICE_USERTYPE" ); + const char *pszProductName = getenv( "PRODUCTNAME" ); GetUserName( tszUserName, &dwUserNameSize ); @@ -506,7 +506,7 @@ BOOL WriteReportFile( CrashReportParams *pParams ) g_strDefaultLanguage.c_str(), GetModuleDirectory( NULL ).c_str(), g_dwExceptionCode, - g_strProductKey.c_str() + pszProductName ? pszProductName : "" ); OSVERSIONINFO VersionInfo; @@ -1762,12 +1762,6 @@ static bool ReadBootstrapParams() szModuleName ) ) { - int needed = WideCharToMultiByte( CP_UTF8, 0, szBuffer, -1, NULL, 0, NULL, NULL ); - char *pszBufferA = (char *)alloca( needed ); - - WideCharToMultiByte( CP_UTF8, 0, szBuffer, -1, pszBufferA, needed, NULL, NULL ); - g_strProductKey = pszBufferA; - TCHAR *pVersion = _tcschr( szBuffer, ' ' ); if ( pVersion ) -- cgit v1.2.3