From a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 9 Feb 2016 18:16:42 +1100 Subject: 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 Reviewed-by: Chris Sherlock --- stoc/source/corereflection/crbase.cxx | 6 ------ stoc/source/corereflection/crcomp.cxx | 5 ----- stoc/source/corereflection/crenum.cxx | 5 ----- stoc/source/corereflection/criface.cxx | 11 ----------- stoc/source/defaultregistry/defaultregistry.cxx | 4 ---- stoc/source/implementationregistration/implreg.cxx | 7 ------- stoc/source/inspect/introspection.cxx | 10 ---------- stoc/source/invocation/invocation.cxx | 13 ------------- stoc/source/invocation_adapterfactory/iafactory.cxx | 4 ---- stoc/source/javaloader/javaloader.cxx | 1 - stoc/source/javavm/javavm.cxx | 2 -- stoc/source/loader/dllcomponentloader.cxx | 1 - stoc/source/proxy_factory/proxyfac.cxx | 2 -- stoc/source/security/access_controller.cxx | 3 --- stoc/source/security/permissions.cxx | 10 ---------- stoc/source/servicemanager/servicemanager.cxx | 7 ------- stoc/source/typeconv/convert.cxx | 1 - 17 files changed, 92 deletions(-) (limited to 'stoc/source') 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& localKey, Reference& 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 xToTestClass, Reference 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 xToTestClass, Reference 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 Implementation::inspect( } - // 3. Methods // Counter for found listeners @@ -2381,8 +2373,6 @@ css::uno::Reference 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 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& } - // 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 InvocationService::createInstanceWithArguments( } - Reference SAL_CALL InvocationService_CreateInstance( const Reference & 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 SAL_CALL JavaComponentLoader::getSupportedServiceNames() } - // XImplementationLoader sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( const css::uno::Reference & 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 & 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 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); -- cgit