diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-14 00:03:52 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-14 01:31:17 +0900 |
commit | 520891d058f9e936b9b8afb490b5a26c156008ef (patch) | |
tree | 6cb8ebad42c3504cb3e26249ba3458afb02a9922 /framework/source/uiconfiguration | |
parent | 4c1c531435e1bdb151d45626648486062012cbaa (diff) |
catch exception by constant reference
Diffstat (limited to 'framework/source/uiconfiguration')
6 files changed, 83 insertions, 83 deletions
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index f417e806d616..d22e36f691d4 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -202,10 +202,10 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl if ( a >>= bValue ) return bValue; } - catch ( css::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( css::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -248,10 +248,10 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle return sal_True; } } - catch ( css::container::NoSuchElementException& ) + catch ( const css::container::NoSuchElementException& ) { } - catch ( css::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -296,10 +296,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() return m_xConfigAccess.is(); } - catch ( css::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } - catch ( css::uno::Exception& ) + catch ( const css::uno::Exception& ) { } diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 8fc4c422470b..47e2a9b1f6a6 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -222,7 +222,7 @@ throw ( NoSuchElementException, RuntimeException) } } } - catch( Exception& ) + catch( const Exception& ) { sShort = ::rtl::OUString(); } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 855bcd331c86..7977f8dfd3f8 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -329,7 +329,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -350,7 +350,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } @@ -367,7 +367,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } @@ -381,16 +381,16 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement } } } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::io::IOException& ) + catch ( const ::com::sun::star::io::IOException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } } @@ -464,7 +464,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag MenuConfiguration aMenuCfg( m_xServiceManager ); aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -476,7 +476,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -488,7 +488,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -685,19 +685,19 @@ void ModuleUIConfigurationManager::impl_Initialize() if ( m_pStorageHandler[i] ) xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser(); } - catch ( com::sun::star::container::NoSuchElementException& ) + catch ( const com::sun::star::container::NoSuchElementException& ) { } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::io::IOException& ) + catch ( const ::com::sun::star::io::IOException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } @@ -723,7 +723,7 @@ void ModuleUIConfigurationManager::impl_Initialize() if( xNameAccess->hasByName( sName ) ) xNameAccess->getByName( sName ) >>= xElementTypeStorage; } - catch ( com::sun::star::container::NoSuchElementException& ) + catch ( const com::sun::star::container::NoSuchElementException& ) { } @@ -794,7 +794,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u if ( xModuleImageManager.is() ) xModuleImageManager->dispose(); } - catch ( Exception& ) + catch ( const Exception& ) { } } @@ -949,7 +949,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer ); rUserElementType.bModified = sal_False; } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -967,16 +967,16 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno for ( k = 0; k < aReplaceEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aReplaceEventNotifyContainer[k], NotifyOp_Replace ); } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::container::NoSuchElementException& ) + catch ( const ::com::sun::star::container::NoSuchElementException& ) { } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } } @@ -1482,7 +1482,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un if ( rUserElementType.bModified ) impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1524,7 +1524,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno m_pStorageHandler[i]->commitUserChanges(); } } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1555,7 +1555,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1604,7 +1604,7 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const Configu break; } } - catch( css::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { pIterator.remove(); } diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 98adb38e43ee..83c006bc4136 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -258,10 +258,10 @@ sal_Bool ConfigurationAccess_UICategory::fillCache() m_aIdCache.insert( IdToInfoCache::value_type( aNameSeq[i], aUIName )); } } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } - catch ( com::sun::star::container::NoSuchElementException& ) + catch ( const com::sun::star::container::NoSuchElementException& ) { } } @@ -288,19 +288,19 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId ) { return m_xGenericUICategories->getByName( rId ); } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } - catch ( com::sun::star::container::NoSuchElementException& ) + catch ( const com::sun::star::container::NoSuchElementException& ) { } } } } - catch( com::sun::star::container::NoSuchElementException& ) + catch( const com::sun::star::container::NoSuchElementException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } @@ -357,10 +357,10 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds() return aNameSeq; } - catch( com::sun::star::container::NoSuchElementException& ) + catch( const com::sun::star::container::NoSuchElementException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } } @@ -394,10 +394,10 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() return sal_True; } - catch ( WrappedTargetException& ) + catch ( const WrappedTargetException& ) { } - catch ( Exception& ) + catch ( const Exception& ) { } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index fedb568813cc..66369b86ece1 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -267,7 +267,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -288,7 +288,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } @@ -305,7 +305,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); return; } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } @@ -319,16 +319,16 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, } } } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::io::IOException& ) + catch ( const ::com::sun::star::io::IOException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } } @@ -393,7 +393,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x MenuConfiguration aMenuCfg( m_xServiceManager ); aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -405,7 +405,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x { ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -417,7 +417,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x { StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings ); } - catch ( ::com::sun::star::lang::WrappedTargetException& ) + catch ( const ::com::sun::star::lang::WrappedTargetException& ) { } } @@ -563,19 +563,19 @@ void UIConfigurationManager::impl_Initialize() { xElementTypeStorage = m_xDocConfigStorage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes ); } - catch ( com::sun::star::container::NoSuchElementException& ) + catch ( const com::sun::star::container::NoSuchElementException& ) { } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::io::IOException& ) + catch ( const ::com::sun::star::io::IOException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } @@ -631,7 +631,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru if ( m_xImageManager.is() ) m_xImageManager->dispose(); } - catch ( Exception& ) + catch ( const Exception& ) { } @@ -755,16 +755,16 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove ); } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( const ::com::sun::star::lang::IllegalArgumentException& ) { } - catch ( ::com::sun::star::container::NoSuchElementException& ) + catch ( const ::com::sun::star::container::NoSuchElementException& ) { } - catch ( ::com::sun::star::embed::InvalidStorageException& ) + catch ( const ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) + catch ( const ::com::sun::star::embed::StorageWrappedTargetException& ) { } } @@ -1142,7 +1142,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S if ( xComponent.is() ) xComponent->dispose(); } - catch ( Exception& ) + catch ( const Exception& ) { } } @@ -1174,10 +1174,10 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } - catch ( com::sun::star::beans::UnknownPropertyException& ) + catch ( const com::sun::star::beans::UnknownPropertyException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } } @@ -1217,7 +1217,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc if ( rDocElementType.bModified ) impl_reloadElementTypeData( rDocElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1256,7 +1256,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce if ( rElementType.bModified && xStorage.is() ) impl_storeElementTypeData( xStorage, rElementType ); } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1290,7 +1290,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } - catch ( Exception& ) + catch ( const Exception& ) { throw IOException(); } @@ -1339,7 +1339,7 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration break; } } - catch( css::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { pIterator.remove(); } diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 221ce883d5aa..88e0a3c798d6 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -436,7 +436,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException ) xFlush->commitChanges(); } } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } } @@ -493,7 +493,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException, xFlush->commitChanges(); } } - catch ( Exception& ) + catch ( const Exception& ) { } } @@ -567,7 +567,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, xFlush->commitChanges(); } } - catch ( Exception& ) + catch ( const Exception& ) { } } @@ -847,10 +847,10 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt aPropSeq[nIndex].Value = a; } } - catch( com::sun::star::container::NoSuchElementException& ) + catch( const com::sun::star::container::NoSuchElementException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } } @@ -1022,10 +1022,10 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" ); } } - catch( com::sun::star::container::NoSuchElementException& ) + catch( const com::sun::star::container::NoSuchElementException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } } @@ -1054,10 +1054,10 @@ Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const r return impl_insertCacheAndReturnSequence( rResourceURL, xNameAccess ); } } - catch( com::sun::star::container::NoSuchElementException& ) + catch( const com::sun::star::container::NoSuchElementException& ) { } - catch ( com::sun::star::lang::WrappedTargetException& ) + catch ( const com::sun::star::lang::WrappedTargetException& ) { } @@ -1295,7 +1295,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" ); } } - catch( Exception& ) + catch( const Exception& ) { } } @@ -1332,10 +1332,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() return sal_True; } - catch ( WrappedTargetException& ) + catch ( const WrappedTargetException& ) { } - catch ( Exception& ) + catch ( const Exception& ) { } @@ -1382,7 +1382,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi { aElementNames = xNameAccess->getElementNames(); } - catch (::com::sun::star::uno::RuntimeException &) + catch (const ::com::sun::star::uno::RuntimeException &) { } Sequence< PropertyValue > aSeq; |