From 82a1d75ee59c46e6bb361b98c520cc4eff2e770c Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Wed, 19 Jun 2013 22:25:24 +0200 Subject: [PATCH] fdo#43460: Use isEmpty() instead of getLength() in svgio Change-Id: I65beeb09285553177a160e260d606e6ba3f1c023 Reviewed-on: https://gerrit.libreoffice.org/4641 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- svgio/source/svgreader/svgstyleattributes.cxx | 6 +++--- svgio/source/svgreader/svgtools.cxx | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index c8dc5c4af724..d9e99e5279df 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -1199,7 +1199,7 @@ namespace svgio if(pNode) { - if(SVGTokenLinearGradient == pNode->getType() || SVGTokenRadialGradient == pNode->getType()) + if(SVGTokenLinearGradient == pNode->getType() || SVGTokenRadialGradient == pNode->getType()) { setSvgGradientNodeFill(static_cast< const SvgGradientNode* >(pNode)); } @@ -1790,7 +1790,7 @@ namespace svgio // style="display:none" // taken from a svg example; this needs to be parsed and set at the owning node. Do not call // mrOwner.parseAttribute(...) here, this would lead to a recursion - if(aContent.getLength()) + if(!aContent.isEmpty()) { mrOwner.setDisplay(getDisplayFromContent(aContent)); } @@ -1798,7 +1798,7 @@ namespace svgio } case SVGTokenBaselineShift: { - if(aContent.getLength()) + if(!aContent.isEmpty()) { static rtl::OUString aStrSub(rtl::OUString::createFromAscii("sub")); static rtl::OUString aStrSuper(rtl::OUString::createFromAscii("super")); diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index 7607a439a3ed..47b6e49a350d 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -1169,9 +1169,7 @@ namespace svgio bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL) { - const sal_Int32 nLen(rCandidate.getLength()); - - if(nLen) + if( !rCandidate.isEmpty() ) { basegfx::BColor aColor;