summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/Palette.cxx
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2014-07-28 14:10:04 +0200
committerKrisztian Pinter <pin.terminator@gmail.com>2014-07-28 14:10:04 +0200
commit834554a743b5935a21abe2026325081f2807bb34 (patch)
tree4f07273c6af600598b2f5311e8e8c8b32eea5984 /svx/source/tbxctrls/Palette.cxx
parent26fe5aaf84c3e2fe92b51eb482d05d496d6a3461 (diff)
Change NamedColor to use OUString
Change-Id: Id84d761b33f12dfc50f980e61ab44565693f2e5a
Diffstat (limited to 'svx/source/tbxctrls/Palette.cxx')
-rw-r--r--svx/source/tbxctrls/Palette.cxx6
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));
}