tdf#123936 Formatting files in module cli_ure with clang-format

Change-Id: I721878c8c7a56f311d1a087618895a2ddb3b6d7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105651
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer
2020-11-13 15:14:18 +01:00
committed by Christian Lohmaier
parent 71b69ac75b
commit 7ebd82e885
3 changed files with 17 additions and 22 deletions
+4 -4
View File
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];
[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
[assembly:System::Reflection::AssemblyProduct("CLI-UNO Language Binding")];
[assembly:System::Reflection::AssemblyDescription("CLI-UNO Helper Library")];
[assembly:System::Reflection::AssemblyDelaySign(true)];
[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];
[assembly:System::Reflection::AssemblyVersion( "@CLI_CPPUHELPER_NEW_VERSION@" )];
[assembly:System::Reflection::AssemblyCompany("OpenOffice.org")];
[assembly:System::Reflection::AssemblyVersion("@CLI_CPPUHELPER_NEW_VERSION@")];
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+13 -16
View File
@@ -28,13 +28,13 @@ using namespace System::Runtime::Serialization;
namespace cli_uno
{
public ref class Cli_environment
public
ref class Cli_environment
{
static System::String^ sOidPart;
static Hashtable^ m_objects;
static System::Runtime::Serialization::ObjectIDGenerator^ m_IDGen;
inline static System::String^ createKey(System::String^ oid, System::Type^ t);
static System::String ^ sOidPart;
static Hashtable ^ m_objects;
static System::Runtime::Serialization::ObjectIDGenerator ^ m_IDGen;
inline static System::String ^ createKey(System::String ^ oid, System::Type ^ t);
#if OSL_DEBUG_LEVEL >= 1
int _numRegisteredObjects;
@@ -44,7 +44,7 @@ public ref class Cli_environment
{
m_objects = Hashtable::Synchronized(gcnew Hashtable());
m_IDGen = gcnew System::Runtime::Serialization::ObjectIDGenerator();
System::Text::StringBuilder^ buffer = gcnew System::Text::StringBuilder(256);
System::Text::StringBuilder ^ buffer = gcnew System::Text::StringBuilder(256);
Guid gd = Guid::NewGuid();
buffer->Append(";cli[0];");
buffer->Append(gd.ToString());
@@ -52,7 +52,6 @@ public ref class Cli_environment
}
public:
inline Cli_environment();
~Cli_environment();
@@ -63,21 +62,21 @@ public:
cli object is represents all interfaces of the UNO object. Therefore the
object can be registered only with its OID; a type is not necessary.
*/
Object^ registerInterface(Object^ obj, System::String^ oid);
Object ^ registerInterface(Object ^ obj, System::String ^ oid);
/**
Registers a CLI object as being mapped by this bridge. The resulting
object represents exactly one UNO interface.
*/
Object^ registerInterface(Object^ obj, System::String^ oid, System::Type^ type);
Object ^ registerInterface(Object ^ obj, System::String ^ oid, System::Type ^ type);
/**
By revoking an interface it is declared that the respective interface has
not been mapped. The proxy implementations call revoke interface in their
destructors.
*/
inline void revokeInterface(System::String^ oid);
inline void revokeInterface(System::String ^ oid);
void revokeInterface(System::String^ oid, System::Type^ type);
void revokeInterface(System::String ^ oid, System::Type ^ type);
/**
* Retrieves an interface identified by its object id and type from this
* environment.
@@ -86,7 +85,7 @@ public:
* @param type the type description of the interface to be retrieved
* @see com.sun.star.uno.IEnvironment#getRegisteredInterface
*/
Object^ getRegisteredInterface(System::String^ oid, System::Type^ type);
Object ^ getRegisteredInterface(System::String ^ oid, System::Type ^ type);
/**
* Generates a worldwide unique object identifier (oid) for the given object. It is
@@ -96,13 +95,11 @@ public:
* @return the generated oid.
* @param object the object for which an Oid should be generated.
*/
static System::String^ getObjectIdentifier(Object^ obj);
static System::String ^ getObjectIdentifier(Object ^ obj);
};
} //namespace cli_uno
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-2
View File
@@ -1413,7 +1413,6 @@ chart2/workbench/addin/sampleaddin.hxx
cli_ure/source/climaker/climaker_app.cxx
cli_ure/source/climaker/climaker_emit.cxx
cli_ure/source/climaker/climaker_share.h
cli_ure/source/native/assembly.cxx
cli_ure/source/native/native_bootstrap.cxx
cli_ure/source/native/native_share.h
cli_ure/source/native/path.cxx
@@ -1422,7 +1421,6 @@ cli_ure/source/uno_bridge/cli_bridge.cxx
cli_ure/source/uno_bridge/cli_bridge.h
cli_ure/source/uno_bridge/cli_data.cxx
cli_ure/source/uno_bridge/cli_environment.cxx
cli_ure/source/uno_bridge/cli_environment.h
cli_ure/source/uno_bridge/cli_proxy.cxx
cli_ure/source/uno_bridge/cli_proxy.h
cli_ure/source/uno_bridge/cli_uno.cxx