summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svx/Palette.hxx2
-rw-r--r--svx/source/tbxctrls/Palette.cxx6
2 files changed, 5 insertions, 3 deletions
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index c659e063e696..2be4eb205adc 100644
--- a/include/svx/Palette.hxx
+++ b/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;
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));
}