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/edit/vclmedit.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/edit/vclmedit.cxx')
| -rw-r--r-- | vcl/source/edit/vclmedit.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 3008a7e887d0..541d6bfc20c8 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -785,13 +785,13 @@ void TextWindow::Command( const CommandEvent& rCEvt ) { bEnableUndo = false; } - pPopup->EnableItem(pPopup->GetItemId("cut"), bEnableCut); - pPopup->EnableItem(pPopup->GetItemId("copy"), bEnableCopy); - pPopup->EnableItem(pPopup->GetItemId("delete"), bEnableDelete); - pPopup->EnableItem(pPopup->GetItemId("paste"), bEnablePaste); - pPopup->EnableItem(pPopup->GetItemId("specialchar"), bEnableSpecialChar); - pPopup->EnableItem(pPopup->GetItemId("undo"), bEnableUndo); - pPopup->ShowItem(pPopup->GetItemId("specialchar"), !vcl::GetGetSpecialCharsFunction()); + pPopup->EnableItem(pPopup->GetItemId(u"cut"), bEnableCut); + pPopup->EnableItem(pPopup->GetItemId(u"copy"), bEnableCopy); + pPopup->EnableItem(pPopup->GetItemId(u"delete"), bEnableDelete); + pPopup->EnableItem(pPopup->GetItemId(u"paste"), bEnablePaste); + pPopup->EnableItem(pPopup->GetItemId(u"specialchar"), bEnableSpecialChar); + pPopup->EnableItem(pPopup->GetItemId(u"undo"), bEnableUndo); + pPopup->ShowItem(pPopup->GetItemId(u"specialchar"), !vcl::GetGetSpecialCharsFunction()); mbActivePopup = true; Point aPos = rCEvt.GetMousePosPixel(); @@ -802,7 +802,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) aPos = Point( aSize.Width()/2, aSize.Height()/2 ); } sal_uInt16 n = pPopup->Execute( this, aPos ); - OString sCommand = pPopup->GetItemIdent(n); + OUString sCommand = pPopup->GetItemIdent(n); if (sCommand == "undo") { mpExtTextView->Undo(); @@ -1484,7 +1484,7 @@ FactoryFunction VclMultiLineEdit::GetUITestFactory() const return MultiLineEditUIObject::create; } -bool VclMultiLineEdit::set_property(const OString &rKey, const OUString &rValue) +bool VclMultiLineEdit::set_property(const OUString &rKey, const OUString &rValue) { if (rKey == "cursor-visible") EnableCursor(toBool(rValue)); |