[Libreoffice-commits] core.git: vcl/unx
Stephan Bergmann
sbergman at redhat.com
Fri Jan 27 14:55:32 UTC 2017
vcl/unx/kde/UnxFilePicker.cxx | 27 --------------------
vcl/unx/kde/UnxFilePicker.hxx | 53 +++++++++++++++++++---------------------
vcl/unx/kde/UnxNotifyThread.cxx | 2 -
vcl/unx/kde/UnxNotifyThread.hxx | 6 +---
4 files changed, 29 insertions(+), 59 deletions(-)
New commits:
commit 4d092cba7993b283107eea193e8aaefdf7604952
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 27 15:54:56 2017 +0100
Remove dynamic exception specifications from some TDE-only code
Change-Id: I55cfacfd66ed31c8ec209d8deed7746ce917f8ba
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index dd5293b..3ec3e18 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -233,7 +233,6 @@ UnxFilePicker::~UnxFilePicker()
}
void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
- throw( uno::RuntimeException, std::exception )
{
OSL_ASSERT( m_pNotifyThread );
osl::MutexGuard aGuard( m_aMutex );
@@ -242,7 +241,6 @@ void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePi
}
void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
- throw( uno::RuntimeException, std::exception )
{
OSL_ASSERT( m_pNotifyThread );
osl::MutexGuard aGuard( m_aMutex );
@@ -251,7 +249,6 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFil
}
void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -265,7 +262,6 @@ void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle )
}
sal_Int16 SAL_CALL UnxFilePicker::execute()
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
@@ -282,7 +278,6 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
}
void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -294,7 +289,6 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
}
void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -308,7 +302,6 @@ void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName )
}
void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -322,7 +315,6 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory )
}
OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -334,7 +326,6 @@ OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
}
uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles()
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -346,7 +337,6 @@ uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles()
}
void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter )
- throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -362,7 +352,6 @@ void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUStrin
}
void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle )
- throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -376,7 +365,6 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle )
}
OUString SAL_CALL UnxFilePicker::getCurrentFilter()
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -388,7 +376,6 @@ OUString SAL_CALL UnxFilePicker::getCurrentFilter()
}
void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters )
- throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -412,7 +399,6 @@ void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, con
}
void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any &rValue )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -493,7 +479,6 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
}
uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -519,7 +504,6 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont
}
void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -534,7 +518,6 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab
}
void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel )
- throw( uno::RuntimeException, std::exception )
{
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
@@ -550,7 +533,6 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLa
}
OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/)
- throw ( uno::RuntimeException, std::exception )
{
// FIXME getLabel() is not yet implemented
checkFilePicker();
@@ -626,7 +608,6 @@ sal_Bool SAL_CALL UnxFilePicker::getShowState()
*/
void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArguments )
- throw( uno::Exception, uno::RuntimeException, std::exception )
{
initFilePicker();
@@ -745,7 +726,6 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
}
void SAL_CALL UnxFilePicker::cancel()
- throw ( uno::RuntimeException, std::exception )
{
// FIXME cancel() is not implemented
checkFilePicker();
@@ -755,7 +735,6 @@ void SAL_CALL UnxFilePicker::cancel()
}
void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
- throw( uno::RuntimeException )
{
uno::Reference<XFilePickerListener> xFilePickerListener( rEvent.Source, uno::UNO_QUERY );
@@ -764,19 +743,16 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
}
OUString SAL_CALL UnxFilePicker::getImplementationName()
- throw( uno::RuntimeException, std::exception )
{
return OUString( FILE_PICKER_IMPL_NAME );
}
sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName )
- throw( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames()
- throw( uno::RuntimeException, std::exception )
{
return FilePicker_getSupportedServiceNames();
}
@@ -868,7 +844,7 @@ void UnxFilePicker::initFilePicker()
return;
}
-void UnxFilePicker::checkFilePicker() throw( css::uno::RuntimeException )
+void UnxFilePicker::checkFilePicker()
{
if ( m_nFilePickerPid > 0 )
{
@@ -926,7 +902,6 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId )
}
uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles()
- throw( uno::RuntimeException, std::exception )
{
return getFiles();
}
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 803d91b..8d9f262 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -76,39 +76,39 @@ public:
// XFilePickerNotifier
- virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+ virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
// XExecutableDialog functions
- virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setTitle( const OUString &rTitle ) override;
+ virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions
- virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
+ virtual void SAL_CALL setDefaultName( const OUString &rName ) override;
+ virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) override;
+ virtual OUString SAL_CALL getDisplayDirectory() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override;
// XFilterManager functions
- virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) override;
+ virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) override;
+ virtual OUString SAL_CALL getCurrentFilter() override;
// XFilterGroupManager functions
- virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) override;
// XFilePickerControlAccess functions
- virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) override;
+ virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) override;
+ virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override;
+ virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) override;
+ virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
/* TODO XFilePreview
@@ -123,26 +123,25 @@ public:
// XFilePicker2
- virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) override;
// XCancellable
- virtual void SAL_CALL cancel( ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL cancel( ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ) throw( css::uno::RuntimeException );
+ virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
UnxFilePicker( const UnxFilePicker& ) = delete;
@@ -150,7 +149,7 @@ private:
protected:
void initFilePicker();
- void checkFilePicker() throw( css::uno::RuntimeException );
+ void checkFilePicker();
// Async sendCommand
void sendCommand( const OUString &rCommand );
diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx
index 3b97014..583fae0 100644
--- a/vcl/unx/kde/UnxNotifyThread.cxx
+++ b/vcl/unx/kde/UnxNotifyThread.cxx
@@ -33,7 +33,6 @@ UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePic
}
void SAL_CALL UnxFilePickerNotifyThread::addFilePickerListener( const uno::Reference< ui::dialogs::XFilePickerListener >& xListener )
- throw( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -41,7 +40,6 @@ void SAL_CALL UnxFilePickerNotifyThread::addFilePickerListener( const uno::Refer
}
void SAL_CALL UnxFilePickerNotifyThread::removeFilePickerListener( const uno::Reference< ui::dialogs::XFilePickerListener >& /*xListener*/ )
- throw( uno::RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx
index 5847e22..ca029d7 100644
--- a/vcl/unx/kde/UnxNotifyThread.hxx
+++ b/vcl/unx/kde/UnxNotifyThread.hxx
@@ -55,10 +55,8 @@ protected:
public:
UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker );
- virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
- throw( css::uno::RuntimeException );
- virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
- throw( css::uno::RuntimeException );
+ virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
+ virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
void SAL_CALL exit();
More information about the Libreoffice-commits
mailing list