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
This commit is contained in:
parent
f3b55fa8f6
commit
67ea329c94
1 changed files with 6 additions and 6 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: predicateinput.cxx,v $
|
||||
*
|
||||
* $Revision: 1.8 $
|
||||
* $Revision: 1.9 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2006-09-17 02:03:26 $
|
||||
* last change: $Author: kz $ $Date: 2006-12-13 16:14:38 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -293,7 +293,7 @@ namespace dbtools
|
|||
// 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 @@ namespace dbtools
|
|||
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 @@ namespace dbtools
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue