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

24 files changed, 32 insertions, 32 deletions

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