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 /include/vcl/syswin.hxx | |
| 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 'include/vcl/syswin.hxx')
| -rw-r--r-- | include/vcl/syswin.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index d370c6399f0e..7eee3693bab8 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -137,7 +137,7 @@ private: protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType, const char* pIdleDebugName); - void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + void loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); void SetWindowState(const vcl::WindowData& rData); @@ -176,8 +176,8 @@ public: void SetMaxOutputSizePixel( const Size& rSize ); const Size& GetMaxOutputSizePixel() const; - void SetWindowState(std::string_view rStr); - OString GetWindowState(vcl::WindowDataMask nMask = vcl::WindowDataMask::All) const; + void SetWindowState(std::u16string_view rStr); + OUString GetWindowState(vcl::WindowDataMask nMask = vcl::WindowDataMask::All) const; void SetMenuBar(MenuBar* pMenuBar); MenuBar* GetMenuBar() const { return mpMenuBar; } |