[PATCH] Fix fdo#64685 - Superscript broken in master

[Khaled Hosny (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4032

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/4032/1

Fix fdo#64685 - Superscript broken in master

After f22006dc6ac34a35a060e15466cf6b2d2058617d the position member of
SwDrawTextInfo is no longer a pointer, so changing the passed Point
after calling SetPos() has no effect, but some code seems to be relying
on it being pointer. Moving SetPos() to after changing the point seems
to do the trick, but there may be other similarly broken code like
SwSubFont::_DrawStretchText() below.

Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370
---
M sw/source/core/txtnode/swfont.cxx
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 02b5add..068fd71 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -850,12 +850,12 @@
     SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() );
 
     Point aPos( rInf.GetPos() );
-    const Point &rOld = rInf.GetPos();
-    rInf.SetPos( aPos );
 
     if( GetEscapement() )
         CalcEsc( rInf, aPos );
 
+    const Point &rOld = rInf.GetPos();
+    rInf.SetPos( aPos );
     rInf.SetKern( CheckKerning() + rInf.GetSperren() / SPACING_PRECISION_FACTOR );
 
     if( IsCapital() )

-- 
To view, visit https://gerrit.libreoffice.org/4032
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny <khaledhosny at eglug.org>