Kill old Core Text layout engine

Reviewed-on: https://gerrit.libreoffice.org/31232
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit d761d952f460e1943e94c5a7556b3b01d2259666)

Change-Id: If80d65899255d8be72f374fbec232d103a08a006
(cherry picked from commit afee24b73e379bf7f9e9d2cf647d8686896f9f8a)

1 files changed, 1 insertions, 29 deletions

diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 86a3de71f03b..e333d4680358 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1490,11 +1490,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 
         nScrPos = pScrArray[ 0 ];
 
-        if( bBullet
-#if defined(MACOSX) || defined(IOS)
-            && OutputDevice::UseCommonLayout()
-#endif
-          )
+        if( bBullet )
         {
             // !!! HACK !!!
             // The Arabic layout engine requires some context of the string
@@ -1557,23 +1553,11 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             if ( bSwitchH2V )
                 rInf.GetFrame()->SwitchHorizontalToVertical( aTextOriginPos );
 
-#if defined(MACOSX) || defined(IOS)
-            if (!OutputDevice::UseCommonLayout())
-            {
-                rInf.GetOut().DrawTextArray( aTextOriginPos, rInf.GetText(),
-                                         pKernArray, rInf.GetIdx(), 1, bBullet ? SalLayoutFlags::DrawBullet : SalLayoutFlags::NONE );
-            }
-            else
-            {
-#endif
             rInf.GetOut().DrawTextArray( aTextOriginPos, rInf.GetText(),
                                          pKernArray.get(), rInf.GetIdx(), 1 );
             if( bBullet )
                 rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray.get(),
                                              rInf.GetIdx() ? 1 : 0, 1 );
-#if defined(MACOSX) || defined(IOS)
-            }
-#endif
         }
         else
         {
@@ -1754,15 +1738,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                 if ( bSwitchH2V )
                     rInf.GetFrame()->SwitchHorizontalToVertical( aTextOriginPos );
 
-#if defined(MACOSX) || defined(IOS)
-                if (!OutputDevice::UseCommonLayout())
-                {
-                        rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray + nOffs,
-                                             rInf.GetIdx() + nOffs , nLen - nOffs, bBullet ? SalLayoutFlags::DrawBullet : SalLayoutFlags::NONE );
-                }
-                else
-                {
-#endif
                 // If we paint bullets instead of spaces, we use a copy of
                 // the paragraph string. For the layout engine, the copy
                 // of the string has to be an environment of the range which
@@ -1817,9 +1792,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                     pTmpFont->SetStrikeout(aPreviousStrikeout);
                     rInf.GetOut().Pop();
                 }
-#if defined(MACOSX) || defined(IOS)
-                }
-#endif
             }
         }
     }