[Libreoffice-commits] .: starmath/source

Caolán McNamara caolan at kemper.freedesktop.org
Sat Jan 29 09:57:46 PST 2011


 starmath/source/cfgitem.cxx |    1 +
 starmath/source/parse.cxx   |   35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 612d073259f93347b07e2c150226321dd85c37cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 29 17:11:13 2011 +0000

    WaE: various new gcc 4.6.0 warnings

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index b202bb7..444cd12 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -748,6 +748,7 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
         ++pValue;
 
         OSL_ENSURE( bOK, "read FontFormat failed" );
+        (void)bOK;
     }
 }
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3e4228f..6a649d0 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1569,28 +1569,29 @@ void SmParser::Escape()
 {
     NextToken();
 
-    sal_Unicode	cChar;
     switch (CurToken.eType)
-    {	case TLPARENT :		cChar = MS_LPARENT;		break;
-        case TRPARENT :		cChar = MS_RPARENT;		break;
-        case TLBRACKET :	cChar = MS_LBRACKET;	break;
-        case TRBRACKET :	cChar = MS_RBRACKET;	break;
-        case TLDBRACKET :   cChar = MS_LDBRACKET;   break;
-        case TRDBRACKET :   cChar = MS_RDBRACKET;   break;
+    {
+        case TLPARENT :
+        case TRPARENT :
+        case TLBRACKET :
+        case TRBRACKET :
+        case TLDBRACKET :
+        case TRDBRACKET :
         case TLBRACE :
-        case TLGROUP :		cChar = MS_LBRACE;		break;
+        case TLGROUP :
         case TRBRACE :
-        case TRGROUP :		cChar = MS_RBRACE;		break;
-        case TLANGLE :		cChar = MS_LANGLE;		break;
-        case TRANGLE :		cChar = MS_RANGLE;		break;
-        case TLCEIL :		cChar = MS_LCEIL;		break;
-        case TRCEIL :		cChar = MS_RCEIL;		break;
-        case TLFLOOR :		cChar = MS_LFLOOR;		break;
-        case TRFLOOR :		cChar = MS_RFLOOR;		break;
+        case TRGROUP :
+        case TLANGLE :
+        case TRANGLE :
+        case TLCEIL :
+        case TRCEIL :
+        case TLFLOOR :
+        case TRFLOOR :
         case TLLINE :
-        case TRLINE :		cChar = MS_LINE;		break;
+        case TRLINE :
         case TLDLINE :
-        case TRDLINE :		cChar = MS_DLINE;		break;
+        case TRDLINE :
+            break;
         default:
             Error(PE_UNEXPECTED_TOKEN);
     }


More information about the Libreoffice-commits mailing list