summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-14 21:21:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-15 08:25:28 +0100
commitf4d20a400b5c06959fd5a362a350bb4d9a6e4bd1 (patch)
tree7f09c7fe9026abca844ebbc1e269a32838a5377b /vcl/generic
parent0d21d9ddbe0561f45419ae4fc376c312565b413b (diff)
Resolves: fdo#31821 use icu layout whenever possible
because icu knows all about otf so we don't have to, which makes things its problem and not ours. This is the default route for all "ctl" languages already so if we suffer performance issues here we should try and fix that before just reverting Change-Id: I68c8d9929ca48388f61951344f2cfc195045166f
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 0e8cd649cb36..d04cebe04f22 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -61,9 +61,7 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
- ServerFontLayoutEngine* pLE = NULL;
- if( !(rArgs.mnFlags & SAL_LAYOUT_COMPLEX_DISABLED) )
- pLE = mrServerFont.GetLayoutEngine();
+ ServerFontLayoutEngine* pLE = mrServerFont.GetLayoutEngine();
if( !pLE )
pLE = &SimpleLayoutEngine::get();