Attachment #57983 for issue #95934

View | Details | Raw Unified | Return to issue 95934
Collapse All | Expand All




}

template< typename Type >
inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny, bool bPercent )
{
    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 bPercent )
{
    bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny, bPercent );
    if( !bIsAuto && xScaling.is() )
        rfValue = xScaling->doScaling( rfValue );

    return bIsAuto;
}


{
    // origin
    double fOrigin = 0.0;
    if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin, false ) )
        maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 32767 );

    // reverse order

{
}

void XclExpChValueRange::Convert( const ScaleData& rScaleData, bool bPercent )
{
    // scaling algorithm
    bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING;

        xLogScaling = rScaleData.Scaling;

    // min/max
    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, bPercent );
    ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX, bAutoMax );

    // origin
    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, 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, false ) || (nCount < 1);
    if( !bAutoMinor )
        maData.mfMinorStep = maData.mfMajorStep / nCount;
    ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR, bAutoMinor );

        mxTick->SetRotation( nRotation );
}

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);

    {
        mxValueRange.reset( new XclExpChValueRange( GetChRoot() ) );
        if( xAxis.is() )
            mxValueRange->Convert( xAxis->getScaleData(), bPercent );
    }

    // axis caption text ------------------------------------------------------

                // 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, 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, bPercent );
                }

                // X axis category ranges

void XclExpChAxesSet::ConvertAxis(
        XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
        XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
        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, bPercent );

    // create and convert axis title
    Reference< XTitled > xTitled( xAxis, UNO_QUERY );

Lines 1988-1993 Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi Link Here

(-)sc/source/filter/excel/xichart.cxx (-6 / +26 lines)
1988	// additional properties	1988	// additional properties
1989	switch( maTypeInfo.meTypeCateg )	1989	switch( maTypeInfo.meTypeCateg )
1990	{	1990	{
		1991	case EXC_CHTYPECATEG_LINE:
		1992	{
		1993	ScfPropertySet aTypeProp(xChartType);
		1994	bool bStacked = (maData.mnFlags & EXC_CHLINE_STACKED);
		1995	bool bPercent = (maData.mnFlags & EXC_CHLINE_PERCENT);
		1996	aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
		1997	aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
		1998	}
		1999	break;
1991	case EXC_CHTYPECATEG_BAR:	2000	case EXC_CHTYPECATEG_BAR:
1992	{	2001	{
1993	ScfPropertySet aTypeProp( xChartType );	2002	ScfPropertySet aTypeProp( xChartType );
Lines 1996-2001 Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi Link Here
1996	aTypeProp.SetProperty( EXC_CHPROP_OVERLAPSEQ, aInt32Seq );	2005	aTypeProp.SetProperty( EXC_CHPROP_OVERLAPSEQ, aInt32Seq );
1997	aInt32Seq[ 0 ] = aInt32Seq[ 1 ] = maData.mnGap;	2006	aInt32Seq[ 0 ] = aInt32Seq[ 1 ] = maData.mnGap;
1998	aTypeProp.SetProperty( EXC_CHPROP_GAPWIDTHSEQ, aInt32Seq );	2007	aTypeProp.SetProperty( EXC_CHPROP_GAPWIDTHSEQ, aInt32Seq );
		2008	bool bStacked = (maData.mnFlags & EXC_CHBAR_STACKED);
		2009	bool bPercent = (maData.mnFlags & EXC_CHBAR_PERCENT);
		2010	aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
		2011	aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
1999	}	2012	}
2000	break;	2013	break;
2001	case EXC_CHTYPECATEG_PIE:	2014	case EXC_CHTYPECATEG_PIE:
Lines 2542-2548 void XclImpChValueRange::ReadChValueRange( XclImpStream& rStrm ) Link Here
2542	>> maData.mnFlags;	2555	>> maData.mnFlags;
2543	}	2556	}
2544		2557
2545	void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) const	2558	void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const
2546	{	2559	{
2547	// scaling algorithm	2560	// scaling algorithm
2548	bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE );	2561	bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE );
Lines 2557-2575 void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co Link Here
2557	}	2570	}
2558		2571
2559	// min/max	2572	// min/max
2560	lclSetScaledValueOrClearAny( rScaleData.Minimum, maData.mfMin, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );	2573	double fMinVal = bPercent ? maData.mfMin/100.0 : maData.mfMin;
2561	lclSetScaledValueOrClearAny( rScaleData.Maximum, maData.mfMax, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );	2574	double fMaxVal = bPercent ? maData.mfMax/100.0 : maData.mfMax;
		2575	lclSetScaledValueOrClearAny( rScaleData.Minimum, fMinVal, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
		2576	lclSetScaledValueOrClearAny( rScaleData.Maximum, fMaxVal, xLogScaling, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );
2562		2577
2563	// origin (max-cross overrides crossing settings, fall back to auto-cross)	2578	// origin (max-cross overrides crossing settings, fall back to auto-cross)
2564	const sal_uInt16 nAutoCrossFlags = EXC_CHVALUERANGE_AUTOCROSS \| EXC_CHVALUERANGE_MAXCROSS;	2579	const sal_uInt16 nAutoCrossFlags = EXC_CHVALUERANGE_AUTOCROSS \| EXC_CHVALUERANGE_MAXCROSS;
2565	lclSetScaledValueOrClearAny( rScaleData.Origin, maData.mfCross, xLogScaling, ::get_flag( maData.mnFlags, nAutoCrossFlags ) );	2580	double fCross = bPercent ? maData.mfCross/100.0 : maData.mfCross;
		2581	lclSetScaledValueOrClearAny( rScaleData.Origin, fCross, xLogScaling, ::get_flag( maData.mnFlags, nAutoCrossFlags ) );
2566		2582
2567	// increment	2583	// increment
2568	bool bAutoMajor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR );	2584	bool bAutoMajor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR );
2569	bool bAutoMinor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR );	2585	bool bAutoMinor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR );
2570	// major increment	2586	// major increment
2571	IncrementData& rIncrementData = rScaleData.IncrementData;	2587	IncrementData& rIncrementData = rScaleData.IncrementData;
2572	lclSetValueOrClearAny( rIncrementData.Distance, maData.mfMajorStep, bAutoMajor );	2588	double fMajorStep = bPercent ? maData.mfMajorStep/100.0 : maData.mfMajorStep;
		2589	lclSetValueOrClearAny( rIncrementData.Distance, fMajorStep, bAutoMajor );
2573	// minor increment	2590	// minor increment
2574	Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;	2591	Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
2575	rSubIncrementSeq.realloc( 1 );	2592	rSubIncrementSeq.realloc( 1 );
Lines 2809-2816 Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup Link Here
2809	break;	2826	break;
2810	case ApiAxisType::REALNUMBER:	2827	case ApiAxisType::REALNUMBER:
2811	case ApiAxisType::PERCENT:	2828	case ApiAxisType::PERCENT:
		2829	{
		2830	bool bPercent = aScaleData.AxisType == ApiAxisType::PERCENT;
2812	// #i85167# pie/donut charts have reversed rotation direction (at Y axis!)	2831	// #i85167# pie/donut charts have reversed rotation direction (at Y axis!)
2813	mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );	2832	mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE, bPercent );
		2833	}
2814	break;	2834	break;
2815	default:	2835	default:
2816	DBG_ERRORFILE( "XclImpChAxis::CreateAxis - unknown axis type" );	2836	DBG_ERRORFILE( "XclImpChAxis::CreateAxis - unknown axis type" );




    explicit            XclExpChValueRange( const XclExpChRoot& rRoot );

    /** Converts value axis scaling settings. */
    void                Convert( const ScaleData& rScaleData, bool bPercent );

private:
    virtual void        WriteBody( XclExpStream& rStrm );

    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, 
                                 bool bPercent );
    /** Converts and writes 3D wall/floor properties from the passed diagram. */
    void                ConvertWall( XDiagramRef xDiagram );


    /** 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,
                            bool bPercent );

    virtual void        WriteBody( XclExpStream& rStrm );


Lines 1109-1115 public: Link Here

(-)sc/source/filter/inc/xichart.hxx (-1 / +1 lines)
1109	/** Reads the CHVALUERANGE record (numeric axis scaling properties). */	1109	/** Reads the CHVALUERANGE record (numeric axis scaling properties). */
1110	void ReadChValueRange( XclImpStream& rStrm );	1110	void ReadChValueRange( XclImpStream& rStrm );
1111	/** Converts value axis scaling settings. */	1111	/** Converts value axis scaling settings. */
1112	void Convert( ScaleData& rScaleData, bool bMirrorOrient ) const;	1112	void Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const;
1113		1113
1114	private:	1114	private:
1115	XclChValueRange maData; /// Contents of the CHVALUERANGE record.	1115	XclChValueRange maData; /// Contents of the CHVALUERANGE record.

Return to issue 95934

