Skip to content

C
core
Kaydet (Commit) 15ed8b52 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS warnings01 (1.5.220); FILE MERGED 

2006/03/10 14:33:16 cl 1.5.220.1: removed some warnings, mostly shadowed variables
üst b9ffb583
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 27 deletions
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
Dosyayı görüntüle @ 15ed8b52
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: EnhancedCustomShapeFunctionParser.cxx,v $ * $RCSfile: EnhancedCustomShapeFunctionParser.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 20:26:28 $ * last change: $Author: hr $ $Date: 2006-06-19 14:57:06 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
{ {
return FUNC_CONST; return FUNC_CONST;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
Fraction aFract( maValue ); Fraction aFract( maValue );
...@@ -159,9 +159,10 @@ class AdjustmentExpression : public ExpressionNode ...@@ -159,9 +159,10 @@ class AdjustmentExpression : public ExpressionNode
public: public:
AdjustmentExpression( const EnhancedCustomShape2d& rCustoShape, sal_Int32 nIndex ) : AdjustmentExpression( const EnhancedCustomShape2d& rCustoShape, sal_Int32 nIndex )
mrCustoShape( rCustoShape ), : mnIndex ( nIndex )
mnIndex ( nIndex ) , mrCustoShape( rCustoShape )
{ {
} }
virtual double operator()() const virtual double operator()() const
...@@ -176,7 +177,7 @@ public: ...@@ -176,7 +177,7 @@ public:
{ {
return ENUM_FUNC_ADJUSTMENT; return ENUM_FUNC_ADJUSTMENT;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT; aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
...@@ -192,9 +193,9 @@ class EquationExpression : public ExpressionNode ...@@ -192,9 +193,9 @@ class EquationExpression : public ExpressionNode
public: public:
EquationExpression( const EnhancedCustomShape2d& rCustoShape, sal_Int32 nIndex ) : EquationExpression( const EnhancedCustomShape2d& rCustoShape, sal_Int32 nIndex )
mrCustoShape( rCustoShape ), : mnIndex ( nIndex )
mnIndex ( nIndex ) , mrCustoShape( rCustoShape )
{ {
} }
virtual double operator()() const virtual double operator()() const
...@@ -209,7 +210,7 @@ public: ...@@ -209,7 +210,7 @@ public:
{ {
return ENUM_FUNC_EQUATION; return ENUM_FUNC_EQUATION;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
...@@ -225,9 +226,9 @@ class EnumValueExpression : public ExpressionNode ...@@ -225,9 +226,9 @@ class EnumValueExpression : public ExpressionNode
public: public:
EnumValueExpression( const EnhancedCustomShape2d& rCustoShape, const ExpressionFunct eFunct ) : EnumValueExpression( const EnhancedCustomShape2d& rCustoShape, const ExpressionFunct eFunct )
mrCustoShape ( rCustoShape ), : meFunct ( eFunct )
meFunct ( eFunct ) , mrCustoShape ( rCustoShape )
{ {
} }
static double getValue( const EnhancedCustomShape2d& rCustoShape, const ExpressionFunct eFunc ) static double getValue( const EnhancedCustomShape2d& rCustoShape, const ExpressionFunct eFunc )
...@@ -266,7 +267,7 @@ public: ...@@ -266,7 +267,7 @@ public:
{ {
return meFunct; return meFunct;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
...@@ -378,12 +379,12 @@ public: ...@@ -378,12 +379,12 @@ public:
EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, NULL, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, NULL, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) );
if ( aSource.Type == EnhancedCustomShapeParameterType::NORMAL ) if ( aSource.Type == EnhancedCustomShapeParameterType::NORMAL )
{ // sumangle needed :-( { // sumangle needed :-(
EnhancedCustomShapeEquation aEquation; EnhancedCustomShapeEquation _aEquation;
aEquation.nOperation |= 0xe; // sumangle _aEquation.nOperation |= 0xe; // sumangle
FillEquationParameter( aSource, 1, aEquation ); FillEquationParameter( aSource, 1, _aEquation );
aSource.Type = EnhancedCustomShapeParameterType::EQUATION; aSource.Type = EnhancedCustomShapeParameterType::EQUATION;
aSource.Value <<= (sal_Int32)rEquations.size(); aSource.Value <<= (sal_Int32)rEquations.size();
rEquations.push_back( aEquation ); rEquations.push_back( _aEquation );
} }
FillEquationParameter( aSource, 1, aEquation ); FillEquationParameter( aSource, 1, aEquation );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
...@@ -508,7 +509,7 @@ public: ...@@ -508,7 +509,7 @@ public:
{ {
return meFunct; return meFunct;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
switch( meFunct ) switch( meFunct )
...@@ -716,7 +717,7 @@ public: ...@@ -716,7 +717,7 @@ public:
{ {
return TERNARY_FUNC_IF; return TERNARY_FUNC_IF;
} }
virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) virtual EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* /*pOptionalArg*/, sal_uInt32 nFlags )
{ {
EnhancedCustomShapeParameter aRet; EnhancedCustomShapeParameter aRet;
aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
...@@ -773,7 +774,7 @@ public: ...@@ -773,7 +774,7 @@ public:
mpContext( rContext ) mpContext( rContext )
{ {
} }
void operator()( StringIteratorT rFirst, StringIteratorT rSecond ) const void operator()( StringIteratorT /*rFirst*/, StringIteratorT /*rSecond*/ ) const
{ {
mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( mnValue ) ) ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( mnValue ) ) );
} }
...@@ -804,15 +805,15 @@ class EnumFunctor ...@@ -804,15 +805,15 @@ class EnumFunctor
public: public:
EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext )
mnValue( 0 ), : meFunct( eFunct )
mpContext( rContext ), , mnValue( 0 )
meFunct( eFunct ) , mpContext( rContext )
{ {
} }
void operator()( StringIteratorT rFirst, StringIteratorT rSecond ) const void operator()( StringIteratorT rFirst, StringIteratorT rSecond ) const
{ {
double nVal = mnValue; /*double nVal = mnValue;*/
switch( meFunct ) switch( meFunct )
{ {
case ENUM_FUNC_ADJUSTMENT : case ENUM_FUNC_ADJUSTMENT :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment