fix warnings in cli_ure

Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7

4 files changed, 60 insertions, 60 deletions

diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index d544087d61cd..505790b132b6 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -42,67 +42,67 @@ System::Type^ loadCliType(System::String ^ typeName);
 System::Type^ mapUnoType(typelib_TypeDescription const * pTD);
 System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD);
 typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType);
-rtl::OUString mapCliString(System::String const ^ data);
+rtl::OUString mapCliString(System::String ^ data);
 System::String^ mapUnoString(rtl_uString const * data);
 System::String^ mapUnoTypeName(rtl_uString const * typeName);
 
 ref struct Constants
 {
-    static const System::String^ sXInterfaceName= gcnew System::String(
+    static System::String^ sXInterfaceName= gcnew System::String(
         "unoidl.com.sun.star.uno.XInterface");
-    static const System::String^ sObject= gcnew System::String("System.Object");
-    static const System::String^ sType= gcnew System::String("System.Type");
-    static const System::String^ sUnoidl= gcnew System::String("unoidl.");
-    static const System::String^ sVoid= gcnew System::String("System.Void");
-    static const System::String^ sAny= gcnew System::String("uno.Any");
-    static const System::String^ sArArray= gcnew System::String("System.Array[]");
-    static const System::String^ sBoolean= gcnew System::String("System.Boolean");
-    static const System::String^ sChar= gcnew System::String("System.Char");
-    static const System::String^ sByte= gcnew System::String("System.Byte");
-    static const System::String^ sInt16= gcnew System::String("System.Int16");
-    static const System::String^ sUInt16= gcnew System::String("System.UInt16");
-    static const System::String^ sInt32= gcnew System::String("System.Int32");
-    static const System::String^ sUInt32= gcnew System::String("System.UInt32");
-    static const System::String^ sInt64= gcnew System::String("System.Int64");
-    static const System::String^ sUInt64= gcnew System::String("System.UInt64");
-    static const System::String^ sString= gcnew System::String("System.String");
-    static const System::String^ sSingle= gcnew System::String("System.Single");
-    static const System::String^ sDouble= gcnew System::String("System.Double");
-    static const System::String^ sArBoolean= gcnew System::String("System.Boolean[]");
-    static const System::String^ sArChar= gcnew System::String("System.Char[]");
-    static const System::String^ sArByte= gcnew System::String("System.Byte[]");
-    static const System::String^ sArInt16= gcnew System::String("System.Int16[]");
-    static const System::String^ sArUInt16= gcnew System::String("System.UInt16[]");
-    static const System::String^ sArInt32= gcnew System::String("System.Int32[]");
-    static const System::String^ sArUInt32= gcnew System::String("System.UInt32[]");
-    static const System::String^ sArInt64= gcnew System::String("System.Int64[]");
-    static const System::String^ sArUInt64= gcnew System::String("System.UInt64[]");
-    static const System::String^ sArString= gcnew System::String("System.String[]");
-    static const System::String^ sArSingle= gcnew System::String("System.Single[]");
-    static const System::String^ sArDouble= gcnew System::String("System.Double[]");
-    static const System::String^ sArType= gcnew System::String("System.Type[]");
-    static const System::String^ sArObject= gcnew System::String("System.Object[]");
-    static const System::String^ sBrackets= gcnew System::String("[]");
-    static const System::String^ sAttributeSet= gcnew System::String("set_");
-    static const System::String^ sAttributeGet= gcnew System::String("get_");
-
-    static const System::String^ usXInterface = "com.sun.star.uno.XInterface";
-    static const System::String^ usVoid = "void";
-    static const System::String^ usType = "type";
-    static const System::String^ usAny = "any";
-    static const System::String^ usBrackets = "[]";
-    static const System::String^ usBool = "boolean";
-    static const System::String^ usByte = "byte";
-    static const System::String^ usChar = "char";
-    static const System::String^ usShort = "short";
-    static const System::String^ usUShort = "unsigned short";
-    static const System::String^ usLong = "long";
-    static const System::String^ usULong = "unsigned long";
-    static const System::String^ usHyper = "hyper";
-    static const System::String^ usUHyper = "unsigned hyper";
-    static const System::String^ usString = "string";
-    static const System::String^ usFloat = "float";
-    static const System::String^ usDouble = "double";
+    static System::String^ sObject= gcnew System::String("System.Object");
+    static System::String^ sType= gcnew System::String("System.Type");
+    static System::String^ sUnoidl= gcnew System::String("unoidl.");
+    static System::String^ sVoid= gcnew System::String("System.Void");
+    static System::String^ sAny= gcnew System::String("uno.Any");
+    static System::String^ sArArray= gcnew System::String("System.Array[]");
+    static System::String^ sBoolean= gcnew System::String("System.Boolean");
+    static System::String^ sChar= gcnew System::String("System.Char");
+    static System::String^ sByte= gcnew System::String("System.Byte");
+    static System::String^ sInt16= gcnew System::String("System.Int16");
+    static System::String^ sUInt16= gcnew System::String("System.UInt16");
+    static System::String^ sInt32= gcnew System::String("System.Int32");
+    static System::String^ sUInt32= gcnew System::String("System.UInt32");
+    static System::String^ sInt64= gcnew System::String("System.Int64");
+    static System::String^ sUInt64= gcnew System::String("System.UInt64");
+    static System::String^ sString= gcnew System::String("System.String");
+    static System::String^ sSingle= gcnew System::String("System.Single");
+    static System::String^ sDouble= gcnew System::String("System.Double");
+    static System::String^ sArBoolean= gcnew System::String("System.Boolean[]");
+    static System::String^ sArChar= gcnew System::String("System.Char[]");
+    static System::String^ sArByte= gcnew System::String("System.Byte[]");
+    static System::String^ sArInt16= gcnew System::String("System.Int16[]");
+    static System::String^ sArUInt16= gcnew System::String("System.UInt16[]");
+    static System::String^ sArInt32= gcnew System::String("System.Int32[]");
+    static System::String^ sArUInt32= gcnew System::String("System.UInt32[]");
+    static System::String^ sArInt64= gcnew System::String("System.Int64[]");
+    static System::String^ sArUInt64= gcnew System::String("System.UInt64[]");
+    static System::String^ sArString= gcnew System::String("System.String[]");
+    static System::String^ sArSingle= gcnew System::String("System.Single[]");
+    static System::String^ sArDouble= gcnew System::String("System.Double[]");
+    static System::String^ sArType= gcnew System::String("System.Type[]");
+    static System::String^ sArObject= gcnew System::String("System.Object[]");
+    static System::String^ sBrackets= gcnew System::String("[]");
+    static System::String^ sAttributeSet= gcnew System::String("set_");
+    static System::String^ sAttributeGet= gcnew System::String("get_");
+
+    static System::String^ usXInterface = "com.sun.star.uno.XInterface";
+    static System::String^ usVoid = "void";
+    static System::String^ usType = "type";
+    static System::String^ usAny = "any";
+    static System::String^ usBrackets = "[]";
+    static System::String^ usBool = "boolean";
+    static System::String^ usByte = "byte";
+    static System::String^ usChar = "char";
+    static System::String^ usShort = "short";
+    static System::String^ usUShort = "unsigned short";
+    static System::String^ usLong = "long";
+    static System::String^ usULong = "unsigned long";
+    static System::String^ usHyper = "hyper";
+    static System::String^ usUHyper = "unsigned hyper";
+    static System::String^ usString = "string";
+    static System::String^ usFloat = "float";
+    static System::String^ usDouble = "double";
 };
 
 struct BridgeRuntimeError
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index b12b44816f46..ed116ac4aa37 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -67,8 +67,8 @@ struct Bridge
     ~Bridge() SAL_THROW(());
     Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno );
 
-    void acquire() const;
-    void release() const;
+    void acquire() const SAL_THROW(());
+    void release() const SAL_THROW(());
 
     void  map_to_uno(
         void * uno_data, System::Object^ cli_data,
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 935a90be2a0a..9292b4af43c5 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -727,7 +727,7 @@ inline System::String^ mapUnoString( rtl_uString const * data)
     return gcnew System::String((__wchar_t*) data->buffer, 0, data->length);
 }
 
-OUString mapCliString(System::String const ^ data)
+OUString mapCliString(System::String ^ data)
 {
 
     if (data != nullptr)
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index d04a92bcf194..e53e18121dd9 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -40,8 +40,6 @@ public ref class Cli_environment
     int _numRegisteredObjects;
 #endif
 
-public:
-
     static Cli_environment()
     {
         m_objects = Hashtable::Synchronized(gcnew Hashtable());
@@ -53,6 +51,8 @@ public:
         sOidPart = buffer->ToString();
     }
 
+public:
+
     inline Cli_environment();
 
     ~Cli_environment();