diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:13:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:16:15 +0100 |
commit | a58f6d2744fde88f2034987208124e5b2505c641 (patch) | |
tree | 167d94743e2854bae544e9a09b59b0fb47b5e3ee /cppuhelper | |
parent | 43635b474cdce65e64fa9ca9d27a3cee6d96d50b (diff) |
loplugin:indentation in cppu..cui
Change-Id: If625e5bf38ca8e1f12686038c7c9be8d0303b6f6
Reviewed-on: https://gerrit.libreoffice.org/67536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/source/implementationentry.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/interfacecontainer.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/propshlp.cxx | 28 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.cxx | 3 |
4 files changed, 20 insertions, 19 deletions
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 466d766558af..2e5891982b8e 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -65,7 +65,7 @@ void * component_getFactoryHelper( SAL_UNUSED_PARAMETER void *, ImplementationEntry const * entries) { - void * pRet = nullptr; + void * pRet = nullptr; Reference< XSingleComponentFactory > xFactory; for( sal_Int32 i = 0 ; entries[i].create ; i ++ ) diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index d4627ff94399..fbf6b4066208 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -397,7 +397,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelper::getContainer( co ::osl::MutexGuard aGuard( rMutex ); t_type2ptr * pMap = static_cast<t_type2ptr *>(m_pMap); - t_type2ptr::iterator iter = findType( pMap, rKey ); + t_type2ptr::iterator iter = findType( pMap, rKey ); if( iter != pMap->end() ) return static_cast<OInterfaceContainerHelper*>((*iter).second); return nullptr; @@ -566,7 +566,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContaine if (!m_pMap) return nullptr; t_long2ptr * pMap = static_cast<t_long2ptr *>(m_pMap); - t_long2ptr::iterator iter = findLong( pMap, rKey ); + t_long2ptr::iterator iter = findLong( pMap, rKey ); if( iter != pMap->end() ) return static_cast<OInterfaceContainerHelper*>((*iter).second); return nullptr; @@ -580,7 +580,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperInt32::addInterface( m_pMap = new t_long2ptr; t_long2ptr * pMap = static_cast<t_long2ptr *>(m_pMap); t_long2ptr::iterator iter = findLong( pMap, rKey ); - if( iter == pMap->end() ) + if( iter == pMap->end() ) { OInterfaceContainerHelper * pLC = new OInterfaceContainerHelper( rMutex ); pMap->push_back(std::pair< sal_Int32, void* >(rKey, pLC)); diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 1a54edffe40e..a7a0f93a396a 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -804,15 +804,15 @@ void OPropertySetHelper::setFastPropertyValues( OSL_ENSURE( !rBHelper.bInDispose, "do not getFastPropertyValue in the dispose call" ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); - // get the map table - IPropertyArrayHelper & rPH = getInfoHelper(); + // get the map table + IPropertyArrayHelper & rPH = getInfoHelper(); - std::unique_ptr<Any[]> pConvertedValues(new Any[ nHitCount ]); - std::unique_ptr<Any[]> pOldValues(new Any[ nHitCount ]); - sal_Int32 n = 0; - sal_Int32 i; + std::unique_ptr<Any[]> pConvertedValues(new Any[ nHitCount ]); + std::unique_ptr<Any[]> pOldValues(new Any[ nHitCount ]); + sal_Int32 n = 0; + sal_Int32 i; - { + { // must lock the mutex outside the loop. So all values are consistent. MutexGuard aGuard( rBHelper.rMutex ); for( i = 0; i < nSeqLen; i++ ) @@ -835,12 +835,12 @@ void OPropertySetHelper::setFastPropertyValues( } } // release guard to fire events - } + } - // fire vetoable events - fire( pHandles, pConvertedValues.get(), pOldValues.get(), n, true ); + // fire vetoable events + fire( pHandles, pConvertedValues.get(), pOldValues.get(), n, true ); - { + { // must lock the mutex outside the loop. MutexGuard aGuard( rBHelper.rMutex ); // Loop over all changed properties @@ -850,10 +850,10 @@ void OPropertySetHelper::setFastPropertyValues( setFastPropertyValue_NoBroadcast( pHandles[i], pConvertedValues[i] ); } // release guard to fire events - } + } - // fire change events - impl_fireAll( pHandles, pConvertedValues.get(), pOldValues.get(), n ); + // fire change events + impl_fireAll( pHandles, pConvertedValues.get(), pOldValues.get(), n ); } // XMultiPropertySet diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index c62df6631a6d..f6295f3a8edb 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -1103,7 +1103,8 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) throw css::lang::IllegalArgumentException( "Bad argument " + args[i].Name, static_cast< cppu::OWeakObject * >(this), 0); - } OUString uri; + } + OUString uri; if (!(args[i].Value >>= uri)) { throw css::lang::IllegalArgumentException( "Bad uri argument", |