CWS-TOOLING: integrate CWS cmcfixes49

5 files changed, 23 insertions, 23 deletions

diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 3420fa9a6803..29a1fa0e3cd5 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: astattribute.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -80,27 +80,27 @@ public:
 
     AstType const * getType() const
         { return m_pType; }
-    const sal_Bool isReadonly()
+    sal_Bool isReadonly() const
         { return ((m_flags & AF_READONLY) == AF_READONLY); }
-    const sal_Bool isOptional()
+    sal_Bool isOptional() const
         { return ((m_flags & AF_OPTIONAL) == AF_OPTIONAL); }
-    const sal_Bool isAttribute()
+    sal_Bool isAttribute() const
         { return ((m_flags & AF_ATTRIBUTE) == AF_ATTRIBUTE); }
-    const sal_Bool isProperty()
+    sal_Bool isProperty() const
         { return ((m_flags & AF_PROPERTY) == AF_PROPERTY); }
-    const sal_Bool isBound()
+    sal_Bool isBound() const
         { return ((m_flags & AF_BOUND) == AF_BOUND); }
-    const sal_Bool isMayBeVoid()
+    sal_Bool isMayBeVoid() const
         { return ((m_flags & AF_MAYBEVOID) == AF_MAYBEVOID); }
-    const sal_Bool isConstrained()
+    sal_Bool isConstrained() const
         { return ((m_flags & AF_CONSTRAINED) == AF_CONSTRAINED); }
-    const sal_Bool isTransient()
+    sal_Bool isTransient() const
         { return ((m_flags & AF_TRANSIENT) == AF_TRANSIENT); }
-    const sal_Bool isMayBeAmbiguous()
+    sal_Bool isMayBeAmbiguous() const
         { return ((m_flags & AF_MAYBEAMBIGUOUS) == AF_MAYBEAMBIGUOUS); }
-    const sal_Bool isMayBeDefault()
+    sal_Bool isMayBeDefault() const
         { return ((m_flags & AF_MAYBEDEFAULT) == AF_MAYBEDEFAULT); }
-    const sal_Bool isRemoveable()
+    sal_Bool isRemoveable() const
         { return ((m_flags & AF_REMOVEABLE) == AF_REMOVEABLE); }
 
     sal_Bool dumpBlob(
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 00670707e9ef..946e154ae6bd 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: astbasetype.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -55,7 +55,7 @@ public:
         }
     }
 
-    const ExprType getExprType() const
+    ExprType getExprType() const
         { return m_exprType; }
 private:
     const ExprType m_exprType;
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index 73eacda1fca4..8bf5bfe11e3e 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: astconstant.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,7 +46,7 @@ public:
 
     AstExpression* getConstValue()
         { return m_pConstValue; }
-    const ExprType getConstValueType()
+    ExprType getConstValueType() const
         { return m_constValueType; }
 
     sal_Bool dumpBlob(
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index e8b2a7eb0554..cc9e0d5153ec 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: astscope.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,7 +42,7 @@ public:
     AstScope(NodeType nodeType);
     virtual ~AstScope();
 
-    const NodeType getScopeNodeType()
+    NodeType getScopeNodeType() const
         { return m_nodeType; }
 
     virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl);
diff --git a/idlc/source/scanner.ll b/idlc/source/scanner.ll
index d1a643556644..ea122c531400 100644
--- a/idlc/source/scanner.ll
+++ b/idlc/source/scanner.ll
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: scanner.ll,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.16.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -189,7 +189,7 @@ static double asciiToFloat(const sal_Char *s)
            	}
            	if (e > 0)
            	{
-            	for (k = 1; e > 0; k *= 10, e--);
+            	for (k = 1; e > 0; k *= 10, e--) ;
                	if (negexp)
                 	d /= k;
                	else
@@ -223,9 +223,9 @@ static void parseLineAndFile(sal_Char* pBuf)
 		return;
 
 	/* Find line number */
-	for (r++; *r == ' ' || *r == '\t' || isalpha(*r); r++);
+	for (r++; *r == ' ' || *r == '\t' || isalpha(*r); r++) ;
 	h = r;
-	for (; *r != '\0' && *r != ' ' && *r != '\t'; r++);
+	for (; *r != '\0' && *r != ' ' && *r != '\t'; r++) ;
 	*r++ = 0;
 	idlc()->setLineNumber((sal_uInt32)atol(h));
 
@@ -236,7 +236,7 @@ static void parseLineAndFile(sal_Char* pBuf)
 			return;
 	}
 	h = ++r;
-	for (; *r != '"'; r++);
+	for (; *r != '"'; r++) ;
 	*r = 0;
 	if (*h == '\0')
 		idlc()->setFileName(::rtl::OString("standard input"));