Lines 124-139 void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec, sal_uInt16 nRecId Link Here

(-)sc/source/filter/excel/xechart.cxx (-18 / +31 lines)
124	}	124	}
125		125
126	template< typename Type >	126	template< typename Type >
127	inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny )	127	inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny, bool bPercent )
128	{	128	{
129	return !rAny.hasValue() \|\| !(rAny >>= rValue);	129	if (!rAny.hasValue())
		130	return true;
		131
		132	if (rAny >>= rValue)
		133	{
		134	if (bPercent)
		135	rValue *= 100.0;
		136	return false;
		137	}
		138	else
		139	return true;
130	}	140	}
131		141
132	bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, Reference< XScaling > xScaling )	142	bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, Reference< XScaling > xScaling, bool bPercent )
133	{	143	{
134	bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny );	144	bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny, bPercent );
135	if( !bIsAuto && xScaling.is() )	145	if( !bIsAuto && xScaling.is() )
136	rfValue = xScaling->doScaling( rfValue );	146	rfValue = xScaling->doScaling( rfValue );
		147
137	return bIsAuto;	148	return bIsAuto;
138	}	149	}
139		150
Lines 2147-2153 void XclExpChLabelRange::Convert( const ScaleData& rScaleData, bool bMirrorOrien Link Here
2147	{	2158	{
2148	// origin	2159	// origin
2149	double fOrigin = 0.0;	2160	double fOrigin = 0.0;
2150	if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin ) )	2161	if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin, false ) )
2151	maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 32767 );	2162	maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 32767 );
2152		2163
2153	// reverse order	2164	// reverse order
Lines 2171-2177 XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : Link Here
2171	{	2182	{
2172	}	2183	}
2173		2184
2174	void XclExpChValueRange::Convert( const ScaleData& rScaleData )	2185	void XclExpChValueRange::Convert( const ScaleData& rScaleData, bool bPercent )
2175	{	2186	{
2176	// scaling algorithm	2187	// scaling algorithm
2177	bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING;	2188	bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING;
Lines 2181-2204 void XclExpChValueRange::Convert( const ScaleData& rScaleData ) Link Here
2181	xLogScaling = rScaleData.Scaling;	2192	xLogScaling = rScaleData.Scaling;
2182		2193
2183	// min/max	2194	// min/max
2184	bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, xLogScaling );	2195	bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, xLogScaling, bPercent );
2185	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN, bAutoMin );	2196	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN, bAutoMin );
2186	bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, xLogScaling );	2197	bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, xLogScaling, bPercent );
2187	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX, bAutoMax );	2198	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX, bAutoMax );
2188		2199
2189	// origin	2200	// origin
2190	bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, xLogScaling );	2201	bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, xLogScaling, bPercent );
2191	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOCROSS, bAutoCross );	2202	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOCROSS, bAutoCross );
2192		2203
2193	// major increment	2204	// major increment
2194	const IncrementData& rIncrementData = rScaleData.IncrementData;	2205	const IncrementData& rIncrementData = rScaleData.IncrementData;
2195	bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance ) \|\| (maData.mfMajorStep <= 0.0);	2206	bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance, bPercent ) \|\| (maData.mfMajorStep <= 0.0);
2196	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR, bAutoMajor );	2207	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR, bAutoMajor );
2197	// minor increment	2208	// minor increment
2198	const Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;	2209	const Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
2199	sal_Int32 nCount = 0;	2210	sal_Int32 nCount = 0;
2200	bool bAutoMinor = bAutoMajor \|\| (rSubIncrementSeq.getLength() < 1) \|\|	2211	bool bAutoMinor = bAutoMajor \|\| (rSubIncrementSeq.getLength() < 1) \|\|
2201	lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount ) \|\| (nCount < 1);	2212	lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount, false ) \|\| (nCount < 1);
2202	if( !bAutoMinor )	2213	if( !bAutoMinor )
2203	maData.mfMinorStep = maData.mfMajorStep / nCount;	2214	maData.mfMinorStep = maData.mfMajorStep / nCount;
2204	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR, bAutoMinor );	2215	::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR, bAutoMinor );
Lines 2320-2326 void XclExpChAxis::SetRotation( sal_uInt16 nRotation ) Link Here
2320	mxTick->SetRotation( nRotation );	2331	mxTick->SetRotation( nRotation );
2321	}	2332	}
2322		2333
2323	void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx )	2334	void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx,
		2335	bool bPercent )
