diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-11-23 00:20:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-11-23 00:25:01 +0200 |
| commit | 75fb3f79c3ba5e94740cea947527477bba50b358 (patch) | |
| tree | d7a5b60ebfb8aee719811d13e281710b6813ab1c /svx | |
| parent | 0155d33972159eae54e7f48faca47a3feac29c99 (diff) | |
Avoid OUString construction at library load time
Change-Id: Ie56cea732ade971aa276411e7552d4eefe47621a
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 27ef20920e3e..d08a2f37ff69 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -35,7 +35,11 @@ #include "palettes.hxx" -static NamedColor aLibreColors[] = +static const struct +{ + Color mColor; + const char* mName; +} aLibreColors[] = { { Color(0x1b, 0x1b, 0x1b), "HLC 000 10 00" }, { Color(0x30, 0x30, 0x30), "HLC 000 20 00" }, @@ -1094,7 +1098,7 @@ public: { for (size_t i = 0; i < SAL_N_ELEMENTS(aLibreColors); i++) { - rColorSet.InsertItem(i, aLibreColors[i].first, aLibreColors[i].second); + rColorSet.InsertItem(i, aLibreColors[i].mColor, OUString::createFromAscii(aLibreColors[i].mName)); } } |