Change NamedColor to use OUString

Change-Id: Id84d761b33f12dfc50f980e61ab44565693f2e5a

include/svx/Palette.hxx

@@ -26,7 +26,7 @@
 #include <tools/stream.hxx>
 
 
-typedef std::pair<Color, OString> NamedColor;
+typedef std::pair<Color, OUString> NamedColor;
 typedef std::vector< NamedColor > ColorList;
 
 

svx/source/tbxctrls/Palette.cxx

@@ -56,7 +56,7 @@ void PaletteGPL::LoadColorSet( SvxColorValueSet& rColorSet )
         it != maColors.end(); ++it)
     {
         // TODO make it->second OUString
-        rColorSet.InsertItem(nIx, it->first, OStringToOUString(it->second, RTL_TEXTENCODING_ASCII_US));
+        rColorSet.InsertItem(nIx, it->first, it->second);
         ++nIx;
     }
 }
@@ -129,7 +129,9 @@ void PaletteGPL::LoadPalette()
             if(nIndex != -1)
                 name = aLine.copy(nIndex);
 
-            maColors.push_back(std::make_pair(Color(r, g, b), name));
+            maColors.push_back(std::make_pair(
+                Color(r, g, b),
+                OStringToOUString(name, RTL_TEXTENCODING_ASCII_US)));
         }
     } while (aFile.ReadLine(aLine));
 }