[Libreoffice-commits] core.git: vcl/quartz

[Caolán McNamara]

 vcl/quartz/ctlayout.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 87a1e49b5e16bbb8226286852300c5e20c000513
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 24 13:47:05 2014 +0000

    Revert "Resolves: #i124375# force soft-hyphen visibility for CoreText..."
    
    prefer 4dba6f5837539746293ef6808ea39a764ab7654d "fdo#67370: Hyphens are not
    visible in tagged PDF"
    
    This reverts commit 8214c1d6156c90cbf259b15cf1c8e15ea1c70daf.

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index e479d31..b8b1b98 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -108,20 +108,11 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
     if( mnCharCount <= 0 )
         return false;
 
-    // prepare the string to be layouted by CoreText
+    // create the CoreText line layout
     CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
                                                               rArgs.mpStr + mnMinCharPos,
                                                               mnCharCount,
                                                               kCFAllocatorNull );
-
-    // #i124375# force soft-hyphen visibility to meet the expectations of Writer+EditEngine
-    if( CFStringFind( aCFText, (CFStringRef)@"\u00AD", 0).length > 0 )
-    {
-        NSString* pDashStr = [(NSString*)aCFText stringByReplacingOccurrencesOfString: @"\u00AD" withString: @"-"];
-        aCFText = CFStringCreateCopy( NULL, (CFStringRef)pDashStr );
-    }
-
-    // create the CoreText line layout using the requested text style
     // CFAttributedStringCreate copies the attribues parameter
     mpAttrString = CFAttributedStringCreate( NULL, aCFText, mpTextStyle->GetStyleDict() );
     mpCTLine = CTLineCreateWithAttributedString( mpAttrString );