[Libreoffice-commits] .: sw/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri May 27 20:48:11 PDT 2011
sw/source/filter/xml/xmlitemm.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c4092e54f53cc06479f7eeb8ad9cc42b3838c215
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri May 27 23:46:46 2011 -0400
Explicitly cast RES_FRMATR enum value to sal_uInt16.
It fails to build on my machine otherwise.
diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx
index 26eb15c..88a08ee 100644
--- a/sw/source/filter/xml/xmlitemm.cxx
+++ b/sw/source/filter/xml/xmlitemm.cxx
@@ -42,13 +42,13 @@
using namespace ::xmloff::token;
#define MAP_ENTRY( p, l, w, m ) \
- { XML_NAMESPACE_##p, XML_##l, w, m }
+ { XML_NAMESPACE_##p, XML_##l, static_cast<sal_uInt16>(w), m }
#define M_E_SI( p, l, w, m ) \
- { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
+ { XML_NAMESPACE_##p, XML_##l, static_cast<sal_uInt16>(w), MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
#define M_E_SE( p, l, w, m ) \
- { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|m }
+ { XML_NAMESPACE_##p, XML_##l, static_cast<sal_uInt16>(w), MID_SW_FLAG_SPECIAL_ITEM_EXPORT|m }
#define M_E_SIE( p, l, w, m ) \
- { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
+ { XML_NAMESPACE_##p, XML_##l, static_cast<sal_uInt16>(w), MID_SW_FLAG_SPECIAL_ITEM_EXPORT|MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
#define M_END { 0, XML_TOKEN_INVALID, 0, 0 }
More information about the Libreoffice-commits
mailing list