[Libreoffice-commits] core.git: 3 commits - editeng/source sw/source vcl/generic

[Noel Grandin]

 editeng/source/editeng/impedit2.cxx |    2 --
 sw/source/uibase/docvw/edtwin.cxx   |    2 +-
 vcl/generic/glyphs/gcach_ftyp.cxx   |    8 --------
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 393032d98be09be43e66604a11269da88958f297
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 27 15:52:54 2014 +0200

    cid#1247616 Logically dead code
    
    Change-Id: I2577bf1d61c24f78070de409c285c8e36dddb3d6

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index ed57dc3..38e4232 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3898,7 +3898,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 case SwTab::COLSEL_VERT :
                     nPointer = POINTER_TAB_SELECT_W;
                     break;
-                case SwTab::COL_NONE: break; // prevent compiler warning
+                default: break; // prevent compiler warning
             }
 
             if ( USHRT_MAX != nPointer &&
commit 96725576e59b25f2d24c431b6e67ccf4c67a1e57
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 27 15:50:43 2014 +0200

    cid#1209201 Logically dead code
    
    Change-Id: I8a7a9e23ad33f0c62813ae4ebd84cece3fe75283

diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3b56fdb..9a46f58 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3103,8 +3103,6 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace )
             }
         }
     }
-    if ( nMaxWidth < 0 )
-        nMaxWidth = 0;
 
     nMaxWidth++; // widen it, because in CreateLines for >= is wrapped.
     return (sal_uInt32)nMaxWidth;
commit b89121208c0667e31f873fd22bb2285b9e073b79
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 27 15:43:51 2014 +0200

    cid#735557 Logically dead code
    
    Change-Id: I0f6851a4ce5c02ea48110bdb8ed47cdb15853917

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 9e12d5a..6b1ce3e 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1605,8 +1605,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
     ReqFeatureTagList aReqFeatureTagList;
     if( rFSD.mbVertical )
         aReqFeatureTagList.push_back( MKTAG("vert") );
-    sal_uLong nRequestedScript = 0;     //MKTAG("hani");//### TODO: where to get script?
-    sal_uLong nRequestedLangsys = 0;    //MKTAG("ZHT"); //### TODO: where to get langsys?
     // TODO: request more features depending on script and language system
 
     if( aReqFeatureTagList.empty()) // nothing to do
@@ -1634,11 +1632,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
     pScriptHeader += 2;
     for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex )
     {
-        const sal_uLong nScriptTag      = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang
         const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 );
         pScriptHeader += 6;
-        if( (nScriptTag != nRequestedScript) && (nRequestedScript != 0) )
-            continue;
 
         const FT_Byte* pScriptTable     = pGsubBase + nOfsScriptList + nOfsScriptTable;
         const sal_uInt16 nDefaultLangsysOfs = GetUShort( pScriptTable+0 );
@@ -1648,11 +1643,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
 
         for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
         {
-            const sal_uLong nTag    = GetUInt( pScriptTable+0 );    // e.g. KOR/ZHS/ZHT/JAN
             const sal_uInt16 nOffset= GetUShort( pScriptTable+4 );
             pScriptTable += 6;
-            if( (nTag != nRequestedLangsys) && (nRequestedLangsys != 0) )
-                continue;
             nLangsysOffset = nOffset;
             break;
         }