diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 12:28:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 20:45:22 +0200 |
commit | 916e1e61a1b2d7f1b822b4b90d63f4e34719a090 (patch) | |
tree | f9a79424083f4a18ff8cdf271e6f6d955d09b467 /include/oox/dump | |
parent | de573ba8e67f165693e58e05d80756e5b55852e7 (diff) |
oox: 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: Id05e85ac8ac4155e6345b6f96ddf9449f640dc98
Reviewed-on: https://gerrit.libreoffice.org/58083
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/oox/dump')
-rw-r--r-- | include/oox/dump/dumperbase.hxx | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 9a1f3586b3e9..03369e2d8d03 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -443,6 +443,11 @@ class Base public: virtual ~Base(); + Base(Base const &) = default; + Base(Base &&) = default; + Base & operator =(Base const &) = default; + Base & operator =(Base &&) = default; + bool isValid() const { return implIsValid(); } static bool isValid( const std::shared_ptr< Base >& rxBase ) { return rxBase.get() && rxBase->isValid(); } @@ -829,7 +834,6 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi class Config : public Base { public: - explicit Config( const Config& rParent ); explicit Config( const sal_Char* pcEnvVar, const ::oox::core::FilterBase& rFilter ); @@ -841,6 +845,11 @@ public: virtual ~Config() override; + Config(Config const &) = default; + Config(Config &&) = default; + Config & operator =(Config const &) = default; + Config & operator =(Config &&) = default; + const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); } const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); } const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); } @@ -1089,6 +1098,11 @@ class ObjectBase : public Base public: virtual ~ObjectBase() override; + ObjectBase(ObjectBase const &) = default; + ObjectBase(ObjectBase &&) = default; + ObjectBase & operator =(ObjectBase const &) = default; + ObjectBase & operator =(ObjectBase &&) = default; + const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return mxConfig->getContext(); } @@ -1189,6 +1203,10 @@ class OutputObjectBase : public ObjectBase public: virtual ~OutputObjectBase() override; + OutputObjectBase(OutputObjectBase const &) = default; + OutputObjectBase(OutputObjectBase &&) = default; + OutputObjectBase & operator =(OutputObjectBase const &) = default; + OutputObjectBase & operator =(OutputObjectBase &&) = default; protected: OutputObjectBase() {} @@ -1353,6 +1371,10 @@ class InputObjectBase : public OutputObjectBase public: virtual ~InputObjectBase() override; + InputObjectBase(InputObjectBase const &) = default; + InputObjectBase(InputObjectBase &&) = default; + InputObjectBase & operator =(InputObjectBase const &) = default; + InputObjectBase & operator =(InputObjectBase &&) = default; protected: InputObjectBase() {} |