Author: hdu
Date: Fri Apr 26 14:25:23 2013
New Revision: 1476217
URL: http://svn.apache.org/r1476217
Log:
fix narrowing conversions in reportdesign
Modified:
openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx
Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx?rev=1476217&r1=1476216&r2=1476217&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx
(original)
+++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx Fri Apr
26 14:25:23 2013
@@ -118,7 +118,7 @@ const XMLPropertyHandler* OPropertyHandl
#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT,
context, SvtSaveOptions::ODFVER_010 }
#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length,
XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC,
context, SvtSaveOptions::ODFVER_010 }
#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token,
type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_C( name, prefix, token, type, context ) { name,
name.length, XML_NAMESPACE_##prefix, XML_##token,
type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_C( name, prefix, token, type, context ) { name,
name.length, XML_NAMESPACE_##prefix, XML_##token,
static_cast<sal_Int32>(type|XML_TYPE_PROP_TABLE_CELL), context,
SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0,
SvtSaveOptions::ODFVER_010}
//
-----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool
_bOldFormat)
