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/dockwin.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/dockwin.cxx')
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 74c18cca5159..b0d65fbd47d6 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -368,7 +368,7 @@ void DockingWindow::doDeferredInit(WinBits nBits) mbIsDeferredInit = false; } -void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, +void DockingWindow::loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) { mbIsDeferredInit = true; @@ -376,7 +376,7 @@ void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStr m_pUIBuilder.reset( new VclBuilder(this, AllSettings::GetUIRootDir(), rUIXMLDescription, rID, rFrame) ); } -DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, +DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const char* pIdleDebugName, const css::uno::Reference<css::frame::XFrame> &rFrame) : Window(WindowType::DOCKINGWINDOW), @@ -1089,7 +1089,7 @@ SystemWindow* DockingWindow::GetFloatingWindow() const DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) : DockingWindow(pParent, - !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), + !bTearable ? OUString("InterimDockParent") : OUString("InterimTearableParent"), !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), "vcl::DropdownDockingWindow maLayoutIdle", rFrame) |