From c1ed90d187eac6abae9f7e50137b20d2ce93f7ff Mon Sep 17 00:00:00 2001

From: Kohei Yoshida <kohei.yoshida@collabora.com>

Date: Mon, 7 Jul 2014 16:38:29 -0400

Subject: [PATCH 005/137] bnc#881025: Mark axis a percent axis only when all

 data series are percent.

(cherry picked from commit b8c444a46b2f41dae673c6118d84276be0e6c87d)

Signed-off-by: Andras Timar <andras.timar@collabora.com>

Conflicts:

	oox/inc/drawingml/chart/axisconverter.hxx

Change-Id: I302cc1e5b164b2ce9999087293b034ec930951af

(cherry picked from commit 3997f7b8e5f07312466e66f6bcf0a4ac1c8c5a39)

Signed-off-by: Andras Timar <andras.timar@collabora.com>

---

 include/oox/drawingml/chart/axisconverter.hxx    | 10 +++----

 oox/source/drawingml/chart/axisconverter.cxx     | 38 +++++++++++++++++++-----

 oox/source/drawingml/chart/plotareaconverter.cxx |  6 ++--

 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx

index e107057..f2df756 100644

--- a/include/oox/drawingml/chart/axisconverter.hxx

+++ b/include/oox/drawingml/chart/axisconverter.hxx

@@ -45,12 +45,10 @@ public:

     virtual             ~AxisConverter();

     /** Creates a chart2 axis and inserts it into the passed coordinate system. */

-    void                convertFromModel(

-                            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& rxCoordSystem,

-                            TypeGroupConverter& rTypeGroup,

-                            const AxisModel* pCrossingAxis,

-                            sal_Int32 nAxesSetIdx,

-                            sal_Int32 nAxisIdx );

+    void convertFromModel(

+        const css::uno::Reference<css::chart2::XCoordinateSystem>& rxCoordSystem,

+        RefVector<TypeGroupConverter>& rTypeGroups, const AxisModel* pCrossingAxis,

+        sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx );

 };

 // ============================================================================

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx

index f290992..d30595d 100644

--- a/oox/source/drawingml/chart/axisconverter.cxx

+++ b/oox/source/drawingml/chart/axisconverter.cxx

@@ -107,6 +107,26 @@ sal_Int32 lclGetTickMark( sal_Int32 nToken )

     return NONE;

 }

+/**

+ * The groups is of percent type only when all of its members are of percent

+ * type.

+ */

+bool isPercent( const RefVector<TypeGroupConverter>& rTypeGroups )

+{

+    if (rTypeGroups.empty())

+        return false;

+

+    RefVector<TypeGroupConverter>::const_iterator it = rTypeGroups.begin(), itEnd = rTypeGroups.end();

+    for (; it != itEnd; ++it)

+    {

+        TypeGroupConverter& rConv = **it;

+        if (!rConv.isPercent())

+            return false;

+    }

+

+    return true;

+}

+

 } // namespace

 // ============================================================================

@@ -120,16 +140,20 @@ AxisConverter::~AxisConverter()

 {

 }

-void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCoordSystem,

-        TypeGroupConverter& rTypeGroup, const AxisModel* pCrossingAxis, sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx )

+void AxisConverter::convertFromModel(

+    const Reference< XCoordinateSystem >& rxCoordSystem,

+    RefVector<TypeGroupConverter>& rTypeGroups, const AxisModel* pCrossingAxis, sal_Int32 nAxesSetIdx, sal_Int32 nAxisIdx )

 {

+    if (rTypeGroups.empty())

+        return;

+

     Reference< XAxis > xAxis;

     try

     {

         namespace cssc = ::com::sun::star::chart;

         namespace cssc2 = ::com::sun::star::chart2;

-        const TypeGroupInfo& rTypeInfo = rTypeGroup.getTypeInfo();

+        const TypeGroupInfo& rTypeInfo = rTypeGroups.front()->getTypeInfo();

         ObjectFormatter& rFormatter = getFormatter();

         // create the axis object (always)

@@ -189,7 +213,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo

                         currently). */

                     aScaleData.AxisType = (bDateAxis && !mrModel.mbAuto) ? cssc2::AxisType::DATE : cssc2::AxisType::CATEGORY;

                     aScaleData.AutoDateAxis = mrModel.mbAuto;

-                    aScaleData.Categories = rTypeGroup.createCategorySequence();

+                    aScaleData.Categories = rTypeGroups.front()->createCategorySequence();

                 }

                 else

                 {

@@ -199,11 +223,11 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo

             break;

             case API_Y_AXIS:

                 OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( valAx ), "AxisConverter::convertFromModel - unexpected axis model type (must: c:valAx)" );

