summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/file/fcode.cxx
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-09-29 11:00:09 +0200
committerOliver Specht <oliver.specht@cib.de>2015-09-30 06:07:57 +0000
commitac9671f94800b647f82b12e718968311a025e87e (patch)
treef3a665eb3527022d016fa9bfdbe4128a8387c967 /connectivity/source/drivers/file/fcode.cxx
parent53e6ac15a14b46c76049a9e6eb39da7bb4093037 (diff)
tdf#94559: second step to remove rtti.hxx
replaced use of PTR_CAST, IS_TYPE, ISA in chart2, connectivity, editeng, extensions, filter, forms, framework, idl Change-Id: I6a2f9d8bbccb07088413f7552af4b5af8f0cad99 Reviewed-on: https://gerrit.libreoffice.org/18920 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'connectivity/source/drivers/file/fcode.cxx')
-rw-r--r--connectivity/source/drivers/file/fcode.cxx27
1 files changed, 14 insertions, 13 deletions
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 95eeffdd987c..20ff3a0e55b2 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -189,9 +189,9 @@ void OBoolOperator::Exec(OCodeStack& rCodeStack)
rCodeStack.pop();
rCodeStack.push(new OOperandResultBOOL(operate(pLeft, pRight)));
- if (IS_TYPE(OOperandResult,pLeft))
+ if( typeid(OOperandResult) == typeid(*pLeft))
delete pLeft;
- if (IS_TYPE(OOperandResult,pRight))
+ if( typeid(OOperandResult) == typeid(*pRight))
delete pRight;
}
@@ -206,7 +206,8 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack)
rCodeStack.pop();
rCodeStack.push(new OOperandResultBOOL(operate(pOperand)));
- if (IS_TYPE(OOperandResult,pOperand))
+
+ if( typeid(OOperandResult) == typeid(*pOperand))
delete pOperand;
}
@@ -228,7 +229,7 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
rCodeStack.pop();
rCodeStack.push(new OOperandResultBOOL(operate(pOperand)));
- if (IS_TYPE(OOperandResult,pOperand))
+ if( typeid(OOperandResult) == typeid(*pOperand))
delete pOperand;
}
@@ -340,9 +341,9 @@ void ONumOperator::Exec(OCodeStack& rCodeStack)
rCodeStack.pop();
rCodeStack.push(new OOperandResultNUM(operate(pLeft->getValue(), pRight->getValue())));
- if (IS_TYPE(OOperandResult,pLeft))
+ if( typeid(OOperandResult) == typeid(*pLeft))
delete pLeft;
- if (IS_TYPE(OOperandResult,pRight))
+ if( typeid(OOperandResult) == typeid(*pRight))
delete pRight;
}
@@ -380,11 +381,11 @@ void ONthOperator::Exec(OCodeStack& rCodeStack)
pOperand = rCodeStack.top();
rCodeStack.pop();
assert(pOperand);
- if (pOperand && !IS_TYPE(OStopOperand,pOperand))
+ if (pOperand && typeid(OStopOperand) != typeid(*pOperand))
aValues.push_back( pOperand->getValue() );
aOperands.push_back( pOperand );
}
- while (pOperand && !IS_TYPE(OStopOperand,pOperand));
+ while (pOperand && typeid(OStopOperand) != typeid(*pOperand));
rCodeStack.push(new OOperandResult(operate(aValues)));
@@ -392,7 +393,7 @@ void ONthOperator::Exec(OCodeStack& rCodeStack)
::std::vector<OOperand*>::iterator aEnd = aOperands.end();
for (; aIter != aEnd; ++aIter)
{
- if (IS_TYPE(OOperandResult,*aIter))
+ if (typeid(OOperandResult) != typeid(*(*aIter)))
delete *aIter;
}
}
@@ -404,13 +405,13 @@ void OBinaryOperator::Exec(OCodeStack& rCodeStack)
OOperand *pLeft = rCodeStack.top();
rCodeStack.pop();
- if ( !rCodeStack.empty() && IS_TYPE(OStopOperand,rCodeStack.top()) )
+ if ( !rCodeStack.empty() && typeid(OStopOperand) == typeid(*rCodeStack.top()) )
rCodeStack.pop();
rCodeStack.push(new OOperandResult(operate(pLeft->getValue(),pRight->getValue())));
- if (IS_TYPE(OOperandResult,pRight))
+ if(typeid(OOperandResult) == typeid(*pRight))
delete pRight;
- if (IS_TYPE(OOperandResult,pLeft))
+ if(typeid(OOperandResult) == typeid(*pLeft))
delete pLeft;
}
@@ -421,7 +422,7 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack)
rCodeStack.pop();
rCodeStack.push(new OOperandResult(operate(pOperand->getValue())));
- if (IS_TYPE(OOperandResult,pOperand))
+ if (typeid(OOperandResult) == typeid(*pOperand))
delete pOperand;
}