xmloff/source/chart/PropertyMap.hxx | 2 +-
xmloff/source/chart/SchXMLExport.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0e9598fa6c388024fa788358e26ef77b5fc3f074
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Tue Jun 5 10:52:17 2012 +0200
Catch more remnant ODFVER_LATEST instances.
This extends commit d0af38eaa029c2f2c2617544c8b6798c463381b9,
converting more latest-ver to 1.2-extended cases.
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index b295eed..5ef9021 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -94,7 +94,7 @@
#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_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_LATEST }
+#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 }
#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 }
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index 9cb5bc5..83a3491 100755
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3119,7 +3119,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Reference<beans::XPropertySe
const SvtSaveOptions::ODFDefaultVersion nCurrentVersion(
SvtSaveOptions().GetODFDefaultVersion() );
/// Dont export X ErrorBars for older ODF versions.
- if ( !bYError && nCurrentVersion != SvtSaveOptions::ODFVER_LATEST )
+ if ( !bYError && nCurrentVersion <= SvtSaveOptions::ODFVER_012 )
return;
if (xSeriesProp.is())
@@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const
Reference<beans::XPropertySe
for( ::std::vector< Reference< chart2::data::XDataSequence >
>::const_iterator aIt(
aErrorBarSequences.begin()); aIt !=
aErrorBarSequences.end(); ++aIt )
{
- if ( nCurrentVersion == SvtSaveOptions::ODFVER_LATEST )
+ if ( nCurrentVersion > SvtSaveOptions::ODFVER_012 )
{
rtl::OUString aRole, aRange;
Reference< beans::XPropertySet > xSeqProp( *aIt,
uno::UNO_QUERY_THROW );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
