dbaccess/source/filter/xml/xmlHelper.cxx | 10 +++++-----
include/xmloff/maptype.hxx | 3 ++-
include/xmloff/xmlprmap.hxx | 3 ++-
reportdesign/source/filter/xml/xmlHelper.cxx | 10 +++++-----
sc/source/filter/xml/xmlstyle.cxx | 8 ++++----
xmloff/source/chart/PropertyMap.hxx | 24 ++++++++++++------------
xmloff/source/draw/sdpropls.cxx | 16 ++++++++--------
xmloff/source/forms/controlpropertymap.cxx | 8 ++++----
xmloff/source/style/PageMasterStyleMap.cxx | 12 ++++++------
xmloff/source/style/xmlexppr.cxx | 12 +++++++-----
xmloff/source/style/xmlprmap.cxx | 9 ++++++---
xmloff/source/table/XMLTableExport.cxx | 4 ++--
xmloff/source/text/txtprmap.cxx | 26 +++++++++++++-------------
13 files changed, 76 insertions(+), 69 deletions(-)
New commits:
commit 3a0a88083dc992015a64216bac94822af8eef6c1
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Apr 22 15:47:43 2020 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri May 8 18:37:36 2020 +0200
replace ODFDefaultVersion usage with ODFSaneDefaultVersion...
... in SvXMLExportPropertyMapper.
The condition nCurrentVersion == SvtSaveOptions::ODFVER_UNKNOWN
is impossible since d571a509aa324db9a425110a67ea142d157256b2.
ODFVER_UNKNOWN isn't a value of ODFSaneDefaultVersion so use
std::optional to handle the remaining usage.
Change-Id: I1e33cb707c289224664a385b4e4425e6788b2943
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92728
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx
b/dbaccess/source/filter/xml/xmlHelper.cxx
index 20327f1febe2..a9f156fc5a51 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -68,7 +68,7 @@ const XMLPropertyHandler*
OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
return pHandler;
}
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFVER_010, false}
+#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetTableStylesPropertySetMapper( bool bForExport )
{
static const XMLPropertyMapEntry s_aTableStylesProperties[] =
@@ -81,7 +81,7 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetTableStylesPropertySetMap
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMapper( bool bForExport )
{
-#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context,
SvtSaveOptions::ODFVER_010, false }
+#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context,
SvtSaveOptions::ODFSVER_010, false }
static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
{
MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE,
XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
@@ -95,8 +95,8 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMa
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapper( bool bForExport )
{
-#define MAP_CONST_CELL( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFVER_010, false }
-#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010, false }
+#define MAP_CONST_CELL( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFSVER_010, false }
+#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFSVER_010, false }
static const XMLPropertyMapEntry s_aCellStylesProperties[] =
{
MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO,
XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
@@ -136,7 +136,7 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapp
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetRowStylesPropertySetMapper()
{
-#define MAP_CONST_ROW( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context,
SvtSaveOptions::ODFVER_010, false }
+#define MAP_CONST_ROW( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context,
SvtSaveOptions::ODFSVER_010, false }
static const XMLPropertyMapEntry s_aStylesProperties[] =
{
MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE,
XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index 91288e2d7d58..ac6033e6dfe1 100644
--- a/include/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
@@ -86,7 +86,8 @@ struct XMLPropertyMapEntry
sal_uInt32 mnType;
sal_Int16 mnContextId; /// User defined id for context filtering
- SvtSaveOptions::ODFDefaultVersion mnEarliestODFVersionForExport;// no
export when the used ODF version is lower than this
+ /// no export when the used ODF version is lower than this
+ SvtSaveOptions::ODFSaneDefaultVersion mnEarliestODFVersionForExport;
/** Flag to specify whether entry is only used during import.
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index ecb9f2145d1e..9d85bbdbf632 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -25,6 +25,7 @@
#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
+#include <optional>
#include <memory>
namespace rtl { template <class reference_type> class Reference; }
@@ -82,7 +83,7 @@ public:
sal_Int16 GetEntryContextId( sal_Int32 nIndex ) const;
/** returns the earliest odf version for which this property should be
exported. */
- SvtSaveOptions::ODFDefaultVersion GetEarliestODFVersionForExport(
sal_Int32 nIndex ) const;
+ std::optional<SvtSaveOptions::ODFSaneDefaultVersion>
GetEarliestODFVersionForExport(sal_Int32 nIndex) const;
/** Returns the index of an entry with the given XML-name and namespace
If there is no matching entry the method returns -1 */
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx
b/reportdesign/source/filter/xml/xmlHelper.cxx
index f4117133674d..6769f6e73011 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -97,11 +97,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::ODFVER_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::ODFVER_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::ODFVER_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::ODFVER_010, false }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0 ,0,
SvtSaveOptions::ODFVER_010, false}
+#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}
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 1dbd6ca451a7..b4d86faca62b 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -50,12 +50,12 @@ 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::ODFVER_010, false }
+#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix,
token, type, context, SvtSaveOptions::ODFSVER_010, false }
// extensions import/export
-#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_012_EXT_COMPAT, false }
// extensions import only
-#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFVER_010, false }
+#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_012_EXT_COMPAT, true }
+#define MAP_END() { nullptr, 0, 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 ef3b3d0a6616..66d39392e1c4 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -85,14 +85,14 @@
#define XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ( XML_SCH_CTF_START + 26 )
#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::ODFVER_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::ODFVER_012, 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::ODFVER_012_EXT_COMPAT, 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::ODFVER_012_EXT_COMPAT, 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::ODFVER_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::ODFVER_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::ODFVER_012, false }
-#define MAP_ENTRY_END {
nullptr,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010,
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_ODF_EXT( a, ns, nm, t ) { a, sizeof(a)-1,
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT, 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_012_EXT_COMPAT, 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_ENTRY_END {
nullptr,0,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
@@ -190,10 +190,10 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY( "Visible", CHART, XML_VISIBLE, XML_TYPE_BOOL ),
MAP_ENTRY_ODF_EXT( "MajorOrigin", LO_EXT, XML_MAJOR_ORIGIN,
XML_TYPE_DOUBLE ),
- MAP_FULL( "CrossoverPosition", CHART, XML_AXIS_POSITION,
XML_SCH_TYPE_AXIS_POSITION|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0,
SvtSaveOptions::ODFVER_012 ),
- MAP_FULL( "CrossoverValue", CHART, XML_AXIS_POSITION,
XML_SCH_TYPE_AXIS_POSITION_VALUE|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY,
0, SvtSaveOptions::ODFVER_012 ),
- MAP_FULL( "LabelPosition", CHART, XML_AXIS_LABEL_POSITION,
XML_SCH_TYPE_AXIS_LABEL_POSITION, 0, SvtSaveOptions::ODFVER_012 ),
- MAP_FULL( "MarkPosition", CHART, XML_TICK_MARK_POSITION,
XML_SCH_TYPE_TICK_MARK_POSITION, 0, SvtSaveOptions::ODFVER_012 ),
+ MAP_FULL( "CrossoverPosition", CHART, XML_AXIS_POSITION,
XML_SCH_TYPE_AXIS_POSITION|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0,
SvtSaveOptions::ODFSVER_012 ),
+ MAP_FULL( "CrossoverValue", CHART, XML_AXIS_POSITION,
XML_SCH_TYPE_AXIS_POSITION_VALUE|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY,
0, SvtSaveOptions::ODFSVER_012 ),
+ MAP_FULL( "LabelPosition", CHART, XML_AXIS_LABEL_POSITION,
XML_SCH_TYPE_AXIS_LABEL_POSITION, 0, SvtSaveOptions::ODFSVER_012 ),
+ MAP_FULL( "MarkPosition", CHART, XML_TICK_MARK_POSITION,
XML_SCH_TYPE_TICK_MARK_POSITION, 0, SvtSaveOptions::ODFSVER_012 ),
// statistical properties
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index fdeb89059d02..5f8c72307e33 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -67,7 +67,7 @@ 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::ODFVER_010, false }
+#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 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)
@@ -75,7 +75,7 @@ using namespace ::xmloff::token;
#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::ODFVER_010, false }
+#define MAP_END() { nullptr, 0, 0, XML_EMPTY, 0 ,0,
SvtSaveOptions::ODFSVER_010, false }
// entry list for graphic properties
@@ -129,7 +129,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "TextAutoGrowHeight", XML_NAMESPACE_DRAW,
XML_AUTO_GROW_HEIGHT, XML_TYPE_BOOL, 0 ),
GMAP( "TextAutoGrowWidth", XML_NAMESPACE_DRAW,
XML_AUTO_GROW_WIDTH, XML_TYPE_BOOL, 0 ),
GMAP( "TextFitToSize", XML_NAMESPACE_DRAW,
XML_FIT_TO_SIZE, XML_SD_TYPE_FITTOSIZE|MID_FLAG_MERGE_PROPERTY, 0),
- GMAPV( "TextFitToSize", XML_NAMESPACE_STYLE,
XML_SHRINK_TO_FIT,
XML_SD_TYPE_FITTOSIZE_AUTOFIT|MID_FLAG_MERGE_PROPERTY, 0,
SvtSaveOptions::ODFVER_012 ),
+ GMAPV( "TextFitToSize", XML_NAMESPACE_STYLE,
XML_SHRINK_TO_FIT,
XML_SD_TYPE_FITTOSIZE_AUTOFIT|MID_FLAG_MERGE_PROPERTY, 0,
SvtSaveOptions::ODFSVER_012 ),
GMAP( "TextContourFrame", XML_NAMESPACE_DRAW,
XML_FIT_TO_CONTOUR, XML_TYPE_BOOL, 0 ),
GMAP( "TextMaximumFrameHeight", XML_NAMESPACE_FO,
XML_MAX_HEIGHT, XML_TYPE_MEASURE, 0 ),
GMAP( "TextMaximumFrameWidth", XML_NAMESPACE_FO, XML_MAX_WIDTH,
XML_TYPE_MEASURE, 0 ),
@@ -153,10 +153,10 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "ShadowTransparence", XML_NAMESPACE_DRAW,
XML_SHADOW_OPACITY, XML_TYPE_NEG_PERCENT, 0 ),
// glow attributes
- GMAPV( "GlowEffect", XML_NAMESPACE_LO_EXT, XML_GLOW,
XML_SD_TYPE_GLOW , 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
- GMAPV( "GlowEffectRad", XML_NAMESPACE_LO_EXT,
XML_GLOW_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
- GMAPV( "GlowEffectColor", XML_NAMESPACE_LO_EXT,
XML_GLOW_COLOR, XML_TYPE_COLOR , 0,
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
- GMAPV( "GlowEffectTransparency", XML_NAMESPACE_LO_EXT,
XML_GLOW_TRANSPARENCY, XML_TYPE_PERCENT16, 0,
SvtSaveOptions::ODFVER_012_EXT_COMPAT),
+ GMAPV( "GlowEffect", XML_NAMESPACE_LO_EXT, XML_GLOW,
XML_SD_TYPE_GLOW , 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT ),
+ GMAPV( "GlowEffectRad", XML_NAMESPACE_LO_EXT,
XML_GLOW_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT ),
+ GMAPV( "GlowEffectColor", XML_NAMESPACE_LO_EXT,
XML_GLOW_COLOR, XML_TYPE_COLOR , 0,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT ),
+ GMAPV( "GlowEffectTransparency", XML_NAMESPACE_LO_EXT,
XML_GLOW_TRANSPARENCY, XML_TYPE_PERCENT16, 0,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT),
// graphic attributes
GMAP( "GraphicColorMode", XML_NAMESPACE_DRAW,
XML_COLOR_MODE, XML_TYPE_COLOR_MODE, 0 ), // exists in SW, too,
with same property name
@@ -166,7 +166,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "AdjustRed", XML_NAMESPACE_DRAW, XML_RED,
XML_TYPE_PERCENT16, 0 ), // signed? exists in SW, too, with same
property name
GMAP( "AdjustGreen", XML_NAMESPACE_DRAW, XML_GREEN,
XML_TYPE_PERCENT16, 0 ), // signed? exists in SW, too, with same
property name
GMAP( "AdjustBlue", XML_NAMESPACE_DRAW, XML_BLUE,
XML_TYPE_PERCENT16, 0 ), // signed? exists in SW, too, with same
property name
- GMAPV( "GraphicCrop", XML_NAMESPACE_FO, XML_CLIP,
XML_TYPE_TEXT_CLIP, CTF_TEXT_CLIP, SvtSaveOptions::ODFVER_012 ),
// exists in SW, too, with same property name
+ GMAPV( "GraphicCrop", XML_NAMESPACE_FO, XML_CLIP,
XML_TYPE_TEXT_CLIP, CTF_TEXT_CLIP, SvtSaveOptions::ODFSVER_012),
// exists in SW, too, with same property name
GMAP( "GraphicCrop", XML_NAMESPACE_FO, XML_CLIP,
XML_TYPE_TEXT_CLIP11, CTF_TEXT_CLIP11 ), // exists in SW, too,
with same property name
GMAP( "Transparency", XML_NAMESPACE_DRAW,
XML_IMAGE_OPACITY, XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0
), // exists in SW, too, with same property name // #i25616#
GMAP( "IsMirrored", XML_NAMESPACE_STYLE,
XML_MIRROR, XML_TYPE_SD_MIRROR|MID_FLAG_MULTI_PROPERTY, 0 ), //
exists in SW, too // #i40214#
diff --git a/xmloff/source/forms/controlpropertymap.cxx
b/xmloff/source/forms/controlpropertymap.cxx
index dc748d1d730f..249f1815d6d6 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::ODFVER_010, false }
-#define MAP_CONST( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFVER_010, false }
-#define MAP_CONST_P( name, prefix, token, type, context ){ name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context,
SvtSaveOptions::ODFVER_010, false }
-#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0,
SvtSaveOptions::ODFVER_010, false }
+#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 }
static XMLPropertyMapEntry const aControlStyleProperties[] =
{
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx
b/xmloff/source/style/PageMasterStyleMap.cxx
index 217e5960a0f4..826fd64973cc 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -26,15 +26,15 @@ using namespace ::xmloff::token;
#define MAP(name,prefix,token,type,context,version) { name, sizeof(name)-1,
prefix, token, type, context, version, false }
#define MAP_IMPORT(name,prefix,token,type,context,version) { name,
sizeof(name)-1, prefix, token, type, context, version, true }
#define PLMAP(name,prefix,token,type,context) \
- MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_010)
+ MAP(name, prefix, token, type|XML_TYPE_PROP_PAGE_LAYOUT, context,
SvtSaveOptions::ODFSVER_010)
#define PLMAP_12(name,prefix,token,type,context) \
- MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_012)
+ MAP(name, prefix, token, type|XML_TYPE_PROP_PAGE_LAYOUT, context,
SvtSaveOptions::ODFSVER_012)
#define PLMAP_EXT(name,prefix,token,type,context) \
- MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_012_EXT_COMPAT)
+ MAP(name, prefix, token, type|XML_TYPE_PROP_PAGE_LAYOUT, context,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT)
#define PLMAP_EXT_IMPORT(name,prefix,token,type,context) \
- MAP_IMPORT(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_012_EXT_COMPAT)
+ MAP_IMPORT(name, prefix,token, type|XML_TYPE_PROP_PAGE_LAYOUT,
context, SvtSaveOptions::ODFSVER_012_EXT_COMPAT)
#define HFMAP(name,prefix,token,type,context) \
- MAP(name,prefix,token,type|XML_TYPE_PROP_HEADER_FOOTER,context,
SvtSaveOptions::ODFVER_010)
+ MAP(name, prefix, token, type|XML_TYPE_PROP_HEADER_FOOTER, context,
SvtSaveOptions::ODFSVER_010)
const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
{
@@ -266,7 +266,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::ODFVER_010, false } //
index 190
+ { nullptr, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFSVER_010, false } //
index 190
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 80f90fdf9edb..2ca0e49df077 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -573,7 +573,8 @@ vector<XMLPropertyState> SvXMLExportPropertyMapper::Filter_(
bool bDelInfo = false;
if( !pFilterInfo )
{
- const SvtSaveOptions::ODFDefaultVersion nCurrentVersion(
SvtSaveOptions().GetODFDefaultVersion() );
+ assert(SvtSaveOptions().GetODFDefaultVersion() !=
SvtSaveOptions::ODFVER_UNKNOWN);
+ const SvtSaveOptions::ODFSaneDefaultVersion
nCurrentVersion(SvtSaveOptions().GetODFSaneDefaultVersion());
pFilterInfo = new FilterPropertiesInfo_Impl;
for( sal_Int32 i=0; i < nProps; i++ )
{
@@ -585,12 +586,13 @@ vector<XMLPropertyState>
SvXMLExportPropertyMapper::Filter_(
( (0 != (nFlags & MID_FLAG_MUST_EXIST)) ||
xInfo->hasPropertyByName( rAPIName ) ) )
{
- const SvtSaveOptions::ODFDefaultVersion
nEarliestODFVersionForExport(
+ const std::optional<SvtSaveOptions::ODFSaneDefaultVersion>
oEarliestODFVersionForExport(
mpImpl->mxPropMapper->GetEarliestODFVersionForExport(i));
- if( nCurrentVersion >= nEarliestODFVersionForExport
- || nCurrentVersion == SvtSaveOptions::ODFVER_UNKNOWN
- || nEarliestODFVersionForExport ==
SvtSaveOptions::ODFVER_UNKNOWN )
+ if (!oEarliestODFVersionForExport
+ || nCurrentVersion >= *oEarliestODFVersionForExport)
+ {
pFilterInfo->AddProperty(rAPIName, i);
+ }
}
}
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 9d20baa86f08..905b068dff01 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -57,7 +57,7 @@ struct XMLPropertySetMapperEntry_Impl
sal_Int32 nType;
sal_uInt16 nXMLNameSpace;
sal_Int16 nContextId;
- SvtSaveOptions::ODFDefaultVersion nEarliestODFVersionForExport;
+ SvtSaveOptions::ODFSaneDefaultVersion nEarliestODFVersionForExport;
bool bImportOnly;
const XMLPropertyHandler *pHdl;
@@ -192,10 +192,13 @@ sal_Int16 XMLPropertySetMapper::GetEntryContextId(
sal_Int32 nIndex ) const
return nIndex == -1 ? 0 : mpImpl->maMapEntries[nIndex].nContextId;
}
-SvtSaveOptions::ODFDefaultVersion
XMLPropertySetMapper::GetEarliestODFVersionForExport( sal_Int32 nIndex ) const
+std::optional<SvtSaveOptions::ODFSaneDefaultVersion>
+XMLPropertySetMapper::GetEarliestODFVersionForExport(sal_Int32 const nIndex)
const
{
assert((-1 <= nIndex) && (nIndex <
static_cast<sal_Int32>(mpImpl->maMapEntries.size())));
- return nIndex == -1 ? SvtSaveOptions::ODFVER_UNKNOWN :
mpImpl->maMapEntries[nIndex].nEarliestODFVersionForExport;
+ return nIndex == -1
+ ? std::optional<SvtSaveOptions::ODFSaneDefaultVersion>()
+ :
std::optional<SvtSaveOptions::ODFSaneDefaultVersion>(mpImpl->maMapEntries[nIndex].nEarliestODFVersionForExport);
}
const XMLPropertyHandler* XMLPropertySetMapper::GetPropertyHandler( sal_Int32
nIndex ) const
diff --git a/xmloff/source/table/XMLTableExport.cxx
b/xmloff/source/table/XMLTableExport.cxx
index 846793f03414..32cdf3a69f28 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -57,11 +57,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::ODFVER_010, false }
+#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, 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::ODFVER_010,
false }
+#define MAP_END { nullptr, 0, 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 4a28c3e6be23..55d9f208306d 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::ODFVER_010, false }
+ { a, sizeof(a)-1, 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 }
#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, false }
+ { a, sizeof(a)-1, 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 ) \
@@ -75,14 +75,14 @@ using namespace ::xmloff::token;
M_E_( a, p, l, (t|XML_TYPE_PROP_TABLE_CELL), c )
// extensions import/export
-#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
+#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_012_EXT_COMPAT, false }
// extensions import only
-#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
+#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1,
prefix, token, type, context, SvtSaveOptions::ODFSVER_012_EXT_COMPAT, true }
#define M_END() \
- { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010,
false }
+ { nullptr, 0, 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::ODFVER_010, false }
+#define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, 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[] =
@@ -179,9 +179,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::ODFVER_012_EXT_COMPAT,
false },
+ { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT,
false },
// RES_PARATR_RSID
- { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT,
false },
+ { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT,
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 ),
@@ -523,9 +523,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::ODFVER_012_EXT_COMPAT,
false },
+ { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT,
false },
// RES_PARATR_RSID
- { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT,
false },
+ { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID,
XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT,
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 ),
@@ -540,7 +540,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::ODFVER_012_EXT_COMPAT, false },
+ { "CharShadingValue", sizeof("CharShadingValue")-1, XML_NAMESPACE_LO_EXT,
XML_CHAR_SHADING_VALUE, XML_TYPE_NUMBER|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_012_EXT_COMPAT, 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 ),
@@ -835,7 +835,7 @@ XMLPropertyMapEntry const aXMLFramePropMap[] =
MG_E( "HoriMirroredOnOddPages", STYLE, MIRROR,
XML_TYPE_TEXT_MIRROR_HORIZONTAL_RIGHT|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY,
0 ),
MG_E( "VertMirrored", STYLE, MIRROR,
XML_TYPE_TEXT_MIRROR_VERTICAL|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY,
0 ),
// RES_GRFATR_CROPGRF
- MG_EV( "GraphicCrop", FO, CLIP, XML_TYPE_TEXT_CLIP,
CTF_TEXT_CLIP, SvtSaveOptions::ODFVER_012 ),
+ MG_EV( "GraphicCrop", FO, CLIP, XML_TYPE_TEXT_CLIP,
CTF_TEXT_CLIP, SvtSaveOptions::ODFSVER_012 ),
MG_E( "GraphicCrop", FO, CLIP, XML_TYPE_TEXT_CLIP11,
CTF_TEXT_CLIP11 ),
// RES_GRFATR_ROTATION
// not required (exported as svg:transform attribute)
@@ -983,7 +983,7 @@ XMLPropertyMapEntry const aXMLRubyPropMap[] =
{
MR_E( "RubyAdjust", STYLE, RUBY_ALIGN, XML_TYPE_TEXT_RUBY_ADJUST, 0 ),
MR_E( "RubyIsAbove", STYLE, RUBY_POSITION, XML_TYPE_TEXT_RUBY_IS_ABOVE,
0 ),
- MR_EV( "RubyPosition", LO_EXT, RUBY_POSITION,
XML_TYPE_TEXT_RUBY_POSITION, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT),
+ MR_EV( "RubyPosition", LO_EXT, RUBY_POSITION,
XML_TYPE_TEXT_RUBY_POSITION, 0, SvtSaveOptions::ODFSVER_012_EXT_COMPAT),
M_END()
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
