fdo#74112 Added properties to store chart display unit information in import.

- added display unit properties.
- added axis display unit converter class.

Change-Id: Iaa1f9a175b1109c8da7321a1567a04fb981568d1
Reviewed-on: https://gerrit.libreoffice.org/7720
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

4 files changed, 28 insertions, 3 deletions

diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index cf023f203c25..2160354a5a91 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -52,7 +52,7 @@ ContextHandlerRef AxisDispUnitsContext::onCreateContext( sal_Int32 nElement, con
             switch( nElement )
             {
                 case C_TOKEN( builtInUnit ):
-                    mrModel.mnBuiltInUnit = rAttribs.getToken( XML_val, XML_thousands );
+                    mrModel.mnBuiltInUnit = rAttribs.getString( XML_val, "thousands" );
                     return 0;
                 case C_TOKEN( custUnit ):
                     mrModel.mfCustomUnit = rAttribs.getDouble( XML_val, 0.0 );
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 5efa7d9183cc..23e4829497c8 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -342,6 +342,10 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
             TitleConverter aTitleConv( *this, *mrModel.mxTitle );
             aTitleConv.convertFromModel( xTitled, "Axis Title", OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx );
         }
+
+        // axis data unit label -----------------------------------------------
+        AxisDispUnitsConverter axisDispUnitsConverter (*this, mrModel.mxDispUnits.getOrCreate());
+        axisDispUnitsConverter.convertFromModel(xAxis);
     }
     catch( Exception& )
     {
@@ -360,6 +364,26 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
 
 // ============================================================================
 
+AxisDispUnitsConverter::AxisDispUnitsConverter( const ConverterRoot& rParent, AxisDispUnitsModel& rModel ) :
+    ConverterBase< AxisDispUnitsModel >( rParent, rModel )
+{
+}
+
+AxisDispUnitsConverter::~AxisDispUnitsConverter()
+{
+}
+
+void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >& rxAxis )
+{
+    PropertySet aPropSet( rxAxis );
+    if (!(mrModel.mnBuiltInUnit).isEmpty() )
+    {
+        aPropSet.setProperty(PROP_DisplayUnits, true);
+        aPropSet.setProperty( PROP_BuiltInUnit, mrModel.mnBuiltInUnit );
+    }
+}
+// ============================================================================
+
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index b6281462acc4..e91c2ec8eb7e 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -26,8 +26,7 @@ namespace chart {
 // ============================================================================
 
 AxisDispUnitsModel::AxisDispUnitsModel() :
-    mfCustomUnit( 0.0 ),
-    mnBuiltInUnit( XML_TOKEN_INVALID )
+    mfCustomUnit( 0.0 )
 {
 }
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 7080d9b0aedb..7a41af2a5fdf 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -37,6 +37,7 @@ BorderWidth
 BottomBorder
 BottomBorderDistance
 BottomMargin
+BuiltInUnit
 BulletChar
 BulletColor
 BulletFont
@@ -135,6 +136,7 @@ DialogLibraries
 DisableComplexChartTypes
 DisableDataTableDialog
 DisplayLabels
+DisplayUnits
 DrillDownOnDoubleClick
 Dropdown
 Duration