cli_ure/source/native/assembly.cxx | 8 +++----
cli_ure/source/uno_bridge/cli_environment.h | 29 ++++++++++++----------------
cppu/source/uno/IdentityMapping.hxx | 7 ++++--
cppu/source/uno/loadmodule.hxx | 12 ++++++-----
cppuhelper/source/paths.hxx | 14 +++++++------
cppuhelper/source/supportsservice.cxx | 6 +----
solenv/clang-format/excludelist | 6 -----
7 files changed, 39 insertions(+), 43 deletions(-)
New commits:
commit fddcbd5d28bb58993ee3d210f1d11e57c70a8894
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 12:52:55 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Nov 13 15:14:36 2020 +0100
tdf#123936 Formatting files in module cppu with clang-format
Change-Id: I98281fce06c2a8c094db9e80c1f6bdf35ce70ccd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105657
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/cppu/source/uno/IdentityMapping.hxx
b/cppu/source/uno/IdentityMapping.hxx
index 4a6db6d81bc1..8ba081b0099f 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -21,8 +21,11 @@
#include <uno/mapping.h>
-namespace com::sun::star::uno { class Environment; }
+namespace com::sun::star::uno
+{
+class Environment;
+}
-uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv);
+uno_Mapping* createIdentityMapping(const css::uno::Environment& rEnv);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index 4d6c322c1078..694b1402492e 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -22,10 +22,13 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-namespace osl { class Module; }
-
-namespace cppu::detail {
+namespace osl
+{
+class Module;
+}
+namespace cppu::detail
+{
#ifndef DISABLE_DYNLOADING
/** Load a module.
@@ -36,10 +39,9 @@ namespace cppu::detail {
@return false if the module could not be loaded, otherwise true
*/
-bool loadModule(osl::Module & rModule, OUString const & name);
+bool loadModule(osl::Module& rModule, OUString const& name);
#endif
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/paths.hxx b/cppuhelper/source/paths.hxx
index 9ce486fa772a..c1e3724c0aa1 100644
--- a/cppuhelper/source/paths.hxx
+++ b/cppuhelper/source/paths.hxx
@@ -22,16 +22,18 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-namespace osl { class Directory; }
-
-namespace cppu {
+namespace osl
+{
+class Directory;
+}
+namespace cppu
+{
OUString getUnoIniUri();
-bool nextDirectoryItem(osl::Directory & directory, OUString * url);
-
-void decodeRdbUri(OUString * uri, bool * optional, bool * directory);
+bool nextDirectoryItem(osl::Directory& directory, OUString* url);
+void decodeRdbUri(OUString* uri, bool* optional, bool* directory);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/supportsservice.cxx
b/cppuhelper/source/supportsservice.cxx
index f7f267ea0fd5..40dca8c0c269 100644
--- a/cppuhelper/source/supportsservice.cxx
+++ b/cppuhelper/source/supportsservice.cxx
@@ -17,12 +17,10 @@
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustring.hxx>
-bool cppu::supportsService(
- css::lang::XServiceInfo * implementation, OUString const & name)
+bool cppu::supportsService(css::lang::XServiceInfo* implementation, OUString
const& name)
{
assert(implementation != nullptr);
- const css::uno::Sequence< OUString > s(
- implementation->getSupportedServiceNames());
+ const css::uno::Sequence<OUString>
s(implementation->getSupportedServiceNames());
return std::find(s.begin(), s.end(), name) != s.end();
}
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index b002207f44ff..a5c4affa2c16 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -2457,7 +2457,6 @@ cppu/source/typelib/typelib.hxx
cppu/source/uno/EnvDcp.cxx
cppu/source/uno/EnvStack.cxx
cppu/source/uno/IdentityMapping.cxx
-cppu/source/uno/IdentityMapping.hxx
cppu/source/uno/any.cxx
cppu/source/uno/assign.hxx
cppu/source/uno/cascade_mapping.cxx
@@ -2471,7 +2470,6 @@ cppu/source/uno/eq.hxx
cppu/source/uno/lbenv.cxx
cppu/source/uno/lbmap.cxx
cppu/source/uno/loadmodule.cxx
-cppu/source/uno/loadmodule.hxx
cppu/source/uno/prim.hxx
cppu/source/uno/sequence.cxx
cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -2496,13 +2494,11 @@ cppuhelper/source/loadsharedlibcomponentfactory.hxx
cppuhelper/source/macro_expander.cxx
cppuhelper/source/macro_expander.hxx
cppuhelper/source/paths.cxx
-cppuhelper/source/paths.hxx
cppuhelper/source/propertysetmixin.cxx
cppuhelper/source/propshlp.cxx
cppuhelper/source/servicemanager.cxx
cppuhelper/source/servicemanager.hxx
cppuhelper/source/shlib.cxx
-cppuhelper/source/supportsservice.cxx
cppuhelper/source/tdmgr.cxx
cppuhelper/source/typemanager.cxx
cppuhelper/source/typemanager.hxx
commit 7ebd82e885b60552464e060236e869162fcadc71
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 12:50:46 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Nov 13 15:14:18 2020 +0100
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+libreoff...@googlemail.com>
diff --git a/cli_ure/source/native/assembly.cxx
b/cli_ure/source/native/assembly.cxx
index 521f5a4842b1..75e33e8c7ff0 100644
--- a/cli_ure/source/native/assembly.cxx
+++ b/cli_ure/source/native/assembly.cxx
@@ -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: */
diff --git a/cli_ure/source/uno_bridge/cli_environment.h
b/cli_ure/source/uno_bridge/cli_environment.h
index db220d32d1fc..3828d971c503 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -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: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 923fceb155e7..b002207f44ff 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
