diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 08:27:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:23 +0200 |
| commit | 976430ba8ed7cf24813cbf1aab502847ab925bde (patch) | |
| tree | bab874f768973c37c875d983ed01f938b560107c | |
| parent | 360c1a8e0859b97b1999febdcc928e8bd0935c10 (diff) | |
convert include/svx/sidebar/ColorControl.hxx from String to OUString
Change-Id: I15787484a74e82fdc8f6c16287317fecf4e80557
| -rw-r--r-- | include/svx/sidebar/ColorControl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/tools/ColorControl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx index 6f8faf7640ce..6cec9cbb3e70 100644 --- a/include/svx/sidebar/ColorControl.hxx +++ b/include/svx/sidebar/ColorControl.hxx @@ -71,7 +71,7 @@ public: private: SvxColorValueSet maVSColor; FloatingWindow* mpFloatingWindow; - const String msNoColorString; + const OUString msNoColorString; ::boost::function<Color(void)> maNoColorGetter; ::boost::function<void(String&,Color)> maColorSetter; diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index 48bc023b3f6e..1c07f802944f 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -131,7 +131,7 @@ void ColorControl::FillColors (void) maVSColor.SetStyle(aWinBits); // neds to be done *before* layouting - if(msNoColorString.Len() > 0) + if(!msNoColorString.isEmpty()) { maVSColor.SetStyle(maVSColor.GetStyle() | WB_NONEFIELD); maVSColor.SetText(msNoColorString); |