[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Khaled Hosny]

 vcl/source/gdi/sallayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cef3f3aac2f7a372e796deac4ee3e8155c5eb697
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu May 23 22:32:14 2013 +0200

    Fix improper glyph positioning with old fonts
    
    Apparently this second mnXOffset is not needed, further more it breaks
    some old Microsoft fonts.
    
    Change-Id: Ice033cb6bcb3f1bdfeef31a8406a7a2e5487da97

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index e795090..31b01b9 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1098,7 +1098,7 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs )
                 if( m_GlyphItems[j].IsClusterStart() )
                     break;
                 if( !m_GlyphItems[j].IsDiacritic() ) // #i99367# ignore diacritics
-                    nOldClusterWidth += m_GlyphItems[j].mnNewWidth -  m_GlyphItems[j].mnXOffset;
+                    nOldClusterWidth += m_GlyphItems[j].mnNewWidth;
                 nNewClusterWidth += pNewGlyphWidths[j];
             }
             const int nDiff = nNewClusterWidth - nOldClusterWidth;