summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/tbxctrls')
-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));
}