Kaydet (Commit) 20bb1e68 authored tarafından Nikhil Walvekar's avatar Nikhil Walvekar Kaydeden (comit) Markus Mohrhard

fdo#72304 Preserve Chart data table properties during ODF import/export.

Change-Id: I767bb32fdaddcaf742923055cc86bb19138b42be
üst 3c32af65
......@@ -133,7 +133,10 @@ enum
PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE,
PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE,
PROP_DIAGRAM_AUTOMATIC_SIZE
PROP_DIAGRAM_AUTOMATIC_SIZE,
PROP_DIAGRAM_DATATABLEHBORDER,
PROP_DIAGRAM_DATATABLEVBORDER,
PROP_DIAGRAM_DATATABLEOUTLINE
};
void lcl_AddPropertiesToVector(
......@@ -415,6 +418,25 @@ void lcl_AddPropertiesToVector(
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "DataTableHBorder",
PROP_DIAGRAM_DATATABLEHBORDER,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "DataTableVBorder",
PROP_DIAGRAM_DATATABLEVBORDER,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "DataTableOutline",
PROP_DIAGRAM_DATATABLEOUTLINE,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
struct StaticDiagramWrapperPropertyArray_Initializer
......
......@@ -71,7 +71,10 @@ enum
PROP_DIAGRAM_ROTATION_HORIZONTAL,
PROP_DIAGRAM_ROTATION_VERTICAL,
PROP_DIAGRAM_MISSING_VALUE_TREATMENT,
PROP_DIAGRAM_3DRELATIVEHEIGHT
PROP_DIAGRAM_3DRELATIVEHEIGHT,
PROP_DIAGRAM_DATATABLEHBORDER,
PROP_DIAGRAM_DATATABLEVBORDER,
PROP_DIAGRAM_DATATABLEOUTLINE
};
void lcl_AddPropertiesToVector(
......@@ -169,6 +172,25 @@ void lcl_AddPropertiesToVector(
PROP_DIAGRAM_3DRELATIVEHEIGHT,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataTableHBorder",
PROP_DIAGRAM_DATATABLEHBORDER,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "DataTableVBorder",
PROP_DIAGRAM_DATATABLEVBORDER,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "DataTableOutline",
PROP_DIAGRAM_DATATABLEOUTLINE,
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
struct StaticDiagramDefaults_Initializer
......@@ -188,6 +210,9 @@ private:
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_GROUP_BARS_PER_AXIS, true );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, true );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_RIGHT_ANGLED_AXES, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_DATATABLEHBORDER, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_DATATABLEVBORDER, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_DATATABLEOUTLINE, false );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_STARTING_ANGLE, 90 );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DIAGRAM_3DRELATIVEHEIGHT, 100 );
::chart::SceneProperties::AddDefaultsToMap( rOutMap );
......
......@@ -3218,6 +3218,10 @@ namespace xmloff { namespace token {
XML_RFC_LANGUAGE_TAG,
XML_RFC_LANGUAGE_TAG_ASIAN,
XML_RFC_LANGUAGE_TAG_COMPLEX,
// Chart data table properties
XML_CHART_DTABLE_SHOWHORZBORDER,
XML_CHART_DTABLE_SHOWVERTBORDER,
XML_CHART_DTABLE_SHOWOUTLINE,
XML_TOKEN_END
};
......
......@@ -97,6 +97,12 @@ service Diagram
[optional, property] boolean RightAngledAxes;
/** Chart Datatable flags
*/
[optional, property] boolean DataTableHBorder;
[optional, property] boolean DataTableVBorder;
[optional, property] boolean DataTableOutline;
/** Perspective of 3D charts ( [0,100] ).
*/
[optional, property] long Perspective;
......
......@@ -133,6 +133,11 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY_ODF12( "AutomaticSize", CHART, XML_AUTOMATIC_SIZE, XML_TYPE_BOOL ),
MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ),
MAP_ENTRY_ODF12( "MissingValueTreatment", CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ),
// #72304 Chart data table flags
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( "ScaleText", CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ),
// spline settings
......
......@@ -3218,6 +3218,9 @@ namespace xmloff { namespace token {
TOKEN( "rfc-language-tag", XML_RFC_LANGUAGE_TAG ),
TOKEN( "rfc-language-tag-asian", XML_RFC_LANGUAGE_TAG_ASIAN ),
TOKEN( "rfc-language-tag-complex", XML_RFC_LANGUAGE_TAG_COMPLEX ),
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 ),
#if OSL_DEBUG_LEVEL > 0
{ 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