[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/source

[Xisco Fauli (via logerrit)]

 svgio/source/svgreader/svgcharacternode.cxx |   32 ++++++++++++----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

New commits:
commit ec0c2e1678825fe032a1160db21c8d8d4c75c623
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jul 13 21:55:34 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Aug 2 12:54:18 2023 +0200

    svgio: remove redundant check
    
    Change-Id: Ie507fb1bf06f75e2fd673864a9ee9046aeb19377
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154401
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155211
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index 1a2bdb9fc80f..e7f08c908ad4 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -263,31 +263,27 @@ namespace svgio::svgreader
 
                 // prepare TextArray
                 ::std::vector< double > aTextArray(rSvgTextPosition.getX());
-
                 if(!aTextArray.empty() && aTextArray.size() < nLength)
                 {
                     const sal_uInt32 nArray(aTextArray.size());
 
-                    if(nArray < nLength)
-                    {
-                        double fStartX(0.0);
+                    double fStartX(0.0);
 
-                        if(rSvgTextPosition.getParent() && 
rSvgTextPosition.getParent()->getAbsoluteX())
-                        {
-                            fStartX = 
rSvgTextPosition.getParent()->getPosition().getX();
-                        }
-                        else
-                        {
-                            fStartX = aTextArray[nArray - 1];
-                        }
+                    if(rSvgTextPosition.getParent() && 
rSvgTextPosition.getParent()->getAbsoluteX())
+                    {
+                        fStartX = 
rSvgTextPosition.getParent()->getPosition().getX();
+                    }
+                    else
+                    {
+                        fStartX = aTextArray[nArray - 1];
+                    }
 
-                        ::std::vector< double > 
aExtendArray(aTextLayouterDevice.getTextArray(getText(), nArray, nLength - 
nArray));
-                        aTextArray.reserve(nLength);
+                    ::std::vector< double > 
aExtendArray(aTextLayouterDevice.getTextArray(getText(), nArray, nLength - 
nArray));
+                    aTextArray.reserve(nLength);
 
-                        for(const auto &a : aExtendArray)
-                        {
-                            aTextArray.push_back(a + fStartX);
-                        }
+                    for(const auto &a : aExtendArray)
+                    {
+                        aTextArray.push_back(a + fStartX);
                     }
                 }