diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-11-07 15:40:37 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-11-07 21:58:53 +0100 |
| commit | 73334560b2dd2d60ac58d2cc2b1a5295490b03e1 (patch) | |
| tree | b5bc4f69dd8ed455c78ea05ab1c5e2f3c25b909e /forms/source/richtext | |
| parent | 6be03ac71e0d4927612b4a57ead3d0b245c29c77 (diff) | |
Replace some macros in forms part 16
Remove DEFAULT_DECLARE_SUBTYPE + EXCEPT + EXPAND_PROP_INIT
+ DECLARE_DEFAULT_CLONE_CTOR + DECLARE_DEFAULT_LEAF_XTOR + FORWARD_TO_PEER_1
+ IMPLEMENT_DEFAULT_CLONING
+ ADD_ENTRY (include removing:
/home/julien/lo/libreoffice/forms/source/xforms/convert.cxx:56:14: error: unused function 'lcl_toXSD_bool' [-Werror,-Wunused-function]
OUString lcl_toXSD_bool( const Any& rAny )
^
/home/julien/lo/libreoffice/forms/source/xforms/convert.cxx:60:9: error: unused function 'lcl_toAny_bool' [-Werror,-Wunused-function]
Any lcl_toAny_bool( const OUString& rStr )
^
/home/julien/lo/libreoffice/forms/source/xforms/convert.cxx:67:14: error: unused function 'lcl_toXSD_double' [-Werror,-Wunused-function]
OUString lcl_toXSD_double( const Any& rAny )
^
/home/julien/lo/libreoffice/forms/source/xforms/convert.cxx:80:9: error: unused function 'lcl_toAny_double' [-Werror,-Wunused-function]
Any lcl_toAny_double( const OUString& rString )
^
)
Change-Id: I1e6923922b7037e8d1e9d009b05a27111c94b6fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124827
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'forms/source/richtext')
| -rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 7 | ||||
| -rw-r--r-- | forms/source/richtext/richtextmodel.hxx | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 1029ce9a7352..2dcfd7a18587 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -279,7 +279,12 @@ namespace frm ); } - IMPLEMENT_DEFAULT_CLONING( ORichTextModel ) + css::uno::Reference< css::util::XCloneable > SAL_CALL ORichTextModel::createClone() +{ + rtl::Reference<ORichTextModel> pClone = new ORichTextModel(this, getContext()); + pClone->clonedFrom(this); + return pClone; +} void SAL_CALL ORichTextModel::disposing() diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index c4f73a1a37c6..dfb1093904c8 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -53,7 +53,14 @@ namespace frm ,public ORichTextModel_BASE { public: - DECLARE_DEFAULT_LEAF_XTOR( ORichTextModel ); + ORichTextModel( + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory + ); + ORichTextModel( + const ORichTextModel* _pOriginal, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory + ); + virtual ~ORichTextModel() override; private: // <properties> |