toolkit/inc/controls/accessiblecontrolcontext.hxx | 2 +- toolkit/source/controls/accessiblecontrolcontext.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit b9cc4575c6b3f25c971fc2d8c82f8254e744eea0 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu May 2 15:28:34 2024 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat May 4 20:11:39 2024 +0200 replace createFromAscii with OUString literals in OAccessibleControlContext Change-Id: I48c3dcff57beef905f1d72cef871e284de2da22a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167117 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index 416984c3344c..92c3fdf81870 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -81,7 +81,7 @@ namespace toolkit virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // retrieves the value of a string property from the model, if the property is present - OUString getModelStringProperty( const char* _pPropertyName ); + OUString getModelStringProperty( const OUString& _pPropertyName ); // starts listening at the control model (currently for disposal only) void startModelListening( ); diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 761821bce601..db5f9c03b183 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -143,14 +143,14 @@ namespace toolkit OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) { OContextEntryGuard aGuard( this ); - return getModelStringProperty( "HelpText" ); + return getModelStringProperty( u"HelpText"_ustr ); } OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) { OContextEntryGuard aGuard( this ); - return getModelStringProperty( "Name" ); + return getModelStringProperty( u"Name"_ustr ); } @@ -191,7 +191,7 @@ namespace toolkit } - OUString OAccessibleControlContext::getModelStringProperty( const char* _pPropertyName ) + OUString OAccessibleControlContext::getModelStringProperty( const OUString& _pPropertyName ) { OUString sReturn; try @@ -199,7 +199,7 @@ namespace toolkit if ( !m_xModelPropsInfo.is() && m_xControlModel.is() ) m_xModelPropsInfo = m_xControlModel->getPropertySetInfo(); - OUString sPropertyName( OUString::createFromAscii( _pPropertyName ) ); + OUString sPropertyName( _pPropertyName ); if ( m_xModelPropsInfo.is() && m_xModelPropsInfo->hasPropertyByName( sPropertyName ) ) m_xControlModel->getPropertyValue( sPropertyName ) >>= sReturn; }