summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /vcl/unx/gtk
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/a11y/atklistener.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx4
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx56
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx14
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.hxx20
5 files changed, 49 insertions, 49 deletions
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index 8b3cb7fff5d3..3255bcf3b78d 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -36,11 +36,11 @@ public:
// XEventListener
virtual void disposing( const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEventListener
virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
AtkObjectWrapper *mpWrapper;
AccessibleVector m_aChildList;
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e8fe27a65d7c..e9309aa40fc8 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -181,10 +181,10 @@ public:
throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
// XEventListener
- virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception);
+ virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleEventListener
- virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception );
+ virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
/*****************************************************************************/
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 4daa294e98b0..94634ca7dd7a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -70,124 +70,124 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XExecutableDialog functions
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL execute()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFilePicker functions
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setDefaultName( const OUString& aName )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
throw( com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getDisplayDirectory( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFilePicker2 functions
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFilterManager functions
virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
- throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
- throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getCurrentFilter( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFilterGroupManager functions
virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFilePickerControlAccess functions
virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
- throw(::com::sun::star::uno::RuntimeException, std::exception );
+ throw(::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFilePreview
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getTargetColorDepth( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAvailableWidth( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getAvailableHeight( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL getShowState( )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XCancellable
virtual void SAL_CALL cancel( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index e4ca5bf62892..a7081c382be4 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -42,33 +42,33 @@ class SalGtkFolderPicker :
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL execute( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFolderPicker functions
virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
- throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception );
+ throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getDisplayDirectory( )
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL getDirectory( )
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setDescription( const OUString& rDescription )
- throw( com::sun::star::uno::RuntimeException, std::exception );
+ throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XCancellable
virtual void SAL_CALL cancel( )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index a3ae4690189e..6a72e7f61b01 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -93,27 +93,27 @@ public:
// XTopWindowListener
using cppu::WeakComponentImplHelperBase::disposing;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& )
- throw(::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& )
- throw (::com::sun::star::uno::RuntimeException, std::exception) {}
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
// XTerminateListener
virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::uno::RuntimeException, std::exception);
+ throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
RunDialog(GtkWidget *pDialog,
::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit,