vcl/quartz/ctlayout.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 606d51a5496f4aaeb6d955d07204db0d775def61
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Wed May 21 23:40:50 2014 -0500
fdo#77993 actually impact 10.6 too apparently
Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9427
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 0b29673..0c317c4 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
