Author: hdu
Date: Fri Apr 26 14:28:48 2013
New Revision: 1476221
URL: http://svn.apache.org/r1476221
Log:
fix narrowing conversions in filters
Modified:
openoffice/trunk/main/sc/source/filter/xml/xmlstyle.cxx
openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx
Modified: openoffice/trunk/main/sc/source/filter/xml/xmlstyle.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/filter/xml/xmlstyle.cxx?rev=1476221&r1=1476220&r2=1476221&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/filter/xml/xmlstyle.cxx (original)
+++ openoffice/trunk/main/sc/source/filter/xml/xmlstyle.cxx Fri Apr 26 14:28:48
2013
@@ -61,7 +61,7 @@ using namespace ::xmloff::token;
using namespace ::formula;
using ::rtl::OUString;
-#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFVER_010 }
+#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, static_cast<sal_Int32>(type), context, SvtSaveOptions::ODFVER_010 }
#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFVER_LATEST }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFVER_010 }
Modified: openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx?rev=1476221&r1=1476220&r2=1476221&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx Fri
Apr 26 14:28:48 2013
@@ -120,7 +120,8 @@ void MakeBorderLine( sal_Int32 nLineThic
{
static const sal_Int32 aBorderDefColor[] =
{
- COL_AUTO, COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN,
+ static_cast<sal_Int32>(COL_AUTO),
+ COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN,
COL_LIGHTMAGENTA, COL_LIGHTRED, COL_YELLOW, COL_WHITE, COL_BLUE,
COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY,
COL_LIGHTGRAY
