[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/source

[Libreoffice Gerrit user]

 editeng/source/editeng/impedit3.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4339c9e6a0e01acecd0ce687a8d0c20128cdd7cf
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Oct 12 17:41:49 2012 +0200

    fdo#55931 Fix renderding of subscript/superscript with Autofit Text.
    
    We are using font metrics to compute the stretch ratio for autofit; but that
    collides with nPropr property of SvxFont - it is then counted twice, ie. in
    the case of nPropr == 25, we actually behave as if it was much less; and
    worse, only in the horizontal direction.
    
    Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
    Reviewed-on: https://gerrit.libreoffice.org/866
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Tested-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index e4025ac..59c70bf 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2647,10 +2647,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
         // ugly on the screen!
         OutputDevice* pDev = pOut ? pOut : GetRefDevice();
         rFont.SetPhysFont( pDev );
-        FontMetric aMetric( pDev->GetFontMetric() );
-        // For the height do not consider the metrics, because it will go
-        // wrong at Superscript/Subscript.
-        Size aRealSz( aMetric.GetSize().Width(), rFont.GetSize().Height() );
+        Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
         if ( aStatus.DoStretch() )
         {
             if ( nStretchY != 100 )