-                aScaleData.AxisType = rTypeGroup.isPercent() ? cssc2::AxisType::PERCENT : cssc2::AxisType::REALNUMBER;

+                aScaleData.AxisType = isPercent(rTypeGroups) ? cssc2::AxisType::PERCENT : cssc2::AxisType::REALNUMBER;

             break;

             case API_Z_AXIS:

                 OSL_ENSURE( mrModel.mnTypeId == C_TOKEN( serAx ), "AxisConverter::convertFromModel - unexpected axis model type (must: c:serAx)" );

-                OSL_ENSURE( rTypeGroup.isDeep3dChart(), "AxisConverter::convertFromModel - series axis not supported by this chart type" );

+                OSL_ENSURE( rTypeGroups.front()->isDeep3dChart(), "AxisConverter::convertFromModel - series axis not supported by this chart type" );

                 aScaleData.AxisType = cssc2::AxisType::SERIES;

             break;

         }

@@ -330,7 +354,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo

         // axis title ---------------------------------------------------------

         // in radar charts, title objects may exist, but are not shown

-        if( mrModel.mxTitle.is() && (rTypeGroup.getTypeInfo().meTypeCategory != TYPECATEGORY_RADAR) )

+        if( mrModel.mxTitle.is() && (rTypeGroups.front()->getTypeInfo().meTypeCategory != TYPECATEGORY_RADAR) )

         {

             Reference< XTitled > xTitled( xAxis, UNO_QUERY_THROW );

             TitleConverter aTitleConv( *this, *mrModel.mxTitle );

diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx

index ff67b5f..eaa51e0 100644

--- a/oox/source/drawingml/chart/plotareaconverter.cxx

+++ b/oox/source/drawingml/chart/plotareaconverter.cxx

@@ -171,15 +171,15 @@ void AxesSetConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,

             ModelRef< AxisModel > xYAxis = lclGetOrCreateAxis( mrModel.maAxes, API_Y_AXIS, C_TOKEN( valAx ) );

             AxisConverter aXAxisConv( *this, *xXAxis );

-            aXAxisConv.convertFromModel( xCoordSystem, rFirstTypeGroup, xYAxis.get(), nAxesSetIdx, API_X_AXIS );

+            aXAxisConv.convertFromModel( xCoordSystem, aTypeGroups, xYAxis.get(), nAxesSetIdx, API_X_AXIS );

             AxisConverter aYAxisConv( *this, *xYAxis );

-            aYAxisConv.convertFromModel( xCoordSystem, rFirstTypeGroup, xXAxis.get(), nAxesSetIdx, API_Y_AXIS );

+            aYAxisConv.convertFromModel( xCoordSystem, aTypeGroups, xXAxis.get(), nAxesSetIdx, API_Y_AXIS );

             if( rFirstTypeGroup.isDeep3dChart() )

             {

                 ModelRef< AxisModel > xZAxis = lclGetOrCreateAxis( mrModel.maAxes, API_Z_AXIS, C_TOKEN( serAx ) );

                 AxisConverter aZAxisConv( *this, *xZAxis );

-                aZAxisConv.convertFromModel( xCoordSystem, rFirstTypeGroup, 0, nAxesSetIdx, API_Z_AXIS );

+                aZAxisConv.convertFromModel( xCoordSystem, aTypeGroups, 0, nAxesSetIdx, API_Z_AXIS );

             }

             // convert all chart type groups, this converts all series data and formatting

-- 

1.9.3