diff options
| author | Nikhil Walvekar <nikhil.walvekar@synerzip.com> | 2013-12-12 17:49:28 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-19 03:55:05 +0100 |
| commit | 20bb1e6854c42df50536238414d93993ad764999 (patch) | |
| tree | d1b0891f77a09474a82215ea6391a0749771bf1e /chart2 | |
| parent | 3c32af65d42b2091e0557e238581fead39dea072 (diff) | |
fdo#72304 Preserve Chart data table properties during ODF import/export.
Change-Id: I767bb32fdaddcaf742923055cc86bb19138b42be
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 24 | ||||
| -rw-r--r-- | chart2/source/model/main/Diagram.cxx | 27 |
2 files changed, 49 insertions, 2 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index c54a2dc56752..8fad1f83a420 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -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 diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 5922ae2de146..ca3e38935095 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -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 ); |