diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-28 14:10:04 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:50 +0200 |
| commit | 78afbfa1cb0f99a62dc643fc64e38c1eaa2014f1 (patch) | |
| tree | f46f50f0304b6252e77b8cedc47ef1a7923983ef /svx | |
| parent | 2d37d10ebdc67e38e2c96735ef38266e5a24b90f (diff) | |
Change NamedColor to use OUString
Change-Id: Id84d761b33f12dfc50f980e61ab44565693f2e5a
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/Palette.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx index f499b987382d..95ebb589735c 100644 --- a/svx/source/tbxctrls/Palette.cxx +++ b/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)); } |