solenv/clang-format/excludelist | 3 ---
stoc/source/javavm/jvmargs.cxx | 12 +++---------
stoc/test/mergekeys_.cxx | 1 -
stoc/test/testsmgr.cxx | 18 ++++++++----------
4 files changed, 11 insertions(+), 23 deletions(-)
New commits:
commit 5ce88c782e44dae6de8df2933b7c036f0dd48172
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:18:01 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 19 14:47:21 2020 +0100
tdf#123936 Formatting files in module stoc with clang-format
Change-Id: I401279561e2481a8af7ed600d4133812b08386ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105712
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 602463bac622..09ed9297e0b9 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11947,7 +11947,6 @@ stoc/source/javavm/interact.cxx
stoc/source/javavm/interact.hxx
stoc/source/javavm/javavm.cxx
stoc/source/javavm/javavm.hxx
-stoc/source/javavm/jvmargs.cxx
stoc/source/javavm/jvmargs.hxx
stoc/source/loader/dllcomponentloader.cxx
stoc/source/namingservice/namingservice.cxx
@@ -11969,7 +11968,6 @@
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
stoc/test/javavm/jvm_interaction/interactionhandler.cxx
stoc/test/javavm/testjavavm.cxx
-stoc/test/mergekeys_.cxx
stoc/test/registry_tdprovider/testregistrytdprovider.cxx
stoc/test/tdmanager/testtdmanager.cxx
stoc/test/testconv.cxx
@@ -11979,7 +11977,6 @@ stoc/test/testintrosp.cxx
stoc/test/testloader.cxx
stoc/test/testproxyfac.cxx
stoc/test/testregistry.cxx
-stoc/test/testsmgr.cxx
stoc/test/testsmgr2.cxx
stoc/test/testsmgr_cpnt.cxx
stoc/test/uriproc/test_uriproc.cxx
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 9668df2037a6..a7110841565b 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -17,22 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "jvmargs.hxx"
#include <rtl/ustring.hxx>
-namespace stoc_javavm {
-
-JVM::JVM() throw()//: _enabled(sal_False)
+namespace stoc_javavm
{
-}
-
-void JVM::pushProp(const OUString & property)
+JVM::JVM() throw() //: _enabled(sal_False)
{
- _props.push_back(property);
}
-
+void JVM::pushProp(const OUString& property) { _props.push_back(property); }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/mergekeys_.cxx b/stoc/test/mergekeys_.cxx
index 02bd486fb98a..079e12670abe 100644
--- a/stoc/test/mergekeys_.cxx
+++ b/stoc/test/mergekeys_.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "../source/implementationregistration/mergekeys.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index d65b1c2e3a07..a8243386e27d 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -38,14 +38,13 @@ extern "C" void SAL_CALL test_ServiceManager();
#define TRUE 1
#endif
-
OString userRegEnv("STAR_USER_REGISTRY=");
OUString getExePath()
{
- OUString exe;
+ OUString exe;
- OSL_VERIFY( osl_getExecutableFile( &exe.pData) == osl_Process_E_None);
+ OSL_VERIFY(osl_getExecutableFile(&exe.pData) == osl_Process_E_None);
#if defined(_WIN32)
exe = exe.copy(0, exe.getLength() - 16);
@@ -57,13 +56,13 @@ OUString getExePath()
void setStarUserRegistry()
{
- Registry *myRegistry = new Registry();
+ Registry* myRegistry = new Registry();
RegistryKey rootKey, rKey, rKey2;
OUString userReg = getExePath();
userReg += "user.rdb";
- if(myRegistry->open(userReg, RegAccessMode::READWRITE))
+ if (myRegistry->open(userReg, RegAccessMode::READWRITE))
{
OSL_VERIFY(!myRegistry->create(userReg));
}
@@ -72,18 +71,17 @@ void setStarUserRegistry()
delete myRegistry;
userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
- putenv((char *)userRegEnv.getStr());
+ putenv((char*)userRegEnv.getStr());
}
-
SAL_IMPLEMENT_MAIN()
{
- printf( "ServiceManagerTest : \r");
+ printf("ServiceManagerTest : \r");
setStarUserRegistry();
- fflush( stdout );
+ fflush(stdout);
test_ServiceManager();
- printf( "ServiceManagerTest : OK\n" );
+ printf("ServiceManagerTest : OK\n");
return 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
