diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-08 11:08:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-08 21:34:10 +0200 |
| commit | 83cefb5ceb4428d61a5b9fae80d1e673131e9bfe (patch) | |
| tree | 35ca37888414e6c0bb4b11440034b506afa0b38e /include/vcl | |
| parent | cf7b97d1328ec2f2c8254abb9ce67d63d9c54c80 (diff) | |
support comboboxtext id values
Change-Id: Ibebdaab5b073a55cb646687890bc16d5f55c0341
Reviewed-on: https://gerrit.libreoffice.org/55460
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/builder.hxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 71819bf8b2da..0c1ea3b56b14 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -49,6 +49,17 @@ class VclExpander; class VclMultiLineEdit; namespace xmlreader { class XmlReader; } +struct ComboBoxTextItem +{ + OUString m_sItem; + OString m_sId; + ComboBoxTextItem(const OUString& rItem, const OString& rId) + : m_sItem(rItem) + , m_sId(rId) + { + } +}; + class VCL_DLLPUBLIC VclBuilder { public: @@ -361,7 +372,7 @@ private: void handleRow(xmlreader::XmlReader &reader, const OString &rID); void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); void handleMenu(xmlreader::XmlReader &reader, const OString &rID); - std::vector<OUString> handleItems(xmlreader::XmlReader &reader) const; + std::vector<ComboBoxTextItem> handleItems(xmlreader::XmlReader &reader) const; void handleSizeGroup(xmlreader::XmlReader &reader); |