[Libreoffice-commits] core.git: 2 commits - jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx |   12 ++++++++++--
 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm  |    4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 55d64bd47238ff1e390a09cc3466fd76c408aa50
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 4 14:50:52 2015 +0100

    Avoid using reserved identifiers, add missing includes
    
    Change-Id: I23b548de1f07a4ec5acfeef7c553030a1f098311

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
index 574ebbf..ebada19 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
@@ -1,7 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-#ifndef __UTIL_COCOA_H__
-#define __UTIL_COCOA_H__
+#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_COCOA_HXX
+#define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_COCOA_HXX
+
+#include <sal/config.h>
+
+#include <rtl/ustring.hxx>
 
 bool JvmfwkUtil_isLoadableJVM( OUString const & aURL );
 
commit fa6504066e59c779d201e6ea3176952984bb48b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 4 14:49:11 2015 +0100

    Add mode lines
    
    Change-Id: I4026040cfa2cd34c3a33a0a3dd4651caeb11c76f

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
index 0b1717a..574ebbf 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx
@@ -1,6 +1,10 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
 #ifndef __UTIL_COCOA_H__
 #define __UTIL_COCOA_H__
 
 bool JvmfwkUtil_isLoadableJVM( OUString const & aURL );
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
index d374ae9..45ba2dd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
@@ -1,3 +1,5 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
 #include <rtl/ustring.hxx>
 
 #include <premac.h>
@@ -127,3 +129,5 @@ bool JvmfwkUtil_isLoadableJVM( OUString const & aURL )
 
     return bRet;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */