diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-26 13:28:48 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-04-26 13:28:48 +0000 |
| commit | 7c2720aa57ce168f189362579fc7e9145ac491da (patch) | |
| tree | 9b6a140b684bcfa84896b16e8b0f2c2b548e7759 | |
| parent | f9b703eabdca69bcd542424908c4121c7b4823a4 (diff) | |
fix narrowing conversions in filters
Notes
Notes:
prefer: 1f4edb5dedd265b5ba155d34df5a802f36d158b4
| -rw-r--r-- | sc/source/filter/xml/xmlstyle.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index bc05d11f583c..f1eb674b82fc 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -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 } diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 9fbb276d8059..25785596fd67 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -120,7 +120,8 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType, { 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 |