From 1e2483a3ab9d32266cba73db250ff4c517bbe4f8 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 24 Mar 2022 10:49:31 +0300 Subject: Create OUString from ASCII literal instead of createFromAscii Change-Id: I58d0b49a32edf4d67807c0d67e08a28705d7334e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132026 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- dbaccess/source/ui/browser/genericcontroller.cxx | 4 ++-- include/dbaccess/genericcontroller.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 05aabe1855fa..eab8c16d7ca0 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -755,7 +755,7 @@ void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) m_aCurrentFrame.frameAction( aEvent.Action ); } -void OGenericUnoController::implDescribeSupportedFeature( const char* _pAsciiCommandURL, +void OGenericUnoController::implDescribeSupportedFeature( const OUString& _rCommandURL, sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup ) { #ifdef DBG_UTIL @@ -765,7 +765,7 @@ void OGenericUnoController::implDescribeSupportedFeature( const char* _pAsciiCom "OGenericUnoController::implDescribeSupportedFeature: invalid feature id!" ); ControllerFeature aFeature; - aFeature.Command = OUString::createFromAscii( _pAsciiCommandURL ); + aFeature.Command = _rCommandURL; aFeature.nFeatureId = _nFeatureId; aFeature.GroupId = _nCommandGroup; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 7ce10174e3d1..50b939791654 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -289,7 +289,7 @@ namespace dbaui Must not be called outside describeSupportedFeatures. - @param _pAsciiCommandURL + @param _rCommandURL the URL of the feature command @param _nFeatureId the id of the feature. Later references to this feature usually happen by id, not by @@ -299,7 +299,7 @@ namespace dbaui by the user, see also CommandGroup. */ void implDescribeSupportedFeature( - const char* _pAsciiCommandURL, + const OUString& _rCommandURL, sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup = css::frame::CommandGroup::INTERNAL ); -- cgit