svgio/source/svgreader/svgcharacternode.cxx | 70 ++++++++++------------------
1 file changed, 26 insertions(+), 44 deletions(-)
New commits:
commit 9346f31f39586445b0547a4810d11ebe3884e0e3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Aug 9 11:06:09 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Aug 9 20:19:17 2023 +0200
svgio: remove recurrent checks
Change-Id: I26c37e6b58e7c54e2bdc2c77543896daceb638d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155520
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/svgio/source/svgreader/svgcharacternode.cxx
b/svgio/source/svgreader/svgcharacternode.cxx
index bfd17c6e0d58..fc926afbedaa 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -45,66 +45,51 @@ namespace svgio::svgreader
{
case SVGToken::X:
{
- if(!aContent.empty())
- {
- SvgNumberVector aVector;
+ SvgNumberVector aVector;
- if(readSvgNumberVector(aContent, aVector))
- {
- setX(std::move(aVector));
- }
+ if(readSvgNumberVector(aContent, aVector))
+ {
+ setX(std::move(aVector));
}
break;
}
case SVGToken::Y:
{
- if(!aContent.empty())
- {
- SvgNumberVector aVector;
+ SvgNumberVector aVector;
- if(readSvgNumberVector(aContent, aVector))
- {
- setY(std::move(aVector));
- }
+ if(readSvgNumberVector(aContent, aVector))
+ {
+ setY(std::move(aVector));
}
break;
}
case SVGToken::Dx:
{
- if(!aContent.empty())
- {
- SvgNumberVector aVector;
+ SvgNumberVector aVector;
- if(readSvgNumberVector(aContent, aVector))
- {
- setDx(std::move(aVector));
- }
+ if(readSvgNumberVector(aContent, aVector))
+ {
+ setDx(std::move(aVector));
}
break;
}
case SVGToken::Dy:
{
- if(!aContent.empty())
- {
- SvgNumberVector aVector;
+ SvgNumberVector aVector;
- if(readSvgNumberVector(aContent, aVector))
- {
- setDy(std::move(aVector));
- }
+ if(readSvgNumberVector(aContent, aVector))
+ {
+ setDy(std::move(aVector));
}
break;
}
case SVGToken::Rotate:
{
- if(!aContent.empty())
- {
- SvgNumberVector aVector;
+ SvgNumberVector aVector;
- if(readSvgNumberVector(aContent, aVector))
- {
- setRotate(std::move(aVector));
- }
+ if(readSvgNumberVector(aContent, aVector))
+ {
+ setRotate(std::move(aVector));
}
break;
}
@@ -123,16 +108,13 @@ namespace svgio::svgreader
}
case SVGToken::LengthAdjust:
{
- if(!aContent.empty())
+ if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent),
u"spacing"))
{
- if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent),
u"spacing"))
- {
- setLengthAdjust(true);
- }
- else
if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"spacingAndGlyphs"))
- {
- setLengthAdjust(false);
- }
+ setLengthAdjust(true);
+ }
+ else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent),
u"spacingAndGlyphs"))
+ {
+ setLengthAdjust(false);
}
break;
}
