Skip to content

C
core
Kaydet (Commit) 78afbfa1 authored tarafından Krisztian Pinter's avatar Krisztian Pinter Kaydeden (comit) Tomaž Vajngerl
Dosyalara gözat
Seçenekler

Change NamedColor to use OUString 

Change-Id: Id84d761b33f12dfc50f980e61ab44565693f2e5a
üst 2d37d10e
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
include/svx/Palette.hxx
Dosyayı görüntüle @ 78afbfa1
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <tools/stream.hxx> #include <tools/stream.hxx>
typedef std::pair<Color, OString> NamedColor; typedef std::pair<Color, OUString> NamedColor;
typedef std::vector< NamedColor > ColorList; typedef std::vector< NamedColor > ColorList;
......
svx/source/tbxctrls/Palette.cxx
Dosyayı görüntüle @ 78afbfa1
...@@ -56,7 +56,7 @@ void PaletteGPL::LoadColorSet( SvxColorValueSet& rColorSet ) ...@@ -56,7 +56,7 @@ void PaletteGPL::LoadColorSet( SvxColorValueSet& rColorSet )
it != maColors.end(); ++it) it != maColors.end(); ++it)
{ {
// TODO make it->second OUString // 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; ++nIx;
} }
} }
...@@ -129,7 +129,9 @@ void PaletteGPL::LoadPalette() ...@@ -129,7 +129,9 @@ void PaletteGPL::LoadPalette()
if(nIndex != -1) if(nIndex != -1)
name = aLine.copy(nIndex); 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)); } while (aFile.ReadLine(aLine));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment