dbaccess/source/filter/xml/xmlHelper.cxx | 72 +++++++++++++--------------
include/xmloff/maptype.hxx | 23 +++++++-
reportdesign/source/filter/xml/xmlHelper.cxx | 10 +--
sc/source/filter/xml/xmlstyle.cxx | 10 +--
xmloff/source/chart/PropertyMap.hxx | 22 ++++----
xmloff/source/draw/sdpropls.cxx | 6 +-
xmloff/source/forms/controlpropertymap.cxx | 8 +--
xmloff/source/style/PageMasterStyleMap.cxx | 6 +-
xmloff/source/table/XMLTableExport.cxx | 4 -
xmloff/source/text/txtprmap.cxx | 27 ++++------
10 files changed, 101 insertions(+), 87 deletions(-)
New commits:
commit 5fe5ded723b2bea0c88ebc7647284dc0ade97ee3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 12 10:07:18 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 12 10:55:07 2021 +0100
simplify construction of XMLPropertyMapEntry
so we don't have to pass in the size of the string literal.
This is mostly a preparatory change, to make an another
patch of mine less noisy.
Change-Id: Idafcd68586b8b465e63dc89e4a4180d2e70ac3a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125080
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx
b/dbaccess/source/filter/xml/xmlHelper.cxx
index 65227360307e..85b98ec1eb70 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -72,7 +72,7 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetTableStylesPropertySetMap
{
static const XMLPropertyMapEntry s_aTableStylesProperties[] =
{
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
+ { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010,
false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
::xmloff::OControlPropertyHandlerFactory();
return new XMLPropertySetMapper(s_aTableStylesProperties, xFac,
bForExport);
@@ -82,12 +82,12 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMa
{
static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
{
- { PROPERTY_WIDTH, sizeof(PROPERTY_WIDTH)-1, XML_NAMESPACE_STYLE,
XML_COLUMN_WIDTH, XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_COLUMN, 0,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_HIDDEN, sizeof(PROPERTY_HIDDEN)-1, XML_NAMESPACE_TABLE,
XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM|XML_TYPE_PROP_TABLE_COLUMN,
+ { PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH,
XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_COLUMN, 0, SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY,
XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM|XML_TYPE_PROP_TABLE_COLUMN,
CTF_DB_ISVISIBLE, SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_NUMBERFORMAT, sizeof(PROPERTY_NUMBERFORMAT)-1,
XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME,
XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM|XML_TYPE_PROP_TABLE_COLUMN,
+ { PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME,
XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM|XML_TYPE_PROP_TABLE_COLUMN,
CTF_DB_NUMBERFORMAT, SvtSaveOptions::ODFSVER_010, false },
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
+ { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010,
false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
OPropertyHandlerFactory();
return new XMLPropertySetMapper(s_aColumnStylesProperties, xFac,
bForExport);
@@ -97,47 +97,45 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapp
{
static const XMLPropertyMapEntry s_aCellStylesProperties[] =
{
- { PROPERTY_ALIGN, sizeof(PROPERTY_ALIGN)-1, XML_NAMESPACE_FO,
XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN|XML_TYPE_PROP_PARAGRAPH,
CTF_DB_COLUMN_TEXT_ALIGN, SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTNAME, sizeof(PROPERTY_FONTNAME)-1,
XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_TEXTCOLOR, sizeof(PROPERTY_TEXTCOLOR)-1, XML_NAMESPACE_FO,
XML_COLOR, XML_TYPE_COLOR|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_TEXTLINECOLOR, sizeof(PROPERTY_TEXTLINECOLOR)-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+ { PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN,
XML_TYPE_TEXT_ALIGN|XML_TYPE_PROP_PARAGRAPH, CTF_DB_COLUMN_TEXT_ALIGN,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME,
XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR,
XML_TYPE_COLOR|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_TEXTRELIEF, sizeof(PROPERTY_TEXTRELIEF)-1,
XML_NAMESPACE_STYLE, XML_FONT_RELIEF,
+ { PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF,
XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_TEXTEMPHASIS, sizeof(PROPERTY_TEXTEMPHASIS)-1,
XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE,
XML_TYPE_CONTROL_TEXT_EMPHASIZE|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTCHARWIDTH, sizeof(PROPERTY_FONTCHARWIDTH)-1,
XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16|XML_TYPE_PROP_TEXT,
0 , SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTCHARSET, sizeof(PROPERTY_FONTCHARSET)-1,
XML_NAMESPACE_STYLE, XML_FONT_CHARSET,
XML_TYPE_TEXT_FONTENCODING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_FONTFAMILY, sizeof(PROPERTY_FONTFAMILY)-1,
XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC,
XML_TYPE_TEXT_FONTFAMILY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_FONTHEIGHT, sizeof(PROPERTY_FONTHEIGHT)-1,
XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTKERNING, sizeof(PROPERTY_FONTKERNING)-1,
XML_NAMESPACE_STYLE, XML_LETTER_KERNING,
- XML_TYPE_BOOL|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_FONTORIENTATION, sizeof(PROPERTY_FONTORIENTATION)-1,
XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE,
XML_TYPE_ROTATION_ANGLE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_FONTPITCH, sizeof(PROPERTY_FONTPITCH)-1,
XML_NAMESPACE_STYLE, XML_FONT_PITCH,
XML_TYPE_TEXT_FONTPITCH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
- { PROPERTY_FONTSLANT, sizeof(PROPERTY_FONTSLANT)-1, XML_NAMESPACE_FO,
XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_STYLE,
+ { PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE,
XML_TYPE_CONTROL_TEXT_EMPHASIZE|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH,
XML_TYPE_NUMBER16|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET,
XML_TYPE_TEXT_FONTENCODING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC,
XML_TYPE_TEXT_FONTFAMILY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE,
XML_TYPE_MEASURE16|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING,
XML_TYPE_BOOL|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE,
XML_TYPE_ROTATION_ANGLE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH,
XML_TYPE_TEXT_FONTPITCH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE,
XML_TYPE_TEXT_POSTURE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE,
XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
- { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TYPE,
+ { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE,
XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
- { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_WIDTH,
+ { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH,
XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
- { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TEXT,
+ { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT,
XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTSTYLENAME, sizeof(PROPERTY_FONTSTYLENAME)-1,
XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
- { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_STYLE,
+ { PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME,
XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE,
XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_TYPE,
+ { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE,
XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_WIDTH,
+ { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH,
XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { "CharUnderlineColor", sizeof("CharUnderlineColor")-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+ { "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
- { "CharUnderlineHasColor", sizeof("CharUnderlineHasColor")-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
-
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTWEIGHT, sizeof(PROPERTY_FONTWEIGHT)-1,
XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTWIDTH, sizeof(PROPERTY_FONTWIDTH)-1,
XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
- { PROPERTY_FONTWORDLINEMODE, sizeof(PROPERTY_FONTWORDLINEMODE)-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE,
+ { "CharUnderlineHasColor", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT,
XML_TYPE_TEXT_WEIGHT|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false
},
+ { PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH,
XML_TYPE_FONT_WIDTH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false
},
+ { PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT,
0 , SvtSaveOptions::ODFSVER_010, false },
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
+ { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010,
false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
/*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
return new XMLPropertySetMapper(s_aCellStylesProperties, xFac, bForExport);
@@ -147,8 +145,8 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetRowStylesPropertySetMappe
{
static const XMLPropertyMapEntry s_aStylesProperties[] =
{
- { PROPERTY_ROW_HEIGHT, sizeof(PROPERTY_ROW_HEIGHT)-1,
XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_ROW,
0, SvtSaveOptions::ODFSVER_010, false },
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
+ { PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT,
XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_ROW, 0, SvtSaveOptions::ODFSVER_010, false
},
+ { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010,
false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
OPropertyHandlerFactory();
return new XMLPropertySetMapper(s_aStylesProperties, xFac,
true/*bForExport*/);
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index dbde180797cf..a4b105b6530e 100644
--- a/include/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
@@ -99,16 +99,33 @@ struct XMLPropertyMapEntry
*/
bool mbImportOnly;
+ template< std::size_t N >
XMLPropertyMapEntry(
- const char* sApiName,
- sal_Int32 nApiNameLength_,
+ const char (&sApiName)[N],
sal_uInt16 nNameSpace,
enum ::xmloff::token::XMLTokenEnum eXMLName,
sal_uInt32 nType,
sal_Int16 nContextId,
SvtSaveOptions::ODFSaneDefaultVersion nEarliestODFVersionForExport,
bool bImportOnly)
- : msApiName(sApiName), nApiNameLength(nApiNameLength_),
+ :
+ msApiName(sApiName),
+ nApiNameLength(N-1),
+ meXMLName(eXMLName), mnNameSpace(nNameSpace), mnType(nType),
+ mnContextId(nContextId),
mnEarliestODFVersionForExport(nEarliestODFVersionForExport),
+ mbImportOnly(bImportOnly)
+ {}
+ XMLPropertyMapEntry(
+ std::nullptr_t ,
+ sal_uInt16 nNameSpace,
+ enum ::xmloff::token::XMLTokenEnum eXMLName,
+ sal_uInt32 nType,
+ sal_Int16 nContextId,
+ SvtSaveOptions::ODFSaneDefaultVersion nEarliestODFVersionForExport,
+ bool bImportOnly)
+ :
+ msApiName(nullptr),
+ nApiNameLength(0),
meXMLName(eXMLName), mnNameSpace(nNameSpace), mnType(nType),
mnContextId(nContextId),
mnEarliestODFVersionForExport(nEarliestODFVersionForExport),
mbImportOnly(bImportOnly)
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx
b/reportdesign/source/filter/xml/xmlHelper.cxx
index e26f30be6492..a73474711523 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -98,11 +98,11 @@ const XMLPropertyHandler*
OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
return pHandler;
}
-#define MAP_CONST_T_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,
context, SvtSaveOptions::ODFSVER_010, false }
-#define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token,
type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFSVER_010, false }
-#define MAP_CONST_S( name, prefix, token, type, context ) { name,
sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token,
type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFSVER_010, false }
-#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::ODFSVER_010, false }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0 ,0,
SvtSaveOptions::ODFSVER_010, false}
+#define MAP_CONST_T_ASCII( name, prefix, token, type, context ) { name,
XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name,
XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST_S( name, prefix, token, type, context ) { name,
XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name,
XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_END() { nullptr, 0, XML_TOKEN_INVALID, 0 ,0,
SvtSaveOptions::ODFSVER_010, false}
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport)
{
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index 6b9aeb4d7231..fcd74ad64fbd 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -49,13 +49,13 @@ using namespace com::sun::star;
using namespace ::xmloff::token;
using namespace ::formula;
-#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFSVER_010, false }
-#define MAP_ODF13(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_013, false }
+#define MAP(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_010, false }
+#define MAP_ODF13(name,prefix,token,type,context) { name, prefix, token,
type, context, SvtSaveOptions::ODFSVER_013, false }
// extensions import/export
-#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
+#define MAP_EXT(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
// extensions import only
-#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_EXT_I(name,prefix,token,type,context) { name, prefix, token,
type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
+#define MAP_END() { nullptr, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFSVER_010, false }
const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
{
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index 171fd124c9b6..60d414bad5c8 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -85,17 +85,17 @@
#define XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SERIES ( XML_SCH_CTF_START + 27 )
#define XML_SCH_CONTEXT_SPECIAL_MOVING_AVERAGE_TYPE ( XML_SCH_CTF_START + 28 )
-#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, false }
-#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_010, false }
-#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::ODFSVER_012, false }
-#define MAP_ENTRY_ODF13( a, ns, nm, t ) { a, sizeof(a)-1, ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_013, false
}
-#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
-#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
-#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::ODFSVER_010, false }
-#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::ODFSVER_010, false }
-#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::ODFSVER_012, false }
-#define MAP_SPECIAL_ODF13( 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::ODFSVER_013, false }
-#define MAP_ENTRY_END {
nullptr,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFSVER_010,
false }
+#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId,
EarliestODFVersionForExport ) { ApiName, XML_NAMESPACE_##NameSpace,
xmloff::token::XMLTokenName, XMLType|XML_TYPE_PROP_CHART, ContextId,
EarliestODFVersionForExport, false }
+#define MAP_ENTRY( a, ns, nm, t ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_010, false
}
+#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_012, false
}
+#define MAP_ENTRY_ODF13( a, ns, nm, t ) { a, ns, xmloff::token::nm,
t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_013, false }
+#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
+#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
+#define MAP_CONTEXT( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFSVER_010, false
}
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c,
SvtSaveOptions::ODFSVER_012, false }
+#define MAP_SPECIAL_ODF13( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns,
xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c,
SvtSaveOptions::ODFSVER_013, false }
+#define MAP_ENTRY_END {
nullptr,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFSVER_010,
false }
// PropertyMap for Chart properties drawing- and
// textproperties are added later using the chaining
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index c25062efb968..c554b2411f6e 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -68,15 +68,15 @@ using ::com::sun::star::uno::Any;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFSVER_010, false }
-#define MAPV_(name,prefix,token,type,context,version) { name, sizeof(name)-1,
prefix, token, type, context, version, false }
+#define MAP_(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_010, false }
+#define MAPV_(name,prefix,token,type,context,version) { name, prefix, token,
type, context, version, false }
#define GMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
#define GMAP_D(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC|MID_FLAG_DEFAULT_ITEM_EXPORT,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 PMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
-#define MAP_END() { nullptr, 0, 0, XML_EMPTY, 0 ,0,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_END() { nullptr, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFSVER_010,
false }
// entry list for graphic properties
diff --git a/xmloff/source/forms/controlpropertymap.cxx
b/xmloff/source/forms/controlpropertymap.cxx
index 5e5cb97df607..d0716bd8d033 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -34,10 +34,10 @@ using namespace ::xmloff::token;
namespace xmloff
{
-#define MAP_ASCII( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFSVER_010, false }
-#define MAP_CONST( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFSVER_010, false }
-#define MAP_CONST_P( name, prefix, token, type, context ){ name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFSVER_010, false }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_ASCII( name, prefix, token, type, context ) { name, prefix,
token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST( name, prefix, token, type, context ) { name, prefix,
token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST_P( name, prefix, token, type, context ){ name, prefix,
token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFSVER_010,
false }
+#define MAP_END() { nullptr, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFSVER_010, false }
XMLPropertyMapEntry const aControlStyleProperties[] =
{
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx
b/xmloff/source/style/PageMasterStyleMap.cxx
index 7dd3432985fb..349badc23c5c 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -23,7 +23,7 @@
using namespace ::xmloff::token;
-#define MAP(name,prefix,token,type,context,version) { name, sizeof(name)-1,
prefix, token, type, context, version, false }
+#define MAP(name,prefix,token,type,context,version) { name, prefix, token,
type, context, version, false }
#define DPMAP(name,prefix,token,type,context) MAP(name, prefix, token,
type|XML_TYPE_PROP_DRAWING_PAGE, context, SvtSaveOptions::ODFSVER_013)
#define PLMAP(name,prefix,token,type,context) \
MAP(name, prefix, token, type|XML_TYPE_PROP_PAGE_LAYOUT, context,
SvtSaveOptions::ODFSVER_010)
@@ -270,7 +270,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
HFMAP( "FooterFillBitmapOffsetX", XML_NAMESPACE_DRAW,
XML_TILE_REPEAT_OFFSET,
XML_SW_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY,
CTF_PM_FOOTERREPEAT_OFFSET_X ),
HFMAP( "FooterFillBitmapOffsetY", XML_NAMESPACE_DRAW,
XML_TILE_REPEAT_OFFSET,
XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY,
CTF_PM_FOOTERREPEAT_OFFSET_Y ),
- { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010, false } //
index 190
+ { nullptr, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010, false } //
index 190
};
XMLPropertyMapEntry const g_XMLPageMasterDrawingPageStyleMap[] =
@@ -299,7 +299,7 @@ XMLPropertyMapEntry const
g_XMLPageMasterDrawingPageStyleMap[] =
DPMAP("FillBitmapOffsetX", XML_NAMESPACE_DRAW,
XML_TILE_REPEAT_OFFSET,
XML_SW_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_PM_REPEAT_OFFSET_X),
DPMAP("FillBitmapOffsetY", XML_NAMESPACE_DRAW,
XML_TILE_REPEAT_OFFSET,
XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_PM_REPEAT_OFFSET_Y),
- { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010, false }
+ { nullptr, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010, false }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/table/XMLTableExport.cxx
b/xmloff/source/table/XMLTableExport.cxx
index cac07330f7bf..c9e306f5e273 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -56,11 +56,11 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::style;
-#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFSVER_010, false }
+#define MAP_(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_010, false }
#define CMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_TABLE_COLUMN,context)
#define RMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_TABLE_ROW,context)
#define CELLMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,type|XML_TYPE_PROP_TABLE_CELL,context)
-#define MAP_END { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010,
false }
+#define MAP_END { nullptr, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010,
false }
const XMLPropertyMapEntry* getColumnPropertiesMap()
{
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 2cfa0554427e..2e8297d7947e 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -32,13 +32,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::ODFSVER_010, false }
+ { a, XML_NAMESPACE_##p, XML_##l, t, c, SvtSaveOptions::ODFSVER_010, false }
#define M_EV_( a, p, l, t, c, v ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, v, false }
+ { a, XML_NAMESPACE_##p, XML_##l, t, c, v, false }
#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::ODFSVER_010, false }
+ { a, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c,
SvtSaveOptions::ODFSVER_010, false }
// text properties
#define MT_E( a, p, l, t, c ) \
@@ -74,17 +74,16 @@ using namespace ::xmloff::token;
#define MC_E( a, p, l, t, c ) \
M_E_( a, p, l, (t|XML_TYPE_PROP_TABLE_CELL), c )
-#define MAP_ODF13(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_013, false }
+#define MAP_ODF13(name,prefix,token,type,context) { name, prefix, token,
type, context, SvtSaveOptions::ODFSVER_013, false }
// extensions import/export
-#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
+#define MAP_EXT(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false }
// extensions import only
-#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
+#define MAP_EXT_I(name,prefix,token,type,context) { name, prefix, token,
type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true }
-#define M_END() \
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFSVER_010,
false }
+#define M_END() { nullptr, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFSVER_010, false }
-#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFSVER_010, false }
+#define MAP_(name,prefix,token,type,context) { name, prefix, token, type,
context, SvtSaveOptions::ODFSVER_010, false }
#define GMAP(name,prefix,token,type,context)
MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
XMLPropertyMapEntry const aXMLParaPropMap[] =
@@ -181,9 +180,9 @@ XMLPropertyMapEntry const aXMLParaPropMap[] =
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT,
0 ),
// RES_CHRATR_RSID
- { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
+ { "Rsid", XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
// RES_PARATR_RSID
- { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
+ { "ParRsid", XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
MT_E( "CharWordMode", STYLE, TEXT_OVERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -525,9 +524,9 @@ XMLPropertyMapEntry const aXMLTextPropMap[] =
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT,
0 ),
// RES_CHRATR_RSID
- { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
+ { "Rsid", XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
// RES_PARATR_RSID
- { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
+ { "ParRsid", XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
MT_E( "CharWordMode", STYLE, TEXT_OVERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -542,7 +541,7 @@ XMLPropertyMapEntry const aXMLTextPropMap[] =
// RES_CHRATR_BACKGROUND
MT_E( "CharBackColor", FO, BACKGROUND_COLOR,
XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ),
MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR,
XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE,
CTF_CHAR_BACKGROUND_TRANSPARENCY),
- { "CharShadingValue", sizeof("CharShadingValue")-1, XML_NAMESPACE_LO_EXT,
XML_CHAR_SHADING_VALUE, XML_TYPE_NUMBER|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false },
+ { "CharShadingValue", XML_NAMESPACE_LO_EXT, XML_CHAR_SHADING_VALUE,
XML_TYPE_NUMBER|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED,
false },
MT_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR,
XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ),
// RES_CHRATR_CJK_FONT
MT_ED( "CharFontNameAsian", STYLE, FONT_NAME_ASIAN,
XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CJK ),
