User: obo Date: 2006/07/13 08:12:53 Modified: dba/connectivity/inc/connectivity/sqlparse.hxx
Log: INTEGRATION: CWS dba204a (1.18.100); FILE MERGED 2006/07/13 07:55:21 fs 1.18.100.2: RESYNC: (1.18-1.19); FILE MERGED 2006/05/22 10:50:00 oj 1.18.100.1: #i50910# some new methods and rearrangement File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: sqlparse.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sqlparse.hxx?r1=1.19&r2=1.20 Delta lines: +10 -7 -------------------- --- sqlparse.hxx 10 Jul 2006 14:16:59 -0000 1.19 +++ sqlparse.hxx 13 Jul 2006 15:12:50 -0000 1.20 @@ -172,7 +172,13 @@ // convert a string into double trim it to scale of _nscale and than transform it back to string ::rtl::OUString stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale); - sal_Int16 buildDate(sal_Int32 _nType,OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare); + OSQLParseNode* buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral); + bool extractDate(OSQLParseNode* pLiteral,double& _rfValue); + void killThousandSeparator(OSQLParseNode* pLiteral); + OSQLParseNode* convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral); + // makes a string out of a number, pLiteral will be deleted + OSQLParseNode* buildNode_STR_NUM(OSQLParseNode*& pLiteral); + OSQLParseNode* buildNode_Date(const double& fValue, sal_Int32 nType); static ::osl::Mutex& getMutex(); @@ -231,14 +237,11 @@ void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank); // does not change the pLiteral argument - sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare); - // makes a string out of a number, pLiteral will be deleted - sal_Int16 buildNode_STR_NUM(OSQLParseNode*& pAppend,OSQLParseNode*& pLiteral,OSQLParseNode*& pCompare); - sal_Int16 buildNode_Date(const double& fValue, sal_Int32 nType, OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare); + sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2); sal_Int16 buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral); // pCompre will be deleted if it is not used - sal_Int16 buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare); + sal_Int16 buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare,OSQLParseNode* pLiteral2 = NULL); sal_Int16 buildLikeRule(OSQLParseNode*& pAppend,OSQLParseNode*& pLiteral,const OSQLParseNode* pEscape); sal_Int16 buildStringNodes(OSQLParseNode*& pLiteral); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
