diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-12 12:20:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-12 18:37:38 +0100 |
| commit | a4d4286a6ae5ad7f57db4f34380ed170b92ced06 (patch) | |
| tree | 3d354a2a00b2fea1003d08566f7e4ab003c4c954 /framework | |
| parent | 16be302fededaf2cc6e82701bda6dcba6e3fa4d3 (diff) | |
introduce OUStringConstExpr
so we can declare compile-time constant arrays and structs
containing OUStringLiteral
Change-Id: I51fd743f2e461a36bb4a0a17c6ff107f86096895
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125045
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/xml/toolboxconfigurationdefines.hxx | 18 | ||||
| -rw-r--r-- | framework/source/fwe/xml/toolboxdocumenthandler.cxx | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx index c84adff58e8b..b4aca76a6bef 100644 --- a/framework/inc/xml/toolboxconfigurationdefines.hxx +++ b/framework/inc/xml/toolboxconfigurationdefines.hxx @@ -52,14 +52,14 @@ #define ATTRIBUTE_BOOLEAN_TRUE "true" #define ATTRIBUTE_BOOLEAN_FALSE "false" -#define ATTRIBUTE_ITEMSTYLE_RADIO "radio" -#define ATTRIBUTE_ITEMSTYLE_AUTO "auto" -#define ATTRIBUTE_ITEMSTYLE_LEFT "left" -#define ATTRIBUTE_ITEMSTYLE_AUTOSIZE "autosize" -#define ATTRIBUTE_ITEMSTYLE_DROPDOWN "dropdown" -#define ATTRIBUTE_ITEMSTYLE_REPEAT "repeat" -#define ATTRIBUTE_ITEMSTYLE_TEXT "text" -#define ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY "dropdownonly" -#define ATTRIBUTE_ITEMSTYLE_IMAGE "image" +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_RADIO = u"radio"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_AUTO = u"auto"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_LEFT = u"left"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_AUTOSIZE = u"autosize"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_DROPDOWN = u"dropdown"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_REPEAT = u"repeat"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_TEXT = u"text"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY = u"dropdownonly"; +constexpr OUStringLiteral ATTRIBUTE_ITEMSTYLE_IMAGE = u"image"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 4fd152a6f03e..11385edd9b5c 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -85,12 +85,12 @@ namespace { struct ToolboxStyleItem { sal_Int16 nBit; - const char* attrName; + rtl::OUStringConstExpr attrName; }; } -const ToolboxStyleItem Styles[ ] = { +constexpr ToolboxStyleItem Styles[ ] = { { css::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }, { css::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT }, { css::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO }, @@ -703,7 +703,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( { if ( !aValue.isEmpty() ) aValue.append(" "); - aValue.appendAscii( pStyle->attrName ); + aValue.append( OUString(pStyle->attrName) ); } } pList->AddAttribute( m_aXMLToolbarNS + ATTRIBUTE_ITEMSTYLE, |