diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 01:18:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-02 18:46:47 +0200 |
| commit | 116b9d6ddf2b61186b29f0370234eec9c1bbe306 (patch) | |
| tree | 7f90a12333274086e33c4e0fabfd96a8e54e6b6c /vcl/source/window/menuwindow.cxx | |
| parent | d7ba78e9c7be835a1e2ecdacd25995663e96862f (diff) | |
Avoid conversions between OUString and OString in VCL
Standardize on OUString, which is the main internal string class.
Convert from/to OUString only when communicating with respective
external APIs.
Removes about 200 conversions from the code.
Change-Id: I96ecee7c6fd271bb76639220e96d69d2964bed26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149930
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/source/window/menuwindow.cxx')
| -rw-r--r-- | vcl/source/window/menuwindow.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/menuwindow.cxx b/vcl/source/window/menuwindow.cxx index a3412e0778b3..36ed07f0730d 100644 --- a/vcl/source/window/menuwindow.cxx +++ b/vcl/source/window/menuwindow.cxx @@ -94,14 +94,14 @@ bool MenuWindow::ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu const * pMen // is an id available, then call help with the id, otherwise // use help-index OUString aCommand = pMenu->GetItemCommand( nId ); - OString aHelpId( pMenu->GetHelpId( nId ) ); + OUString aHelpId( pMenu->GetHelpId( nId ) ); if( aHelpId.isEmpty() ) aHelpId = OOO_HELP_INDEX; if ( !aCommand.isEmpty() ) pHelp->Start(aCommand); else - pHelp->Start(OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8)); + pHelp->Start(aHelpId); } bDone = true; } |