diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /crashrep | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'crashrep')
| -rwxr-xr-x | crashrep/prj/build.lst | 2 | ||||
| -rw-r--r-- | crashrep/source/win32/soreport.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst index d1a6798aa549..ac6218b793f4 100755 --- a/crashrep/prj/build.lst +++ b/crashrep/prj/build.lst @@ -1,4 +1,4 @@ -cr crashrep : l10n sal sysui shell NULL +cr crashrep : L10N:l10n sal sysui shell NULL cr crashrep usr1 - all cr_mkout NULL cr crashrep\source\all nmake - all cr_sresource NULL cr crashrep\source\unx nmake - u cr_sunx NULL diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index 6d00a3098fd5..e37913e90bf9 100644 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -1846,7 +1846,7 @@ bool WriteChecksumFile( FILE *fchksum, const boost::unordered_map< string, strin for ( int i = 0; i < sizeof(checksum); fprintf( fchksum, "%02X", checksum[i++] ) ); fprintf( fchksum, "\" bytes=\"%d\" file=\"%s\"/>\n", nBytesProcessed, - GetFileName( iter->first ) ); + GetFileName( iter->first ).c_str() ); } } |