ucbhelper/source/provider/resultset.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit e55074b33b1e3a2f630b74ae5de03a748b1624cd Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu May 2 15:38:03 2024 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat May 4 21:10:17 2024 +0200 replace createFromAscii with OUString literals in ucbhelper Change-Id: Ia8b0afb56e715798d4d43d662126cc3cedb66387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167127 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 61682f4fd539..b15430b9099a 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -40,7 +40,7 @@ namespace { struct PropertyInfo { - const char* pName; + OUString aName; sal_Int32 nHandle; sal_Int16 nAttributes; const uno::Type& (*pGetCppuType)(); @@ -58,19 +58,19 @@ static const uno::Type& sal_Bool_getCppuType() return cppu::UnoType<bool>::get(); } -const PropertyInfo aPropertyTable[] = +constexpr PropertyInfo aPropertyTable[] = { - { "IsRowCountFinal", + { u"IsRowCountFinal"_ustr, 1000, beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, &sal_Bool_getCppuType }, - { "RowCount", + { u"RowCount"_ustr, 1001, beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, &sal_Int32_getCppuType }, - { nullptr, + { u""_ustr, 0, 0, nullptr @@ -1390,7 +1390,7 @@ PropertySetInfo::PropertySetInfo( { beans::Property& rProp = pProperties[ n ]; - rProp.Name = OUString::createFromAscii( pEntry->pName ); + rProp.Name = pEntry->aName; rProp.Handle = pEntry->nHandle; rProp.Type = pEntry->pGetCppuType(); rProp.Attributes = pEntry->nAttributes;