From 73334560b2dd2d60ac58d2cc2b1a5295490b03e1 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 7 Nov 2021 15:40:37 +0100 Subject: 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 --- forms/source/richtext/richtextmodel.cxx | 7 ++++++- forms/source/richtext/richtextmodel.hxx | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'forms/source/richtext') 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 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: // -- cgit