summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:25 -0400
commit8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch)
tree7e0b3686991aef9689218ed309f462987f36e273 /jvmfwk
parentb91e39cf1b2d0c4201993d768a1b2c686eeff0de (diff)
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> (cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89) Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/inc/vendorplugin.hxx3
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx5
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx1
-rw-r--r--jvmfwk/source/elements.cxx2
-rw-r--r--jvmfwk/source/framework.hxx1
-rw-r--r--jvmfwk/source/fwkbase.hxx1
-rw-r--r--jvmfwk/source/libxmlutil.cxx4
8 files changed, 0 insertions, 19 deletions
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index f96b094f6fb8..5ebd4c4e209c 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -59,7 +59,6 @@ typedef enum
} javaPluginError;
-
/** obtains information about installations of Java Runtime Environments (JREs).
<p>The function gathers information about available JREs which have the same
@@ -171,7 +170,6 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
JavaInfo ** ppInfo);
-
/** obtains information for a JRE referenced by the JAVA_HOME environment variable.
<p>If the JAVA_HOME environment variable is set and points to a JRE whoose vendor
@@ -299,7 +297,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
JNIEnv ** ppEnv);
-
/** checks if the installation of the jre still exists.
This function checks if the JRE described by pInfo still
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 52d1a3c36660..667b2875cd85 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -497,8 +497,6 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
}
-
-
#if defined(WNT)
// Load msvcr71.dll using an explicit full path from where it is
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f16f96fdf098..25ae2a4fa4ca 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -138,7 +138,6 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
bool decodeOutput(const OString& s, OUString* out);
-
namespace
{
@@ -217,8 +216,6 @@ rtl::Bootstrap * getBootstrap()
}
-
-
class FileHandleGuard: private boost::noncopyable
{
public:
@@ -688,7 +685,6 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
}
-
bool getSDKInfoFromRegistry(vector<OUString> & vecHome)
{
return getJavaInfoFromRegistry(HKEY_SUN_SDK, vecHome);
@@ -1252,7 +1248,6 @@ void addJavaInfosDirScan(
RTL_TEXTENCODING_UTF8);
-
for( int ii = 0; ii < cSearchPaths; ii ++)
{
OUString usDir1("file:///" + arPaths[ii]);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 5ee17d7bd869..9b580ccaa8fb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -49,7 +49,6 @@ MalformedVersionException::operator =(
}
-
VendorBase::VendorBase(): m_bAccessibility(false)
{
}
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 30cd00e80f75..2c7d1667f4fb 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -168,7 +168,6 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
}
-
VersionInfo::VersionInfo(): arVersions(nullptr)
{
}
@@ -1057,7 +1056,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user)
}
-
JavaInfo * MergedSettings::createJavaInfo() const
{
return m_javaInfo.makeJavaInfo();
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index fcd687c2ff68..b81634376b4c 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -79,7 +79,6 @@ public:
::JavaInfo * pInfo;
-
CJavaInfo();
CJavaInfo(const CJavaInfo &);
~CJavaInfo();
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index a8efc2a119ea..1a86cb9f6a1a 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -71,7 +71,6 @@ OUString getClasspathUrls();
} //end namespace
-
enum JFW_MODE
{
JFW_MODE_APPLICATION,
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 73b4de3b9bae..d2fe64e391a5 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -87,8 +87,6 @@ CXmlDocPtr & CXmlDocPtr::operator = (xmlDoc* pObj)
}
-
-
CXmlCharPtr::CXmlCharPtr(xmlChar * aChar)
: _object(aChar)
{
@@ -131,8 +129,6 @@ CXmlCharPtr::operator OUString()
}
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */