diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-30 16:02:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-31 06:59:51 +0000 |
| commit | 9a165a86795c65c42a94bf6f7f48545c797f2db3 (patch) | |
| tree | 23d0359987e767ff36a9c899a77a3f7b797f54c8 /include | |
| parent | dcffc21805828ddff7de1282f3d40ffdf3fac38d (diff) | |
use actual UNO enums in xmloff
Change-Id: I585825ad3faf972acde548817187183029856971
Reviewed-on: https://gerrit.libreoffice.org/35914
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmlement.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmluconv.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx index 5879324701bf..5a149f6335ad 100644 --- a/include/xmloff/xmlement.hxx +++ b/include/xmloff/xmlement.hxx @@ -37,7 +37,7 @@ private: sal_uInt16 nValue; public: SvXMLEnumMapEntry(::xmloff::token::XMLTokenEnum eToken_, EnumT nValue_) - : eToken(eToken_), nValue(nValue_) {} + : eToken(eToken_), nValue(static_cast<sal_uInt16>(nValue_)) {} ::xmloff::token::XMLTokenEnum GetToken() const { return eToken; } }; diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index e71880be867e..8eb234289011 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -161,7 +161,7 @@ public: enum ::xmloff::token::XMLTokenEnum eDefault = ::xmloff::token::XML_TOKEN_INVALID ) { - return convertEnumImpl(rBuffer, nValue, + return convertEnumImpl(rBuffer, static_cast<sal_uInt16>(nValue), reinterpret_cast<const SvXMLEnumMapEntry<sal_uInt16>*>(pMap), eDefault); } |