[Libreoffice-commits] core.git: include/toolkit toolkit/source

[Libreoffice Gerrit user]

 include/toolkit/controls/dialogcontrol.hxx   |   15 +++++++++++++++
 toolkit/source/controls/spinningprogress.cxx |    5 +++++
 2 files changed, 20 insertions(+)

New commits:
commit c5fcb476ac8eab18152a7f6d0487daa56231fcf8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 11:22:07 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jul 27 09:33:41 2018 +0200

    toolkit: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    ...by explicitly defaulting the copy/move functions (and, where needed in turn,
    also a default ctor) for classes that have a user-declared dtor that does
    nothing other than an implicitly-defined one would do, but needs to be user-
    declared because it is virtual and potentially serves as a key function to
    emit the vtable, or is non-public, etc.
    
    Change-Id: Ib10659fbd430b96edbad67e779ce4c12b7eeaa5d
    Reviewed-on: https://gerrit.libreoffice.org/58054
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 970226416253..df643f47f450 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -170,6 +170,11 @@ public:
     UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~UnoMultiPageModel() override;
 
+    UnoMultiPageModel(UnoMultiPageModel const &) = default;
+    UnoMultiPageModel(UnoMultiPageModel &&) = default;
+    UnoMultiPageModel & operator =(UnoMultiPageModel const &) = default;
+    UnoMultiPageModel & operator =(UnoMultiPageModel &&) = default;
+
     rtl::Reference<UnoControlModel> Clone() const override;
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
@@ -244,6 +249,11 @@ public:
     UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~UnoPageModel() override;
 
+    UnoPageModel(UnoPageModel const &) = default;
+    UnoPageModel(UnoPageModel &&) = default;
+    UnoPageModel & operator =(UnoPageModel const &) = default;
+    UnoPageModel & operator =(UnoPageModel &&) = default;
+
     rtl::Reference<UnoControlModel> Clone() const override;
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoPageModel" )
@@ -277,6 +287,11 @@ public:
     UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~UnoFrameModel() override;
 
+    UnoFrameModel(UnoFrameModel const &) = default;
+    UnoFrameModel(UnoFrameModel &&) = default;
+    UnoFrameModel & operator =(UnoFrameModel const &) = default;
+    UnoFrameModel & operator =(UnoFrameModel &&) = default;
+
     rtl::Reference<UnoControlModel> Clone() const override;
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, "com.sun.star.awt.UnoFrameModel" )
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 096de0c98bfd..4792b98fae27 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -34,6 +34,11 @@ class SpinningProgressControlModel : public SpinningProgressControlModel_Base
 public:
     explicit SpinningProgressControlModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory );
 
+    SpinningProgressControlModel(SpinningProgressControlModel const &) = default;
+    SpinningProgressControlModel(SpinningProgressControlModel &&) = default;
+    SpinningProgressControlModel & operator =(SpinningProgressControlModel const &) = default;
+    SpinningProgressControlModel & operator =(SpinningProgressControlModel &&) = default;
+
     virtual rtl::Reference<UnoControlModel> Clone() const override;
 
     // XPropertySet