User: kz Date: 2006/12/13 08:14:41 Modified: dba/connectivity/source/commontools/predicateinput.cxx
Log: INTEGRATION: CWS dba22ui (1.8.20); FILE MERGED 2006/12/05 09:46:53 fs 1.8.20.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: predicateinput.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/predicateinput.cxx?r1=1.8&r2=1.9 Delta lines: +4 -4 ------------------- --- predicateinput.cxx 17 Sep 2006 02:03:26 -0000 1.8 +++ predicateinput.cxx 13 Dec 2006 16:14:38 -0000 1.9 @@ -293,7 +293,7 @@ // translate it back into a string sTransformedText = ::rtl::OUString(); pParseNode->parseNodeToPredicateStr( - sTransformedText, m_xConnection->getMetaData(), m_xFormatter, _rxField, + sTransformedText, m_xConnection, m_xFormatter, _rxField, rParseContext.getPreferredLocale(), (sal_Char)nDecSeparator, &rParseContext ); _rPredicateValue = sTransformedText; @@ -372,7 +372,7 @@ OSL_ENSURE( pFuncSpecParent, "OPredicateInputController::getPredicateValue: an ODBC func spec node without parent?" ); if ( pFuncSpecParent ) pFuncSpecParent->parseNodeToStr( - sReturn, m_xConnection->getMetaData(), &m_aParser.getContext(), sal_False, sal_True + sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True ); } } @@ -388,12 +388,12 @@ sReturn = pValueNode->getTokenValue(); else pValueNode->parseNodeToStr( - sReturn, m_xConnection->getMetaData(), &m_aParser.getContext(), sal_False, sal_True + sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True ); } else pValueNode->parseNodeToStr( - sReturn, m_xConnection->getMetaData(), &m_aParser.getContext(), sal_False, sal_True + sReturn, m_xConnection, &m_aParser.getContext(), sal_False, sal_True ); } else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
