fdo#62846 incorrect glyph to Unicode mappings in PDFs

Change-Id: Idebc7f69f95d8f72626373475d8611ea68f1483a

7 files changed, 58 insertions, 7 deletions

diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 1b9776e8c195..e99d276abee7 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -619,6 +619,17 @@ int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int
                 break;
     }
 
+    // update returned index-into-string array
+    if( pCharIndexes )
+    {
+        int nCharPos;
+        if( mpGlyphs2Chars )
+            nCharPos = mpGlyphs2Chars[nStart];
+        else
+            nCharPos = nStart + mnMinCharPos;
+        *(pCharIndexes++) = nCharPos;
+    }
+
     return nCount;
 }
 
diff --git a/vcl/coretext/salcoretextlayout.cxx b/vcl/coretext/salcoretextlayout.cxx
index d2c2d48cf519..12c2035191a4 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -447,6 +447,10 @@ int CoreTextLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos
         nStart += 1;
     }
 
+    if( pCharIndexes ) {
+        pCharIndexes[i] = mpGlyphs2Chars[mnCurrentGlyphIndex];
+    }
+
     SAL_INFO( "vcl.coretext.layout", "GetNextGlyphs() returning " << i );
 
     return i;
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 10af66051ddb..344ff3f699a6 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -731,7 +731,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
     sal_Int32   aWidthAry[ nMaxGlyphs ];
     sal_Int32   aIdxAry  [ nMaxGlyphs ];
     sal_Unicode aUnicodes[ nMaxGlyphs ];
-    int         aCharPosAry [ nMaxGlyphs ];
+    int         aCharPosAry [ nMaxGlyphs+1 ];
 
     Point aPos;
     long nUnitsPerPixel = rLayout.GetUnitsPerPixel();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3c7b186daec2..4e84f0711778 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7619,7 +7619,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
     std::vector<sal_Ucs> aUnicodes;
     aUnicodes.reserve( nMaxGlyphs );
     sal_Int32 pUnicodesPerGlyph[nMaxGlyphs];
-    int pCharPosAry[nMaxGlyphs];
+    int pCharPosAry[nMaxGlyphs+1];
     sal_Int32 nAdvanceWidths[nMaxGlyphs];
     const PhysicalFontFace* pFallbackFonts[nMaxGlyphs];
     bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical();
@@ -7768,14 +7768,14 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
                 aUnicodes.push_back( rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) ) );
                 pUnicodesPerGlyph[i] = 1;
                 // try to handle ligatures and such
-                if( i < nGlyphs-1 )
+                if( i < nGlyphs )
                 {
                     nChars = pCharPosAry[i+1] - pCharPosAry[i];
                     // #i115618# fix for simple RTL+CTL cases
                     // TODO: sanitize for RTL ligatures, more complex CTL, etc.
                     if( nChars < 0 )
                         nChars = -nChars;
-            else if( nChars == 0 )
+                    else if( nChars == 0 )
                         nChars = 1;
                     pUnicodesPerGlyph[i] = nChars;
                     for( int n = 1; n < nChars; n++ )
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6955679350ad..705b8cc8c2e0 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1427,7 +1427,11 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos
         nOldFlags = pG->mnGlyphIndex; // &GF_FLAGMASK not needed for test above
     }
 
-    aRelativePos.X() /= mnUnitsPerPixel;
+    // Calculate final pCharPosAry item
+    if( pCharPosAry )
+        *pCharPosAry = pG->mnCharPos;
+
+        aRelativePos.X() /= mnUnitsPerPixel;
     aRelativePos.Y() /= mnUnitsPerPixel;
     rPos = GetDrawPosition( aRelativePos );
 
@@ -1675,7 +1679,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     // prepare "merge sort"
     int nStartOld[ MAX_FALLBACK ];
     int nStartNew[ MAX_FALLBACK ];
-    int nCharPos[ MAX_FALLBACK ];
+    int nCharPos[ MAX_FALLBACK+1 ];
     sal_Int32 nGlyphAdv[ MAX_FALLBACK ];
     int nValid[ MAX_FALLBACK ] = {0};
 
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 3898ab1c7fdd..976ccc532983 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -294,7 +294,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
             if (bCluster)
             {
                 nBaseGlyphIndex = mvGlyphs.size();
-                mvGlyph2Char[nBaseGlyphIndex] = iChar + mnSegCharOffset;
+                mvGlyph2Char[nBaseGlyphIndex] = firstChar + mnSegCharOffset;
                 nFirstCharInCluster = firstChar;
                 nLastCharInCluster = lastChar;
             }
@@ -1295,6 +1295,24 @@ int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out,
      if (glyph_itr->mnGlyphIndex == GF_DROPPED)
        break;
   }
+
+    // Calculate final pCharPosAry item
+    if (char_index)
+    {
+        if (glyph_slot >= (signed)mvGlyph2Char.size())
+        {
+            *char_index++ = mnMinCharPos + mvCharDxs.size();
+        }
+        else
+        {
+            assert(glyph_slot > -1);
+            if (mvGlyph2Char[glyph_slot] == -1)
+                *char_index++ = mnMinCharPos + mvCharDxs.size();
+            else
+                *char_index++ = mvGlyph2Char[glyph_slot];
+        }
+    }
+
   int numGlyphs = glyph_slot - glyph_slot_begin;
   // move the next glyph_slot to a glyph that hasn't been dropped
   while (glyph_slot < static_cast<int>(mvGlyphs.size()) &&
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 41271b02c954..60858718edfc 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -594,6 +594,16 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
                 break;
     }
 
+    if( pCharIndexes )
+    {
+        int nCharPos;
+        if( !mpGlyphs2Chars )
+            nCharPos = nStart + mnMinCharPos;
+        else
+            nCharPos = mpGlyphs2Chars[nStart];
+        *(pCharIndexes++) = nCharPos;
+    }
+
     return nCount;
 }
 
@@ -1882,6 +1892,10 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
 
     ++nStart;
     nStartx8 = (nStart << 8) + nSubIter;
+
+    if( pCharPosAry )
+        *(pCharPosAry++) = nCharPos;
+
     return nCount;
 }