diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-12 10:51:08 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-12 11:08:42 +0200 |
| commit | fec3f8a8bab77ffb5345a401739114e0afaafcb2 (patch) | |
| tree | 7e0f9f71be0e6da4e056260ba6cf881b78942e20 /vcl/source | |
| parent | 62ea355b2679073b8ee326df5793231996136da9 (diff) | |
Much better fix for the iOS text colour problem
Just use the same simple trick as for OS X in
OutputDevice::ImplLayout().
Thanks to Khaled Hosny for pointing out this.
This reverts commit 9aba69e8cc034526c53f6135a41fc62dc3c5dce3.
Change-Id: I27ba92ef8ebd1ebdb9eb74f670d8170649078881
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index f3f5a77f28df..7f099373fd01 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -5783,7 +5783,7 @@ SalLayout* OutputDevice::ImplLayout( const OUString& rOrigStr, sal_Int32 nMinInd ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs( aStr, nMinIndex, nLen, nPixelWidth, pDXArray ); -#ifdef MACOSX +#if defined(MACOSX) || defined(IOS) // CoreText layouts are immutable and already contain the text color // so we need to provide the color already for the layout request // even if this layout will never be drawn |