[Libreoffice-commits] core.git: 2 commits - include/editeng include/svx jvmfwk/plugins svx/source sw/inc sw/source

[Andrea Gelmini (via logerrit)]

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1b794249c8fbceac599525f53914b8b3463ff4e3
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Apr 26 22:32:11 2019 +0000
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Sat Apr 27 08:58:20 2019 +0200

    Removed executable permission on source files
    
    Change-Id: Iaafc0f45282b0351c24b4ddc433ed1086177ff73
    Reviewed-on: https://gerrit.libreoffice.org/71400
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/include/editeng/legacyitem.hxx b/include/editeng/legacyitem.hxx
old mode 100755
new mode 100644
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
old mode 100755
new mode 100644
diff --git a/svx/source/items/legacyitem.cxx b/svx/source/items/legacyitem.cxx
old mode 100755
new mode 100644
diff --git a/sw/inc/legacyitem.hxx b/sw/inc/legacyitem.hxx
old mode 100755
new mode 100644
diff --git a/sw/source/core/layout/legacyitem.cxx b/sw/source/core/layout/legacyitem.cxx
old mode 100755
new mode 100644
commit 1c299098d368bb02581c20d10657ce3184db9855
Author:     Tomoyuki Kubota <himajin100000 at gmail.com>
AuthorDate: Sat Apr 27 13:37:47 2019 +0900
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Apr 27 08:57:59 2019 +0200

    osl/diagnose.h and diagnostics.h are used when OSL_DEBUG_LEVEL >= 2
    
    Change-Id: I004ee1a56b0d4c63db82106c516e19753ad2a0f5
    Reviewed-on: https://gerrit.libreoffice.org/71405
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 09c75f9a3064..d87bd86a235a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -22,7 +22,10 @@
 #include <osl/thread.h>
 #include <rtl/character.hxx>
 #include <string.h>
-
+#if OSL_DEBUG_LEVEL >= 2
+#include <osl/diagnose.h>
+#include "diagnostics.h"
+#endif
 namespace jfw_plugin  { //stoc_javadetect