summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/style-internal.cpp3
-rw-r--r--src/style-internal.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index ba60d06e8..ef4fbb2ec 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -596,9 +596,8 @@ SPIFontVariationSettings::write( guint const flags, SPStyleSrc const &style_src_
void
SPIFontVariationSettings::cascade( const SPIBase* const parent ) {
-
if( const SPIFontVariationSettings* p = dynamic_cast<const SPIFontVariationSettings*>(parent) ) {
- if( (inherits && !set) || inherit ) {
+ if( !set || inherit ) { // Always inherits
normal = p->normal;
axes.clear();
axes = p->axes;
diff --git a/src/style-internal.h b/src/style-internal.h
index 5d54df5b5..2d49daad0 100644
--- a/src/style-internal.h
+++ b/src/style-internal.h
@@ -520,6 +520,7 @@ public:
virtual void merge( const SPIBase* const parent );
SPIFontVariationSettings& operator=(const SPIFontVariationSettings& rhs) {
+ SPIBase::operator=(rhs);
axes = rhs.axes;
normal = rhs.normal;
return *this;