[Libreoffice-commits] core.git: 2 commits - sc/source vcl/generic

[Caolán McNamara]

 sc/source/filter/lotus/lotform.cxx   |   11 -----------
 sc/source/filter/qpro/qproform.cxx   |    7 -------
 vcl/generic/print/genpspgraphics.cxx |    1 +
 3 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 33b8636ced08abcb48c2424709db21e7a8fc27bf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 1 12:02:03 2014 +0100

    coverity#704264 Logically dead code
    
    and coverity#704265 Logically dead code
    
    Change-Id: Ice40fcb71de4cca07e3353cf579477c7e5363e52

diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index dc0dcba..ebb3eb2 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -35,9 +35,6 @@ static const sal_Char*      GetAddInName( const sal_uInt8 nIndex );
 
 static DefTokenId           lcl_KnownAddIn(const OString& rTest);
 
-//extern double decipher_Number123( sal_uInt32 nValue );
-
-
 void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtString )
 {
     TokenId                     eParam[ 256 ];
@@ -45,7 +42,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
     TokenId                     nMerk0, nMerk1;
 
     sal_Bool                        bAddIn = false;
-    sal_Bool                        bNeg = false;
 
     OSL_ENSURE( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" );
 
@@ -197,15 +193,8 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
     aPool << ocClose;
 
     aPool >> aStack;
-
-    if( bNeg )
-    {
-        aPool << ocOpen << ocSub << aStack << ocClose;
-        aPool >> aStack;
-    }
 }
 
-
 void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD )
 {
     // Col-Bemachung
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index ff47b00..a53060b 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -79,7 +79,6 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
     TokenId  nPush, nPush1;
 
     sal_Bool bAddIn = false;
-    sal_Bool bNeg = false;
 
     if( eOc == ocNoName )
     {
@@ -160,12 +159,6 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
 
     aPool << ocClose;
     aPool >> aStack;
-
-    if( bNeg )
-    {
-        aPool << ocOpen << ocSub << aStack << ocClose;
-        aPool >> aStack;
-    }
 }
 
 void QProToSc::IncToken( TokenId &rParam )
commit 06284f399da1f504f58cc483651a3932f9746e63
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 1 10:56:46 2014 +0100

    coverity#708657 Uninitialized pointer field
    
    Change-Id: Ief35e66ef2e1bcad39f7ff70fd39e91973a4dc69

diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 924faa6..5a6aecd 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -145,6 +145,7 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) :
 
         default:
             OSL_FAIL("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format");
+            mpFncGetPixel = NULL;
         break;
     }
 }