[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/app/crashreport.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e9779829283c7e56ce5bcee97db1a75c11f81b8c
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 26 12:26:03 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 26 15:51:24 2021 +0100

    fix --enable-breakpad build
    
    Change-Id: I45992f2707bf93bc6da15987b26613bea250e76d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109952
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 968734df4493..4a5f93c21117 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -266,12 +266,12 @@ void CrashReporter::writeSystemInfo()
             std::smatch match;
             if( !haveModel && std::regex_match( line, match, modelRegex ) && 
match.size() == 2)
             {
-                addKeyValue("CPUModelName", OUString::fromUtf8( match[ 1 
].str()), AddItem);
+                addKeyValue("CPUModelName", OUString::fromUtf8(OString(match[ 
1 ].str())), AddItem);
                 haveModel = true;
             }
             if( !haveFlags && std::regex_match( line, match, flagsRegex ) && 
match.size() == 2)
             {
-                addKeyValue("CPUFlags", OUString::fromUtf8( match[ 1 ].str()), 
AddItem);
+                addKeyValue("CPUFlags", OUString::fromUtf8(OString(match[ 1 
].str())), AddItem);
                 haveFlags = true;
             }
             if( haveModel && haveFlags )
@@ -287,7 +287,7 @@ void CrashReporter::writeSystemInfo()
             std::smatch match;
             if( std::regex_match( line, match, memTotalRegex ) && match.size() 
== 2)
             {
-                addKeyValue("MemoryTotal", OUString::fromUtf8( match[ 1 
].str()), AddItem);
+                addKeyValue("MemoryTotal", OUString::fromUtf8(OString(match[ 1 
].str())), AddItem);
                 break;
             }
         }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits