Kaydet (Commit) d5831895 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

fdo#77993 actually impact 10.6 too apparently

Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9426Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst 28207c36
...@@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) ...@@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// - CoreText handles spaces specially (in particular at the text end) // - CoreText handles spaces specially (in particular at the text end)
if( mnTrailingSpaceCount ) 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 // don't recreate line layout here, because this can lead to problems
// (looks like internal issues inside early CoreText versions) // (looks like internal issues inside early CoreText versions)
mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine ); mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
...@@ -218,7 +218,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) ...@@ -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 ); CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth - mfTrailingSpaceWidth );
#else #else
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth); CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth);
...@@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) ...@@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
} }
CFRelease( mpCTLine ); CFRelease( mpCTLine );
mpCTLine = pNewCTLine; mpCTLine = pNewCTLine;
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
mfCachedWidth = nPixelWidth; mfCachedWidth = nPixelWidth;
#else #else
mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth; mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
......
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