ooo-build r14500 - in trunk: . patches/test
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14500 - in trunk: . patches/test
- Date: Thu, 13 Nov 2008 21:04:11 +0000 (UTC)
Author: kyoshida
Date: Thu Nov 13 21:04:11 2008
New Revision: 14500
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14500&view=rev
Log:
2008-11-13 Kohei Yoshida <kyoshida novell com>
* patches/test/chart-axis-multi-chart-types-chart2.diff:
* patches/test/chart-axis-multi-chart-types-sc.diff: improve excel
interoperability on documents with charts having multiple data series
of differing chart types (i#95934).
Added:
trunk/patches/test/chart-axis-multi-chart-types-chart2.diff
trunk/patches/test/chart-axis-multi-chart-types-sc.diff
Modified:
trunk/ChangeLog
Added: trunk/patches/test/chart-axis-multi-chart-types-chart2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/test/chart-axis-multi-chart-types-chart2.diff Thu Nov 13 21:04:11 2008
@@ -0,0 +1,228 @@
+diff --git chart2/source/model/template/ColumnChartType.cxx chart2/source/model/template/ColumnChartType.cxx
+index ed5aea8..8613b95 100644
+--- chart2/source/model/template/ColumnChartType.cxx
++++ chart2/source/model/template/ColumnChartType.cxx
+@@ -49,7 +49,9 @@ namespace
+ enum
+ {
+ PROP_BARCHARTTYPE_OVERLAP_SEQUENCE,
+- PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
++ PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE,
++ PROP_BARCHARTTYPE_STACKED,
++ PROP_BARCHARTTYPE_PERCENT
+ };
+
+ void lcl_AddPropertiesToVector(
+@@ -68,6 +70,19 @@ void lcl_AddPropertiesToVector(
+ ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
++
++ rOutProperties.push_back(
++ Property( C2U( "Stacked" ),
++ PROP_BARCHARTTYPE_STACKED,
++ ::getBooleanCppuType(),
++ beans::PropertyAttribute::BOUND
++ | beans::PropertyAttribute::MAYBEDEFAULT ));
++ rOutProperties.push_back(
++ Property( C2U( "Percent" ),
++ PROP_BARCHARTTYPE_PERCENT,
++ ::getBooleanCppuType(),
++ beans::PropertyAttribute::BOUND
++ | beans::PropertyAttribute::MAYBEDEFAULT ));
+ }
+
+ void lcl_AddDefaultsToMap(
+diff --git chart2/source/model/template/LineChartType.cxx chart2/source/model/template/LineChartType.cxx
+index 05f6b43..6ee1151 100644
+--- chart2/source/model/template/LineChartType.cxx
++++ chart2/source/model/template/LineChartType.cxx
+@@ -54,7 +54,9 @@ enum
+ {
+ PROP_LINECHARTTYPE_CURVE_STYLE,
+ PROP_LINECHARTTYPE_CURVE_RESOLUTION,
+- PROP_LINECHARTTYPE_SPLINE_ORDER
++ PROP_LINECHARTTYPE_SPLINE_ORDER,
++ PROP_LINECHARTTYPE_STACKED,
++ PROP_LINECHARTTYPE_PERCENT
+ };
+
+ void lcl_AddPropertiesToVector(
+@@ -79,6 +81,19 @@ void lcl_AddPropertiesToVector(
+ ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
++
++ rOutProperties.push_back(
++ Property( C2U( "Stacked" ),
++ PROP_LINECHARTTYPE_STACKED,
++ ::getBooleanCppuType(),
++ beans::PropertyAttribute::BOUND
++ | beans::PropertyAttribute::MAYBEDEFAULT ));
++ rOutProperties.push_back(
++ Property( C2U( "Percent" ),
++ PROP_LINECHARTTYPE_PERCENT,
++ ::getBooleanCppuType(),
++ beans::PropertyAttribute::BOUND
++ | beans::PropertyAttribute::MAYBEDEFAULT ));
+ }
+
+ void lcl_AddDefaultsToMap(
+diff --git chart2/source/view/axes/ScaleAutomatism.cxx chart2/source/view/axes/ScaleAutomatism.cxx
+index 711a911..f750acc 100644
+--- chart2/source/view/axes/ScaleAutomatism.cxx
++++ chart2/source/view/axes/ScaleAutomatism.cxx
+@@ -132,7 +132,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
+ if( bAutoMinimum )
+ {
+ if( m_aSourceScale.AxisType==AxisType::PERCENT )
++ {
+ rExplicitScale.Minimum = 0.0;
++ if (!::rtl::math::isNan(m_fValueMinimum))
++ {
++ double fMin = m_fValueMinimum / 100.0;
++ if (rExplicitScale.Minimum > fMin)
++ rExplicitScale.Minimum = fMin;
++ }
++ }
+ else if( ::rtl::math::isNan( m_fValueMinimum ) )
+ rExplicitScale.Minimum = 0.0; //@todo get Minimum from scaling or from plotter????
+ else
+@@ -143,7 +151,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
+ if( bAutoMaximum )
+ {
+ if( m_aSourceScale.AxisType==AxisType::PERCENT )
++ {
+ rExplicitScale.Maximum = 1.0;
++ if (!::rtl::math::isNan(m_fValueMaximum))
++ {
++ double fMax = m_fValueMaximum / 100.0;
++ if (rExplicitScale.Maximum < fMax)
++ rExplicitScale.Maximum = fMax;
++ }
++ }
+ else if( ::rtl::math::isNan( m_fValueMaximum ) )
+ rExplicitScale.Maximum = 10.0; //@todo get Maximum from scaling or from plotter????
+ else
+diff --git chart2/source/view/charttypes/AreaChart.cxx chart2/source/view/charttypes/AreaChart.cxx
+index 84710f0..1f036c1 100644
+--- chart2/source/view/charttypes/AreaChart.cxx
++++ chart2/source/view/charttypes/AreaChart.cxx
+@@ -598,6 +598,11 @@ struct FormerPoint
+
+ void AreaChart::createShapes()
+ {
++ sal_Bool bPercent = sal_False;
++ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
++ if (xPropSet.is())
++ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
++
+ if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+ return;
+
+@@ -734,9 +739,30 @@ void AreaChart::createShapes()
+ if( m_nDimension==3 && m_bArea && pSeriesList->size()!=1 )
+ fLogicY = fabs( fLogicY );
+
+- if( pPosHelper->isPercentY() && !::rtl::math::approxEqual( aLogicYSumMap[nAttachedAxisIndex], 0.0 ) )
++ if (bPercent)
++ {
++ // This data series is percent-stacked.
++
++ if (::rtl::math::approxEqual(aLogicYSumMap[nAttachedAxisIndex], 0.0))
++ fLogicY = 0.0;
++ else
++ fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
++
++ if (!pPosHelper->isPercentY())
++ {
++ // When the axis itself is not percent-stacked,
++ // their internal range value is 0 - 100. So we
++ // need to adjust the data point values
++ // accordingly.
++ fLogicY *= 100.0;
++ }
++ }
++ else if (pPosHelper->isPercentY())
+ {
+- fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
++ // The data series is not percent-stacked, but the
++ // axis itself is. In this case, the axis' internal
++ // range is 0 to 1. Adjust the data point values.
++ fLogicY /= 100.0;
+ }
+
+ if( ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
+diff --git chart2/source/view/charttypes/BarChart.cxx chart2/source/view/charttypes/BarChart.cxx
+index 7def5fa..49bb776 100644
+--- chart2/source/view/charttypes/BarChart.cxx
++++ chart2/source/view/charttypes/BarChart.cxx
+@@ -454,6 +454,11 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
+
+ void BarChart::createShapes()
+ {
++ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
++ sal_Bool bPercent = sal_False;
++ if (xPropSet.is())
++ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
++
+ if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+ return;
+
+diff --git chart2/source/view/charttypes/VSeriesPlotter.cxx chart2/source/view/charttypes/VSeriesPlotter.cxx
+index c0cedb1..1e651ca 100644
+--- chart2/source/view/charttypes/VSeriesPlotter.cxx
++++ chart2/source/view/charttypes/VSeriesPlotter.cxx
+@@ -1154,6 +1154,15 @@ double VSeriesPlotter::getMaximumX()
+
+ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
+ {
++ sal_Bool bPercent = sal_False;
++ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
++ if (xPropSet.is())
++ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
++
++ if (bPercent)
++ // This plotter is percent-stacked.
++ return 0.0;
++
+ if( !m_bCategoryXAxis )
+ {
+ double fMinY, fMaxY;
+@@ -1188,6 +1197,15 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
+
+ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
+ {
++ sal_Bool bPercent = sal_False;
++ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
++ if (xPropSet.is())
++ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
++
++ if (bPercent)
++ // This plotter is percent-stacked.
++ return 100.0;
++
+ if( !m_bCategoryXAxis )
+ {
+ double fMinY, fMaxY;
+diff --git chart2/source/view/main/ChartView.cxx chart2/source/view/main/ChartView.cxx
+index 63075dc..189cc7d 100644
+--- chart2/source/view/main/ChartView.cxx
++++ chart2/source/view/main/ChartView.cxx
+@@ -1448,7 +1448,15 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
+ if( nDimensionIndex == 0 )
+ aRoleToMatch = C2U("values-x");
+ Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
+- for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
++ sal_Int32 nCTCount = aChartTypes.getLength();
++ if (nCTCount > 0)
++ // When multiple chart types share the same axis, always
++ // use the first chart type for automatic detection of
++ // desired number format. This is in line with the
++ // fact that the axis type is also determined from the
++ // first chart type alone.
++ nCTCount = 1;
++ for( sal_Int32 nCTIdx=0; nCTIdx<nCTCount; ++nCTIdx )
+ {
+ if( nDimensionIndex != 0 )
+ aRoleToMatch = aChartTypes[nCTIdx]->getRoleOfSequenceForSeriesLabel();
Added: trunk/patches/test/chart-axis-multi-chart-types-sc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/test/chart-axis-multi-chart-types-sc.diff Thu Nov 13 21:04:11 2008
@@ -0,0 +1,282 @@
+diff --git sc/source/filter/excel/xechart.cxx sc/source/filter/excel/xechart.cxx
+index 7fff80d..96bcaa6 100644
+--- sc/source/filter/excel/xechart.cxx
++++ sc/source/filter/excel/xechart.cxx
+@@ -124,16 +124,27 @@ void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec, sal_uInt16 nRecId
+ }
+
+ template< typename Type >
+-inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny )
++inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny, bool bPercent )
+ {
+- return !rAny.hasValue() || !(rAny >>= rValue);
++ if (!rAny.hasValue())
++ return true;
++
++ if (rAny >>= rValue)
++ {
++ if (bPercent)
++ rValue *= 100.0;
++ return false;
++ }
++ else
++ return true;
+ }
+
+-bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, Reference< XScaling > xScaling )
++bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, Reference< XScaling > xScaling, bool bPercent )
+ {
+- bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny );
++ bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny, bPercent );
+ if( !bIsAuto && xScaling.is() )
+ rfValue = xScaling->doScaling( rfValue );
++
+ return bIsAuto;
+ }
+
+@@ -2147,7 +2158,7 @@ void XclExpChLabelRange::Convert( const ScaleData& rScaleData, bool bMirrorOrien
+ {
+ // origin
+ double fOrigin = 0.0;
+- if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin ) )
++ if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin, false ) )
+ maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 32767 );
+
+ // reverse order
+@@ -2171,7 +2182,7 @@ XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) :
+ {
+ }
+
+-void XclExpChValueRange::Convert( const ScaleData& rScaleData )
++void XclExpChValueRange::Convert( const ScaleData& rScaleData, bool bPercent )
+ {
+ // scaling algorithm
+ bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING;
+@@ -2181,24 +2192,24 @@ void XclExpChValueRange::Convert( const ScaleData& rScaleData )
+ xLogScaling = rScaleData.Scaling;
+
+ // min/max
+- bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, xLogScaling );
++ bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, xLogScaling, bPercent );
+ ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN, bAutoMin );
+- bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, xLogScaling );
++ bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, xLogScaling, bPercent );
+ ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX, bAutoMax );
+
+ // origin
+- bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, xLogScaling );
++ bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, xLogScaling, bPercent );
+ ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOCROSS, bAutoCross );
+
+ // major increment
+ const IncrementData& rIncrementData = rScaleData.IncrementData;
+- bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance ) || (maData.mfMajorStep <= 0.0);
++ bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance, bPercent ) || (maData.mfMajorStep <= 0.0);
+ ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR, bAutoMajor );
+ // minor increment
+ const Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
+ sal_Int32 nCount = 0;
+ bool bAutoMinor = bAutoMajor || (rSubIncrementSeq.getLength() < 1) ||
+- lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount ) || (nCount < 1);
++ lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount, false ) || (nCount < 1);
+ if( !bAutoMinor )
+ maData.mfMinorStep = maData.mfMajorStep / nCount;
+ ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR, bAutoMinor );
+@@ -2320,7 +2331,8 @@ void XclExpChAxis::SetRotation( sal_uInt16 nRotation )
+ mxTick->SetRotation( nRotation );
+ }
+
+-void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx )
++void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx,
++ bool bPercent )
+ {
+ ScfPropertySet aAxisProp( xAxis );
+ bool bCategoryAxis = ((GetAxisType() == EXC_CHAXIS_X) && rTypeInfo.mbCategoryAxis) || (GetAxisType() == EXC_CHAXIS_Z);
+@@ -2349,7 +2361,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rT
+ {
+ mxValueRange.reset( new XclExpChValueRange( GetChRoot() ) );
+ if( xAxis.is() )
+- mxValueRange->Convert( xAxis->getScaleData() );
++ mxValueRange->Convert( xAxis->getScaleData(), bPercent );
+ }
+
+ // axis caption text ------------------------------------------------------
+@@ -2523,10 +2535,10 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
+ // create axes according to chart type (no axes for pie and donut charts)
+ if( rTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE )
+ {
+- ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo );
+- ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo );
++ ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo, bPercent );
++ ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo, bPercent );
+ if( pGroup->Is3dDeepChart() )
+- ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo );
++ ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo, bPercent );
+ }
+
+ // X axis category ranges
+@@ -2610,14 +2622,15 @@ XclExpChTypeGroupRef XclExpChAxesSet::GetLastTypeGroup() const
+ void XclExpChAxesSet::ConvertAxis(
+ XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
+ XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
+- Reference< XCoordinateSystem > xCoordSystem, const XclChExtTypeInfo& rTypeInfo )
++ Reference< XCoordinateSystem > xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
++ bool bPercent )
+ {
+ // create and convert axis object
+ rxChAxis.reset( new XclExpChAxis( GetChRoot(), nAxisType ) );
+ sal_Int32 nApiAxisDim = rxChAxis->GetApiAxisDimension();
+ sal_Int32 nApiAxesSetIdx = GetApiAxesSetIndex();
+ Reference< XAxis > xAxis = lclGetApiAxis( xCoordSystem, nApiAxisDim, nApiAxesSetIdx );
+- rxChAxis->Convert( xAxis, rTypeInfo, nApiAxesSetIdx );
++ rxChAxis->Convert( xAxis, rTypeInfo, nApiAxesSetIdx, bPercent );
+
+ // create and convert axis title
+ Reference< XTitled > xTitled( xAxis, UNO_QUERY );
+diff --git sc/source/filter/excel/xichart.cxx sc/source/filter/excel/xichart.cxx
+index 441f699..1bddb08 100644
+--- sc/source/filter/excel/xichart.cxx
++++ sc/source/filter/excel/xichart.cxx
+@@ -1988,6 +1988,15 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi
+ // additional properties
+ switch( maTypeInfo.meTypeCateg )
+ {
++ case EXC_CHTYPECATEG_LINE:
++ {
++ ScfPropertySet aTypeProp(xChartType);
++ bool bStacked = (maData.mnFlags & EXC_CHLINE_STACKED);
++ bool bPercent = (maData.mnFlags & EXC_CHLINE_PERCENT);
++ aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
++ aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
++ }
++ break;
+ case EXC_CHTYPECATEG_BAR:
+ {
+ ScfPropertySet aTypeProp( xChartType );
+@@ -1996,6 +2005,10 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi
+ aTypeProp.SetProperty( EXC_CHPROP_OVERLAPSEQ, aInt32Seq );
+ aInt32Seq[ 0 ] = aInt32Seq[ 1 ] = maData.mnGap;
+ aTypeProp.SetProperty( EXC_CHPROP_GAPWIDTHSEQ, aInt32Seq );
++ bool bStacked = (maData.mnFlags & EXC_CHBAR_STACKED);
++ bool bPercent = (maData.mnFlags & EXC_CHBAR_PERCENT);
++ aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
++ aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
+ }
+ break;
+ case EXC_CHTYPECATEG_PIE:
+@@ -2542,7 +2555,7 @@ void XclImpChValueRange::ReadChValueRange( XclImpStream& rStrm )
+ >> maData.mnFlags;
+ }
+
+-void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) const
++void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const
+ {
+ // scaling algorithm
+ bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE );
+@@ -2557,19 +2570,23 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co
+ }
+
+ // min/max
+- lclSetScaledValueOrClearAny( rScaleData.Minimum, maData.mfMin, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
+- lclSetScaledValueOrClearAny( rScaleData.Maximum, maData.mfMax, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );
++ double fMinVal = bPercent ? maData.mfMin/100.0 : maData.mfMin;
++ double fMaxVal = bPercent ? maData.mfMax/100.0 : maData.mfMax;
++ lclSetScaledValueOrClearAny( rScaleData.Minimum, fMinVal, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
++ lclSetScaledValueOrClearAny( rScaleData.Maximum, fMaxVal, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );
+
+ // origin (max-cross overrides crossing settings, fall back to auto-cross)
+ const sal_uInt16 nAutoCrossFlags = EXC_CHVALUERANGE_AUTOCROSS | EXC_CHVALUERANGE_MAXCROSS;
+- lclSetScaledValueOrClearAny( rScaleData.Origin, maData.mfCross, xLogScaling, ::get_flag( maData.mnFlags, nAutoCrossFlags ) );
++ double fCross = bPercent ? maData.mfCross/100.0 : maData.mfCross;
++ lclSetScaledValueOrClearAny( rScaleData.Origin, fCross, xLogScaling, ::get_flag( maData.mnFlags, nAutoCrossFlags ) );
+
+ // increment
+ bool bAutoMajor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR );
+ bool bAutoMinor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR );
+ // major increment
+ IncrementData& rIncrementData = rScaleData.IncrementData;
+- lclSetValueOrClearAny( rIncrementData.Distance, maData.mfMajorStep, bAutoMajor );
++ double fMajorStep = bPercent ? maData.mfMajorStep/100.0 : maData.mfMajorStep;
++ lclSetValueOrClearAny( rIncrementData.Distance, fMajorStep, bAutoMajor );
+ // minor increment
+ Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
+ rSubIncrementSeq.realloc( 1 );
+@@ -2809,8 +2826,11 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
+ break;
+ case ApiAxisType::REALNUMBER:
+ case ApiAxisType::PERCENT:
++ {
++ bool bPercent = aScaleData.AxisType == ApiAxisType::PERCENT;
+ // #i85167# pie/donut charts have reversed rotation direction (at Y axis!)
+- mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );
++ mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE, bPercent );
++ }
+ break;
+ default:
+ DBG_ERRORFILE( "XclImpChAxis::CreateAxis - unknown axis type" );
+diff --git sc/source/filter/inc/xechart.hxx sc/source/filter/inc/xechart.hxx
+index 6ad5595..4fa788e 100644
+--- sc/source/filter/inc/xechart.hxx
++++ sc/source/filter/inc/xechart.hxx
+@@ -944,7 +944,7 @@ public:
+ explicit XclExpChValueRange( const XclExpChRoot& rRoot );
+
+ /** Converts value axis scaling settings. */
+- void Convert( const ScaleData& rScaleData );
++ void Convert( const ScaleData& rScaleData, bool bPercent );
+
+ private:
+ virtual void WriteBody( XclExpStream& rStrm );
+@@ -1004,7 +1004,8 @@ public:
+ virtual void SetRotation( sal_uInt16 nRotation );
+
+ /** Converts formatting and scaling settings from the passed axis. */
+- void Convert( XAxisRef xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx );
++ void Convert( XAxisRef xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx,
++ bool bPercent );
+ /** Converts and writes 3D wall/floor properties from the passed diagram. */
+ void ConvertWall( XDiagramRef xDiagram );
+
+@@ -1076,7 +1077,8 @@ private:
+ /** Converts a complete axis object including axis title. */
+ void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
+ XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
+- XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo );
++ XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
++ bool bPercent );
+
+ virtual void WriteBody( XclExpStream& rStrm );
+
+diff --git sc/source/filter/inc/xichart.hxx sc/source/filter/inc/xichart.hxx
+index 2e79767..da91cd5 100644
+--- sc/source/filter/inc/xichart.hxx
++++ sc/source/filter/inc/xichart.hxx
+@@ -1109,7 +1109,7 @@ public:
+ /** Reads the CHVALUERANGE record (numeric axis scaling properties). */
+ void ReadChValueRange( XclImpStream& rStrm );
+ /** Converts value axis scaling settings. */
+- void Convert( ScaleData& rScaleData, bool bMirrorOrient ) const;
++ void Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const;
+
+ private:
+ XclChValueRange maData; /// Contents of the CHVALUERANGE record.
+diff --git sc/source/filter/inc/xlchart.hxx sc/source/filter/inc/xlchart.hxx
+index 5e3b3f5..1a580ed 100644
+--- sc/source/filter/inc/xlchart.hxx
++++ sc/source/filter/inc/xlchart.hxx
+@@ -107,6 +107,7 @@ namespace com { namespace sun { namespace star {
+ #define EXC_CHPROP_OFFSET CREATE_OUSTRING( "Offset" )
+ #define EXC_CHPROP_OVERLAPSEQ CREATE_OUSTRING( "OverlapSequence" )
+ #define EXC_CHPROP_PERCENTAGENUMFMT CREATE_OUSTRING( "PercentageNumberFormat" )
++#define EXC_CHPROP_PERCENT CREATE_OUSTRING( "Percent" )
+ #define EXC_CHPROP_PERCENTDIAGONAL CREATE_OUSTRING( "PercentDiagonal" )
+ #define EXC_CHPROP_PERSPECTIVE CREATE_OUSTRING( "Perspective" )
+ #define EXC_CHPROP_POSITIVEERROR CREATE_OUSTRING( "PositiveError" )
+@@ -121,6 +122,7 @@ namespace com { namespace sun { namespace star {
+ #define EXC_CHPROP_SHOWHIGHLOW CREATE_OUSTRING( "ShowHighLow" )
+ #define EXC_CHPROP_SHOWNEGATIVEERROR CREATE_OUSTRING( "ShowNegativeError" )
+ #define EXC_CHPROP_SHOWPOSITIVEERROR CREATE_OUSTRING( "ShowPositiveError" )
++#define EXC_CHPROP_STACKED CREATE_OUSTRING( "Stacked" )
+ #define EXC_CHPROP_STACKINGDIR CREATE_OUSTRING( "StackingDirection" )
+ #define EXC_CHPROP_STARTINGANGLE CREATE_OUSTRING( "StartingAngle" )
+ #define EXC_CHPROP_SWAPXANDYAXIS CREATE_OUSTRING( "SwapXAndYAxis" )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
