summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /stoc
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (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 'stoc')
-rw-r--r--stoc/source/corereflection/crbase.cxx6
-rw-r--r--stoc/source/corereflection/crcomp.cxx5
-rw-r--r--stoc/source/corereflection/crenum.cxx5
-rw-r--r--stoc/source/corereflection/criface.cxx11
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx4
-rw-r--r--stoc/source/implementationregistration/implreg.cxx7
-rw-r--r--stoc/source/inspect/introspection.cxx10
-rw-r--r--stoc/source/invocation/invocation.cxx13
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx4
-rw-r--r--stoc/source/javaloader/javaloader.cxx1
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx1
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx2
-rw-r--r--stoc/source/security/access_controller.cxx3
-rw-r--r--stoc/source/security/permissions.cxx10
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx7
-rw-r--r--stoc/source/typeconv/convert.cxx1
-rw-r--r--stoc/test/javavm/testjavavm.cxx1
-rw-r--r--stoc/test/testconv.cxx2
-rw-r--r--stoc/test/testcorefl.cxx1
-rw-r--r--stoc/test/testiadapter.cxx4
-rw-r--r--stoc/test/testintrosp.cxx3
-rw-r--r--stoc/test/testproxyfac.cxx1
-rw-r--r--stoc/test/testsmgr_cpnt.cxx7
24 files changed, 0 insertions, 111 deletions
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index f74620bdbc5c..d3dcacf366bd 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -228,12 +228,6 @@ Reference< XIdlArray > IdlClassImpl::getArray()
}
-
-
-
-
-
-
IdlMemberImpl::IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
typelib_TypeDescription * pTypeDescr,
typelib_TypeDescription * pDeclTypeDescr )
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index 6bf3f72092ca..7e1eeab99607 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -275,11 +275,6 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue )
}
-
-
-
-
-
CompoundIdlClassImpl::~CompoundIdlClassImpl()
{
delete _pFields;
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 5003574629e4..21d4159c63da 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -168,11 +168,6 @@ void IdlEnumFieldImpl::set( Any &, const Any & )
}
-
-
-
-
-
EnumIdlClassImpl::~EnumIdlClassImpl()
{
delete _pFields;
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index de8e73c959c1..16fa4060ef8b 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -324,11 +324,6 @@ void IdlAttributeFieldImpl::checkException(
}
-
-
-
-
-
class IdlInterfaceMethodImpl
: public IdlMemberImpl
, public XIdlMethod
@@ -763,12 +758,6 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
}
-
-
-
-
-
-
InterfaceIdlClassImpl::~InterfaceIdlClassImpl()
{
for ( sal_Int32 nPos = _nMethods + _nAttributes; nPos--; )
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 2b5aa51cf35f..d4077d9c1c08 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -145,7 +145,6 @@ protected:
};
-
NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
Reference<XRegistryKey>& localKey,
Reference<XRegistryKey>& defaultKey )
@@ -1106,7 +1105,6 @@ OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName )
}
-
// DefaultRegistry Implementation
@@ -1179,8 +1177,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, s
}
-
-
OUString SAL_CALL NestedRegistryImpl::getImplementationName( )
throw(RuntimeException, std::exception)
{
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index d15e4ee0d9b4..c95159bb7a7f 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -479,7 +479,6 @@ static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
}
-
// static deleteUserLink
static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
@@ -1028,7 +1027,6 @@ static void insert_singletons(
}
-
// static prepareRegistry
static void prepareRegistry(
@@ -1328,7 +1326,6 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
}
-
// XInitialization
void ImplementationRegistration::initialize(
@@ -1418,8 +1415,6 @@ void ImplementationRegistration::initialize(
}
-
-
// virtual function registerImplementationWithLocation of XImplementationRegistration2
void ImplementationRegistration::registerImplementationWithLocation(
@@ -1536,7 +1531,6 @@ void ImplementationRegistration::registerImplementation(
}
-
// virtual function revokeImplementation of XImplementationRegistration
sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location,
@@ -1774,7 +1768,6 @@ void ImplementationRegistration::doRegister(
}
-
Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRegistry(
const Reference< XMultiComponentFactory > &rSMgr,
const Reference < XComponentContext > & xCtx)
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 9f43c8c6fbe8..9483a1482b6e 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -90,8 +90,6 @@ typedef WeakImplHelper< XIntrospectionAccess, XMaterialHolder, XExactName,
XIdlArray, XUnoTunnel > IntrospectionAccessHelper;
-
-
// Special value for Method-Concept, to be able to mark "normal" functions
#define MethodConcept_NORMAL_IMPL 0x80000000
@@ -117,7 +115,6 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer
}
-
// *** Classification of Properties (no enum, to be able to use Sequence) ***
// Properties from a PropertySet-Interface
#define MAP_PROPERTY_SET 0
@@ -133,8 +130,6 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer
#define ARRAY_SIZE_STEP 20
-
-
//*** IntrospectionAccessStatic_Impl ***
// Equals to the old IntrospectionAccessImpl, forms now a static
@@ -689,7 +684,6 @@ void IntrospectionAccessStatic_Impl::checkInterfaceArraySize( Sequence< Referenc
}
-
//*** ImplIntrospectionAccess ***
@@ -1102,7 +1096,6 @@ Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType )
}
-
//*** Implementation of ImplIntrospectionAdapter ***
@@ -1990,7 +1983,6 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
}
-
// 3. Methods
// Counter for found listeners
@@ -2381,8 +2373,6 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
}
-
-
// 4. Place methods in overall sequence
// How many methods in the method sequence
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index acb08095ffec..5d57fd6ff83b 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -85,7 +85,6 @@ inline Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference<
}
-
class Invocation_Impl
: public OWeakObject
, public XInvocation2
@@ -199,7 +198,6 @@ public:
virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override;
-
private:
void setMaterial( const Any& rMaterial );
@@ -234,11 +232,6 @@ private:
};
-
-
-
-
-
Invocation_Impl::Invocation_Impl
(
const Any & rAdapted,
@@ -259,7 +252,6 @@ Invocation_Impl::~Invocation_Impl() {}
//### INTERFACE IMPLEMENTATIONS ####################################################################
-
Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
throw( RuntimeException, std::exception )
{
@@ -341,7 +333,6 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
}
-
Any Invocation_Impl::getMaterial() throw(RuntimeException, std::exception)
{
// AB, 12.2.1999 Make sure that the material is taken when possible
@@ -732,7 +723,6 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
}
-
// Struct to optimize sorting
struct MemberItem
{
@@ -1081,8 +1071,6 @@ Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( Ru
}
-
-
class InvocationService
: public WeakImplHelper< XSingleServiceFactory, XServiceInfo >
{
@@ -1163,7 +1151,6 @@ Reference<XInterface> InvocationService::createInstanceWithArguments(
}
-
Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx )
throw( RuntimeException )
{
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 081f10636477..4ed0b8f2d073 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -905,10 +905,6 @@ static Reference< XInterface > SAL_CALL FactoryImpl_create(
}
-
-
-
-
static const struct ::cppu::ImplementationEntry g_entries[] =
{
{
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 7017956520c4..6355db4ad10b 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -320,7 +320,6 @@ Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames()
}
-
// XImplementationLoader
sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo(
const css::uno::Reference<XRegistryKey> & xKey, const OUString & blabla,
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 64db8c85d4cd..c7a061c057e6 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -112,7 +112,6 @@ using stoc_javavm::JavaVirtualMachine;
namespace {
-
class NoJavaIniException: public css::uno::Exception
{
};
@@ -405,7 +404,6 @@ void getDefaultLocaleFromConfig(
}
-
void getJavaPropsFromSafetySettings(
stoc_javavm::JVM * pjvm,
const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 0062ef1e0922..ecbe66ba7430 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -144,7 +144,6 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
}
-
sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo(
const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName )
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index bafd2f27eda9..2ce250ba17e2 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -393,8 +393,6 @@ Any ProxyRoot::queryAggregation( Type const & rType )
}
-
-
FactoryImpl::FactoryImpl()
{
OUString uno = UNO_LB_UNO;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 31bac05019a9..b5966bb23f32 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -67,7 +67,6 @@ static OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
const char s_acRestriction[] = "access-control.restriction";
-
/** ac context intersects permissions of two ac contexts
*/
class acc_Intersection
@@ -259,7 +258,6 @@ Any acc_CurrentContext::getValueByName( OUString const & name )
}
-
static inline Reference< security::XAccessControlContext > getDynamicRestriction(
Reference< XCurrentContext > const & xContext )
{
@@ -523,7 +521,6 @@ static void dumpPermissions(
#endif
-
inline void AccessController::clearPostPoned()
{
delete static_cast< t_rec_vec * >( m_rec.getData() );
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 77f99b79fe7b..57030fba53cf 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -102,8 +102,6 @@ static inline OUString makeStrings(
}
-
-
class SocketPermission : public Permission
{
static char const * s_actions [];
@@ -271,8 +269,6 @@ OUString SocketPermission::toString() const
}
-
-
class FilePermission : public Permission
{
static char const * s_actions [];
@@ -424,8 +420,6 @@ OUString FilePermission::toString() const
}
-
-
class RuntimePermission : public Permission
{
OUString m_name;
@@ -462,8 +456,6 @@ OUString RuntimePermission::toString() const
}
-
-
bool AllPermission::implies( Permission const & ) const
{
return true;
@@ -475,8 +467,6 @@ OUString AllPermission::toString() const
}
-
-
PermissionCollection::PermissionCollection(
Sequence< Any > const & permissions, PermissionCollection const & addition )
: m_head( addition.m_head )
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index b453c95edbb0..75533986ff63 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -466,7 +466,6 @@ private:
};
-
inline bool OServiceManager::is_disposed() const
{
// ought to be guarded by m_mutex:
@@ -485,9 +484,6 @@ inline void OServiceManager::check_undisposed() const
}
-
-
-
typedef WeakComponentImplHelper<
lang::XMultiServiceFactory, lang::XMultiComponentFactory, lang::XServiceInfo,
container::XSet, container::XContentEnumerationAccess,
@@ -659,9 +655,6 @@ OServiceManagerWrapper::OServiceManagerWrapper(
}
-
-
-
/**
* Create a ServiceManager
*/
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 9ee51a6e3fad..d952852afdc2 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -80,7 +80,6 @@ static inline double unsigned_int64_to_double( sal_uInt64 n )
#endif
-
static inline double round( double aVal )
{
bool bPos = (aVal >= 0.0);
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 76a7d29c5257..827a93cfb63e 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -43,7 +43,6 @@ using namespace css::registry;
using namespace css::java;
-
sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
{
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 786e8d35966c..d78e77b01db4 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -261,7 +261,6 @@ static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bE
}
-
typedef struct _ConvBlock
{
Any _value;
@@ -287,7 +286,6 @@ typedef struct _ConvBlock
} ConvBlock;
-
static sal_Int32 initBlocks( ConvBlock * pTestBlocks )
{
Any aVal;
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 3d875b94efc7..e04519c2ba84 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -59,7 +59,6 @@ using namespace css::reflection;
using namespace css::container;
-
class OInterfaceA : public WeakImplHelper< XInterfaceA >
{
public:
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 3452e68bc393..54c260e4fef4 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -49,8 +49,6 @@ using namespace css::reflection;
using namespace css::registry;
-
-
sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 )
{
OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" );
@@ -666,8 +664,6 @@ sal_Bool XLB_Invocation::hasProperty( const OUString & rName )
}
-
-
void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index a3f694bb3bfc..49fac8c4d932 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -52,7 +52,6 @@ using namespace css::container;
using namespace css::beans::PropertyAttribute;
-
#define DEFAULT_INDEX_ACCESS_COUNT 10
#define DEFAULT_NAME_ACCESS_COUNT 5
@@ -659,7 +658,6 @@ void ImplIntroTest::removePropertiesChangeListener
}
-
struct DefItem
{
char const * pName;
@@ -839,7 +837,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr,
OString aErrorStr;
-
// create test object
Any aObjAny = getIntrospectionTestObject( xMgr );
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 9505d7ca32bd..83bda7ff321f 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -97,7 +97,6 @@ Any TargetObject::queryInterface( Type const & type )
int TargetObject::s_obj = 0;
-
class TestMaster : public WeakImplHelper< lang::XServiceInfo >
{
Reference< XAggregation > m_xProxyTarget;
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index e754b1038ee0..d64c2c3af8ad 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -60,7 +60,6 @@ using namespace osl;
using namespace cppu;
-
Reference<XMultiServiceFactory> getProcessServiceManager()
{
Reference<XMultiServiceFactory > s_x;
@@ -115,7 +114,6 @@ Reference< XInterface > SAL_CALL Test_Manager_Impl_CreateInstance_Impl()
}
-
// Test_Manager_Impl_CreateInstance()
Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance(
@@ -127,7 +125,6 @@ Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance(
}
-
// Test_Manager_Impl::getImplementationName
OUString Test_Manager_Impl::getImplementationName() throw()
@@ -161,8 +158,6 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static() throw
}
-
-
/****
*
*
@@ -257,7 +252,6 @@ extern "C" void SAL_CALL test_ServiceManager()
}
-
extern "C"
{
@@ -313,5 +307,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */