Kaydet (Commit) f295adc5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Miklos Vajna

tdf#95194: We need to set the GF flags in UniscribeLayout::GetNextGlyphs()

The old SimpleWinLayout::GetNextGlyphs() did it.
PDFWriterImpl::drawVerticalGlyphs() expects GF_ROTL etc to be set when
necessary for vertical text when exporting to PDF.

Change-Id: I1971dd2784efa3cd7274a32a51f61fdf197ec81a
Reviewed-on: https://gerrit.libreoffice.org/20329Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 80acb57d
......@@ -700,6 +700,8 @@ UniscribeLayout::~UniscribeLayout()
bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
{
msTheString = OUString(rArgs.mpStr, rArgs.mnLength);
// for a base layout only the context glyphs have to be dropped
// => when the whole string is involved there is no extra context
typedef std::vector<int> TIntVector;
......@@ -1401,6 +1403,9 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
}
// update return values
if( (mnLayoutFlags & SalLayoutFlags::Vertical) &&
nCharPos != -1 )
aGlyphId |= GetVerticalFlags( msTheString[nCharPos] );
*(pGlyphs++) = aGlyphId;
if( pGlyphAdvances )
*(pGlyphAdvances++) = nGlyphWidth;
......
......@@ -110,6 +110,7 @@ private:
// string specific info
// everything is in logical order
OUString msTheString; // Sadly we need it in GetNextGlyphs(), to be able to call GetVerticalFlags()
int mnCharCapacity;
WORD* mpLogClusters; // map from absolute_char_pos to relative_glyph_pos
int* mpCharWidths; // map from absolute_char_pos to char_width
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment