diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:25 -0400 |
commit | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch) | |
tree | 7e0b3686991aef9689218ed309f462987f36e273 /jvmfwk/plugins | |
parent | b91e39cf1b2d0c4201993d768a1b2c686eeff0de (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/plugins')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 5 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 1 |
3 files changed, 0 insertions, 8 deletions
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) { } |