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

3 files changed, 93 insertions, 93 deletions

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 2a71217b4cc4..fcd7d97c8b69 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -114,7 +114,7 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XTypeProvider
@@ -134,7 +134,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XAggregation
@@ -155,7 +155,7 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
         const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XControl
@@ -177,7 +177,7 @@ public:
     virtual void SAL_CALL createPeer(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >&      xToolkit ,
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >&   xParent
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -194,7 +194,7 @@ public:
 
     virtual sal_Bool SAL_CALL setModel(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -210,7 +210,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XComponent
@@ -229,7 +229,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XEventListener
@@ -248,7 +248,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XControlContainer
@@ -270,7 +270,7 @@ public:
     virtual void SAL_CALL addControl(
         const OUString&                                   sName    ,
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >&    xControl
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception  );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception  ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -287,7 +287,7 @@ public:
 
     virtual void SAL_CALL removeControl(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -304,7 +304,7 @@ public:
 
     virtual void SAL_CALL setStatusText(
         const OUString& sStatusText
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -321,7 +321,7 @@ public:
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(
         const OUString& sName
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -337,7 +337,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XWindow
@@ -356,7 +356,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
 //  protected methods
@@ -379,7 +379,7 @@ protected:
 
     virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer
-    );
+    ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short
@@ -398,7 +398,7 @@ protected:
         sal_Int32                                           nX ,
         sal_Int32                                           nY ,
         const   ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >&   xGraphics
-    );
+    ) SAL_OVERRIDE;
 
 
 //  private methods
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 55676b5f2374..d4efe7188a46 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -183,7 +183,7 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
         const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -199,7 +199,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL acquire() throw();
+    virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      decrement refcount
@@ -215,7 +215,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL release() throw();
+    virtual void SAL_CALL release() throw() SAL_OVERRIDE;
 
 
     //  XTypeProvider
@@ -235,7 +235,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      get implementation id
@@ -252,7 +252,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XAggregation
@@ -273,7 +273,7 @@ public:
 
     virtual void SAL_CALL setDelegator(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDelegator
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -290,7 +290,7 @@ public:
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
         const ::com::sun::star::uno::Type& aType
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XServiceInfo
@@ -311,7 +311,7 @@ public:
 
     virtual sal_Bool SAL_CALL supportsService(
         const OUString& sServiceName
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -327,7 +327,7 @@ public:
     */
 
     virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -343,7 +343,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XComponent
@@ -362,7 +362,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -379,7 +379,7 @@ public:
 
     virtual void SAL_CALL addEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -396,7 +396,7 @@ public:
 
     virtual void SAL_CALL removeEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XControl
@@ -418,7 +418,7 @@ public:
     virtual void SAL_CALL createPeer(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit,
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -435,7 +435,7 @@ public:
 
     virtual void SAL_CALL setContext(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xContext
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -452,7 +452,7 @@ public:
 
     virtual sal_Bool SAL_CALL setModel(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0 ;
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -467,7 +467,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -483,7 +483,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -499,7 +499,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -515,7 +515,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -531,7 +531,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -546,7 +546,7 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -561,7 +561,7 @@ public:
         @onerror    -
     */
 
-    virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XWindow
@@ -584,7 +584,7 @@ public:
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+                                        sal_Int16   nFlags  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -599,7 +599,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -614,7 +614,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -629,7 +629,7 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -644,7 +644,7 @@ public:
         @onerror    -
     */
 
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -661,7 +661,7 @@ public:
 
     virtual void SAL_CALL addWindowListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -678,7 +678,7 @@ public:
 
     virtual void SAL_CALL addFocusListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -695,7 +695,7 @@ public:
 
     virtual void SAL_CALL addKeyListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener )
-    throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -712,7 +712,7 @@ public:
 
     virtual void SAL_CALL addMouseListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -729,7 +729,7 @@ public:
 
     virtual void SAL_CALL addMouseMotionListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -746,7 +746,7 @@ public:
 
     virtual void SAL_CALL addPaintListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -763,7 +763,7 @@ public:
 
     virtual void SAL_CALL removeWindowListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -780,7 +780,7 @@ public:
 
     virtual void SAL_CALL removeFocusListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -797,7 +797,7 @@ public:
 
     virtual void SAL_CALL removeKeyListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -814,7 +814,7 @@ public:
 
     virtual void SAL_CALL removeMouseListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -831,7 +831,7 @@ public:
 
     virtual void SAL_CALL removeMouseMotionListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -848,7 +848,7 @@ public:
 
     virtual void SAL_CALL removePaintListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XView
@@ -868,7 +868,7 @@ public:
     */
 
     virtual void SAL_CALL draw( sal_Int32   nX  ,
-                                sal_Int32   nY  ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+                                sal_Int32   nY  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -885,7 +885,7 @@ public:
 
     virtual sal_Bool SAL_CALL setGraphics(
         const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -901,7 +901,7 @@ public:
     */
 
     virtual void SAL_CALL setZoom(  float   fZoomX  ,
-                                    float   fZoomY  ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+                                    float   fZoomY  ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -917,7 +917,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -932,7 +932,7 @@ public:
         @onerror    -
     */
 
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  ::com::sun::star::lang::XEventListener
@@ -953,7 +953,7 @@ public:
 
     virtual void SAL_CALL disposing(
         const ::com::sun::star::lang::EventObject& rSource
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XPaintListener
@@ -974,7 +974,7 @@ public:
 
     virtual void SAL_CALL windowPaint(
         const ::com::sun::star::awt::PaintEvent& rEvent
-    ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XWindowListener
@@ -993,10 +993,10 @@ public:
         @onerror    -
     */
 
-    virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  impl but public method to register service
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 09aaebe20941..2cc0125740cc 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -141,7 +141,7 @@ public:
     */
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -157,7 +157,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL acquire() throw();
+    virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
 
     /**_______________________________________________________________________________________________________
         @short      decrement refcount
@@ -173,7 +173,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL release() throw();
+    virtual void SAL_CALL release() throw() SAL_OVERRIDE;
 
 
     //  operator
@@ -294,7 +294,7 @@ public:
     */
 
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource)
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XFocusListener
@@ -315,7 +315,7 @@ public:
     */
 
     virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -332,7 +332,7 @@ public:
     */
 
     virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XWindowListener
@@ -353,7 +353,7 @@ public:
     */
 
     virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -370,7 +370,7 @@ public:
     */
 
     virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -387,7 +387,7 @@ public:
     */
 
     virtual void SAL_CALL windowShown(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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -404,7 +404,7 @@ public:
     */
 
     virtual void SAL_CALL windowHidden(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 ;
 
 
     //  XKeyListener
@@ -425,7 +425,7 @@ public:
     */
 
     virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -442,7 +442,7 @@ public:
     */
 
     virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XMouseListener
@@ -463,7 +463,7 @@ public:
     */
 
     virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -480,7 +480,7 @@ public:
     */
 
     virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -497,7 +497,7 @@ public:
     */
 
     virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -514,7 +514,7 @@ public:
     */
 
     virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XMouseMotionListener
@@ -535,7 +535,7 @@ public:
     */
 
     virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -552,7 +552,7 @@ public:
     */
 
     virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XPaintListener
@@ -573,7 +573,7 @@ public:
     */
 
     virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) ;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
 
 
     //  XTopWindowListener
@@ -594,7 +594,7 @@ public:
     */
 
     virtual void SAL_CALL windowOpened( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -611,7 +611,7 @@ public:
     */
 
     virtual void SAL_CALL windowClosing( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -628,7 +628,7 @@ public:
     */
 
     virtual void SAL_CALL windowClosed( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -645,7 +645,7 @@ public:
     */
 
     virtual void SAL_CALL windowMinimized( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -662,7 +662,7 @@ public:
     */
 
     virtual void SAL_CALL windowNormalized( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -679,7 +679,7 @@ public:
     */
 
     virtual void SAL_CALL windowActivated( 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 ;
 
     /**_______________________________________________________________________________________________________
         @short      -
@@ -696,7 +696,7 @@ public:
     */
 
     virtual void SAL_CALL windowDeactivated( 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 ;
 
 
 //  protected methods