forms: expand DECLARE_XCLONEABLE

Change-Id: I2a468e40489797e33935b79a27459ab408558124
2014-06-03 23:01:07 +02:00
parent 2091d5a4d3
commit 28ac97dce1
24 changed files with 23 additions and 27 deletions
--- 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();
--- 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
--- 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
--- 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();
 };
--- 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
--- 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;
--- 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;
 };


--- 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;
 };


--- 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();

--- 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(
--- 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;
 };


--- 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
--- 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;
--- 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();

--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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();
--- 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;
--- 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;
--- 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) \
    { \
--- 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;