diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:18:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 17:07:36 +0100 |
| commit | 2ae813975ae8ba97e2adbce13be272e6902ca7b5 (patch) | |
| tree | 3ad997cea671154f311cfff95418bf22e6829e59 /jvmfwk | |
| parent | de8c193833a7c60826015ecaed13d9fb3d1e0aba (diff) | |
loplugin:indentation in jvmfwk..lotuswordpro
Change-Id: I1af665f4c6d34d8514dd23bb7a3eba700ce3ddbc
Reviewed-on: https://gerrit.libreoffice.org/67559
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/inc/fwkutil.hxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/elements.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/inc/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx index ce46ef2cadbe..890ccb15bbcc 100644 --- a/jvmfwk/inc/fwkutil.hxx +++ b/jvmfwk/inc/fwkutil.hxx @@ -55,9 +55,9 @@ struct Bootstrap : buf.append(SAL_CONFIGFILE("/jvmfwk3")); OUString sIni = buf.makeStringAndClear(); ::rtl::Bootstrap * bootstrap = new ::rtl::Bootstrap(sIni); - SAL_INFO("jfw.level2", "Using configuration file " << sIni); - return bootstrap; - } + SAL_INFO("jfw.level2", "Using configuration file " << sIni); + return bootstrap; + } }; struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {}; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 034b0687d5e6..14faf56762d7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -44,7 +44,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size) "jre/bin/java" #endif }; - *size = SAL_N_ELEMENTS (ar); + *size = SAL_N_ELEMENTS (ar); return ar; } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index f1b0ee485480..6949ed903b1e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -848,7 +848,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( fprintf(stderr, "lo_get_javavm returns %p", *ppVm); #endif - return errorcode; + return errorcode; #if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wclobbered" diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 3563e4ccb3b0..249deeaf304c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -173,7 +173,7 @@ bool getAndAddJREInfoByPath( { OUString const & operator()() { - static OUString sIni; + static OUString sIni; OUStringBuffer buf( 255); buf.append( getLibraryLocation()); #ifdef MACOSX diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index ebd395b466fc..ec77f7ab1cae 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -53,7 +53,7 @@ static OString getElement(OString const & docPath, { //Prepare the xml document and context OSL_ASSERT(!docPath.isEmpty()); - jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr())); + jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr())); if (doc == nullptr) throw FrameworkException( JFW_E_ERROR, diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 5a8b39f9f58f..2286fd9b1e17 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -317,7 +317,7 @@ OUString BootParams::getVendorSettings() UNO_JAVA_JFW_VENDOR_SETTINGS); } } - SAL_INFO( + SAL_INFO( "jfw.level2", "Using bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS " = " << sVendor); |