diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-05-21 23:40:50 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-05-23 10:25:22 -0500 |
| commit | 606d51a5496f4aaeb6d955d07204db0d775def61 (patch) | |
| tree | 1ada2b3bbf387c32e6d8322c93b1c312bb531b6b /vcl | |
| parent | 959a17b9c2a2afac9946be44beb646c273311887 (diff) | |
fdo#77993 actually impact 10.6 too apparently
Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9427
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/quartz/ctlayout.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index 0b29673cbf42..0c317c4f9cc7 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // - CoreText handles spaces specially (in particular at the text end) if( mnTrailingSpaceCount ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 // don't recreate line layout here, because this can lead to problems // (looks like internal issues inside early CoreText versions) mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine ); @@ -218,7 +218,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) } } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth - mfTrailingSpaceWidth ); #else CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth); @@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) } CFRelease( mpCTLine ); mpCTLine = pNewCTLine; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 mfCachedWidth = nPixelWidth; #else mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth; |