include/oox/drawingml/shape.hxx | 2 ++
include/oox/drawingml/theme.hxx | 3 ---
oox/source/drawingml/theme.cxx | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
New commits:
commit e9ac9830328df833311a3ff703c165234965e2cb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Nov 15 12:22:11 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 16 15:15:50 2021 +0100
Avoid some -Werror,-Wdeprecated-copy-with-user-provided-dtor
...after e6968f0485cfb2f6c941d11c438386e14a47095d "PPTX import: fix
handling of
theme overrides in the chart import" introduced a use of
std::make_shared<Theme>
Change-Id: I5f6384b81e02034b6b2fdf3a3bad0148de4eb584
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125228
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 829ea811e19fead7ad35049342136b592077674b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125303
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 53401d18a1c1..64b1d6fb7611 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -107,7 +107,9 @@ public:
explicit Shape( const char* pServiceType = nullptr, bool bDefaultHeight =
true );
explicit Shape( const ShapePtr& pSourceShape );
+ Shape(Shape const &) = default;
virtual ~Shape();
+ Shape & operator =(Shape const &) = default;
OUString& getServiceName(){ return msServiceName; }
void setServiceName( const char* pServiceName );
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index 6d64649f3a69..944e58b6e79c 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -56,9 +56,6 @@ class TextFont;
class OOX_DLLPUBLIC Theme
{
public:
- Theme();
- ~Theme();
-
void setStyleName( const OUString& rStyleName ) {
maStyleName = rStyleName; }
ClrScheme& getClrScheme() { return maClrScheme; }
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index ca26f389904e..036779d21711 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -23,14 +23,6 @@
namespace oox::drawingml {
-Theme::Theme()
-{
-}
-
-Theme::~Theme()
-{
-}
-
namespace {
template< typename Type >
