path: root/vcl/source/glyphs/graphite_layout.cxx
diff options
authorKhaled Hosny <>2013-06-14 11:10:32 +0200
committerKhaled Hosny <>2013-06-16 15:30:01 +0000
commit3d12036000f4e13127affc0cb764fc65cf89af44 (patch)
treec52bb99e41e41e274c741ac6bbd5a7279494fe62 /vcl/source/glyphs/graphite_layout.cxx
parent7441d4bbdbbcb87193c32510f3577a0e531467e5 (diff)
Get rid of SalLayout::GetFallbackFontData()
This is only used in conjunction with SalLayout::GetNextGlyphs() in vcl/source/gdi/pdfwriter_impl.cxx to retrieve the fallback font, if any, used to layout the given glyph, but it is a very convoluted way to do a straight forward thing, and hard to adapt for new SalLayout implementations. So now I just pass a fallback fonts array, when requested, in GetNextGlyphs() itself. Change-Id: I24e7931f64867a4fb4e7b728c65faa6198e24aba Reviewed-on: Reviewed-by: Khaled Hosny <> Tested-by: Khaled Hosny <>
Diffstat (limited to 'vcl/source/glyphs/graphite_layout.cxx')
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 3898ab1c7fdd..034842afdd21 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -1209,7 +1209,8 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
// The logic in this method must match that expected in MultiSalLayout which
// is used when glyph fallback is in operation.
int GraphiteLayout::GetNextGlyphs( int length, sal_GlyphId * glyph_out,
- ::Point & aPosOut, int &glyph_slot, sal_Int32 * glyph_adv, int *char_index) const
+ ::Point & aPosOut, int &glyph_slot, sal_Int32 * glyph_adv, int *char_index,
+ const PhysicalFontFace** /*pFallbackFonts*/ ) const
// Sanity check on the slot index.
if (glyph_slot >= signed(mvGlyphs.size()))