filter/source/msfilter/msocximex.cxx | 1
framework/source/uielement/uicommanddescription.cxx | 28 ++++++++++----------
2 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 1da878532e2c821313609fe376df05895f1325a6
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 26 12:53:38 2011 +0100
doesn't use a DocShell anymore, so can ditch check for it
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index 19e217e..616df10 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -47,7 +47,6 @@ static char sWW8_form[] = "WW-Standard";
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference<
frame::XModel >& rxModel) : mxModel(rxModel)
{
- OSL_ENSURE( pDocSh, "No DocShell, Cannot do Controls" );
}
SvxMSConvertOCXControls::~SvxMSConvertOCXControls()
commit 9cbc1eb35e2fff63f16a30e2fcc8909c2e566cc2
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 26 12:06:22 2011 +0100
WaE: unused e
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index a338c26..6702612 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -394,10 +394,10 @@ void ConfigurationAccess_UICommand::impl_fill(const
Reference< XNameAccess >& _x
aImageMirrorVector.push_back( aNameSeq[i] );
}
}
- 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&)
{
}
}
@@ -437,11 +437,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ))) >>= aCommandNameSeq )
m_aCommandRotateImageList = comphelper::concatSequences<
rtl::OUString >( m_aCommandRotateImageList, aCommandNameSeq );
}
- catch ( RuntimeException& e )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -451,11 +451,11 @@ sal_Bool
ConfigurationAccess_UICommand::addGenericInfoToCache()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))) >>= aCommandNameSeq )
m_aCommandMirrorImageList = comphelper::concatSequences<
rtl::OUString >( m_aCommandMirrorImageList, aCommandNameSeq );
}
- catch ( RuntimeException& e )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -482,19 +482,19 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand(
const rtl::OUString& rCom
{
return m_xGenericUICommands->getByName( rCommandURL );
}
- 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&)
{
}
@@ -537,10 +537,10 @@ Sequence< rtl::OUString >
ConfigurationAccess_UICommand::getAllCommands()
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&)
{
}
}
@@ -587,10 +587,10 @@ sal_Bool
ConfigurationAccess_UICommand::initializeConfigAccess()
return sal_True;
}
- catch ( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
