From d9e99472767428d190c6a1100c6a0221cc229859 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 19 Dec 2024 14:11:21 +0100 Subject: Avoid global variables with non-constexpr ctors ...that had been introduced in ddeeca35d9630f2d3d3afb83a2ec8f21458f6e19 "tdf#163620 [API CHANGE] Add UI for libreoffice themes", but caused builds that statically link in Library_cui (like LOWA) to fail on start up with an uncaught css::uno::DeploymentException from > soffice.wasm.comphelper::getProcessServiceFactory() > soffice.wasm.comphelper::getProcessComponentContext() > soffice.wasm.utl::ConfigManager::acquireTree(utl::ConfigItem const&) > soffice.wasm.utl::ConfigManager::addConfigItem(utl::ConfigItem&) > soffice.wasm.utl::ConfigItem::ConfigItem(rtl::OUString, ConfigItemMode) > soffice.wasm.SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl() > soffice.wasm.SvtSysLocaleOptions::SvtSysLocaleOptions()) > soffice.wasm.SvtSysLocale_Impl::SvtSysLocale_Impl() > soffice.wasm.SvtSysLocale::SvtSysLocale() > soffice.wasm.CuiResId(TranslateId) > soffice.wasm._GLOBAL__sub_I_appearance.cxx > soffice.wasm.__wasm_call_ctors (because comphelper::getProcessServiceFactory was now called before comphelper::setProcessServiceFactory) Change-Id: I4e2d8aa048c5c0b8c5c15edf6ae358bafceb08a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178815 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 1338df7dcfaec258e5a015abb5d1e7ed561a2792) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178819 --- cui/source/options/appearance.cxx | 298 +++++++++++++++++++------------------- 1 file changed, 151 insertions(+), 147 deletions(-) diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx index e2cc7e8896a7..c2630cfaade0 100644 --- a/cui/source/options/appearance.cxx +++ b/cui/source/options/appearance.cxx @@ -33,147 +33,57 @@ struct BitmapData OUString aBitmapFileName; }; -std::vector m_aBitmapList = { - { CuiResId(BMP_FUZZY_LIGHTGREY), "fuzzy-lightgrey.jpg" }, - { CuiResId(BMP_ICE_LIGHT), "ice-light.jpg" }, - { CuiResId(BMP_PAINTED_WHITE), "painted-white.jpg" }, - { CuiResId(BMP_TEXTURE_PAPER), "texture-paper.jpg" }, - { CuiResId(BMP_CRUMPLED_PAPER), "crumpled-paper.jpg" }, - { CuiResId(BMP_MARBLE), "marble.jpg" }, - { CuiResId(BMP_CONCRETE), "concrete.jpg" }, - { CuiResId(BMP_FUZZY_GREY), "fuzzy-grey.jpg" }, - { CuiResId(BMP_FUZZY_DARKGREY), "fuzzy-darkgrey.jpg" }, - { CuiResId(BMP_STONE), "stone.jpg" }, - { CuiResId(BMP_WHITE_DIFFUSION), "white-diffusion.jpg" }, - { CuiResId(BMP_SAND_LIGHT), "sand-light.jpg" }, - { CuiResId(BMP_SAND), "sand.jpg" }, - { CuiResId(BMP_SURFACE), "surface.jpg" }, - { CuiResId(BMP_STUDIO), "studio.jpg" }, - { CuiResId(BMP_INVOICE_PAPER), "invoice-paper.jpg" }, - { CuiResId(BMP_PARCHMENT_PAPER), "parchment-paper.jpg" }, - { CuiResId(BMP_CARDBOARD), "cardboard.jpg" }, - { CuiResId(BMP_FENCE), "fence.jpg" }, - { CuiResId(BMP_WOODEN_FENCE), "wooden-fence.jpg" }, - { CuiResId(BMP_WOOD), "wood.jpg" }, - { CuiResId(BMP_WOODEN_BOARD), "wooden-board.jpg" }, - { CuiResId(BMP_PAINTED_WOOD), "painted-wood.jpg" }, - { CuiResId(BMP_STONES), "stones.jpg" }, - { CuiResId(BMP_PEBBLE_LIGHT), "pebble-light.jpg" }, - { CuiResId(BMP_STONE_WALL), "stone-wall.jpg" }, - { CuiResId(BMP_STONE_GRAY), "stone-gray.jpg" }, - { CuiResId(BMP_ROCK_WALL), "rock-wall.jpg" }, - { CuiResId(BMP_SURFACE_BLACK), "surface-black.jpg" }, - { CuiResId(BMP_BRICK_WALL), "brick-wall.png" }, - { CuiResId(BMP_TILES), "tiles.jpg" }, - { CuiResId(BMP_GRAPH_PAPER), "graph-paper.png" }, - { CuiResId(BMP_CLOUD), "cloud.jpg" }, - { CuiResId(BMP_POOL), "pool.jpg" }, - { CuiResId(BMP_SKY), "sky.jpg" }, - { CuiResId(BMP_CIRCUIT_BOARD), "circuit-board.jpg" }, - { CuiResId(BMP_COFFEE), "coffee.jpg" }, - { CuiResId(BMP_COLOR_STRIPES), "color-stripes.png" }, - { CuiResId(BMP_FLORAL), "floral.png" }, - { CuiResId(BMP_LEAF), "leaf.jpg" }, - { CuiResId(BMP_MAPLE_LEAVES), "maple-leaves.jpg" }, - { CuiResId(BMP_SPACE), "space.png" }, - { CuiResId(BMP_GIRAFFE), "giraffe.png" }, - { CuiResId(BMP_TIGER), "tiger.jpg" }, - { CuiResId(BMP_ZEBRA), "zebra.png" }, -}; - -std::map m_aRegistryEntries - = { { DOCCOLOR, CuiResId(REG_DOCCOLOR) }, - { DOCBOUNDARIES, CuiResId(REG_DOCBOUNDARIES) }, - { APPBACKGROUND, CuiResId(REG_APPBACKGROUND) }, - { TABLEBOUNDARIES, CuiResId(REG_TABLEBOUNDARIES) }, - { FONTCOLOR, CuiResId(REG_FONTCOLOR) }, - { LINKS, CuiResId(REG_LINKS) }, - { LINKSVISITED, CuiResId(REG_LINKSVISITED) }, - { SPELL, CuiResId(REG_SPELL) }, - { GRAMMAR, CuiResId(REG_GRAMMAR) }, - { SMARTTAGS, CuiResId(REG_SMARTTAGS) }, - { SHADOWCOLOR, CuiResId(REG_SHADOW) }, - { WRITERTEXTGRID, CuiResId(REG_WRITERTEXTGRID) }, - { WRITERFIELDSHADINGS, CuiResId(REG_WRITERFIELDSHADINGS) }, - { WRITERIDXSHADINGS, CuiResId(REG_WRITERIDXSHADINGS) }, - { WRITERDIRECTCURSOR, CuiResId(REG_WRITERDIRECTCURSOR) }, - { WRITERSCRIPTINDICATOR, CuiResId(REG_WRITERSCRIPTINDICATOR) }, - { WRITERSECTIONBOUNDARIES, CuiResId(REG_WRITERSECTIONBOUNDARIES) }, - { WRITERHEADERFOOTERMARK, CuiResId(REG_WRITERHEADERFOOTERMARK) }, - { WRITERPAGEBREAKS, CuiResId(REG_WRITERPAGEBREAKS) }, - { WRITERNONPRINTCHARS, CuiResId(REG_WRITERNONPRINTCHARS) }, - { HTMLSGML, CuiResId(REG_HTMLSGML) }, - { HTMLCOMMENT, CuiResId(REG_HTMLCOMMENT) }, - { HTMLKEYWORD, CuiResId(REG_HTMLKEYWORD) }, - { HTMLUNKNOWN, CuiResId(REG_HTMLUNKNOWN) }, - { CALCGRID, CuiResId(REG_CALCGRID) }, - { CALCCELLFOCUS, CuiResId(REG_CALCCELLFOCUS) }, - { CALCPAGEBREAK, CuiResId(REG_CALCPAGEBREAK) }, - { CALCPAGEBREAKMANUAL, CuiResId(REG_CALCPAGEBREAKMANUAL) }, - { CALCPAGEBREAKAUTOMATIC, CuiResId(REG_CALCPAGEBREAKAUTOMATIC) }, - { CALCHIDDENROWCOL, CuiResId(REG_CALCHIDDENCOLROW) }, - { CALCTEXTOVERFLOW, CuiResId(REG_CALCTEXTOVERFLOW) }, - { CALCCOMMENTS, CuiResId(REG_CALCCOMMENTS) }, - { CALCDETECTIVE, CuiResId(REG_CALCDETECTIVE) }, - { CALCDETECTIVEERROR, CuiResId(REG_CALCDETECTIVEERROR) }, - { CALCREFERENCE, CuiResId(REG_CALCREFERENCE) }, - { CALCNOTESBACKGROUND, CuiResId(REG_CALCNOTESBACKGROUND) }, - { CALCVALUE, CuiResId(REG_CALCVALUE) }, - { CALCFORMULA, CuiResId(REG_CALCFORMULA) }, - { CALCTEXT, CuiResId(REG_CALCTEXT) }, - { CALCPROTECTEDBACKGROUND, CuiResId(REG_CALCPROTECTEDBACKGROUND) }, - { DRAWGRID, CuiResId(REG_DRAWGRID) }, - { AUTHOR1, CuiResId(REG_AUTHOR1) }, - { AUTHOR2, CuiResId(REG_AUTHOR2) }, - { AUTHOR3, CuiResId(REG_AUTHOR3) }, - { AUTHOR4, CuiResId(REG_AUTHOR4) }, - { AUTHOR5, CuiResId(REG_AUTHOR5) }, - { AUTHOR6, CuiResId(REG_AUTHOR6) }, - { AUTHOR7, CuiResId(REG_AUTHOR7) }, - { AUTHOR8, CuiResId(REG_AUTHOR8) }, - { AUTHOR9, CuiResId(REG_AUTHOR9) }, - { BASICEDITOR, CuiResId(REG_BASICEDITOR) }, - { BASICIDENTIFIER, CuiResId(REG_BASICIDENTIFIER) }, - { BASICCOMMENT, CuiResId(REG_BASICCOMMENT) }, - { BASICNUMBER, CuiResId(REG_BASICNUMBER) }, - { BASICSTRING, CuiResId(REG_BASICSTRING) }, - { BASICOPERATOR, CuiResId(REG_BASICOPERATOR) }, - { BASICKEYWORD, CuiResId(REG_BASICKEYWORD) }, - { BASICERROR, CuiResId(REG_BASICERROR) }, - { SQLIDENTIFIER, CuiResId(REG_SQLIDENTIFIER) }, - { SQLNUMBER, CuiResId(REG_SQLNUMBER) }, - { SQLSTRING, CuiResId(REG_SQLSTRING) }, - { SQLOPERATOR, CuiResId(REG_SQLOPERATOR) }, - { SQLKEYWORD, CuiResId(REG_SQLKEYWORD) }, - { SQLPARAMETER, CuiResId(REG_SQLPARAMETER) }, - { SQLCOMMENT, CuiResId(REG_SQLCOMMENT) }, - { WINDOWCOLOR, CuiResId(REG_WINDOWCOLOR) }, - { WINDOWTEXTCOLOR, CuiResId(REG_WINDOWTEXTCOLOR) }, - { BASECOLOR, CuiResId(REG_BASECOLOR) }, - { BUTTONCOLOR, CuiResId(REG_BUTTONCOLOR) }, - { BUTTONTEXTCOLOR, CuiResId(REG_BUTTONTEXTCOLOR) }, - { ACCENTCOLOR, CuiResId(REG_ACCENTCOLOR) }, - { DISABLEDCOLOR, CuiResId(REG_DISABLEDCOLOR) }, - { DISABLEDTEXTCOLOR, CuiResId(REG_DISABLEDTEXTCOLOR) }, - { SHADECOLOR, CuiResId(REG_SHADOWCOLOR) }, - { SEPARATORCOLOR, CuiResId(REG_SEPARATORCOLOR) }, - { FACECOLOR, CuiResId(REG_FACECOLOR) }, - { ACTIVECOLOR, CuiResId(REG_ACTIVECOLOR) }, - { ACTIVETEXTCOLOR, CuiResId(REG_ACTIVETEXTCOLOR) }, - { ACTIVEBORDERCOLOR, CuiResId(REG_ACTIVEBORDERCOLOR) }, - { FIELDCOLOR, CuiResId(REG_FIELDCOLOR) }, - { MENUBARCOLOR, CuiResId(REG_MENUBARCOLOR) }, - { MENUBARTEXTCOLOR, CuiResId(REG_MENUBARTEXTCOLOR) }, - { MENUBARHIGHLIGHTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTCOLOR) }, - { MENUBARHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTTEXTCOLOR) }, - { MENUCOLOR, CuiResId(REG_MENUCOLOR) }, - { MENUTEXTCOLOR, CuiResId(REG_MENUTEXTCOLOR) }, - { MENUHIGHLIGHTCOLOR, CuiResId(REG_MENUHIGHLIGHTCOLOR) }, - { MENUHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUHIGHLIGHTTEXTCOLOR) }, - { MENUBORDERCOLOR, CuiResId(REG_MENUBORDERCOLOR) }, - { INACTIVECOLOR, CuiResId(REG_INACTIVECOLOR) }, - { INACTIVETEXTCOLOR, CuiResId(REG_INACTIVETEXTCOLOR) }, - { INACTIVEBORDERCOLOR, CuiResId(REG_INACTIVEBORDERCOLOR) } }; +std::vector const& getBitmapList() +{ + static std::vector m_aBitmapList = { + { CuiResId(BMP_FUZZY_LIGHTGREY), "fuzzy-lightgrey.jpg" }, + { CuiResId(BMP_ICE_LIGHT), "ice-light.jpg" }, + { CuiResId(BMP_PAINTED_WHITE), "painted-white.jpg" }, + { CuiResId(BMP_TEXTURE_PAPER), "texture-paper.jpg" }, + { CuiResId(BMP_CRUMPLED_PAPER), "crumpled-paper.jpg" }, + { CuiResId(BMP_MARBLE), "marble.jpg" }, + { CuiResId(BMP_CONCRETE), "concrete.jpg" }, + { CuiResId(BMP_FUZZY_GREY), "fuzzy-grey.jpg" }, + { CuiResId(BMP_FUZZY_DARKGREY), "fuzzy-darkgrey.jpg" }, + { CuiResId(BMP_STONE), "stone.jpg" }, + { CuiResId(BMP_WHITE_DIFFUSION), "white-diffusion.jpg" }, + { CuiResId(BMP_SAND_LIGHT), "sand-light.jpg" }, + { CuiResId(BMP_SAND), "sand.jpg" }, + { CuiResId(BMP_SURFACE), "surface.jpg" }, + { CuiResId(BMP_STUDIO), "studio.jpg" }, + { CuiResId(BMP_INVOICE_PAPER), "invoice-paper.jpg" }, + { CuiResId(BMP_PARCHMENT_PAPER), "parchment-paper.jpg" }, + { CuiResId(BMP_CARDBOARD), "cardboard.jpg" }, + { CuiResId(BMP_FENCE), "fence.jpg" }, + { CuiResId(BMP_WOODEN_FENCE), "wooden-fence.jpg" }, + { CuiResId(BMP_WOOD), "wood.jpg" }, + { CuiResId(BMP_WOODEN_BOARD), "wooden-board.jpg" }, + { CuiResId(BMP_PAINTED_WOOD), "painted-wood.jpg" }, + { CuiResId(BMP_STONES), "stones.jpg" }, + { CuiResId(BMP_PEBBLE_LIGHT), "pebble-light.jpg" }, + { CuiResId(BMP_STONE_WALL), "stone-wall.jpg" }, + { CuiResId(BMP_STONE_GRAY), "stone-gray.jpg" }, + { CuiResId(BMP_ROCK_WALL), "rock-wall.jpg" }, + { CuiResId(BMP_SURFACE_BLACK), "surface-black.jpg" }, + { CuiResId(BMP_BRICK_WALL), "brick-wall.png" }, + { CuiResId(BMP_TILES), "tiles.jpg" }, + { CuiResId(BMP_GRAPH_PAPER), "graph-paper.png" }, + { CuiResId(BMP_CLOUD), "cloud.jpg" }, + { CuiResId(BMP_POOL), "pool.jpg" }, + { CuiResId(BMP_SKY), "sky.jpg" }, + { CuiResId(BMP_CIRCUIT_BOARD), "circuit-board.jpg" }, + { CuiResId(BMP_COFFEE), "coffee.jpg" }, + { CuiResId(BMP_COLOR_STRIPES), "color-stripes.png" }, + { CuiResId(BMP_FLORAL), "floral.png" }, + { CuiResId(BMP_LEAF), "leaf.jpg" }, + { CuiResId(BMP_MAPLE_LEAVES), "maple-leaves.jpg" }, + { CuiResId(BMP_SPACE), "space.png" }, + { CuiResId(BMP_GIRAFFE), "giraffe.png" }, + { CuiResId(BMP_TIGER), "tiger.jpg" }, + { CuiResId(BMP_ZEBRA), "zebra.png" }, + }; + return m_aBitmapList; +} } SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* pPage, @@ -368,14 +278,14 @@ IMPL_LINK_NOARG(SvxAppearanceTabPage, ColorEntryChgHdl, weld::ComboBox&, void) // bitmap file name to translated label size_t i; - for (i = 0; i < m_aBitmapList.size(); ++i) + for (i = 0; i < getBitmapList().size(); ++i) { - if (rCurrentEntryColor.sBitmapFileName == m_aBitmapList[i].aBitmapFileName) + if (rCurrentEntryColor.sBitmapFileName == getBitmapList()[i].aBitmapFileName) break; } // if bitmap not in the list then reset to 0 - if (i == m_aBitmapList.size()) + if (i == getBitmapList().size()) i = 0; m_xBitmapDropDownBtn->set_active(i); @@ -529,7 +439,7 @@ IMPL_LINK_NOARG(SvxAppearanceTabPage, BitmapChangeHdl, weld::ComboBox&, void) // save the bitmap file name aCurrentEntryColor.sBitmapFileName - = m_aBitmapList[m_xBitmapDropDownBtn->get_active()].aBitmapFileName; + = getBitmapList()[m_xBitmapDropDownBtn->get_active()].aBitmapFileName; pColorConfig->SetColorValue(static_cast(nEntry), aCurrentEntryColor); m_bRestartRequired = true; @@ -593,8 +503,8 @@ void SvxAppearanceTabPage::InitCustomization() m_xShowInDocumentChkBtn->hide(); // load bitmap names - for (size_t i = 0; i < m_aBitmapList.size(); ++i) - m_xBitmapDropDownBtn->append_text(m_aBitmapList[i].aTranslatedBitmapLabel); + for (size_t i = 0; i < getBitmapList().size(); ++i) + m_xBitmapDropDownBtn->append_text(getBitmapList()[i].aTranslatedBitmapLabel); m_xBitmapDropDownBtn->set_active(0); // DOCCOLOR uses color, so image controls are disabled @@ -661,6 +571,100 @@ bool SvxAppearanceTabPage::IsDarkModeEnabled() void SvxAppearanceTabPage::FillItemsList() { + static std::map m_aRegistryEntries + = { { DOCCOLOR, CuiResId(REG_DOCCOLOR) }, + { DOCBOUNDARIES, CuiResId(REG_DOCBOUNDARIES) }, + { APPBACKGROUND, CuiResId(REG_APPBACKGROUND) }, + { TABLEBOUNDARIES, CuiResId(REG_TABLEBOUNDARIES) }, + { FONTCOLOR, CuiResId(REG_FONTCOLOR) }, + { LINKS, CuiResId(REG_LINKS) }, + { LINKSVISITED, CuiResId(REG_LINKSVISITED) }, + { SPELL, CuiResId(REG_SPELL) }, + { GRAMMAR, CuiResId(REG_GRAMMAR) }, + { SMARTTAGS, CuiResId(REG_SMARTTAGS) }, + { SHADOWCOLOR, CuiResId(REG_SHADOW) }, + { WRITERTEXTGRID, CuiResId(REG_WRITERTEXTGRID) }, + { WRITERFIELDSHADINGS, CuiResId(REG_WRITERFIELDSHADINGS) }, + { WRITERIDXSHADINGS, CuiResId(REG_WRITERIDXSHADINGS) }, + { WRITERDIRECTCURSOR, CuiResId(REG_WRITERDIRECTCURSOR) }, + { WRITERSCRIPTINDICATOR, CuiResId(REG_WRITERSCRIPTINDICATOR) }, + { WRITERSECTIONBOUNDARIES, CuiResId(REG_WRITERSECTIONBOUNDARIES) }, + { WRITERHEADERFOOTERMARK, CuiResId(REG_WRITERHEADERFOOTERMARK) }, + { WRITERPAGEBREAKS, CuiResId(REG_WRITERPAGEBREAKS) }, + { WRITERNONPRINTCHARS, CuiResId(REG_WRITERNONPRINTCHARS) }, + { HTMLSGML, CuiResId(REG_HTMLSGML) }, + { HTMLCOMMENT, CuiResId(REG_HTMLCOMMENT) }, + { HTMLKEYWORD, CuiResId(REG_HTMLKEYWORD) }, + { HTMLUNKNOWN, CuiResId(REG_HTMLUNKNOWN) }, + { CALCGRID, CuiResId(REG_CALCGRID) }, + { CALCCELLFOCUS, CuiResId(REG_CALCCELLFOCUS) }, + { CALCPAGEBREAK, CuiResId(REG_CALCPAGEBREAK) }, + { CALCPAGEBREAKMANUAL, CuiResId(REG_CALCPAGEBREAKMANUAL) }, + { CALCPAGEBREAKAUTOMATIC, CuiResId(REG_CALCPAGEBREAKAUTOMATIC) }, + { CALCHIDDENROWCOL, CuiResId(REG_CALCHIDDENCOLROW) }, + { CALCTEXTOVERFLOW, CuiResId(REG_CALCTEXTOVERFLOW) }, + { CALCCOMMENTS, CuiResId(REG_CALCCOMMENTS) }, + { CALCDETECTIVE, CuiResId(REG_CALCDETECTIVE) }, + { CALCDETECTIVEERROR, CuiResId(REG_CALCDETECTIVEERROR) }, + { CALCREFERENCE, CuiResId(REG_CALCREFERENCE) }, + { CALCNOTESBACKGROUND, CuiResId(REG_CALCNOTESBACKGROUND) }, + { CALCVALUE, CuiResId(REG_CALCVALUE) }, + { CALCFORMULA, CuiResId(REG_CALCFORMULA) }, + { CALCTEXT, CuiResId(REG_CALCTEXT) }, + { CALCPROTECTEDBACKGROUND, CuiResId(REG_CALCPROTECTEDBACKGROUND) }, + { DRAWGRID, CuiResId(REG_DRAWGRID) }, + { AUTHOR1, CuiResId(REG_AUTHOR1) }, + { AUTHOR2, CuiResId(REG_AUTHOR2) }, + { AUTHOR3, CuiResId(REG_AUTHOR3) }, + { AUTHOR4, CuiResId(REG_AUTHOR4) }, + { AUTHOR5, CuiResId(REG_AUTHOR5) }, + { AUTHOR6, CuiResId(REG_AUTHOR6) }, + { AUTHOR7, CuiResId(REG_AUTHOR7) }, + { AUTHOR8, CuiResId(REG_AUTHOR8) }, + { AUTHOR9, CuiResId(REG_AUTHOR9) }, + { BASICEDITOR, CuiResId(REG_BASICEDITOR) }, + { BASICIDENTIFIER, CuiResId(REG_BASICIDENTIFIER) }, + { BASICCOMMENT, CuiResId(REG_BASICCOMMENT) }, + { BASICNUMBER, CuiResId(REG_BASICNUMBER) }, + { BASICSTRING, CuiResId(REG_BASICSTRING) }, + { BASICOPERATOR, CuiResId(REG_BASICOPERATOR) }, + { BASICKEYWORD, CuiResId(REG_BASICKEYWORD) }, + { BASICERROR, CuiResId(REG_BASICERROR) }, + { SQLIDENTIFIER, CuiResId(REG_SQLIDENTIFIER) }, + { SQLNUMBER, CuiResId(REG_SQLNUMBER) }, + { SQLSTRING, CuiResId(REG_SQLSTRING) }, + { SQLOPERATOR, CuiResId(REG_SQLOPERATOR) }, + { SQLKEYWORD, CuiResId(REG_SQLKEYWORD) }, + { SQLPARAMETER, CuiResId(REG_SQLPARAMETER) }, + { SQLCOMMENT, CuiResId(REG_SQLCOMMENT) }, + { WINDOWCOLOR, CuiResId(REG_WINDOWCOLOR) }, + { WINDOWTEXTCOLOR, CuiResId(REG_WINDOWTEXTCOLOR) }, + { BASECOLOR, CuiResId(REG_BASECOLOR) }, + { BUTTONCOLOR, CuiResId(REG_BUTTONCOLOR) }, + { BUTTONTEXTCOLOR, CuiResId(REG_BUTTONTEXTCOLOR) }, + { ACCENTCOLOR, CuiResId(REG_ACCENTCOLOR) }, + { DISABLEDCOLOR, CuiResId(REG_DISABLEDCOLOR) }, + { DISABLEDTEXTCOLOR, CuiResId(REG_DISABLEDTEXTCOLOR) }, + { SHADECOLOR, CuiResId(REG_SHADOWCOLOR) }, + { SEPARATORCOLOR, CuiResId(REG_SEPARATORCOLOR) }, + { FACECOLOR, CuiResId(REG_FACECOLOR) }, + { ACTIVECOLOR, CuiResId(REG_ACTIVECOLOR) }, + { ACTIVETEXTCOLOR, CuiResId(REG_ACTIVETEXTCOLOR) }, + { ACTIVEBORDERCOLOR, CuiResId(REG_ACTIVEBORDERCOLOR) }, + { FIELDCOLOR, CuiResId(REG_FIELDCOLOR) }, + { MENUBARCOLOR, CuiResId(REG_MENUBARCOLOR) }, + { MENUBARTEXTCOLOR, CuiResId(REG_MENUBARTEXTCOLOR) }, + { MENUBARHIGHLIGHTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTCOLOR) }, + { MENUBARHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTTEXTCOLOR) }, + { MENUCOLOR, CuiResId(REG_MENUCOLOR) }, + { MENUTEXTCOLOR, CuiResId(REG_MENUTEXTCOLOR) }, + { MENUHIGHLIGHTCOLOR, CuiResId(REG_MENUHIGHLIGHTCOLOR) }, + { MENUHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUHIGHLIGHTTEXTCOLOR) }, + { MENUBORDERCOLOR, CuiResId(REG_MENUBORDERCOLOR) }, + { INACTIVECOLOR, CuiResId(REG_INACTIVECOLOR) }, + { INACTIVETEXTCOLOR, CuiResId(REG_INACTIVETEXTCOLOR) }, + { INACTIVEBORDERCOLOR, CuiResId(REG_INACTIVEBORDERCOLOR) } }; + for (size_t i = DOCCOLOR; i <= SHADOWCOLOR; ++i) m_xColorEntryBtn->append(OUString(cNames[i].cName), m_aRegistryEntries[static_cast(i)]); -- cgit