diff options
Diffstat (limited to 'kspread/kspread_condition.cc')
| -rw-r--r-- | kspread/kspread_condition.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kspread/kspread_condition.cc b/kspread/kspread_condition.cc index fdca8e46..876dfbf0 100644 --- a/kspread/kspread_condition.cc +++ b/kspread/kspread_condition.cc @@ -475,14 +475,14 @@ void Conditions::loadOasisConditions( const TQDomElement & element ) void Conditions::loadOasisConditionValue( const TQString &styleCondition, Conditional &newCondition ) { TQString val( styleCondition ); - if ( val.tqcontains( "cell-content()" ) ) + if ( val.contains( "cell-content()" ) ) { val = val.remove( "cell-content()" ); loadOasisCondition( val,newCondition ); } //GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value) //for the moment we support just int/double value, not text/date/time :( - if ( val.tqcontains( "cell-content-is-between(" ) ) + if ( val.contains( "cell-content-is-between(" ) ) { val = val.remove( "cell-content-is-between(" ); val = val.remove( ")" ); @@ -490,7 +490,7 @@ void Conditions::loadOasisConditionValue( const TQString &styleCondition, Condit loadOasisValidationValue( listVal, newCondition ); newCondition.cond = Conditional::Between; } - if ( val.tqcontains( "cell-content-is-not-between(" ) ) + if ( val.contains( "cell-content-is-not-between(" ) ) { val = val.remove( "cell-content-is-not-between(" ); val = val.remove( ")" ); @@ -505,33 +505,33 @@ void Conditions::loadOasisConditionValue( const TQString &styleCondition, Condit void Conditions::loadOasisCondition( TQString &valExpression, Conditional &newCondition ) { TQString value; - if (valExpression.tqfind( "<=" )==0 ) + if (valExpression.find( "<=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::InferiorEqual; } - else if (valExpression.tqfind( ">=" )==0 ) + else if (valExpression.find( ">=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::SuperiorEqual; } - else if (valExpression.tqfind( "!=" )==0 ) + else if (valExpression.find( "!=" )==0 ) { //add Differentto attribute value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::DifferentTo; } - else if ( valExpression.tqfind( "<" )==0 ) + else if ( valExpression.find( "<" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Inferior; } - else if(valExpression.tqfind( ">" )==0 ) + else if(valExpression.find( ">" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Superior; } - else if (valExpression.tqfind( "=" )==0 ) + else if (valExpression.find( "=" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Equal; |