Author: hdu
Date: Thu Jan 31 14:38:52 2013
New Revision: 1440985
URL: http://svn.apache.org/viewvc?rev=1440985&view=rev
Log:
WaE: fix hundreds of ill-formed C++11 conversions in xmloff
XMLPropertyMapEntry's signedness is the root cause of the problem,
but that class is widely used outside, even in binfilter, so changing
it directly is not advisable. Fixing it indirectly suffices to
eliminate almost 300 warnings.
Modified:
openoffice/trunk/main/xmloff/source/chart/PropertyMap.hxx
openoffice/trunk/main/xmloff/source/draw/sdpropls.cxx
openoffice/trunk/main/xmloff/source/forms/controlpropertymap.cxx
openoffice/trunk/main/xmloff/source/style/PageMasterStyleMap.cxx
openoffice/trunk/main/xmloff/source/text/txtprmap.cxx
openoffice/trunk/main/xmloff/source/transform/TransformerActionInit.hxx
Modified: openoffice/trunk/main/xmloff/source/chart/PropertyMap.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/chart/PropertyMap.hxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/chart/PropertyMap.hxx (original)
+++ openoffice/trunk/main/xmloff/source/chart/PropertyMap.hxx Thu Jan 31
14:38:52 2013
@@ -87,11 +87,11 @@
#define XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ( XML_SCH_CTF_START + 24 )
#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId,
EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1,
XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName,
XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
-#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_010 }
-#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFVER_012 }
-#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c,
SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART |
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART |
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
+#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm,
static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_010 }
+#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm,
static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_012 }
+#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm,
static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), c, SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm,
static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c,
SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm,
static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c,
SvtSaveOptions::ODFVER_012 }
#define MAP_ENTRY_END {
0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010 }
// ---------------------------------------------------------
Modified: openoffice/trunk/main/xmloff/source/draw/sdpropls.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/draw/sdpropls.cxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/draw/sdpropls.cxx (original)
+++ openoffice/trunk/main/xmloff/source/draw/sdpropls.cxx Thu Jan 31 14:38:52
2013
@@ -84,10 +84,10 @@ using namespace ::xmloff::token;
#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFVER_010 }
#define _MAPV(name,prefix,token,type,context,version) { name, sizeof(name)-1,
prefix, token, type, context, version }
-#define GMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
-#define GMAPV(name,prefix,token,type,context,version)
_MAPV(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context,version)
-#define DPMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context)
-#define TMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,type|XML_TYPE_PROP_TEXT,context)
+#define GMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
+#define GMAPV(name,prefix,token,type,context,version)
_MAPV(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context,version)
+#define DPMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_DRAWING_PAGE),context)
+#define TMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT),context)
#define PMAP(name,prefix,token,type,context)
_MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
#define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010}
Modified: openoffice/trunk/main/xmloff/source/forms/controlpropertymap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/controlpropertymap.cxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/forms/controlpropertymap.cxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/controlpropertymap.cxx Thu Jan 31
14:38:52 2013
@@ -43,9 +43,9 @@ namespace xmloff
{
//.........................................................................
-#define MAP_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFVER_010 }
+#define MAP_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT),
context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT),
context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii,
name.length, prefix, token,
static_cast<sal_Int32>(type|XML_TYPE_PROP_PARAGRAPH), context,
SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFVER_010 }
XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
Modified: openoffice/trunk/main/xmloff/source/style/PageMasterStyleMap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/style/PageMasterStyleMap.cxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/style/PageMasterStyleMap.cxx (original)
+++ openoffice/trunk/main/xmloff/source/style/PageMasterStyleMap.cxx Thu Jan 31
14:38:52 2013
@@ -31,7 +31,7 @@
using namespace ::xmloff::token;
-#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 PLMAP(name,prefix,token,type,context) \
_MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context)
#define HFMAP(name,prefix,token,type,context) \
Modified: openoffice/trunk/main/xmloff/source/text/txtprmap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtprmap.cxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/text/txtprmap.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtprmap.cxx Thu Jan 31 14:38:52
2013
@@ -37,13 +37,13 @@ using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
#define _M_E( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c,
SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l,
static_cast<sal_Int32>(t), c, SvtSaveOptions::ODFVER_010 }
#define _M_EV( a, p, l, t, c, v ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, v }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l,
static_cast<sal_Int32>(t), c, v }
#define _M_ED( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) |
MID_FLAG_DEFAULT_ITEM_EXPORT, c, SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l,
static_cast<sal_Int32>((t) | MID_FLAG_DEFAULT_ITEM_EXPORT), c,
SvtSaveOptions::ODFVER_010 }
// text properties
#define MT_E( a, p, l, t, c ) \
Modified:
openoffice/trunk/main/xmloff/source/transform/TransformerActionInit.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/TransformerActionInit.hxx?rev=1440985&r1=1440984&r2=1440985&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/TransformerActionInit.hxx
(original)
+++ openoffice/trunk/main/xmloff/source/transform/TransformerActionInit.hxx Thu
Jan 31 14:38:52 2013
@@ -36,7 +36,7 @@ struct XMLTransformerActionInit
sal_uInt32 m_nParam2;
sal_uInt32 m_nParam3;
- static sal_Int32 QNameParam( sal_uInt16 nPrefix,
+ static sal_uInt32 QNameParam( sal_uInt16 nPrefix,
::xmloff::token::XMLTokenEnum eLocalName )
{
return (static_cast< sal_uInt32 >( nPrefix ) << 16) +
