Kaydet (Commit) 2054af83 authored tarafından sushil_shinde's avatar sushil_shinde Kaydeden (comit) Markus Mohrhard

fdo#72520 : Added property to store external data path in chart.

  -  added new property entry to store xlsx external data for chart.

Change-Id: I3695865ad7e888359d1048e9bc380cba26108636
Reviewed-on: https://gerrit.libreoffice.org/7212Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst fdc383dc
...@@ -136,7 +136,8 @@ enum ...@@ -136,7 +136,8 @@ enum
PROP_DIAGRAM_AUTOMATIC_SIZE, PROP_DIAGRAM_AUTOMATIC_SIZE,
PROP_DIAGRAM_DATATABLEHBORDER, PROP_DIAGRAM_DATATABLEHBORDER,
PROP_DIAGRAM_DATATABLEVBORDER, PROP_DIAGRAM_DATATABLEVBORDER,
PROP_DIAGRAM_DATATABLEOUTLINE PROP_DIAGRAM_DATATABLEOUTLINE,
PROP_DIAGRAM_EXTERNALDATA
}; };
void lcl_AddPropertiesToVector( void lcl_AddPropertiesToVector(
...@@ -436,6 +437,12 @@ void lcl_AddPropertiesToVector( ...@@ -436,6 +437,12 @@ void lcl_AddPropertiesToVector(
::getBooleanCppuType(), ::getBooleanCppuType(),
beans::PropertyAttribute::BOUND beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT )); | beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
} }
......
...@@ -74,7 +74,8 @@ enum ...@@ -74,7 +74,8 @@ enum
PROP_DIAGRAM_3DRELATIVEHEIGHT, PROP_DIAGRAM_3DRELATIVEHEIGHT,
PROP_DIAGRAM_DATATABLEHBORDER, PROP_DIAGRAM_DATATABLEHBORDER,
PROP_DIAGRAM_DATATABLEVBORDER, PROP_DIAGRAM_DATATABLEVBORDER,
PROP_DIAGRAM_DATATABLEOUTLINE PROP_DIAGRAM_DATATABLEOUTLINE,
PROP_DIAGRAM_EXTERNALDATA
}; };
void lcl_AddPropertiesToVector( void lcl_AddPropertiesToVector(
...@@ -190,6 +191,11 @@ void lcl_AddPropertiesToVector( ...@@ -190,6 +191,11 @@ void lcl_AddPropertiesToVector(
::getBooleanCppuType(), ::getBooleanCppuType(),
beans::PropertyAttribute::BOUND beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT )); | beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::MAYBEVOID ));
} }
......
...@@ -3225,6 +3225,7 @@ namespace xmloff { namespace token { ...@@ -3225,6 +3225,7 @@ namespace xmloff { namespace token {
XML_CHART_DTABLE_SHOWHORZBORDER, XML_CHART_DTABLE_SHOWHORZBORDER,
XML_CHART_DTABLE_SHOWVERTBORDER, XML_CHART_DTABLE_SHOWVERTBORDER,
XML_CHART_DTABLE_SHOWOUTLINE, XML_CHART_DTABLE_SHOWOUTLINE,
XML_EXTERNALDATA,
XML_TOKEN_END XML_TOKEN_END
}; };
......
...@@ -120,6 +120,9 @@ service Diagram ...@@ -120,6 +120,9 @@ service Diagram
@see ::com::sun::star::chart::MissingValueTreatment @see ::com::sun::star::chart::MissingValueTreatment
*/ */
[optional, property] long MissingValueTreatment; [optional, property] long MissingValueTreatment;
[optional, property] string ExternalData;
}; };
} ; // chart2 } ; // chart2
......
...@@ -150,6 +150,7 @@ ErrorBarY ...@@ -150,6 +150,7 @@ ErrorBarY
ErrorMessage ErrorMessage
ErrorTitle ErrorTitle
Expansion Expansion
ExternalData
ExternalDocLinks ExternalDocLinks
ExternalLinks ExternalLinks
ExtrapolateForward ExtrapolateForward
......
...@@ -137,6 +137,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = ...@@ -137,6 +137,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), 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( "DataTableVBorder", CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, 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 ), MAP_ENTRY( "ScaleText", CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ),
......
...@@ -3224,6 +3224,7 @@ namespace xmloff { namespace token { ...@@ -3224,6 +3224,7 @@ namespace xmloff { namespace token {
TOKEN( "data-table-show-horz-border", XML_CHART_DTABLE_SHOWHORZBORDER ), TOKEN( "data-table-show-horz-border", XML_CHART_DTABLE_SHOWHORZBORDER ),
TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ), TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ),
TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ),
TOKEN( "external-data", XML_EXTERNALDATA),
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
{ 0, NULL, NULL, XML_TOKEN_END } { 0, NULL, NULL, XML_TOKEN_END }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment