From 481e2bc6f7273d9c2c34db96e0dc211bf055ee63 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Apr 2022 21:44:13 +0200 Subject: Clean up odd function definitions ...that were like that ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import", but which when called would run into the assert(false)/ "!!br0ken!!" code in rtl::str::newFromSubString (sal/rtl/strtmpl.hxx), as the count argument to OUString::copy is -1. So just return an empty OUString, similar to what the getTimeDateFunctions and getNumericFunctions functions always did. (Stumbled across this when it got flagged by loplugin:stringviewvar with clang-cl.) Change-Id: Ief23c7e0c7712dd65e6213c9e7db3a10d276eaa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133226 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- connectivity/source/drivers/ado/ADatabaseMetaData.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index b2a4f54b524e..65e0a80f52a8 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -896,8 +896,7 @@ OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { - OUString aValue; - return aValue.copy(0,aValue.lastIndexOf(',')); + return OUString(); } OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) @@ -907,8 +906,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { - OUString aValue; - return aValue.copy(0,aValue.lastIndexOf(',')); + return OUString(); } OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) -- cgit