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

2022-09-03 Thread Stephan Bergmann (via logerrit) 
Rebased ref, commits from common ancestor:
commit 6f60a85d71f1e160bf48ca4d23cd9c99677961a2
Author: Stephan Bergmann 
AuthorDate: Thu Sep 1 17:33:51 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Sep 3 14:04:37 2022 +0200

Filter out unwanted command URIs

Change-Id: I0b7e5329af8cc053d14d5c60ec14fe7f364ef993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139225
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

Conflicts:
desktop/source/app/cmdlineargs.cxx

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 8fe83f523c48..c00a3d6e42ad 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -167,7 +168,14 @@ CommandLineEvent CheckOfficeURI(/* in,out */ OUString& 
arg, CommandLineEvent cur
 }
 if (nURIlen < 0)
 nURIlen = rest2.getLength();
-arg = rest2.copy(0, nURIlen);
+auto const uri = rest2.copy(0, nURIlen);
+if (INetURLObject(uri).GetProtocol() == INetProtocol::Macro) {
+// Let the "Open" machinery process the full command URI (leading to 
failure, by intention,
+// as the "Open" machinery does not know about those command URI 
schemes):
+curEvt = CommandLineEvent::Open;
+} else {
+arg = uri;
+}
 return curEvt;
 }

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - desktop/source sw/source

2020-06-26 Thread Thorsten Behrens (via logerrit) 
Rebased ref, commits from common ancestor:
commit ec3fe5363161b42c2d339ab7dd9fcf86a97c68ce
Author: Thorsten Behrens 
AuthorDate: Fri Jun 26 18:55:03 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 27 01:14:10 2020 +0200

Fixups to build on c++11-only compilers

This is a follow-up to:
 - a5a603aa83fbc6604952bd6bf9795ceed61978e9
 - b93b2b974e003a2e6b8cf9852b7e7e4fb126fff0
 - 5a7288901fad8bd833357f1672213bce8273ab3c

avoiding breakage on gcc48 for CentOS6 baseline (which has no full
c++14 support yet)

Change-Id: I9654b057f792103e6934f19b97dc0d3c84d77852

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index c121b4fb8069..8354ffb810a3 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -219,7 +219,7 @@ void CrashReporter::installExceptionHandler()
 return;
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 google_breakpad::MinidumpDescriptor descriptor("/tmp");
-mpExceptionHandler = 
std::make_unique(descriptor, nullptr, 
dumpCallback, nullptr, true, -1);
+mpExceptionHandler.reset(new google_breakpad::ExceptionHandler(descriptor, 
nullptr, dumpCallback, nullptr, true, -1));
 #elif defined WNT
 mpExceptionHandler = 
std::make_unique(L".", nullptr, 
dumpCallback, nullptr, google_breakpad::ExceptionHandler::HANDLER_ALL);
 #endif
diff --git a/sw/source/core/inc/scriptinfo.hxx 
b/sw/source/core/inc/scriptinfo.hxx
index 9a408f52abe6..16d08683c3bc 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -35,7 +35,7 @@ class MultiSelection;
 typedef std::vector< sal_Int32 > PositionList;
 enum class SwFontScript;
 namespace sw { struct MergedPara; }
-namespace sw::mark { class IBookmark; }
+namespace sw { namespace mark { class IBookmark; }}
 
 #define SPACING_PRECISION_FACTOR 100
 
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 226e9e83999a..1968e48a30ab 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1660,7 +1660,7 @@ TextFrameIndex SwScriptInfo::NextBookmark(TextFrameIndex 
const nPos) const
 
 auto SwScriptInfo::GetBookmark(TextFrameIndex const nPos) const -> MarkKind
 {
-MarkKind ret{0};
+MarkKind ret; ret = (MarkKind)0;
 for (auto const& it : m_Bookmarks)
 {
 if (nPos == it.first)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-26 Thread Thorsten Behrens (via logerrit) 
 desktop/source/app/crashreport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ae9cc74ec53ee738716f0110a40d9d5cb7fb2c4
Author: Thorsten Behrens 
AuthorDate: Fri Jun 26 18:55:03 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Jun 26 18:55:03 2020 +0200

Fixup crashreport to build on pure c++11 compilers

This is a follow-up to a5a603aa83fbc6604952bd6bf9795ceed61978e9
avoiding breakage on gcc44 for CentOS6 baseline (which has no full
c++14 support yet)

Change-Id: I9654b057f792103e6934f19b97dc0d3c84d77852

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index c121b4fb8069..8354ffb810a3 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -219,7 +219,7 @@ void CrashReporter::installExceptionHandler()
 return;
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 google_breakpad::MinidumpDescriptor descriptor("/tmp");
-mpExceptionHandler = 
std::make_unique(descriptor, nullptr, 
dumpCallback, nullptr, true, -1);
+mpExceptionHandler.reset(new google_breakpad::ExceptionHandler(descriptor, 
nullptr, dumpCallback, nullptr, true, -1));
 #elif defined WNT
 mpExceptionHandler = 
std::make_unique(L".", nullptr, 
dumpCallback, nullptr, google_breakpad::ExceptionHandler::HANDLER_ALL);
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-21 Thread Thorsten Behrens (via logerrit) 
 desktop/source/app/crashreport.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 63e2f183336babb5956730e5a9b0684951afdfa4
Author: Thorsten Behrens 
AuthorDate: Wed Apr 22 01:10:13 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 22 01:10:13 2020 +0200

Get local, no-upload crash dumps working again

With this, CrashDumpEnable=true and CrashDumpUrl missing will
create local dmp files, but never upload/present GUI for it.

Change-Id: I0bae48a0accace01dc8507cccb2a7b02a4de61a0

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index c90a584a4163..c121b4fb8069 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -119,7 +119,10 @@ void CrashReporter::writeCommonInfo()
 rtl::Bootstrap::get("CrashDumpUrl", url);
 if (url.isEmpty())
 {
-// no url in config, bail out
+// no url in config, bail out, but still set proper crash
+// directory for local dump generation (incase CrashDumpEnable
+// is on
+updateMinidumpLocation();
 mbInit = false;
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits