Kaydet (Commit) 701324a1 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Noel Grandin

SVGIO: tdf#45771: Fix issue when text size is twice its size...

... when using relative units (em, ex)

This is because for nodes of type textnode, getFontSizeNumber
is called from SvgCharacterNode::createSimpleTextPrimitive
and from SvgNode::getCurrentFontSize(), so avoid the second call.

Change-Id: Ibd418708a572e3c1643164a900fac7e7481afe81
Reviewed-on: https://gerrit.libreoffice.org/21801Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst c06238f2
...@@ -160,7 +160,7 @@ namespace svgio ...@@ -160,7 +160,7 @@ namespace svgio
virtual double getCurrentFontSizeInherited() const override; virtual double getCurrentFontSizeInherited() const override;
virtual double getCurrentXHeightInherited() const override; virtual double getCurrentXHeightInherited() const override;
double getCurrentFontSize() const; virtual double getCurrentFontSize() const;
double getCurrentXHeight() const; double getCurrentXHeight() const;
/// Id access /// Id access
......
...@@ -58,6 +58,8 @@ namespace svgio ...@@ -58,6 +58,8 @@ namespace svgio
virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override; virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override;
virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool bReferenced) const override; virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool bReferenced) const override;
virtual double getCurrentFontSize() const override;
/// transform content, set if found in current context /// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; } const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
void setTransform(const basegfx::B2DHomMatrix* pMatrix = nullptr) { if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); } void setTransform(const basegfx::B2DHomMatrix* pMatrix = nullptr) { if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
......
...@@ -260,6 +260,11 @@ namespace svgio ...@@ -260,6 +260,11 @@ namespace svgio
} }
} }
} }
double SvgTextNode::getCurrentFontSize() const
{
return getCurrentFontSizeInherited();
}
} // end of namespace svgreader } // end of namespace svgreader
} // end of namespace svgio } // end of namespace svgio
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment