diff options
Diffstat (limited to 'connectivity/source/commontools/predicateinput.cxx')
| -rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 57f3d07678..a4bd5ae352 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -93,7 +93,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPredicateInputController::getSeparatorChars: caught an exception!" ); + OSL_FAIL( "OPredicateInputController::getSeparatorChars: caught an exception!" ); } return sal_False; } @@ -133,7 +133,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPredicateInputController::OPredicateInputController: caught an exception!" ); + OSL_FAIL( "OPredicateInputController::OPredicateInputController: caught an exception!" ); } } @@ -144,7 +144,7 @@ namespace dbtools if ( !pReturn ) { // is it a text field ? sal_Int32 nType = DataType::OTHER; - _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nType; + _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) >>= nType; if ( ( DataType::CHAR == nType ) || ( DataType::VARCHAR == nType ) @@ -203,10 +203,10 @@ namespace dbtools try { Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() ); - if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString::createFromAscii( "FormatKey" ) ) ) + if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) ) { sal_Int32 nFormatKey = 0; - _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "FormatKey" ) ) >>= nFormatKey; + _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) >>= nFormatKey; if ( nFormatKey && m_xFormatter.is() ) { Locale aFormatLocale; @@ -226,7 +226,7 @@ namespace dbtools } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" ); + OSL_FAIL( "OPredicateInputController::implPredicateTree: caught an exception while dealing with the formats!" ); } sal_Bool bDecDiffers = ( nCtxDecSep != nFmtDecSep ); @@ -343,7 +343,7 @@ namespace dbtools sReturn = pOdbcSpec->getChild(1)->getTokenValue(); } else - OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" ); + OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (odbc + param use)!" ); } else { @@ -376,7 +376,7 @@ namespace dbtools ); } else - OSL_ENSURE( sal_False, "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" ); + OSL_FAIL( "OPredicateInputController::getPredicateValue: unknown/invalid structure (noodbc)!" ); } delete pParseNode; |