[Libreoffice-commits] core.git: 3 commits - desktop/source svx/source

[Markus Mohrhard]

 desktop/source/app/crashreport.cxx   |    2 +-
 desktop/source/app/sofficemain.cxx   |    2 +-
 svx/source/dialog/crashreportdlg.cxx |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit aaff9f4862b89a4318b93d19511694e5d6321acc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue May 24 21:05:02 2016 +0200

    use correct path for minidump_upload on windows
    
    Change-Id: I1cd60d8b8b1c55b039f76bdaa4f73dc31e654d12

diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 091432f..a3ac1d9 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -55,7 +55,11 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void)
     if (pBtn == mpBtnSend.get())
     {
         std::string ini_path = CrashReporter::getIniFileName();
+#if defined WNT
+        OString aCommand = getLibDir().copy(8) + "/minidump_upload.exe " + ini_path.c_str();
+#else
         OString aCommand = getLibDir().copy(7) + "/minidump_upload " + ini_path.c_str();
+#endif
         int retVal = std::system(aCommand.getStr());
         SAL_WARN_IF(retVal != 0, "svx.dialog", "Failed to upload minidump. Error Code: " << retVal);
         // TODO: moggi: return the id for the user to look it up
commit 0b35dcb579c90b9f8759d49ece6c71795367eec2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue May 24 21:03:35 2016 +0200

    add the file extension for minidumps on windows
    
    Change-Id: Ib5692ef839c500cac7d2551d0b0ee6faf141132a

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 70c2287..fdc60d0 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -89,7 +89,7 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id,
     std::ofstream minidump_file(ini_path, std::ios_base::app);
     // TODO: moggi: can we avoid this conversion
     std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1;
-    std::string aPath = conv1.to_bytes(std::wstring(path)) + conv1.to_bytes(std::wstring(id));
+    std::string aPath = conv1.to_bytes(std::wstring(path)) + conv1.to_bytes(std::wstring(id)) + ".dmp";
     minidump_file << "DumpFile=" << aPath << "\n";;
     minidump_file.close();
     SAL_WARN("desktop", "minidump generated: " << aPath);
commit 7b990ae17a032affd5cb04db9f8d93daa89e3109
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue May 24 21:02:58 2016 +0200

    use correct URL for crashreport
    
    Change-Id: Ia7d584685961e8573c1c35f2560a66664632f5f7

diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 830fe84..50f1a1e 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -47,7 +47,7 @@ void CrashReporter::writeCommonInfo()
     std::ofstream minidump_file(ini_path, std::ios_base::trunc);
     minidump_file << "ProductName=LibreOffice\n";
     minidump_file << "Version=" LIBO_VERSION_DOTTED "\n";
-    minidump_file << "URL=http://crashreport.libreoffice.org/submit\n";
+    minidump_file << "URL=http://crashreport.libreoffice.org/submit/\n";
     minidump_file.close();
 
     updateMinidumpLocation();