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>

7 files changed, 16 insertions, 17 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ec1d80ca63e7..b2fe0fea93bd 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -593,7 +593,7 @@ bool Button::IsSmallSymbol () const
     return mpButtonData->mbSmallSymbol;
 }
 
-bool Button::set_property(const OString &rKey, const OString &rValue)
+bool Button::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "image-position")
     {
@@ -1668,7 +1668,7 @@ Size PushButton::GetOptimalSize() const
     return CalcMinimumSize();
 }
 
-bool PushButton::set_property(const OString &rKey, const OString &rValue)
+bool PushButton::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "has-default")
     {
@@ -2644,7 +2644,7 @@ void RadioButton::SetState( bool bCheck )
     }
 }
 
-bool RadioButton::set_property(const OString &rKey, const OString &rValue)
+bool RadioButton::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "active")
         SetState(toBool(rValue));
@@ -3558,7 +3558,7 @@ void CheckBox::SetState( TriState eState )
     }
 }
 
-bool CheckBox::set_property(const OString &rKey, const OString &rValue)
+bool CheckBox::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "active")
         SetState(toBool(rValue) ? TRISTATE_TRUE : TRISTATE_FALSE);
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a0218d8ada95..cc8959373cfb 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1494,7 +1494,7 @@ void ComboBox::setMaxWidthChars(sal_Int32 nWidth)
     }
 }
 
-bool ComboBox::set_property(const OString &rKey, const OString &rValue)
+bool ComboBox::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "max-width-chars")
         setMaxWidthChars(rValue.toInt32());
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 70cebbbc77f3..0a778b86148f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -179,7 +179,7 @@ void Edit::setMaxWidthChars(sal_Int32 nWidth)
     }
 }
 
-bool Edit::set_property(const OString &rKey, const OString &rValue)
+bool Edit::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "width-chars")
         SetWidthInChars(rValue.toInt32());
@@ -212,7 +212,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue)
         SetStyle(nBits);
     }
     else if (rKey == "placeholder-text")
-        SetPlaceholderText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetPlaceholderText(rValue);
     else
         return Control::set_property(rKey, rValue);
     return true;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 4b1a66a5cf3b..b6d3b082cbda 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -748,7 +748,7 @@ void NumericField::dispose()
     SpinField::dispose();
 }
 
-bool NumericField::set_property(const OString &rKey, const OString &rValue)
+bool NumericField::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "digits")
         SetDecimalDigits(rValue.toInt32());
@@ -1524,7 +1524,7 @@ Size MetricField::CalcMinimumSize() const
     return calcMinimumSize(*this, *this);
 }
 
-bool MetricField::set_property(const OString &rKey, const OString &rValue)
+bool MetricField::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "digits")
         SetDecimalDigits(rValue.toInt32());
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 6722fd345de6..96da4001428a 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -391,7 +391,7 @@ void FixedText::setMinWidthChars(sal_Int32 nWidth)
     }
 }
 
-bool FixedText::set_property(const OString &rKey, const OString &rValue)
+bool FixedText::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "max-width-chars")
         setMaxWidthChars(rValue.toInt32());
@@ -968,14 +968,13 @@ bool FixedImage::SetModeImage( const Image& rImage )
     return true;
 }
 
-
-Image FixedImage::loadThemeImage(const OString &rFileName)
+Image FixedImage::loadThemeImage(const OUString &rFileName)
 {
-    BitmapEx aBitmap(OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8));
+    BitmapEx aBitmap(rFileName);
     return Image(aBitmap);
 }
 
-bool FixedImage::set_property(const OString &rKey, const OString &rValue)
+bool FixedImage::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "pixbuf")
     {
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index 052973d92ef4..4d0631b85867 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -140,10 +140,10 @@ void FixedHyperlink::SetText(const OUString& rNewDescription)
     m_nTextLen = GetCtrlTextWidth(GetText());
 }
 
-bool FixedHyperlink::set_property(const OString &rKey, const OString &rValue)
+bool FixedHyperlink::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "uri")
-        SetURL(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
+        SetURL(rValue);
     else
         return FixedText::set_property(rKey, rValue);
     return true;
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 2e3334efea81..fe07dc901c06 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1408,7 +1408,7 @@ void ListBox::setMaxWidthChars(sal_Int32 nWidth)
     }
 }
 
-bool ListBox::set_property(const OString &rKey, const OString &rValue)
+bool ListBox::set_property(const OString &rKey, const OUString &rValue)
 {
     if (rKey == "active")
         SelectEntryPos(rValue.toInt32());