diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 13:47:59 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:20:20 +0200 |
commit | f1a10d4f14e86a2a2a632ff4a091690c2f31f255 (patch) | |
tree | 739f86a047016f2ac99c9dca142d666253173c80 /sc/inc/textuno.hxx | |
parent | 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f (diff) |
sc: 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.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined counterparts,
but may prevent implicitly declared copy functions from being defined as non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I4efe3eb088e5f9096be87dd8240504768755112b
Reviewed-on: https://gerrit.libreoffice.org/58096
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/inc/textuno.hxx')
-rw-r--r-- | sc/inc/textuno.hxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index ec66fdcf17c0..6a1d1ee946f7 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -220,6 +220,11 @@ public: ScCellTextCursor(ScCellObj& rText); virtual ~ScCellTextCursor() throw() override; + ScCellTextCursor(ScCellTextCursor const &) = default; + ScCellTextCursor(ScCellTextCursor &&) = default; + ScCellTextCursor & operator =(ScCellTextCursor const &) = default; + ScCellTextCursor & operator =(ScCellTextCursor &&) = default; + ScCellObj& GetCellObj() const { return *mxTextObj; } // SvxUnoTextCursor methods reimplemented here: @@ -246,6 +251,11 @@ public: ScHeaderFooterTextCursor(rtl::Reference<ScHeaderFooterTextObj> const & rText); virtual ~ScHeaderFooterTextCursor() throw() override; + ScHeaderFooterTextCursor(ScHeaderFooterTextCursor const &) = default; + ScHeaderFooterTextCursor(ScHeaderFooterTextCursor &&) = default; + ScHeaderFooterTextCursor & operator =(ScHeaderFooterTextCursor const &) = default; + ScHeaderFooterTextCursor & operator =(ScHeaderFooterTextCursor &&) = default; + // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; @@ -271,6 +281,11 @@ public: const SvxUnoTextBase& rText ); virtual ~ScDrawTextCursor() throw() override; + ScDrawTextCursor(ScDrawTextCursor const &) = default; + ScDrawTextCursor(ScDrawTextCursor &&) = default; + ScDrawTextCursor & operator =(ScDrawTextCursor const &) = default; + ScDrawTextCursor & operator =(ScDrawTextCursor &&) = default; + // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; |