starmath/source/node.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit e7145b142d21af4d23a21a8490dcbbd0fb42685a Author: Takeshi Abe <[email protected]> Date: Thu Nov 17 20:26:24 2016 +0900 tdf#84650 Fix X-coordinate of SmMatrixNode's elements which are aligned to left or right against the column. Change-Id: Ie2b6944bc0dddb0e1589842472298f787fabf596 Reviewed-on: https://gerrit.libreoffice.org/30929 Tested-by: Jenkins <[email protected]> Reviewed-by: Takeshi Abe <[email protected]> (cherry picked from commit 395295a40c24a49c12415ec803860a888d734515) Reviewed-on: https://gerrit.libreoffice.org/30943 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index da9d861..47b27fc 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2380,7 +2380,6 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) // align all baselines in that row if possible aPos = rNodeRect.AlignTo(aLineRect, RectPos::Right, RectHorAlign::Center, RectVerAlign::Baseline); - aPos.X() += nHorDist; // get horizontal alignment const SmNode *pCoNode = pTmpNode->GetLeftMost(); @@ -2390,7 +2389,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) // and horizontal alignment switch (eHorAlign) { case RectHorAlign::Left: - aPos.X() = rNodeRect.GetLeft() + aColLeft[j]; + aPos.X() = aColLeft[j]; break; case RectHorAlign::Center: aPos.X() = rNodeRect.GetLeft() + aColLeft[j] @@ -2398,7 +2397,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) - rNodeRect.GetItalicCenterX(); break; case RectHorAlign::Right: - aPos.X() = rNodeRect.GetLeft() + aColLeft[j] + aPos.X() = aColLeft[j] + aColWidth[j] - rNodeRect.GetItalicWidth(); break; default:
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
