[Libreoffice-commits] core.git: 4 commits - starmath/source vcl/generic

[Caolán McNamara]

 starmath/source/mathtype.cxx         |    2 +-
 vcl/generic/fontmanager/parseAFM.cxx |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c50c800f9c183f12aa75d64a386c3b9f20731d70
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 6 14:04:19 2014 +0100

    coverity#708822 Unused pointer value
    
    Change-Id: I6ccd4c2ab97237806652059d6ae2cd23a6dc1625

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index fb2ca532..a46bef3 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2295,7 +2295,7 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel)
         if (pNode->GetSubNode(RSUB+1))
             nVariation=2;
     }
-    else if (NULL != (pTemp = pNode->GetSubNode(RSUB+1)))
+    else if (NULL != pNode->GetSubNode(RSUB+1))
         nVariation=1;
 
     if (nVariation!=0xff)
commit 4d33acbfbda4d72a8c4ded4ac9df6f1aee667424
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 6 14:03:38 2014 +0100

    coverity#708896 Unused pointer value
    
    Change-Id: I8cb1d720a8fb22ba2153c5f556e4bd538f5ea8af

diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index a7199bcb..4e34697 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -497,7 +497,7 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
                     break;
                 case EM:
                     // skip one token
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     break;
                 case STARTDIRECTION:
                     if ((keyword = token(fp,tokenlen)) != NULL)
@@ -506,22 +506,22 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
                 case ENDDIRECTION:
                     break; /* ignore this for now */
                 case MAPPINGSCHEME:
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     break; /* ignore     this for now */
                 case CHARACTERS:
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     break; /* ignore this for now */
                 case ISBASEFONT:
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     break; /* ignore this for now */
                 case CHARACTERSET:
-                    keyword=token(fp,tokenlen); //ignore
+                    token(fp,tokenlen); //ignore
                     break;
                 case STDHW:
-                    keyword=token(fp,tokenlen); //ignore
+                    token(fp,tokenlen); //ignore
                     break;
                 case STDVW:
-                    keyword=token(fp,tokenlen); //ignore
+                    token(fp,tokenlen); //ignore
                     break;
                 case CHARWIDTH:
                     if ((keyword = token(fp,tokenlen)) != NULL)
@@ -529,7 +529,7 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
                         if (direction == 0)
                             gfi->charwidth = atoi(keyword);
                     }
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     /* ignore y-width for now */
                     break;
                 case METRICSSETS:
commit 4c4901893f2f734385411a76fa33d82a98ff714a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 6 14:02:38 2014 +0100

    coverity#708898 Unused pointer value
    
    Change-Id: Ida87450bda99260d9e153bb9e48d8867f53d42ca

diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index bbb8c2e..a7199bcb 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -611,7 +611,7 @@ static int parseCharWidths( FileInputStream* fp, int* cwi)
                     break;
                 case XYWIDTH:
                     /* PROBLEM: Should be no Y-WIDTH when doing "quick & dirty" */
-                    keyword = token(fp,tokenlen); keyword = token(fp,tokenlen); /* eat values */
+                    token(fp,tokenlen); keyword = token(fp,tokenlen); /* eat values */
                     error = parseError;
                     break;
                 case CODEHEX:
@@ -634,14 +634,14 @@ static int parseCharWidths( FileInputStream* fp, int* cwi)
                     error = normalEOF;
                     break;
                 case CHARNAME:  /* eat values (so doesn't cause parseError) */
-                    keyword = token(fp,tokenlen);
+                    token(fp,tokenlen);
                     break;
                 case CHARBBOX:
-                    keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
-                    keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
+                    token(fp,tokenlen); keyword = token(fp,tokenlen);
+                    token(fp,tokenlen); keyword = token(fp,tokenlen);
                     break;
                 case LIGATURE:
-                    keyword = token(fp,tokenlen); keyword = token(fp,tokenlen);
+                    token(fp,tokenlen); keyword = token(fp,tokenlen);
                     break;
                 case VVECTOR:
                     token(fp,tokenlen); /*eat token*/
commit 6407a1bd8094aa86522566693c6d6ae631f4610d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 6 14:00:51 2014 +0100

    coverity#708901 Unused pointer value
    
    Change-Id: Idb9be9f594b9ab3d1837c003d4a748f9693f5ceb

diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index 4b82ca3..bbb8c2e 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -1151,7 +1151,7 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi)
                     break;
                 case COMMENT:
                 case COMPCHAR:
-                    keyword = linetoken(fp);
+                    linetoken(fp);
                     break;
                 default:
                     break;