diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-11-15 12:22:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-11-17 10:44:57 +0100 |
| commit | 8037a24dad50d98bd36ddc0f94d98d208ae3788d (patch) | |
| tree | 08bf520131a72db6a3f9624f9607927c9c326d4b | |
| parent | f43f08133f6004043ab4a0fb0fd0f51cd8b871fb (diff) | |
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 <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125279
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 2 | ||||
| -rw-r--r-- | include/oox/drawingml/theme.hxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/theme.cxx | 8 |
3 files changed, 2 insertions, 11 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1fbe533d3600..746d47a26378 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -106,7 +106,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 > |