move builder attributes from OString to OUString

Change-Id: I235188c9a086337b104e600f31a1c81deeca6c17
Reviewed-on: https://gerrit.libreoffice.org/37076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 4db55175a0c8..20e1855a37fa 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1395,7 +1395,7 @@ void Window::queue_resize(StateChangedType eReason)
 
 namespace
 {
-    VclAlign toAlign(const OString &rValue)
+    VclAlign toAlign(const OUString &rValue)
     {
         VclAlign eRet = VclAlign::Fill;
 
@@ -1411,7 +1411,7 @@ namespace
     }
 }
 
-bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
+bool Window::set_font_attribute(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "weight")
     {
@@ -1470,11 +1470,11 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
     return true;
 }
 
-bool Window::set_property(const OString &rKey, const OString &rValue)
+bool Window::set_property(const OString &rKey, const OUString &rValue)
 {
     if ((rKey == "label") || (rKey == "title") || (rKey == "text") )
     {
-        SetText(OStringToOUString(VclBuilder::convertMnemonicMarkup(rValue), RTL_TEXTENCODING_UTF8));
+        SetText(VclBuilder::convertMnemonicMarkup(rValue));
     }
     else if (rKey == "visible")
         Show(toBool(rValue));
@@ -1553,9 +1553,9 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
     else if (rKey == "valign")
         set_valign(toAlign(rValue));
     else if (rKey == "tooltip-markup")
-        SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetQuickHelpText(rValue);
     else if (rKey == "tooltip-text")
-        SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetQuickHelpText(rValue);
     else if (rKey == "border-width")
         set_border_width(rValue.toInt32());
     else if (rKey == "margin-left")
@@ -1588,11 +1588,11 @@ bool Window::set_property(const OString &rKey, const OString &rValue)
     }
     else if (rKey == "accessible-name")
     {
-        SetAccessibleName(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetAccessibleName(rValue);
     }
     else if (rKey == "accessible-description")
     {
-        SetAccessibleDescription(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetAccessibleDescription(rValue);
     }
     else if (rKey == "use-markup")
     {