diff options
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 9 | ||||
| -rw-r--r-- | chart2/source/model/main/Diagram.cxx | 8 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 | ||||
| -rw-r--r-- | offapi/com/sun/star/chart2/Diagram.idl | 3 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 1 | ||||
| -rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 |
7 files changed, 22 insertions, 2 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 8fad1f83a420..cceaf7526c4a 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -136,7 +136,8 @@ enum PROP_DIAGRAM_AUTOMATIC_SIZE, PROP_DIAGRAM_DATATABLEHBORDER, PROP_DIAGRAM_DATATABLEVBORDER, - PROP_DIAGRAM_DATATABLEOUTLINE + PROP_DIAGRAM_DATATABLEOUTLINE, + PROP_DIAGRAM_EXTERNALDATA }; void lcl_AddPropertiesToVector( @@ -436,6 +437,12 @@ void lcl_AddPropertiesToVector( ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); + rOutProperties.push_back( + Property( "ExternalData", + PROP_DIAGRAM_EXTERNALDATA, + ::getCppuType( reinterpret_cast< const OUString * >(0)), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEVOID )); } diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 5aef64793b41..9de30d9b118d 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -74,7 +74,8 @@ enum PROP_DIAGRAM_3DRELATIVEHEIGHT, PROP_DIAGRAM_DATATABLEHBORDER, PROP_DIAGRAM_DATATABLEVBORDER, - PROP_DIAGRAM_DATATABLEOUTLINE + PROP_DIAGRAM_DATATABLEOUTLINE, + PROP_DIAGRAM_EXTERNALDATA }; void lcl_AddPropertiesToVector( @@ -190,6 +191,11 @@ void lcl_AddPropertiesToVector( ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); + rOutProperties.push_back( + Property( "ExternalData", + PROP_DIAGRAM_EXTERNALDATA, + ::getCppuType( reinterpret_cast< const OUString * >(0)), + beans::PropertyAttribute::MAYBEVOID )); } diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index e986f2ae00f0..f804744e09ce 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3225,6 +3225,7 @@ namespace xmloff { namespace token { XML_CHART_DTABLE_SHOWHORZBORDER, XML_CHART_DTABLE_SHOWVERTBORDER, XML_CHART_DTABLE_SHOWOUTLINE, + XML_EXTERNALDATA, XML_TOKEN_END }; diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl index f599ae7b39b9..b63063ca188c 100644 --- a/offapi/com/sun/star/chart2/Diagram.idl +++ b/offapi/com/sun/star/chart2/Diagram.idl @@ -120,6 +120,9 @@ service Diagram @see ::com::sun::star::chart::MissingValueTreatment */ [optional, property] long MissingValueTreatment; + + [optional, property] string ExternalData; + }; } ; // chart2 diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 57b427046f06..7080d9b0aedb 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -150,6 +150,7 @@ ErrorBarY ErrorMessage ErrorTitle Expansion +ExternalData ExternalDocLinks ExternalLinks ExtrapolateForward diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 8ee500d4dfa1..89f990a71fdb 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -137,6 +137,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( "ExternalData", CHART, XML_EXTERNALDATA, XML_TYPE_STRING), MAP_ENTRY( "ScaleText", CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ), diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 95114522765f..27fb252fb860 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3224,6 +3224,7 @@ namespace xmloff { namespace token { TOKEN( "data-table-show-horz-border", XML_CHART_DTABLE_SHOWHORZBORDER ), TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ), TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), + TOKEN( "external-data", XML_EXTERNALDATA), #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } |