[Libreoffice-commits] .: scripting/source sd/source
Takeshi Abe
tabe at kemper.freedesktop.org
Sat Dec 24 22:10:50 PST 2011
scripting/source/protocolhandler/scripthandler.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 2
scripting/source/provider/ProviderCache.cxx | 10 -
scripting/source/provider/ScriptImpl.cxx | 8 -
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx | 36 ++---
scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 24 +--
scripting/source/runtimemgr/StorageBridge.cxx | 10 -
sd/source/core/CustomAnimationCloner.cxx | 9 -
sd/source/core/CustomAnimationEffect.cxx | 69 +++-------
sd/source/core/TransitionPreset.cxx | 3
sd/source/core/sdpage.cxx | 5
sd/source/core/stlsheet.cxx | 2
sd/source/core/undoanim.cxx | 9 -
sd/source/filter/eppt/pptexanimations.cxx | 6
sd/source/filter/html/htmlex.cxx | 6
sd/source/filter/ppt/pptinanimations.cxx | 6
sd/source/ui/animations/CustomAnimationDialog.cxx | 3
sd/source/ui/animations/CustomAnimationList.cxx | 7 -
sd/source/ui/animations/CustomAnimationPane.cxx | 17 +-
sd/source/ui/annotations/annotationmanager.cxx | 3
sd/source/ui/dlg/dlgass.cxx | 9 -
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 2
sd/source/ui/func/fusel.cxx | 3
sd/source/ui/slideshow/slideshowimpl.cxx | 60 ++------
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 9 -
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 6
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 3
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 3
sd/source/ui/table/TableDesignPane.cxx | 3
sd/source/ui/tools/ConfigurationAccess.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/view/drviews1.cxx | 3
33 files changed, 134 insertions(+), 214 deletions(-)
New commits:
commit 8cc98837d30d818fe3a2e4063798c7451044eb9c
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Dec 25 15:08:11 2011 +0900
catch exception by constant reference
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 008a0e4..c1d2b2c 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -299,7 +299,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
{
xListener->dispatchFinished( aEvent ) ;
}
- catch(RuntimeException & e)
+ catch(const RuntimeException & e)
{
OSL_TRACE(
"ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException"
@@ -413,12 +413,12 @@ void ScriptProtocolHandler::createScriptProvider()
xFac->createScriptProvider( aContext ), UNO_QUERY_THROW );
}
}
- catch ( RuntimeException & e )
+ catch ( const RuntimeException & e )
{
::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::createScriptProvider(), " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::createScriptProvider: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index abd7b7a..19c534c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -327,7 +327,7 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference<
locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("share")) ) ), UNO_QUERY_THROW );
}
// TODO proper exception handling, should throw
- catch( Exception& e )
+ catch( const Exception& e )
{
(void)e;
OSL_TRACE("Caught Exception %s",
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 3dbde51..c5fe4c8 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -243,7 +243,7 @@ void MasterScriptProvider::createPkgProvider()
xFac->createScriptProvider( location ), UNO_QUERY_THROW );
}
- catch ( Exception& e )
+ catch ( const Exception& e )
{
(void)e;
OSL_TRACE("Exception creating MasterScriptProvider for uno_packages in context %s: %s",
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index e7c8e70..4e6390b 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -122,13 +122,9 @@ ProviderCache::getAllProviders() throw ( RuntimeException )
xScriptProvider = createProvider( h_it->second );
providers[ providerIndex++ ] = xScriptProvider;
}
- catch ( Exception& e )
+ catch ( const Exception& )
{
- ::rtl::OUString temp = OUSTR( "ProviderCache::getAllProviders: failed to create provider, " );
- temp.concat( e.Message );
DBG_UNHANDLED_EXCEPTION();
- //throw RuntimeException( temp.concat( e.Message ),
- // Reference< XInterface >() );
}
}
}
@@ -187,7 +183,7 @@ ProviderCache::populateCache() throw ( RuntimeException )
}
}
}
- catch ( Exception &e )
+ catch ( const Exception &e )
{
::rtl::OUString temp = OUSTR(
"ProviderCache::populateCache: couldn't obtain XSingleComponentFactory for " );
@@ -204,7 +200,7 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti
details.provider.set(
details.factory->createInstanceWithArgumentsAndContext( m_Sctx, m_xContext ), UNO_QUERY_THROW );
}
- catch ( RuntimeException& e )
+ catch ( const RuntimeException& e )
{
::rtl::OUString temp(RTL_CONSTASCII_USTRINGPARAM("ProviderCache::createProvider() Error creating provider from factory!!!\n"));
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index ade15a8..7204e8f 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -75,14 +75,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException,
result = m_RunTimeManager->invoke( m_ScriptURI, anyScriptingContext, aParams,
aOutParamIndex, aOutParam );
}
- catch ( lang::IllegalArgumentException & iae )
+ catch ( const lang::IllegalArgumentException & iae )
{
::rtl::OUString temp = OUSTR( "ScriptImpl::invoke IllegalArgumentException : " );
throw lang::IllegalArgumentException( temp.concat( iae.Message ),
Reference< XInterface > (),
iae.ArgumentPosition );
}
- catch ( script::CannotConvertException & cce )
+ catch ( const script::CannotConvertException & cce )
{
::rtl::OUString temp = OUSTR( "ScriptImpl::invoke CannotConvertException : " );
throw script::CannotConvertException( temp.concat( cce.Message ),
@@ -91,14 +91,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException,
cce.Reason,
cce.ArgumentIndex );
}
- catch ( reflection::InvocationTargetException & ite )
+ catch ( const reflection::InvocationTargetException & ite )
{
::rtl::OUString temp = OUSTR( "ScriptImpl::invoke InvocationTargetException : " );
throw reflection::InvocationTargetException( temp.concat( ite.Message ),
Reference< XInterface > (),
ite.TargetException );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
::rtl::OUString temp = OUSTR( "ScriptImpl::invoke RuntimeException : " );
throw RuntimeException( temp.concat( re.Message ),
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 5a96c3b..a9b0ed1 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -144,7 +144,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
Reference< XInterface > () );
}
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolve : problem with getPropertyValue" );
@@ -212,7 +212,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
{
filesysURL = getFilesysURL( scriptURI );
}
- catch ( lang::IllegalArgumentException & e )
+ catch ( const lang::IllegalArgumentException & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -245,7 +245,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
filesysScriptStorageID, ::rtl::OUStringToOString(
filesysURL, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
}
- catch ( RuntimeException & e )
+ catch ( const RuntimeException & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -292,41 +292,41 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
}
}
- catch ( css::security::AccessControlException & e )
+ catch ( css::security::AccessControlException & )
{
// no execute permission
OSL_TRACE( "ScriptNameResolverImpl::resolve : AccessControlException " );
continue;
}
- catch ( beans::UnknownPropertyException & e )
+ catch ( const beans::UnknownPropertyException & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolve : UnknownPropertyException" );
throw RuntimeException( temp.concat( e.Message ),
Reference< XInterface > () );
}
- catch ( beans::PropertyVetoException & e )
+ catch ( const beans::PropertyVetoException & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolve : PropertyVetoException " );
throw RuntimeException( temp.concat( e.Message ),
Reference< XInterface > () );
}
- catch ( lang::IllegalArgumentException & e )
+ catch ( const lang::IllegalArgumentException & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolve : IllegalArgumentException " );
throw lang::IllegalArgumentException( temp.concat( e.Message ),
Reference< XInterface > (), e.ArgumentPosition );
}
- catch ( lang::WrappedTargetException & e )
+ catch ( const lang::WrappedTargetException & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolve : WrappedTargetException " );
throw RuntimeException( temp.concat( e.Message ),
Reference< XInterface > () );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OSL_TRACE(
"Exception thrown by storage %d, failed to match uri: %s",
@@ -426,7 +426,7 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
{
permissionURI = getFilesysURL( scriptURI );
}
- catch ( lang::IllegalArgumentException & e )
+ catch ( const lang::IllegalArgumentException & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::resolveFromURI: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -449,7 +449,7 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
// that information was in the uri
resolvedScriptInfo = results[ 0 ];
}
- catch ( css::security::AccessControlException & ace )
+ catch ( const css::security::AccessControlException & ace )
{
OUString temp = OUSTR(
"ScriptRuntimeManager::resolveURIFromStorageID AccessControlException: " );
@@ -457,7 +457,7 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
Reference< XInterface > (),
ace.LackingPermission );
}
- catch ( lang::IllegalArgumentException & iae )
+ catch ( const lang::IllegalArgumentException & iae )
{
OUString temp = OUSTR(
"ScriptRuntimeManager::resolveURIFromStorageID IllegalArgumentException: " );
@@ -465,14 +465,14 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
Reference< XInterface > (),
iae.ArgumentPosition );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR(
"ScriptRuntimeManager::resolveURIFromStorageID RuntimeException: " );
throw RuntimeException( temp.concat( re.Message ),
Reference< XInterface > () );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR(
"ScriptNameResolverImpl::resolveURIFromStorageID : Exception caught - RuntimeException rethrown" );
@@ -520,23 +520,23 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
Reference< XInterface > xScriptStorage( ScriptStorageManager->getScriptStorage( sid ), UNO_SET_THROW );
xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW );
}
- catch ( lang::IllegalArgumentException & e )
+ catch ( const lang::IllegalArgumentException & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " );
throw lang::IllegalArgumentException( temp.concat( e.Message ),
Reference< XInterface >(), e.ArgumentPosition );
}
- catch ( css::security::AccessControlException & e )
+ catch ( const css::security::AccessControlException & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: AccessControlException " );
throw css::security::AccessControlException( temp.concat( e.Message ), Reference< XInterface >(), e.LackingPermission );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " );
throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR( "ScriptNameResolverImpl::getStorageInstance: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index 7ce4a0d..929cffc 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -107,7 +107,7 @@ throw( RuntimeException )
xInterface.set( m_xContext->getValueByName( buf.makeStringAndClear() ), UNO_QUERY_THROW );
xScriptInvocation.set( xInterface, UNO_QUERY_THROW );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR( "ScriptRuntimeManager::GetScriptRuntime: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -137,7 +137,7 @@ throw( RuntimeException )
);
xScriptNameResolver.set( xInterface, UNO_QUERY_THROW );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR( "ScriptRuntimeManager::GetScriptNameResolver: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -222,14 +222,14 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
xEL_ScriptStorageManager->disposing( event );
}
}
- catch ( lang::IllegalArgumentException & iae )
+ catch ( const lang::IllegalArgumentException & iae )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke IllegalArgumentException: " );
throw lang::IllegalArgumentException( temp.concat( iae.Message ),
Reference< XInterface > (),
iae.ArgumentPosition );
}
- catch ( script::CannotConvertException & cce )
+ catch ( const script::CannotConvertException & cce )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke CannotConvertException: " );
throw script::CannotConvertException( temp.concat( cce.Message ),
@@ -237,31 +237,31 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
cce.DestinationTypeClass, cce.Reason,
cce.ArgumentIndex );
}
- catch ( reflection::InvocationTargetException & ite )
+ catch ( const reflection::InvocationTargetException & ite )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke InvocationTargetException: " );
throw reflection::InvocationTargetException( temp.concat( ite.Message ),
Reference< XInterface > (), ite.TargetException );
}
- catch ( beans::UnknownPropertyException & e )
+ catch ( const beans::UnknownPropertyException & e )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke UnknownPropertyException: " );
throw RuntimeException( temp.concat( e.Message ),
Reference< XInterface > () );
}
- catch ( lang::WrappedTargetException & e )
+ catch ( const lang::WrappedTargetException & e )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke WrappedTargetException : " );
throw RuntimeException( temp.concat( e.Message ),
Reference< XInterface > () );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke RuntimeException: " );
throw RuntimeException( temp.concat( re.Message ),
Reference< XInterface > () );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR( "ScriptRuntimeManager::invoke Exception: " );
throw RuntimeException( temp.concat( e.Message ),
@@ -296,7 +296,7 @@ throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx
{
resolvedURI = xScriptNameResolver->resolve( scriptURI, invocationCtx );
}
- catch ( lang::IllegalArgumentException & iae )
+ catch ( const lang::IllegalArgumentException & iae )
{
OUString temp =
OUSTR( "ScriptRuntimeManager::resolve IllegalArgumentException: " );
@@ -304,7 +304,7 @@ throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx
Reference< XInterface > (),
iae.ArgumentPosition );
}
- catch ( script::CannotConvertException & cce )
+ catch ( const script::CannotConvertException & cce )
{
OUString temp = OUSTR( "ScriptRuntimeManager::resolve CannotConvertException: " );
throw script::CannotConvertException( temp.concat( cce.Message ),
@@ -312,7 +312,7 @@ throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx
cce.DestinationTypeClass, cce.Reason,
cce.ArgumentIndex );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR( "ScriptRuntimeManager::resolve RuntimeException: " );
throw RuntimeException( temp.concat( re.Message ),
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index 2b579a7..878a963 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -59,7 +59,7 @@ StorageBridge::StorageBridge( const Reference< XComponentContext >& xContext,
{
initStorage();
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR( "StorageBridge::StorageBridge(salIn32&): " );
throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() );
@@ -79,12 +79,12 @@ StorageBridge::initStorage() throw ( ::com::sun::star::uno::RuntimeException )
Reference< XInterface > xScriptStorage( xScriptStorageManager->getScriptStorage( m_sid ), UNO_SET_THROW );
m_xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW );
}
- catch ( RuntimeException & re )
+ catch ( const RuntimeException & re )
{
OUString temp = OUSTR( "StorageBridge::StorageBridge: " );
throw RuntimeException( temp.concat( re.Message ), Reference< XInterface >() );
}
- catch ( Exception & e )
+ catch ( const Exception & e )
{
OUString temp = OUSTR( "StorageBridge::StorageBridge: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -102,7 +102,7 @@ throw ( lang::IllegalArgumentException,
{
results = m_xScriptInfoAccess->getScriptLogicalNames();
}
- catch ( Exception &e )
+ catch ( const Exception &e )
{
OUString temp = OUSTR( "StorageBridge::getScriptLogicalNames: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
@@ -121,7 +121,7 @@ throw ( lang::IllegalArgumentException, RuntimeException )
{
results = m_xScriptInfoAccess->getImplementations( queryURI );
}
- catch ( Exception &e )
+ catch ( const Exception &e )
{
OUString temp = OUSTR( "StorageBridge::getImplementations: " );
throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index d3fc643..08a7ebc 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -135,9 +135,8 @@ namespace sd
return xCloneNode;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::Clone(), "
"exception caught: ") +
@@ -220,9 +219,8 @@ namespace sd
xNode->setUserData( aUserData );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformNode(), "
"exception caught: ") +
@@ -295,9 +293,8 @@ namespace sd
return makeAny( aEvent );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformValue(), "
"exception caught: ") +
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 47b47d1..b3baaa3 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -375,9 +375,8 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
nSubItems = 0;
OSL_FAIL( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception cought!" );
}
@@ -1112,9 +1111,8 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
checkForText();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::CustomAnimationEffect::setIterateType(), Exception cought!" );
}
}
@@ -1158,9 +1156,8 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::getPath(), exception cought!" );
}
@@ -1187,9 +1184,8 @@ void CustomAnimationEffect::setPath( const ::rtl::OUString& rPath )
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setPath(), exception cought!" );
}
}
@@ -1237,9 +1233,8 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::getProperty(), exception cought!" );
}
@@ -1315,9 +1310,8 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setProperty(), exception cought!" );
}
@@ -1374,9 +1368,8 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::getColor(), exception cought!" );
}
@@ -1430,9 +1423,8 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setColor(), exception cought!" );
}
}
@@ -1477,9 +1469,8 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType,
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::getTransformationProperty(), exception cought!" );
}
@@ -1551,9 +1542,8 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setTransformationProperty(), exception cought!" );
}
@@ -1574,9 +1564,8 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour
xAudio->setVolume( fVolume );
setAudio( xAudio );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::createAudio(), exception cought!" );
}
}
@@ -1598,9 +1587,8 @@ static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >&
xCommand.set( xNode, UNO_QUERY_THROW );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::findCommandNode(), exception caught!" );
}
@@ -1631,9 +1619,8 @@ void CustomAnimationEffect::removeAudio()
xContainer->removeChild( xChild );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::removeAudio(), exception caught!" );
}
@@ -1652,9 +1639,8 @@ void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animati
if( xContainer.is() && xChild.is() )
xContainer->appendChild( xChild );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setAudio(), exception caught!" );
}
}
@@ -1679,9 +1665,8 @@ void CustomAnimationEffect::setStopAudio()
mnCommand = EffectCommands::STOPAUDIO;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::CustomAnimationEffect::setStopAudio(), exception caught!" );
}
}
@@ -1959,9 +1944,8 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con
rebuild();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::EffectSequenceHelper::replace(), exception cought!" );
}
}
@@ -2116,9 +2100,8 @@ void EffectSequenceHelper::implRebuild()
mxSequenceRoot->setDuration( makeAny((double)0.0) );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::EffectSequenceHelper::rebuild(), exception cought!" );
}
}
@@ -2284,9 +2267,8 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "ppt::stl_process_after_effect_node_func::operator(), exception cought!" );
}
}
@@ -2736,9 +2718,8 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
}
notify_listeners();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::EffectSequenceHelper::createTextGroup(), exception cought!" );
}
}
@@ -3131,9 +3112,8 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::EffectSequenceHelper::createEffects(), exception cought!" );
}
}
@@ -3193,9 +3173,8 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" );
}
}
@@ -3356,9 +3335,8 @@ void MainSequence::createMainSequence()
if( xNotifier.is() )
xNotifier->addChangesListener( mxChangesListener );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::MainSequence::create(), exception cought!" );
return;
}
@@ -3766,9 +3744,8 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::InteractiveSequence::InteractiveSequence(), exception cought!" );
return;
}
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index d1ffd96..e8bfab4 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -215,9 +215,8 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
return bRet;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::TransitionPreset::importResources(), Exception cought!" );
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 1fd344d..9045613 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2683,10 +2683,9 @@ SdPage* SdPage::getImplementation( const ::com::sun::star::uno::Reference< ::com
return static_cast< SdPage* >( pUnoPage->GetSdrPage() );
}
}
- catch( ::com::sun::star::uno::Exception& e )
+ catch( ::com::sun::star::uno::Exception& )
{
- (void)e;
- OSL_FAIL("sd::SdPage::getImplementation(), exception cathced!" );
+ OSL_FAIL("sd::SdPage::getImplementation(), exception caught!" );
}
return 0;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 521c7f6..6f08257 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -822,7 +822,7 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException)
{
throw;
}
- catch (Exception & exc)
+ catch (const Exception & exc)
{
throw RuntimeException(
OUString( RTL_CONSTASCII_USTRINGPARAM(
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index 8b6b17e..79f6ede 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -66,9 +66,8 @@ UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage )
if( pThePage->mxAnimationNode.is() )
mpImpl->mxOldNode = ::sd::Clone( pThePage->getAnimationNode() );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::UndoAnimation::UndoAnimation(), exception caught!");
}
}
@@ -95,9 +94,8 @@ void UndoAnimation::Undo()
mpImpl->mpPage->setAnimationNode( xOldNode );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::UndoAnimation::Undo(), exception caught!");
}
}
@@ -111,9 +109,8 @@ void UndoAnimation::Redo()
xNewNode = ::sd::Clone( mpImpl->mxNewNode );
mpImpl->mpPage->setAnimationNode( xNewNode );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::UndoAnimation::Redo(), exception caught!");
}
}
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 3017c1f..ac8f14d 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -413,9 +413,8 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "(@CL)AnimationExporter::processAfterEffectNodes(), exception cought!" );
}
}
@@ -767,9 +766,8 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const
return xCloneNode;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("(@CL)sd::ppt::AnimationExporter::createAfterEffectNodeClone(), could not create clone!" );
}
return xNode;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 152ad77..41a5363 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3114,9 +3114,8 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA
url += aFileName;
return xFileAccess->exists( url );
}
- catch( com::sun::star::uno::Exception& e )
+ catch( com::sun::star::uno::Exception& )
{
- (void)e;
OSL_FAIL((OString("sd::HtmlExport::checkFileExists(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
}
@@ -3178,9 +3177,8 @@ bool HtmlExport::checkForExistingFiles()
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
bFound = false;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index fb619f0..32f9def 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -635,9 +635,8 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::AnimationImporter::fixMainSequenceTiming(), exception caught!" );
}
}
@@ -661,9 +660,8 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un
xClickNode->setBegin( aBegin );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sd::AnimationImporter::fixInteractiveSequenceTiming(), exception caught!" );
}
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index c2e74f1..e8d501a 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1818,9 +1818,8 @@ void CustomAnimationEffectTabPage::onSoundPreview()
mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ), uno::UNO_QUERY_THROW );
mxPlayer->start();
}
- catch( uno::Exception& e )
+ catch( uno::Exception& )
{
- (void)e;
OSL_FAIL("CustomAnimationEffectTabPage::onSoundPreview(), exception caught!" );
}
}
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 7790ef5..eccbc61 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -797,10 +797,9 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
mpLastParentEntry = pEntry;
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
- OSL_FAIL("sd::CustomAnimationList::append(), exception catched!" );
+ OSL_FAIL("sd::CustomAnimationList::append(), exception caught!" );
}
}
@@ -856,7 +855,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
}
catch( Exception& )
{
- OSL_FAIL( "sd::CustomAnimationList::onSelectionChanged(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationList::onSelectionChanged(), Exception caught!" );
}
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index bb16681..742d745 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -235,10 +235,9 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas
mxView = Reference< XDrawView >::query(mrBase.GetController());
addListener();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
- OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" );
}
// get current page and update custom animation list
@@ -1045,7 +1044,7 @@ void CustomAnimationPane::onSelectionChanged()
}
catch( Exception& )
{
- OSL_FAIL( "sd::CustomAnimationPane::onSelectionChanged(), Exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPane::onSelectionChanged(), Exception caught!" );
}
}
}
@@ -1275,9 +1274,8 @@ static sal_Bool hasVisibleShape( const Reference< XShape >& xShape )
return eFillStyle != FillStyle_NONE || eLineStyle != ::com::sun::star::drawing::LineStyle_NONE;
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
}
return sal_True;
}
@@ -1773,7 +1771,7 @@ void CustomAnimationPane::onChangeCurrentPage()
}
catch( Exception& )
{
- OSL_FAIL( "sd::CustomAnimationPane::onChangeCurrentPage(), exception catched!" );
+ OSL_FAIL( "sd::CustomAnimationPane::onChangeCurrentPage(), exception caught!" );
}
}
@@ -1830,10 +1828,9 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::
return true;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
- OSL_FAIL( "sd::CustomAnimationPane::getTextSelection(), exception cought!" );
+ OSL_FAIL( "sd::CustomAnimationPane::getTextSelection(), exception caught!" );
}
return false;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 1eb18ed..87bac6d 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -209,9 +209,8 @@ void AnnotationManagerImpl::init()
addListener();
mxView = Reference< XDrawView >::query(mrBase.GetController());
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::AnnotationManagerImpl::AnnotationManagerImpl(), Exception caught!" );
}
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 3c0c3e3..e30ae03 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -872,10 +872,9 @@ void AssistentDlgImpl::ProvideTemplates (void)
{
UpdatePreview(sal_True);
}
- catch (uno::RuntimeException& e)
+ catch (uno::RuntimeException& )
{
// Ignore all exceptions.
- (void) e;
}
}
}
@@ -1792,9 +1791,8 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
}
while(false);
}
- catch (com::sun::star::uno::Exception& rException)
+ catch (com::sun::star::uno::Exception& )
{
- (void)rException;
}
return sLabel;
@@ -1849,9 +1847,8 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL)
}
while(false);
}
- catch (com::sun::star::uno::Exception& rException)
+ catch (com::sun::star::uno::Exception& )
{
- (void)rException;
}
return aIcon;
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 06abaa2..6689c7b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -243,7 +243,7 @@ void ConfigurationControllerResourceManager::DeactivateResource (
{
aDescriptor.mxResourceFactory->releaseResource(aDescriptor.mxResource);
}
- catch (lang::DisposedException& rException)
+ catch (const lang::DisposedException& rException)
{
if ( ! rException.Context.is()
|| rException.Context == aDescriptor.mxResourceFactory)
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 633f068..18edbb2 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1329,9 +1329,8 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mxPlayer.set( avmedia::MediaWindow::createPlayer( pInfo->GetBookmark()), uno::UNO_QUERY_THROW );
mxPlayer->start();
}
- catch( uno::Exception& e )
+ catch( uno::Exception& )
{
- (void)e;
}
bAnimated = sal_True;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 63eb11d..8df6407 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -338,9 +338,8 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
return true;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::AnimationSlideController::getSlideAPI(), "
"exception caught: ") +
@@ -660,9 +659,8 @@ void SAL_CALL SlideshowImpl::disposing()
if( mxView.is() )
mxView->dispose();
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::stop(), "
"exception caught: ") +
@@ -889,9 +887,8 @@ bool SlideshowImpl::startPreview(
mpShowWindow->SetPreviewMode();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::startPreview(), "
"exception caught: ") +
@@ -1138,9 +1135,8 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
setActiveXToolbarsVisible( sal_False );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::startShow(), "
"exception caught: ") +
@@ -1201,9 +1197,8 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
return true;
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::startShowImpl(), "
"exception caught: ") +
@@ -1240,9 +1235,8 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
// aEvt.UpdateRect = TODO
mxView->paint( aEvt );
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::paint(), "
"exception caught: ") +
@@ -1295,9 +1289,8 @@ void SlideshowImpl::removeShapeEvents()
maShapeEventMap.clear();
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::removeShapeEvents(), "
"exception caught: ") +
@@ -1331,9 +1324,8 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
registerShapeEvents( xDrawPage );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
@@ -1411,9 +1403,8 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
mxShow->setShapeCursor( xShape, awt::SystemPointer::REFHAND );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
@@ -1483,9 +1474,8 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
mxListenerProxy->paused();
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::pause(), "
"exception caught: ") +
@@ -1520,9 +1510,8 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::resume(), "
"exception caught: ") +
@@ -1586,9 +1575,8 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
mxPlayer.set(avmedia::MediaWindow::createPlayer(pEvent->maStrBookmark), uno::UNO_QUERY_THROW );
mxPlayer->start();
}
- catch( uno::Exception& e )
+ catch( uno::Exception& )
{
- (void)e;
OSL_FAIL("sd::SlideshowImpl::click(), exception caught!" );
}
}
@@ -1943,9 +1931,8 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
+ rtl::OUStringToOString(
@@ -2074,10 +2061,9 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
break;
}
}
- catch( Exception& e )
+ catch( Exception& )
{
bRet = false;
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::keyInput(), "
"exception caught: ") +
@@ -2469,9 +2455,8 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
xShow.set( xInt, UNO_QUERY_THROW );
}
- catch( uno::Exception& e )
+ catch( uno::Exception& )
{
- (void)e;
OSL_FAIL(
(OString("sd::SlideshowImpl::createSlideShow(), "
"exception caught: ") +
@@ -2679,9 +2664,8 @@ void SlideshowImpl::resize( const Size& rSize )
awt::WindowEvent aEvt;
mxView->windowResized(aEvt);
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::resize(), "
"exception caught: ") +
@@ -3040,9 +3024,8 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
mxShow->setProperty( aPenPropSwitchPenMode );
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::setUsePen(), "
"exception caught: ") +
@@ -3115,9 +3098,8 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc
aPenPropEraseAllInk.Value <<= bEraseAllInk;
mxShow->setProperty( aPenPropEraseAllInk );
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_TRACE(
(OString("sd::SlideshowImpl::setEraseAllInk(), "
"exception caught: ") +
@@ -3336,9 +3318,8 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
}
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::gotoPreviousSlide(), "
"exception caught: ") +
@@ -3437,9 +3418,8 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException)
mxPlayer.clear();
}
}
- catch( Exception& e )
+ catch( Exception& )
{
- static_cast<void>(e);
OSL_FAIL(
(OString("sd::SlideshowImpl::stopSound(), "
"exception caught: ") +
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 914f396..1f78d8e 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -134,13 +134,11 @@ CacheConfiguration::CacheConfiguration (void)
xHierarchy->getByHierarchicalName(sPathToNode),
UNO_QUERY);
}
- catch (RuntimeException &aException)
+ catch (RuntimeException &)
{
- (void)aException;
}
- catch (Exception &aException)
+ catch (Exception &)
{
- (void)aException;
}
}
@@ -157,9 +155,8 @@ Any CacheConfiguration::GetValue (const ::rtl::OUString& rName)
{
aResult = mxCacheNode->getByName(rName);
}
- catch (Exception &aException)
+ catch (Exception &)
{
- (void)aException;
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index b503363..44ce6c5 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -221,14 +221,12 @@ void QueueProcessor::ProcessOneRequest (
}
}
}
- catch (::com::sun::star::uno::RuntimeException &aException)
+ catch (::com::sun::star::uno::RuntimeException &)
{
- (void) aException;
OSL_FAIL("RuntimeException caught in QueueProcessor");
}
- catch (::com::sun::star::uno::Exception &aException)
+ catch (::com::sun::star::uno::Exception &)
{
- (void) aException;
OSL_FAIL("Exception caught in QueueProcessor");
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 0d9f576..d86ce83 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -189,9 +189,8 @@ SlideSorterController::~SlideSorterController (void)
if (xComponent.is())
xComponent->dispose();
}
- catch( uno::Exception& e )
+ catch( uno::Exception& )
{
- (void)e;
OSL_FAIL( "sd::SlideSorterController::~SlideSorterController(), exception caught!" );
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 4ef5cf6..22beaae 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -165,9 +165,8 @@ SlideSorterViewShell::~SlideSorterViewShell (void)
xComponent->dispose();
}
}
- catch( ::com::sun::star::uno::Exception& e )
+ catch( ::com::sun::star::uno::Exception& )
{
- (void)e;
OSL_FAIL("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" );
}
GetFrameView()->Disconnect();
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 678da8a..a9943f8 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -150,9 +150,8 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool
mxTableFamily = Reference< XIndexAccess >( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" );
}
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 2ae4150..3a9994c 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -148,7 +148,7 @@ Any ConfigurationAccess::GetConfigurationNode (
return rxNode->getByHierarchicalName(sPathToNode);
}
}
- catch (Exception& rException)
+ catch (const Exception& rException)
{
OSL_TRACE ("caught exception while getting configuration node %s: %s",
::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(),
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 73f3b74..47114ca 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -269,7 +269,7 @@ SdFilterDetect::~SdFilterDetect()
sFilterName = pFilter->GetName();
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &sFilterName );
}
- catch( lang::WrappedTargetException& aWrap )
+ catch( const lang::WrappedTargetException& aWrap )
{
packages::zip::ZipIOException aZipException;
if ( ( aWrap.TargetException >>= aZipException ) && aTypeName.Len() )
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index b8a9e0d..54874de 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -253,9 +253,8 @@ void DrawViewShell::SelectionHasChanged (void)
}
}
}
- catch( ::com::sun::star::uno::Exception& e )
+ catch( ::com::sun::star::uno::Exception& )
{
- (void)e;
OSL_FAIL(
(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), "
"exception caught: ") +
More information about the Libreoffice-commits
mailing list