summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/fontcfg.cxx40
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx68
2 files changed, 58 insertions, 50 deletions
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 46d92d121a66..c97f6fd505a0 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -165,7 +165,7 @@ DefaultFontConfiguration::DefaultFontConfiguration()
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
// configuration is awry
m_xConfigProvider.clear();
@@ -173,7 +173,7 @@ DefaultFontConfiguration::DefaultFontConfiguration()
}
}
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
#if OSL_DEBUG_LEVEL > 1
@@ -214,10 +214,10 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
it->second.xAccess = xNode;
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
@@ -231,10 +231,10 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
aAny >>= aRet;
}
}
- catch( NoSuchElementException& )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
}
@@ -451,7 +451,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
// configuration is awry
m_xConfigProvider.clear();
@@ -459,7 +459,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
}
}
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
#if OSL_DEBUG_LEVEL > 1
@@ -994,10 +994,10 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen
}
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
@@ -1025,10 +1025,10 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re
#endif
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
return (FontWeight)( weight >= 0 ? pWeightNames[weight].nEnum : WEIGHT_DONTKNOW );
@@ -1057,10 +1057,10 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe
#endif
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
return (FontWidth)( width >= 0 ? pWidthNames[width].nEnum : WIDTH_DONTKNOW );
@@ -1092,10 +1092,10 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R
}
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
@@ -1117,10 +1117,10 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
Any aAny = m_xConfigAccess->getByName( it->second.aConfigLocaleString );
aAny >>= xNode;
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
if( xNode.is() )
@@ -1147,10 +1147,10 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
Any aAny = xNode->getByName( pFontNames[i] );
aAny >>= xFont;
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
if( ! xFont.is() )
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index c95608c3faaf..5393cb972813 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -696,7 +696,7 @@ Moderator::Result Moderator::getResult(const sal_uInt32 milliSec)
// reset
m_aResultType = NORESULT;
}
- catch(const salhelper::ConditionWaiter::timedout&)
+ catch (const salhelper::ConditionWaiter::timedout&)
{
ret.type = TIMEDOUT;
}
@@ -849,24 +849,24 @@ void SAL_CALL Moderator::run()
aResult = m_aContent.executeCommand(m_aArg.Name,m_aArg.Argument);
aResultType = RESULT;
}
- catch ( CommandAbortedException )
+ catch (const CommandAbortedException&)
{
aResultType = COMMANDABORTED;
}
- catch ( CommandFailedException )
+ catch (const CommandFailedException&)
{
aResultType = COMMANDFAILED;
}
- catch ( InteractiveIOException& r )
+ catch (const InteractiveIOException& r)
{
nIOErrorCode = r.Code;
aResultType = INTERACTIVEIO;
}
- catch ( UnsupportedDataSinkException& )
+ catch (const UnsupportedDataSinkException )
{
aResultType = UNSUPPORTED;
}
- catch ( Exception )
+ catch (const Exception&)
{
aResultType = GENERAL;
}
@@ -950,10 +950,13 @@ static sal_Bool UCBOpenContentSync(
bool bResultAchieved(false);
Moderator* pMod = 0;
- try {
+ try
+ {
pMod = new Moderator(xContent,xInteract,xProgress,rArg);
pMod->create();
- } catch(const ContentCreationException&) {
+ }
+ catch (const ContentCreationException&)
+ {
bResultAchieved = bException = true;
xLockBytes->SetError( ERRCODE_IO_GENERAL );
}
@@ -1180,17 +1183,17 @@ static sal_Bool _UCBOpenContentSync(
{
aResult = aContent.executeCommand( rArg.Name, rArg.Argument );
}
- catch ( CommandAbortedException )
+ catch (const CommandAbortedException&)
{
bAborted = true;
xLockBytes->SetError( ERRCODE_ABORT );
}
- catch ( CommandFailedException )
+ catch (const CommandFailedException&)
{
bAborted = true;
xLockBytes->SetError( ERRCODE_ABORT );
}
- catch ( InteractiveIOException& r )
+ catch (const InteractiveIOException& r)
{
bException = true;
if ( r.Code == IOErrorCode_ACCESS_DENIED || r.Code == IOErrorCode_LOCKING_VIOLATION )
@@ -1202,12 +1205,12 @@ static sal_Bool _UCBOpenContentSync(
else
xLockBytes->SetError( ERRCODE_IO_GENERAL );
}
- catch ( UnsupportedDataSinkException& )
+ catch (const UnsupportedDataSinkException&)
{
bException = true;
xLockBytes->SetError( ERRCODE_IO_NOTSUPPORTED );
}
- catch ( Exception )
+ catch (const Exception&)
{
bException = true;
xLockBytes->SetError( ERRCODE_IO_GENERAL );
@@ -1262,10 +1265,12 @@ UcbLockBytes::~UcbLockBytes()
{
m_xInputStream->closeInput();
}
- catch ( RuntimeException const & )
- {}
- catch ( IOException const & )
- {}
+ catch (const RuntimeException&)
+ {
+ }
+ catch (const IOException&)
+ {
+ }
}
}
@@ -1275,10 +1280,12 @@ UcbLockBytes::~UcbLockBytes()
{
m_xOutputStream->closeOutput();
}
- catch ( RuntimeException const & )
- {}
- catch ( IOException const & )
- {}
+ catch (const RuntimeException&)
+ {
+ }
+ catch (const IOException&)
+ {
+ }
}
}
@@ -1352,8 +1359,9 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp
bRet = m_xInputStream.is();
}
- catch( Exception& )
- {}
+ catch (const Exception&)
+ {
+ }
if ( m_bStreamValid && m_xInputStream.is() )
m_aInitialized.set();
@@ -1420,11 +1428,11 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount,
{
xSeekable->seek( nPos );
}
- catch ( IOException )
+ catch (const IOException&)
{
return ERRCODE_IO_CANTSEEK;
}
- catch (com::sun::star::lang::IllegalArgumentException)
+ catch (const com::sun::star::lang::IllegalArgumentException&)
{
return ERRCODE_IO_CANTSEEK;
}
@@ -1444,7 +1452,7 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount,
nSize = xStream->readBytes( aData, sal_Int32(nCount) );
}
- catch (IOException)
+ catch (const IOException&)
{
return ERRCODE_IO_CANTREAD;
}
@@ -1474,7 +1482,7 @@ ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong n
{
xSeekable->seek( nPos );
}
- catch ( IOException )
+ catch (const IOException&)
{
return ERRCODE_IO_CANTSEEK;
}
@@ -1487,7 +1495,7 @@ ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong n
if ( pWritten )
*pWritten = nCount;
}
- catch ( Exception )
+ catch (const Exception&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -1506,7 +1514,7 @@ ErrCode UcbLockBytes::Flush() const
{
xOutputStream->flush();
}
- catch( Exception )
+ catch (const Exception&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -1577,7 +1585,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
{
pStat->nSize = sal_uLong(xSeekable->getLength());
}
- catch (IOException)
+ catch (const IOException&)
{
return ERRCODE_IO_CANTTELL;
}