diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-07 17:26:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-07 17:27:39 +0200 |
| commit | 6ac0e1399a2be344284f192fb3445489346b1fba (patch) | |
| tree | c79887c9a1ddf69718f231b1797dc03d06c4fc84 | |
| parent | a8dd89b49ea26d8bfb27feab562191e61d4a7487 (diff) | |
Remove silly PUT_SEMICOLON_AT_THE_END
...and rather live with macro calls not terminated by semicolons until those
macros are gone for good anyway. Completely remove unused
DECLARE_UNO3_XCOMPONENT_DEFAULTS.
Change-Id: I0d4eb5a91736004b0da2b09fce860e57f6d1ddbd
50 files changed, 73 insertions, 120 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 82f3e7d6c3ef..932a54fb2a4f 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -123,7 +123,7 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 4e2aae98a0c3..e0aea4902057 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -87,7 +87,7 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 23ec45adc650..dada920404e6 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -109,7 +109,7 @@ namespace cairocanvas // Classname Base doing refcount Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 6737c38c9e95..f1f17c4f1f95 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -120,7 +120,7 @@ namespace cairocanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 5467c2d1eeb8..9ee0195aba5a 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -90,7 +90,7 @@ namespace dxcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); @@ -149,7 +149,7 @@ namespace dxcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index ad94a90709e9..1f96957fadc2 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -109,7 +109,7 @@ namespace dxcanvas // Classname Base doing refcount Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index b6bc4228eb9a..8a2f4fd7eb5c 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -115,7 +115,7 @@ namespace dxcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index a026144276c1..d65979bc98f0 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -82,7 +82,7 @@ namespace oglcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index a2ac127f4d0d..18fc745a0645 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -97,7 +97,7 @@ namespace vclcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index f15ba63db77d..0b5fb509f3b4 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -96,7 +96,7 @@ namespace vclcanvas // Classname Base doing refcount Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index f2015ee49887..19bced3ac7e8 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -122,7 +122,7 @@ namespace vclcanvas // Classname Base doing refcounting Base implementing the XComponent interface // | | | // V V V - DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); + DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index acccc3b849fe..7ff31df3b3a5 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -50,7 +50,7 @@ namespace dbaui SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // UNO - DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController); + DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 5d3c1474a3fd..6b0e94400f07 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -160,7 +160,7 @@ namespace dbaui void AttachForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster); // UNO - DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1); + DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 203a891e5410..ef9b4db2f991 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -67,7 +67,7 @@ namespace dbaui virtual ~SbaXGridControl(); // UNO - DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl); + DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index d4fcf634903b..ba23e758a0b8 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -69,7 +69,7 @@ namespace dbaui public: \ classname( ::cppu::OWeakObject& rSource, \ ::osl::Mutex& rMutex); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ \ @@ -190,7 +190,7 @@ namespace dbaui \ public: \ classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ - DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \ + DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ \ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 04c815753ac7..916e6b57a5e0 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -145,7 +145,7 @@ namespace dbaui static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController); + DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction virtual bool Construct(Window* pParent) SAL_OVERRIDE; // XInterface diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index e4bd08f8c9fd..c28b5165c7f8 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -52,7 +52,7 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OButtonModel ); // UNO - DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel ); + DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; @@ -138,7 +138,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // UNO binding - DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl); + DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XActionListener diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index c16e0b7291ee..58f22b18d093 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -71,7 +71,7 @@ public: virtual ~OGridColumn(); // UNO binding - DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE); + DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelImplementationId(); diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 1afc0b4777f3..18621566c2d8 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -94,7 +94,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO - DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index b4762bad2c46..80e2cbe6083d 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -223,7 +223,7 @@ public: virtual ~ODatabaseForm(); // UNO binding - DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents); + DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 13dda6038ef3..82fb195860a7 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -110,7 +110,7 @@ protected: public: ODateControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); - DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl); + DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl) // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(ODateControl); diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 12333d808c01..8a1cdcf72f04 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -138,7 +138,7 @@ public: OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); virtual ~OEditControl(); - DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl); + DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 0d9018a0f4a5..1f56f3b99ea3 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -87,7 +87,7 @@ protected: public: // UNO Anbindung - DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject); + DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; OComponentEventThread(::cppu::OComponentHelper* pCompImpl); diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index ed643b3de9b3..af3ae371b378 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -43,7 +43,7 @@ protected: public: DECLARE_DEFAULT_LEAF_XTOR( OFileControlModel ); - DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index e42abe26832e..f61b7ab40820 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -83,7 +83,7 @@ namespace frm public: OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); - DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject); + DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject) ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString GetComponentServiceName() SAL_OVERRIDE; diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index ae71e45da87d..0c99bf422284 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -56,7 +56,7 @@ class OFormattedModel protected: // XInterface - DECLARE_UNO3_AGG_DEFAULTS( OFormattedModel, OEditBaseModel ); + DECLARE_UNO3_AGG_DEFAULTS( OFormattedModel, OEditBaseModel ) // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; @@ -151,7 +151,7 @@ class OFormattedModel OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); virtual ~OFormattedControl(); - DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl); + DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 2cef250f674f..1315d4f8a2f6 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -65,7 +65,7 @@ protected: public: // UNO - DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject); + DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 05ce7d513b68..2a8dce1407aa 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -55,7 +55,7 @@ public: virtual ~OFormsCollection(); public: - DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase); + DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index fe623765a22a..5561a7679dc3 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -103,7 +103,7 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OGridControlModel ); // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index e7775bf8a3f2..02140241e0bf 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -74,7 +74,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl); + DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 6cabd9700111..dc1b3a0c47b7 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -73,7 +73,7 @@ public: throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo @@ -162,7 +162,7 @@ public: OImageControlControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); // UNO - DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl ); + DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index b5569dbf2f2c..f61fba4c9247 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -133,7 +133,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper @@ -275,7 +275,7 @@ public: virtual ~OListBoxControl(); // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl); + DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 81c4594ded15..564750282498 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -110,7 +110,7 @@ protected: public: OTimeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); - DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl); + DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl) // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OTimeControl); diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index da3cbbef3eda..453d79788ebd 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -91,7 +91,7 @@ namespace frm DECLARE_DEFAULT_XTOR( OClickableImageBaseModel ); // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -209,7 +209,7 @@ namespace frm protected: // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl); + DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index debfa100296d..b3045ebc4a45 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -78,7 +78,7 @@ namespace frm protected: // UNO - DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel ); + DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index adfb2ed524d9..9fbdf37e88f1 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -221,7 +221,7 @@ protected: void doResetDelegator(); // UNO - DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); + DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -298,7 +298,7 @@ public: virtual ~OBoundControl(); - DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl); + DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBoundControl @@ -405,7 +405,7 @@ protected: ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames(); public: - DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); + DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -1022,7 +1022,7 @@ public: public: // UNO Anbindung - DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel); + DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index f305a3a0b151..ddb8bbd691d0 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -299,7 +299,7 @@ public: OFormComponents( const OFormComponents& _cloneSource ); virtual ~OFormComponents(); - DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase); + DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index a74e92e5f72f..ba719cb949cc 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -62,7 +62,7 @@ namespace frm protected: // UNO - DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ); + DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XControl diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 3c5384630d57..5cc32ca198d5 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -103,7 +103,7 @@ namespace frm DECLARE_DEFAULT_LEAF_XTOR( ORichTextModel ); // UNO - DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ); + DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 36faf579f8fb..962cda8945a0 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -63,7 +63,7 @@ namespace frm protected: // UNO - DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl ); + DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl ) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XControl diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index 0bebb9fa91aa..e853590088a1 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -44,8 +44,7 @@ namespace comphelper */ #define DECLARE_UNO3_DEFAULTS(classname, baseclass) \ virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() + virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } /** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class, (e.g. if you overload queryAggregation) @@ -54,50 +53,7 @@ namespace comphelper virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); } \ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ - { return baseclass::queryInterface(_rType); } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - - /** Use this macro to forward XComponent methods to base class - - When using the ::cppu::WeakComponentImplHelper base classes to - implement a UNO interface, a problem occurs when the interface - itself already derives from XComponent (like e.g. awt::XWindow - or awt::XControl): ::cppu::WeakComponentImplHelper is then - still abstract. Using this macro in the most derived class - definition provides overrides for the XComponent methods, - forwarding them to the given baseclass. - - @param classname - Name of the class this macro is issued within - - @param baseclass - Name of the baseclass that should have the XInterface methods - forwarded to - that's usually the WeakComponentImplHelperN base - - @param implhelper - Name of the baseclass that should have the XComponent methods - forwarded to - in the case of the WeakComponentImplHelper, - that would be ::cppu::WeakComponentImplHelperBase - */ - #define DECLARE_UNO3_XCOMPONENT_DEFAULTS(classname, baseclass, implhelper) \ - virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ - virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::dispose(); \ - } \ - virtual void SAL_CALL addEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::addEventListener(xListener); \ - } \ - virtual void SAL_CALL removeEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - + { return baseclass::queryInterface(_rType); } /** Use this macro to forward XComponent methods to base class @@ -139,10 +95,7 @@ namespace comphelper ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { \ implhelper::removeEventListener(xListener); \ - } \ - void SAL_CALL PUT_SEMICOLON_AT_THE_END() - - + } //= deriving from multiple XInterface-derived classes diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 3ec3b7b255d0..19a34f1dafbf 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -96,7 +96,7 @@ namespace svt public: // UNO - DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase); + DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase) virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 86ed1fce828d..ea78b789f8c8 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -47,7 +47,7 @@ public: virtual ~SvxFmDrawPage() throw (); // UNO connection - DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage); + DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 1b548f6b7a6c..1f2b2c59df37 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -78,7 +78,7 @@ class FmXModifyMultiplexer :public OWeakSubObject { public: FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -101,7 +101,7 @@ class FmXUpdateMultiplexer : public OWeakSubObject, { public: FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -126,7 +126,7 @@ class FmXSelectionMultiplexer :public OWeakSubObject { public: FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -150,7 +150,7 @@ class FmXGridControlMultiplexer :public OWeakSubObject { public: FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); - DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ); + DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -174,7 +174,7 @@ class FmXContainerMultiplexer : public OWeakSubObject, { public: FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex); - DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject); + DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -226,7 +226,7 @@ public: virtual ~FmXGridControl(); // UNO connection - DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl); + DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -379,7 +379,7 @@ public: void Create(Window* pParent, WinBits nStyle); // UNO connection - DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow); + DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 00d030ab3c1d..99d3c4204827 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -97,7 +97,7 @@ public: // the set has to support the sdb::ResultSet service virtual ~FmRecordCountListener(); - // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject); + // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject) // virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut); // ::com::sun::star::lang::XEventListener diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx index f952b2785b01..972690e173ec 100644 --- a/include/toolkit/controls/tkthrobber.hxx +++ b/include/toolkit/controls/tkthrobber.hxx @@ -75,7 +75,7 @@ namespace toolkit UnoThrobberControl(); OUString GetComponentServiceName(); - DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ); + DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ) ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 979807641754..bb2623e3d938 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -258,7 +258,7 @@ public: FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame); // UNO Anbindung - DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE); + DECLARE_UNO3_DEFAULTS(FmXFormShell, FmXFormShell_BASE) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index f6d244c26c3a..92766a3558cd 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -84,7 +84,7 @@ namespace svxform ); // UNO - DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE); + DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE) // ::com::sun::star::frame::XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 15197fedd022..1778dc6f7472 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -758,7 +758,7 @@ public: FmXGridCell( DbGridColumn* pColumn, DbCellControl* pControl ); void init(); - DECLARE_UNO3_AGG_DEFAULTS(FmXGridCell, OComponentHelper); + DECLARE_UNO3_AGG_DEFAULTS(FmXGridCell, OComponentHelper) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SetTextLineColor(); @@ -909,7 +909,7 @@ protected: public: FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ); - DECLARE_UNO3_AGG_DEFAULTS(FmXEditCell, FmXTextCell); + DECLARE_UNO3_AGG_DEFAULTS(FmXEditCell, FmXTextCell) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -966,7 +966,7 @@ public: FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); // UNO - DECLARE_UNO3_AGG_DEFAULTS(FmXCheckBoxCell, FmXDataCell); + DECLARE_UNO3_AGG_DEFAULTS(FmXCheckBoxCell, FmXDataCell) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -1009,7 +1009,7 @@ protected: public: FmXListBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); - DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell); + DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -1064,7 +1064,7 @@ protected: public: FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); - DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell); + DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -1105,7 +1105,7 @@ public: FmXFilterCell(DbGridColumn* pColumn = NULL, DbCellControl* pControl = NULL); - DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell); + DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index ee40b0bea521..c9deabce214f 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -78,7 +78,7 @@ public: UnoSpinButtonControl(); OUString GetComponentServiceName() SAL_OVERRIDE; - DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ); + DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ) css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; |