From be654dc8132ca8683e37d8babec6550f8d060a0a Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 2 Jul 2010 11:44:44 +0200
Subject: sb126: #i112871# missing parentheses around || within &&
---
crashrep/source/unx/main.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'crashrep/source')
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index afdba0afeebc..7579de78ec94 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -129,12 +129,12 @@ static string trim_string( const string& rString )
{
string temp = rString;
- while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' )
+ while ( temp.length() && (temp[0] == ' ' || temp[0] == '\t') )
temp.erase( 0, 1 );
string::size_type len = temp.length();
- while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' )
+ while ( len && (temp[len-1] == ' ' || temp[len-1] == '\t') )
{
temp.erase( len - 1, 1 );
len = temp.length();
--
cgit
From 0aa94e999fe32557c15f0caf1bda5a7f216e142f Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 23 Sep 2010 16:42:50 +0200
Subject: sb132: #i113570# correctly pass char* to %s (patch by tono)
---
crashrep/source/win32/soreport.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'crashrep/source')
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f3d19ca98790..abca528dc987 100755
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -1847,7 +1847,7 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar
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() );
}
}
--
cgit