Author: hdu
Date: Fri Apr 26 13:37:07 2013
New Revision: 1476186
URL: http://svn.apache.org/r1476186
Log:
fix narrowing conversions in xmlHelper
Modified:
openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx
Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx?rev=1476186&r1=1476185&r2=1476186&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlHelper.cxx Fri Apr 26
13:37:07 2013
@@ -144,7 +144,7 @@ UniReference < XMLPropertySetMapper > OX
//
-----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMapper()
{
-#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context,
SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token,
static_cast<sal_Int32>(type|XML_TYPE_PROP_TABLE_COLUMN), context,
SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
{
MAP_CONST_COLUMN( PROPERTY_WIDTH,
XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
