summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--idlc/inc/idlc/astattribute.hxx24
-rw-r--r--idlc/inc/idlc/astbasetype.hxx4
-rw-r--r--idlc/inc/idlc/astconstant.hxx4
-rw-r--r--idlc/inc/idlc/astscope.hxx4
-rw-r--r--idlc/source/scanner.ll10
-rw-r--r--registry/inc/registry/registry.h6
-rw-r--r--registry/source/registry.cxx2
-rw-r--r--registry/source/regkey.cxx4
-rw-r--r--xml2cmp/source/support/sistr.cxx10
9 files changed, 34 insertions, 34 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"));
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index 0c3174a833f2..294aaa0b3cad 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: registry.h,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -126,7 +126,7 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
@param hKey identifies a currently open key which name will be returned.
@param pKeyName contains the keyname if succeeds else an empty string.
*/
-const RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
+RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
/** This function sets a value of a key.
@@ -429,7 +429,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
@param pName returns the name of the registry if the function succeeds otherwise an empty string.
@return REG_NO_ERROR if succeeds else an error code.
*/
-const RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
+RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
/** This function returns the access mode of the registry.
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 89028260e0c1..cb145b3910c2 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -605,7 +605,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
//*********************************************************************
// reg_getName
//
-const RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
+RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
{
return getName(hRegistry, pName);
}
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 04594bc8b178..5c63c9cde09f 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: regkey.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1053,7 +1053,7 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey)
//*********************************************************************
// reg_getKeyName
//
-const RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
+RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
{
if (hKey)
{
diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx
index 1f63f771ee8c..c8277f7b8d5f 100644
--- a/xml2cmp/source/support/sistr.cxx
+++ b/xml2cmp/source/support/sistr.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sistr.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.10.1 $
*
* This file is part of OpenOffice.org.
*
@@ -567,7 +567,7 @@ int
Simstr::pos_first(char c) const
{
int i = 0;
- for (i = 0; i < len ? sz[i] != c : false; i++);
+ for (i = 0; i < len ? sz[i] != c : false; i++) ;
if (i >= len)
return NO_POS;
else
@@ -581,7 +581,7 @@ Simstr::pos_first_after( char c,
int i = 0;
if (startSearchPos >= i)
i = startSearchPos+1;
- for (; i < len ? sz[i] != c : false; i++);
+ for (; i < len ? sz[i] != c : false; i++) ;
if (i >= len)
return NO_POS;
else
@@ -593,7 +593,7 @@ int
Simstr::pos_last(char c) const
{
int i = 0;
- for (i = len-1; i >= 0 ? sz[i] != c : false; i--);
+ for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ;
if (i < 0)
return NO_POS;
else
@@ -644,7 +644,7 @@ Simstr::is_no_text() const
return true;
int i;
- for (i = 0; sz[i] <= 32 && i < len; i++);
+ for (i = 0; sz[i] <= 32 && i < len; i++) ;
if (i < len)
return false;
return true;