diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-07-13 23:06:02 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-07-14 12:46:41 +0200 |
| commit | a3d8f4079dc31a0496f86dc2f80eee9ad60415f5 (patch) | |
| tree | 99bbc607c3d080e308d5f4f80e75c7bc195dd35a /svgio/source | |
| parent | d86a6d2b47c6a22d185dc631388ca3f2c0386a35 (diff) | |
tdf#156271: add dx shift on top of x position
Change-Id: I61263a7fec2ec8236221a10f8cb730899c878f5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154403
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svgio/source')
| -rw-r--r-- | svgio/source/svgreader/svgcharacternode.cxx | 63 |
1 files changed, 24 insertions, 39 deletions
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index e9b719afc946..e7f08c908ad4 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -622,17 +622,6 @@ namespace svgio::svgreader // we have absolute positions, get first one as current text position X maPosition.setX(rSvgTextPositions.getX()[0].solve(rInfoProvider, NumberType::xcoordinate)); mbAbsoluteX = true; - - if(nSizeX > 1) - { - // fill deltas to maX - maX.reserve(nSizeX); - - for(sal_uInt32 a(1); a < nSizeX; a++) - { - maX.push_back(rSvgTextPositions.getX()[a].solve(rInfoProvider, NumberType::xcoordinate) - maPosition.getX()); - } - } } else { @@ -644,22 +633,25 @@ namespace svgio::svgreader } const sal_uInt32 nSizeDx(rSvgTextPositions.getDx().size()); - if(nSizeDx) { // relative positions given, translate position derived from parent maPosition.setX(maPosition.getX() + rSvgTextPositions.getDx()[0].solve(rInfoProvider, NumberType::xcoordinate)); + } - if(nSizeDx > 1) - { - // fill deltas to maX - maX.reserve(nSizeDx); + // fill deltas to maX + maX.reserve(nSizeX); - for(sal_uInt32 a(1); a < nSizeDx; a++) - { - maX.push_back(rSvgTextPositions.getDx()[a].solve(rInfoProvider, NumberType::xcoordinate)); - } + for(sal_uInt32 a(1); a < nSizeX; a++) + { + double nPos = rSvgTextPositions.getX()[a].solve(rInfoProvider, NumberType::xcoordinate) - maPosition.getX(); + + if(a < nSizeDx) + { + nPos += rSvgTextPositions.getDx()[a].solve(rInfoProvider, NumberType::xcoordinate); } + + maX.push_back(nPos); } // get text positions Y @@ -670,17 +662,6 @@ namespace svgio::svgreader // we have absolute positions, get first one as current text position Y maPosition.setY(rSvgTextPositions.getY()[0].solve(rInfoProvider, NumberType::ycoordinate)); mbAbsoluteX = true; - - if(nSizeY > 1) - { - // fill deltas to maY - maY.reserve(nSizeY); - - for(sal_uInt32 a(1); a < nSizeY; a++) - { - maY.push_back(rSvgTextPositions.getY()[a].solve(rInfoProvider, NumberType::ycoordinate) - maPosition.getY()); - } - } } else { @@ -697,17 +678,21 @@ namespace svgio::svgreader { // relative positions given, translate position derived from parent maPosition.setY(maPosition.getY() + rSvgTextPositions.getDy()[0].solve(rInfoProvider, NumberType::ycoordinate)); + } - if(nSizeDy > 1) - { - // fill deltas to maY - maY.reserve(nSizeDy); + // fill deltas to maY + maY.reserve(nSizeY); - for(sal_uInt32 a(1); a < nSizeDy; a++) - { - maY.push_back(rSvgTextPositions.getDy()[a].solve(rInfoProvider, NumberType::ycoordinate)); - } + for(sal_uInt32 a(1); a < nSizeY; a++) + { + double nPos = rSvgTextPositions.getY()[a].solve(rInfoProvider, NumberType::ycoordinate) - maPosition.getY(); + + if(a < nSizeDy) + { + nPos += rSvgTextPositions.getDy()[a].solve(rInfoProvider, NumberType::ycoordinate); } + + maY.push_back(nPos); } } |