2324	{	2336	{
2325	ScfPropertySet aAxisProp( xAxis );	2337	ScfPropertySet aAxisProp( xAxis );
2326	bool bCategoryAxis = ((GetAxisType() == EXC_CHAXIS_X) && rTypeInfo.mbCategoryAxis) \|\| (GetAxisType() == EXC_CHAXIS_Z);	2338	bool bCategoryAxis = ((GetAxisType() == EXC_CHAXIS_X) && rTypeInfo.mbCategoryAxis) \|\| (GetAxisType() == EXC_CHAXIS_Z);
Lines 2349-2355 void XclExpChAxis::Convert( Reference< XAxis > xAxis, const XclChExtTypeInfo& rT Link Here
2349	{	2361	{
2350	mxValueRange.reset( new XclExpChValueRange( GetChRoot() ) );	2362	mxValueRange.reset( new XclExpChValueRange( GetChRoot() ) );
2351	if( xAxis.is() )	2363	if( xAxis.is() )
2352	mxValueRange->Convert( xAxis->getScaleData() );	2364	mxValueRange->Convert( xAxis->getScaleData(), bPercent );
2353	}	2365	}
2354		2366
2355	// axis caption text ------------------------------------------------------	2367	// axis caption text ------------------------------------------------------
Lines 2523-2532 sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16 Link Here
2523	// create axes according to chart type (no axes for pie and donut charts)	2535	// create axes according to chart type (no axes for pie and donut charts)
2524	if( rTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE )	2536	if( rTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE )
2525	{	2537	{
2526	ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo );	2538	ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo, bPercent );
2527	ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo );	2539	ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo, bPercent );
2528	if( pGroup->Is3dDeepChart() )	2540	if( pGroup->Is3dDeepChart() )
2529	ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo );	2541	ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo, bPercent );
2530	}	2542	}
2531		2543
2532	// X axis category ranges	2544	// X axis category ranges
Lines 2610-2623 XclExpChTypeGroupRef XclExpChAxesSet::GetLastTypeGroup() const Link Here
2610	void XclExpChAxesSet::ConvertAxis(	2622	void XclExpChAxesSet::ConvertAxis(
2611	XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,	2623	XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
2612	XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,	2624	XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
2613	Reference< XCoordinateSystem > xCoordSystem, const XclChExtTypeInfo& rTypeInfo )	2625	Reference< XCoordinateSystem > xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
		2626	bool bPercent )
2614	{	2627	{
2615	// create and convert axis object	2628	// create and convert axis object
2616	rxChAxis.reset( new XclExpChAxis( GetChRoot(), nAxisType ) );	2629	rxChAxis.reset( new XclExpChAxis( GetChRoot(), nAxisType ) );
2617	sal_Int32 nApiAxisDim = rxChAxis->GetApiAxisDimension();	2630	sal_Int32 nApiAxisDim = rxChAxis->GetApiAxisDimension();
2618	sal_Int32 nApiAxesSetIdx = GetApiAxesSetIndex();	2631	sal_Int32 nApiAxesSetIdx = GetApiAxesSetIndex();
2619	Reference< XAxis > xAxis = lclGetApiAxis( xCoordSystem, nApiAxisDim, nApiAxesSetIdx );	2632	Reference< XAxis > xAxis = lclGetApiAxis( xCoordSystem, nApiAxisDim, nApiAxesSetIdx );
2620	rxChAxis->Convert( xAxis, rTypeInfo, nApiAxesSetIdx );	2633	rxChAxis->Convert( xAxis, rTypeInfo, nApiAxesSetIdx, bPercent );
2621		2634
2622	// create and convert axis title	2635	// create and convert axis title
2623	Reference< XTitled > xTitled( xAxis, UNO_QUERY );	2636	Reference< XTitled > xTitled( xAxis, UNO_QUERY );

Lines 944-950 public: Link Here

(-)sc/source/filter/inc/xechart.hxx (-3 / +5 lines)
944	explicit XclExpChValueRange( const XclExpChRoot& rRoot );	944	explicit XclExpChValueRange( const XclExpChRoot& rRoot );
945		945
946	/** Converts value axis scaling settings. */	946	/** Converts value axis scaling settings. */
947	void Convert( const ScaleData& rScaleData );	947	void Convert( const ScaleData& rScaleData, bool bPercent );
948		948
949	private:	949	private:
950	virtual void WriteBody( XclExpStream& rStrm );	950	virtual void WriteBody( XclExpStream& rStrm );
Lines 1004-1010 public: Link Here
1004	virtual void SetRotation( sal_uInt16 nRotation );	1004	virtual void SetRotation( sal_uInt16 nRotation );
1005		1005
1006	/** Converts formatting and scaling settings from the passed axis. */	1006	/** Converts formatting and scaling settings from the passed axis. */
1007	void Convert( XAxisRef xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx );	1007	void Convert( XAxisRef xAxis, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nApiAxesSetIdx,
		1008	bool bPercent );
1008	/** Converts and writes 3D wall/floor properties from the passed diagram. */	1009	/** Converts and writes 3D wall/floor properties from the passed diagram. */
1009	void ConvertWall( XDiagramRef xDiagram );	1010	void ConvertWall( XDiagramRef xDiagram );
1010		1011
Lines 1076-1082 private: Link Here
1076	/** Converts a complete axis object including axis title. */	1077	/** Converts a complete axis object including axis title. */
1077	void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,	1078	void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
1078	XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,	1079	XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
1079	XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo );	1080	XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
		1081	bool bPercent );
