diff options
author | David Tardon <dtardon@redhat.com> | 2019-08-03 18:50:01 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2019-08-03 18:54:00 +0200 |
commit | f860cf6342530b80248f9c054fa16d1b293509a0 (patch) | |
tree | 26649d95737eec3df09fb457898f466a2b68eb29 | |
parent | d8f9af1e0e06f2439c1737312744f0b6f83e60ab (diff) |
WaE: implicitly-declared VSDTextBlockStyle::operator= is deprecated
Change-Id: Ic482a4bdd3386504ec65fb04c5d302bc2218ecf9
-rw-r--r-- | src/lib/VSDStyles.cpp | 17 | ||||
-rw-r--r-- | src/lib/VSDStyles.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp index 3bf28ca..7c9d339 100644 --- a/src/lib/VSDStyles.cpp +++ b/src/lib/VSDStyles.cpp @@ -216,6 +216,23 @@ const VSDOptionalTextBlockStyle &VSDOptionalTextBlockStyle::operator=(const VSDO return *this; } +const VSDTextBlockStyle &VSDTextBlockStyle::operator=(const VSDTextBlockStyle &style) +{ + if (this != &style) + { + leftMargin = style.leftMargin; + rightMargin = style.rightMargin; + topMargin = style.topMargin; + bottomMargin = style.bottomMargin; + verticalAlign = style.verticalAlign; + isTextBkgndFilled = style.isTextBkgndFilled; + textBkgndColour = style.textBkgndColour; + defaultTabStop = style.defaultTabStop; + textDirection = style.textDirection; + } + return *this; +} + } libvisio::VSDStyles::VSDStyles() : diff --git a/src/lib/VSDStyles.h b/src/lib/VSDStyles.h index 32d4957..338d641 100644 --- a/src/lib/VSDStyles.h +++ b/src/lib/VSDStyles.h @@ -513,6 +513,7 @@ struct VSDTextBlockStyle bottomMargin(style.bottomMargin), verticalAlign(style.verticalAlign), isTextBkgndFilled(style.isTextBkgndFilled), textBkgndColour(style.textBkgndColour), defaultTabStop(style.defaultTabStop), textDirection(style.textDirection) {} ~VSDTextBlockStyle() {} + const VSDTextBlockStyle &operator=(const VSDTextBlockStyle &style); void override(const VSDOptionalTextBlockStyle &style, const VSDXTheme * /* theme */) { ASSIGN_OPTIONAL(style.leftMargin, leftMargin); |