summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /cui
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/colorpicker.cxx34
-rw-r--r--cui/source/dialogs/thesdlg.cxx1
-rw-r--r--cui/source/inc/colorpicker.hxx3
-rw-r--r--cui/source/inc/thesdlg.hxx2
-rw-r--r--cui/source/options/personasdochandler.cxx9
-rw-r--r--cui/source/options/personasdochandler.hxx25
6 files changed, 27 insertions, 47 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 476dffe3a8f4..54b1e9d7ee4f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1381,20 +1381,20 @@ public:
explicit ColorPicker();
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
// XInitialization
- virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XPropertyAccess
- virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
+ virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) override;
+ virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) override;
// XExecutableDialog
- virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+ virtual sal_Int16 SAL_CALL execute( ) override;
private:
OUString msTitle;
@@ -1415,7 +1415,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone
return static_cast<XWeak*>( new ColorPicker );
}
-Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames()
{
Sequence< OUString > seq { "com.sun.star.ui.dialogs.ColorPicker" };
return seq;
@@ -1431,7 +1431,7 @@ ColorPicker::ColorPicker()
}
// XInitialization
-void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments )
{
if( aArguments.getLength() == 1 )
{
@@ -1440,23 +1440,23 @@ void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments ) throw
}
// XInitialization
-OUString SAL_CALL ColorPicker::getImplementationName( ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ColorPicker::getImplementationName( )
{
return ColorPicker_getImplementationName();
}
-sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName )
{
return cppu::supportsService(this, sServiceName);
}
-Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames( )
{
return ColorPicker_getSupportedServiceNames();
}
// XPropertyAccess
-Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues( ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues( )
{
Sequence< PropertyValue > props(1);
props[0].Name = msColorKey;
@@ -1464,7 +1464,7 @@ Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues( ) throw (Run
return props;
}
-void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& aProps )
{
for( sal_Int32 n = 0; n < aProps.getLength(); n++ )
{
@@ -1480,12 +1480,12 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a
}
// XExecutableDialog
-void SAL_CALL ColorPicker::setTitle( const OUString& sTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL ColorPicker::setTitle( const OUString& sTitle )
{
msTitle = sTitle;
}
-sal_Int16 SAL_CALL ColorPicker::execute( ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL ColorPicker::execute( )
{
ScopedVclPtrInstance< ColorPickerDialog > aDlg( VCLUnoHelper::GetWindow( mxParent ), mnColor, mnMode );
sal_Int16 ret = aDlg->Execute();
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4b8bad46d825..b2cb31592be7 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -275,7 +275,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SvxThesaurusDialog::que
OUString& rTerm,
const lang::Locale& rLocale,
const beans::PropertyValues& rProperties )
- throw(lang::IllegalArgumentException, uno::RuntimeException)
{
uno::Sequence< uno::Reference< linguistic2::XMeaning > > aMeanings(
xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) );
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index 2936e944c0f3..b2b24ba0d7c0 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -42,8 +42,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance(
css::uno::Reference<css::uno::XComponentContext> const &);
/// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames()
- throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames();
}
#endif
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 298c68f179de..2a43f980fe52 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -154,7 +154,7 @@ public:
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > >
- queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties );
bool UpdateAlternativesBox_Impl();
void LookUp( const OUString &rText );
diff --git a/cui/source/options/personasdochandler.cxx b/cui/source/options/personasdochandler.cxx
index 9173aea8b550..90809abaa99d 100644
--- a/cui/source/options/personasdochandler.cxx
+++ b/cui/source/options/personasdochandler.cxx
@@ -15,19 +15,16 @@ using namespace ::com::sun::star::uno;
// XDocumentHandler
void SAL_CALL
PersonasDocHandler::startDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
PersonasDocHandler::endDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
PersonasDocHandler::characters( const OUString & aChars)
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
if( m_isLearnmoreTag )
m_vLearnmoreURLs.push_back( aChars );
@@ -35,29 +32,24 @@ PersonasDocHandler::characters( const OUString & aChars)
void SAL_CALL
PersonasDocHandler::ignorableWhitespace( const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
PersonasDocHandler::processingInstruction(
const OUString &, const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
PersonasDocHandler::setDocumentLocator(
const Reference< xml::sax::XLocator >& )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
PersonasDocHandler::startElement( const OUString& aName,
const Reference< xml::sax::XAttributeList > &xAttribs )
- throw ( xml::sax::SAXException,
- RuntimeException, std::exception )
{
if( aName == "searchresults" )
{
@@ -73,7 +65,6 @@ PersonasDocHandler::startElement( const OUString& aName,
}
void SAL_CALL PersonasDocHandler::endElement( const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
diff --git a/cui/source/options/personasdochandler.hxx b/cui/source/options/personasdochandler.hxx
index 7875be68d4f3..3e3f58ef5d92 100644
--- a/cui/source/options/personasdochandler.hxx
+++ b/cui/source/options/personasdochandler.hxx
@@ -26,33 +26,24 @@ public:
bool hasResults() { return m_hasResults; }
// XDocumentHandler
- virtual void SAL_CALL startDocument()
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocument() override;
- virtual void SAL_CALL endDocument()
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL endDocument() override;
virtual void SAL_CALL startElement( const OUString& aName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs )
- throw ( css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) override;
- virtual void SAL_CALL endElement( const OUString & aName )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL endElement( const OUString & aName ) override;
- virtual void SAL_CALL characters( const OUString & aChars )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL characters( const OUString & aChars ) override;
- virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) override;
virtual void SAL_CALL processingInstruction(
- const OUString & aTarget, const OUString & aData )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const OUString & aTarget, const OUString & aData ) override;
virtual void SAL_CALL setDocumentLocator(
- const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONASDOCHANDLER_HXX