1080		1082
1081	virtual void WriteBody( XclExpStream& rStrm );	1083	virtual void WriteBody( XclExpStream& rStrm );
1082		1084

Lines 107-112 namespace com { namespace sun { namespace star { Link Here

(-)sc/source/filter/inc/xlchart.hxx (+2 lines)
107	#define EXC_CHPROP_OFFSET CREATE_OUSTRING( "Offset" )	107	#define EXC_CHPROP_OFFSET CREATE_OUSTRING( "Offset" )
108	#define EXC_CHPROP_OVERLAPSEQ CREATE_OUSTRING( "OverlapSequence" )	108	#define EXC_CHPROP_OVERLAPSEQ CREATE_OUSTRING( "OverlapSequence" )
109	#define EXC_CHPROP_PERCENTAGENUMFMT CREATE_OUSTRING( "PercentageNumberFormat" )	109	#define EXC_CHPROP_PERCENTAGENUMFMT CREATE_OUSTRING( "PercentageNumberFormat" )
		110	#define EXC_CHPROP_PERCENT CREATE_OUSTRING( "Percent" )
110	#define EXC_CHPROP_PERCENTDIAGONAL CREATE_OUSTRING( "PercentDiagonal" )	111	#define EXC_CHPROP_PERCENTDIAGONAL CREATE_OUSTRING( "PercentDiagonal" )
111	#define EXC_CHPROP_PERSPECTIVE CREATE_OUSTRING( "Perspective" )	112	#define EXC_CHPROP_PERSPECTIVE CREATE_OUSTRING( "Perspective" )
112	#define EXC_CHPROP_POSITIVEERROR CREATE_OUSTRING( "PositiveError" )	113	#define EXC_CHPROP_POSITIVEERROR CREATE_OUSTRING( "PositiveError" )
Lines 121-126 namespace com { namespace sun { namespace star { Link Here
121	#define EXC_CHPROP_SHOWHIGHLOW CREATE_OUSTRING( "ShowHighLow" )	122	#define EXC_CHPROP_SHOWHIGHLOW CREATE_OUSTRING( "ShowHighLow" )
122	#define EXC_CHPROP_SHOWNEGATIVEERROR CREATE_OUSTRING( "ShowNegativeError" )	123	#define EXC_CHPROP_SHOWNEGATIVEERROR CREATE_OUSTRING( "ShowNegativeError" )
123	#define EXC_CHPROP_SHOWPOSITIVEERROR CREATE_OUSTRING( "ShowPositiveError" )	124	#define EXC_CHPROP_SHOWPOSITIVEERROR CREATE_OUSTRING( "ShowPositiveError" )
		125	#define EXC_CHPROP_STACKED CREATE_OUSTRING( "Stacked" )
124	#define EXC_CHPROP_STACKINGDIR CREATE_OUSTRING( "StackingDirection" )	126	#define EXC_CHPROP_STACKINGDIR CREATE_OUSTRING( "StackingDirection" )
125	#define EXC_CHPROP_STARTINGANGLE CREATE_OUSTRING( "StartingAngle" )	127	#define EXC_CHPROP_STARTINGANGLE CREATE_OUSTRING( "StartingAngle" )
126	#define EXC_CHPROP_SWAPXANDYAXIS CREATE_OUSTRING( "SwapXAndYAxis" )	128	#define EXC_CHPROP_SWAPXANDYAXIS CREATE_OUSTRING( "SwapXAndYAxis" )