From 28ac97dce1750fdc2a4c8e8d4d03f7a81668b0f9 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 3 Jun 2014 23:01:07 +0200
Subject: forms: expand DECLARE_XCLONEABLE

Change-Id: I2a468e40489797e33935b79a27459ab408558124
---
 forms/source/component/Button.hxx         | 2 +-
 forms/source/component/CheckBox.hxx       | 2 +-
 forms/source/component/ComboBox.hxx       | 2 +-
 forms/source/component/Currency.hxx       | 2 +-
 forms/source/component/Date.hxx           | 2 +-
 forms/source/component/Edit.hxx           | 2 +-
 forms/source/component/File.hxx           | 2 +-
 forms/source/component/FixedText.hxx      | 2 +-
 forms/source/component/FormattedField.hxx | 2 +-
 forms/source/component/Grid.hxx           | 2 +-
 forms/source/component/GroupBox.hxx       | 2 +-
 forms/source/component/Hidden.hxx         | 2 +-
 forms/source/component/ImageButton.hxx    | 2 +-
 forms/source/component/ImageControl.hxx   | 2 +-
 forms/source/component/ListBox.hxx        | 2 +-
 forms/source/component/Numeric.hxx        | 2 +-
 forms/source/component/Pattern.hxx        | 2 +-
 forms/source/component/RadioButton.hxx    | 2 +-
 forms/source/component/Time.hxx           | 2 +-
 forms/source/component/navigationbar.hxx  | 2 +-
 forms/source/component/scrollbar.hxx      | 2 +-
 forms/source/component/spinbutton.hxx     | 2 +-
 forms/source/inc/FormComponent.hxx        | 4 ----
 forms/source/richtext/richtextmodel.hxx   | 2 +-
 24 files changed, 23 insertions(+), 27 deletions(-)

(limited to 'forms/source')

diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index b12771319123..0e10752e8c9f 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -86,7 +86,7 @@ public:
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     void    impl_resetNoBroadcast_nothrow();
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index b13cc93824c7..276992af12cb 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -52,7 +52,7 @@ public:
     ) const SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // OBoundControlModel overridables
     virtual ::com::sun::star::uno::Any
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 22f983a41a66..af3518d74668 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -138,7 +138,7 @@ protected:
 protected:
     void loadData( bool _bForce );
 
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 class OComboBoxControl : public OBoundControl
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index c1574beae510..23a2ee8f326d 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -61,7 +61,7 @@ protected:
     virtual void            resetNoBroadcast() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     void implConstruct();
 };
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 4ffb43b882ce..5942e7e1d342 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -86,7 +86,7 @@ protected:
     virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     /** translates the control value (the VCL-internal integer representation of a date) into
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 2d667437190a..66af4a06fe96 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -109,7 +109,7 @@ protected:
 protected:
     virtual sal_uInt16 getPersistenceFlags() const SAL_OVERRIDE;
 
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     bool    implActsAsRichText( ) const;
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index fa9eea160a05..5c47c530e1e3 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -80,7 +80,7 @@ public:
 protected:
     virtual void _reset();
 
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index a9481311f51c..f733fa3ac550 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -49,7 +49,7 @@ public:
     ) const SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 6939b2af9e0d..7c9c261d0665 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -135,7 +135,7 @@ class OFormattedModel
         virtual void        onDisconnectedDbColumn() SAL_OVERRIDE;
 
     private:
-        DECLARE_XCLONEABLE();
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         void implConstruct();
 
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 99e5004d3d02..3c03911a5e01 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -171,7 +171,7 @@ public:
     using OControlModel::getFastPropertyValue;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
     virtual void approveNewElement(
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index ceac40b435e4..1fd17774e074 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -49,7 +49,7 @@ public:
     ) const SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 1a343e602391..358c71c1e223 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -62,7 +62,7 @@ public:
     using OControlModel::getFastPropertyValue;
 
 protected:
-    DECLARE_XCLONEABLE( );
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 5a6e776e2cf2..645bb88d754e 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -48,7 +48,7 @@ public:
     ) const SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XMouseListener> OImageButtonControl_BASE;
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index add837ddfec4..2e85a5990f53 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -125,7 +125,7 @@ protected:
     virtual void            resetNoBroadcast() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     void implConstruct();
 
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 68e22d80be51..991627ca50dd 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -204,7 +204,7 @@ protected:
     virtual void    refreshInternalEntryList() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     void init();
     ::com::sun::star::uno::Any getCurrentSingleValue() const;
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index 54b7f90442a4..3d37a965afe7 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -60,7 +60,7 @@ protected:
     virtual void            resetNoBroadcast() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 class ONumericControl: public OBoundControl
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index e973f84d477c..8b2504dd1e42 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -69,7 +69,7 @@ protected:
     virtual void            resetNoBroadcast() SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 class OPatternControl: public OBoundControl
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 02d6ff2c2c28..fbdacad7f35e 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -65,7 +65,7 @@ protected:
 protected:
     void SetSiblingPropsTo(const OUString& rPropName, const ::com::sun::star::uno::Any& rValue);
 
-    DECLARE_XCLONEABLE( );
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     /** sets the given value as new State at the aggregate
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 7adf8dc2d7ff..76aadfb574e0 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -86,7 +86,7 @@ protected:
     virtual void            onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE;
 
 protected:
-    DECLARE_XCLONEABLE();
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     /** translates the control value (the VCL-internal integer representation of a date) into
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 2aceb2262c00..0f6637b49bd1 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -112,7 +112,7 @@ namespace frm
         using OControlModel::getFastPropertyValue;
 
     protected:
-        DECLARE_XCLONEABLE();
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
         void implInitPropertyContainer();
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 8350f64dfcff..50af8b258fee 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -43,7 +43,7 @@ namespace frm
         DECLARE_XPERSISTOBJECT()
 
         // XCloneable
-        DECLARE_XCLONEABLE();
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         // XPropertyState
         virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE;
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 808c89d60755..0cd4ee4667f0 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -43,7 +43,7 @@ namespace frm
         DECLARE_XPERSISTOBJECT()
 
         // XCloneable
-        DECLARE_XCLONEABLE();
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         // XPropertyState
         virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index f63e9da49508..374d4ad77d78 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -564,10 +564,6 @@ public:
     virtual ~classname() \
 
 
-// XCloneable
-#define DECLARE_XCLONEABLE( ) \
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
-
 #define IMPLEMENT_DEFAULT_CLONING( classname ) \
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL classname::createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
     { \
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 16a6fb703959..1df1bc43073d 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -116,7 +116,7 @@ namespace frm
         DECLARE_XTYPEPROVIDER()
 
         // XCloneable
-        DECLARE_XCLONEABLE();
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         // XUnoTunnel
         virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-- 
cgit