diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /registry | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (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
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'registry')
-rw-r--r-- | registry/source/keyimpl.cxx | 7 | ||||
-rw-r--r-- | registry/source/reflcnst.hxx | 3 | ||||
-rw-r--r-- | registry/source/reflwrit.cxx | 1 | ||||
-rw-r--r-- | registry/source/regimpl.cxx | 10 | ||||
-rw-r--r-- | registry/source/registry.cxx | 9 | ||||
-rw-r--r-- | registry/source/regkey.cxx | 7 | ||||
-rw-r--r-- | registry/test/testmerge.cxx | 5 |
7 files changed, 0 insertions, 42 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index a2908e12cf7d..9fa3dab7d1c8 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -69,7 +69,6 @@ RegError ORegKey::createKey(const OUString& keyName, RegKeyHandle* phNewKey) } - // openKey RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) @@ -78,7 +77,6 @@ RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) } - // openSubKeys RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys) @@ -140,7 +138,6 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK } - // getKeyNames RegError ORegKey::getKeyNames(const OUString& keyName, @@ -200,7 +197,6 @@ RegError ORegKey::getKeyNames(const OUString& keyName, } - // closeKey RegError ORegKey::closeKey(RegKeyHandle hKey) @@ -209,7 +205,6 @@ RegError ORegKey::closeKey(RegKeyHandle hKey) } - // deleteKey RegError ORegKey::deleteKey(const OUString& keyName) @@ -218,7 +213,6 @@ RegError ORegKey::deleteKey(const OUString& keyName) } - // getValueType RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueType, sal_uInt32* pValueSize) const @@ -285,7 +279,6 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy } - // setValue RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegValue value, sal_uInt32 vSize) diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index 468bd549f533..9bb560a47325 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -227,7 +227,4 @@ sal_uInt32 UINT16StringLen(const sal_uInt8* wstring); #endif - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index b7ab081d7b25..eaa1d18ab3fc 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -34,7 +34,6 @@ #include "reflcnst.hxx" - namespace { inline OString toByteString(rtl_uString const * str) { diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 4ac560fa835b..12455b00c363 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -449,7 +449,6 @@ ORegistry::~ORegistry() } - // initRegistry RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode, bool bCreate) @@ -516,7 +515,6 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo } - // closeRegistry RegError ORegistry::closeRegistry() @@ -536,7 +534,6 @@ RegError ORegistry::closeRegistry() } - // destroyRegistry RegError ORegistry::destroyRegistry(const OUString& regName) @@ -692,7 +689,6 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, } - // openKey RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, @@ -741,7 +737,6 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, } - // closeKey RegError ORegistry::closeKey(RegKeyHandle hKey) @@ -898,7 +893,6 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey) } - // loadKey RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName, @@ -945,7 +939,6 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName, } - // loadAndSaveValue() RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, @@ -1073,7 +1066,6 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } - // checkblop() RegError ORegistry::checkBlop(OStoreStream& rValue, @@ -1348,7 +1340,6 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey, } - // getRootKey() ORegKey* ORegistry::getRootKey() @@ -1358,7 +1349,6 @@ ORegKey* ORegistry::getRootKey() } - // dumpRegistry() RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index fed98584c645..0b355fa98c7f 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -51,7 +51,6 @@ static void REGISTRY_CALLTYPE acquire(RegHandle hReg) } - // release static void REGISTRY_CALLTYPE release(RegHandle hReg) @@ -69,7 +68,6 @@ static void REGISTRY_CALLTYPE release(RegHandle hReg) } - // getName static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName) @@ -93,7 +91,6 @@ static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName) } - // isReadOnly static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg) @@ -105,7 +102,6 @@ static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg) } - // createRegistry static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName, @@ -151,7 +147,6 @@ static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg, } - // openRegistry static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName, @@ -204,7 +199,6 @@ static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg) } - // destroyRegistry static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg, @@ -235,7 +229,6 @@ static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg, } - // mergeKey static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, @@ -361,7 +354,6 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, } - // reg_openRegistry RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, @@ -400,7 +392,6 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) } - // reg_dumpRegistry RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 7e471f0b9f43..4da68754f117 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -27,7 +27,6 @@ #include "keyimpl.hxx" - // acquireKey void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey) @@ -41,7 +40,6 @@ void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey) } - // releaseKey void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey) @@ -55,7 +53,6 @@ void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey) } - // isKeyReadOnly sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey) @@ -65,7 +62,6 @@ sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey) } - // getKeyName RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName) @@ -83,7 +79,6 @@ RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName) } - // createKey RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey, @@ -671,7 +666,6 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames, // C API - // reg_openKey RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, @@ -696,5 +690,4 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index 48eb384473b6..cd480534abc5 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -187,7 +187,6 @@ void test_merge() OUString("merge2.rdb")), "testMerge error 4"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 5"); REG_ENSURE(!key1.openKey("MergeKey1", mkey1), "testMerge error 6"); @@ -216,7 +215,6 @@ void test_merge() REG_ENSURE(!key1.closeKey(), "testMerge error 24"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key2), "testMerge error 25"); REG_ENSURE(!key2.openKey("MergeKey2", mkey2), "testMerge error 26"); @@ -245,7 +243,6 @@ void test_merge() REG_ENSURE(!key2.closeKey(), "testMerge error 44"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1u2), "testMerge error 40"); REG_ENSURE(!key1u2.openKey("MergeKey1u2", mkey1u2), "testMerge error 41"); @@ -289,7 +286,6 @@ void test_merge() REG_ENSURE(!key1u2.closeKey(), "testMerge error 71"); - RegValueType valueType; sal_uInt32 valueSize; sal_Int32 int32Value; @@ -396,7 +392,6 @@ void test_merge() REG_ENSURE(!key1.closeKey(), "testMerge error 24"); - REG_ENSURE(!rootKey.closeKey(), "testMerge error 10"); REG_ENSURE(!myRegistry->destroy( OUString("merge1.rdb") ), "test_registry_CppApi error 11"); |