[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - svx/source

[David Tardon]

 svx/source/dialog/fntctrl.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit f52577053763b287d21da0067970c5727ff087cc
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jul 9 14:41:29 2014 +0200

    fdo#81004 this looks like a mis-merge to me
    
    Change-Id: I2d30774a8a89002b6c2d8487bfce15eb13c82e0d
    (cherry picked from commit 8817e5e3a0d92a4febae955ced7a35c52cb08910)
    Reviewed-on: https://gerrit.libreoffice.org/10170
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 90939f2b5dfc8a7aafc255322f0fcb66f670241e)
    Reviewed-on: https://gerrit.libreoffice.org/10271
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 6e9ca6e..e9a92eb 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -248,14 +248,6 @@ void FontPrevWin_Impl::CheckScript()
     }
     sal_uInt16 nScript = xBreak->getScriptType( aText, 0 );
     sal_Int32 nChg = 0;
-    if( com::sun::star::i18n::ScriptType::WEAK == nScript )
-    {
-        nChg = xBreak->endOfScript( aText, nChg, nScript );
-        if (nChg < aText.getLength() && nChg >= 0)
-            nScript = xBreak->getScriptType( aText, nChg );
-        else
-            nScript = com::sun::star::i18n::ScriptType::LATIN;
-    }
 
     do
     {