diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:47:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:47:23 +0000 |
| commit | 0081cdaa9e014b094603b3be7832e0915755d2f4 (patch) | |
| tree | bf58c0c740f399539fcf0a05ba5acf8c073daa8a /xmloff/source/chart | |
| parent | ab8e1c06f56c1bc89aea210664bf5f27454e3102 (diff) | |
INTEGRATION: CWS odfversionedexport (1.53.20); FILE MERGED
2008/04/30 15:07:20 iha 1.53.20.1: #i88889# ODF: Omit export of OFD 1.2 chart features when 1.1 is set
Diffstat (limited to 'xmloff/source/chart')
| -rw-r--r-- | xmloff/source/chart/PropertyMaps.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index f1a4254e40d6..0692e51d72f6 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: PropertyMaps.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.54 $ * * This file is part of OpenOffice.org. * @@ -51,6 +51,7 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include "XMLErrorIndicatorPropertyHdl.hxx" +#include "XMLErrorBarStylePropertyHdl.hxx" #include "XMLTextOrientationHdl.hxx" #include "XMLSymbolTypePropertyHdl.hxx" #include <com/sun/star/chart/ChartAxisMarks.hpp> @@ -100,7 +101,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 case XML_SCH_TYPE_ERROR_BAR_STYLE: // here we have a constant rather than an enum - pHdl = new XMLEnumPropertyHdl( aXMLChartErrorBarStyleEnumMap, + pHdl = new XMLErrorBarStylePropertyHdl( aXMLChartErrorBarStyleEnumMap, ::getCppuType((const sal_Int32*)0) ); break; @@ -409,8 +410,14 @@ void XMLChartExportPropertyMapper::handleSpecialItem( rProperty.maValue >>= nValue; if((( nValue & chart::ChartDataCaption::VALUE ) == chart::ChartDataCaption::VALUE )) { - if(( nValue & chart::ChartDataCaption::PERCENT ) == chart::ChartDataCaption::PERCENT ) - sValueBuffer.append( GetXMLToken( XML_VALUE_AND_PERCENTAGE )); + if( ( nValue & chart::ChartDataCaption::PERCENT ) == chart::ChartDataCaption::PERCENT ) + { + const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( SvtSaveOptions().GetODFDefaultVersion() ); + if( nCurrentVersion < SvtSaveOptions::ODFVER_012 ) + sValueBuffer.append( GetXMLToken( XML_PERCENTAGE )); + else + sValueBuffer.append( GetXMLToken( XML_VALUE_AND_PERCENTAGE )); + } else sValueBuffer.append( GetXMLToken( XML_VALUE )); } |