[Libreoffice-commits] core.git: svtools/source

Caolán McNamara caolanm at redhat.com
Fri Mar 28 10:24:34 PDT 2014


 svtools/source/control/ctrltool.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 018652591d0e2a0fc740a16200bc887a9acc93a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 28 16:17:28 2014 +0000

    coverity#982312 Logically dead code
    
    Change-Id: I2b40ac902812ad27dc06bd20603414dff3358eef

diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index f0733bd..ca4b68a 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -518,7 +518,6 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
     if (!rStyleName.isEmpty())
     {
         bool                    bNotSynthetic = false;
-        bool                    bNoneAvailable = false;
         FontWeight              eWeight = rInfo.GetWeight();
         FontItalic              eItalic = rInfo.GetItalic();
         ImplFontListFontInfo*   pFontInfo = pData->mpFirst;
@@ -534,11 +533,7 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
             pFontInfo = pFontInfo->mpNext;
         }
 
-        if ( bNoneAvailable )
-        {
-            return OUString();
-        }
-        else if ( !bNotSynthetic )
+        if ( !bNotSynthetic )
         {
             if (maMapStyleNotAvailable.isEmpty())
                 ((FontList*)this)->maMapStyleNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_STYLENOTAVAILABLE);


More information about the Libreoffice-commits mailing list