Kaydet (Commit) f2bc5c62 authored tarafından Noel Grandin's avatar Noel Grandin

fdo#46808, Convert various chart2:*Scaling services to new style

Change-Id: I93294be4c822160e609ae6aab552edd64478e34b
üst dfc49e04
...@@ -80,10 +80,15 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ ...@@ -80,10 +80,15 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\
CartesianCoordinateSystem2d \ CartesianCoordinateSystem2d \
CartesianCoordinateSystem3d \ CartesianCoordinateSystem3d \
ExponentialScaling \
FormattedString \ FormattedString \
LogarithmicScaling \
LinearScaling \
PolarCoordinateSystem2d \ PolarCoordinateSystem2d \
PolarCoordinateSystem3d \ PolarCoordinateSystem3d \
PowerScaling \
RegressionEquation \ RegressionEquation \
Scaling \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
DatabaseDataProvider \ DatabaseDataProvider \
...@@ -622,17 +627,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2, ...@@ -622,17 +627,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,
DataSeries \ DataSeries \
Diagram \ Diagram \
ErrorBar \ ErrorBar \
ExponentialScaling \
GridProperties \ GridProperties \
Legend \ Legend \
LinearScaling \
LogarithmicScaling \
LogicTargetModel \ LogicTargetModel \
PowerScaling \
PropertyPool \ PropertyPool \
RegressionCurve \ RegressionCurve \
RegressionCurveEquation \ RegressionCurveEquation \
Scaling \
StandardDiagramCreationParameters \ StandardDiagramCreationParameters \
Title \ Title \
)) ))
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef com_sun_star_chart2_ExponentialScaling_idl #ifndef com_sun_star_chart2_ExponentialScaling_idl
#define com_sun_star_chart2_ExponentialScaling_idl #define com_sun_star_chart2_ExponentialScaling_idl
#include <com/sun/star/chart2/Scaling.idl> #include <com/sun/star/chart2/XScaling.idl>
module com { module sun { module star { module chart2 { module com { module sun { module star { module chart2 {
...@@ -31,10 +31,7 @@ module com { module sun { module star { module chart2 { ...@@ -31,10 +31,7 @@ module com { module sun { module star { module chart2 {
<p>If not mentioned explicitly, the base for the power function is <p>If not mentioned explicitly, the base for the power function is
10.0</p> 10.0</p>
*/ */
service ExponentialScaling service ExponentialScaling : com::sun::star::chart2::XScaling;
{
service Scaling;
};
}; }; }; }; }; }; }; };
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef com_sun_star_chart2_LinearScaling_idl #ifndef com_sun_star_chart2_LinearScaling_idl
#define com_sun_star_chart2_LinearScaling_idl #define com_sun_star_chart2_LinearScaling_idl
#include <com/sun/star/chart2/Scaling.idl> #include <com/sun/star/chart2/XScaling.idl>
module com { module sun { module star { module chart2 { module com { module sun { module star { module chart2 {
...@@ -32,10 +32,7 @@ module com { module sun { module star { module chart2 { ...@@ -32,10 +32,7 @@ module com { module sun { module star { module chart2 {
and <em>t</em> is 0.0, which means the transformation is an and <em>t</em> is 0.0, which means the transformation is an
identical mapping.</p> identical mapping.</p>
*/ */
service LinearScaling service LinearScaling : com::sun::star::chart2::XScaling;
{
service Scaling;
};
}; }; }; }; }; }; }; };
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef com_sun_star_chart2_LogarithmicScaling_idl #ifndef com_sun_star_chart2_LogarithmicScaling_idl
#define com_sun_star_chart2_LogarithmicScaling_idl #define com_sun_star_chart2_LogarithmicScaling_idl
#include <com/sun/star/chart2/Scaling.idl> #include <com/sun/star/chart2/XScaling.idl>
module com { module sun { module star { module chart2 { module com { module sun { module star { module chart2 {
...@@ -30,10 +30,7 @@ module com { module sun { module star { module chart2 { ...@@ -30,10 +30,7 @@ module com { module sun { module star { module chart2 {
<p>If not mentioned explicitly, the base for the logarithm is <p>If not mentioned explicitly, the base for the logarithm is
10.0</p> 10.0</p>
*/ */
service LogarithmicScaling service LogarithmicScaling : com::sun::star::chart2::XScaling;
{
service Scaling;
};
}; }; }; }; }; }; }; };
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef com_sun_star_chart2_PowerScaling_idl #ifndef com_sun_star_chart2_PowerScaling_idl
#define com_sun_star_chart2_PowerScaling_idl #define com_sun_star_chart2_PowerScaling_idl
#include <com/sun/star/chart2/Scaling.idl> #include <com/sun/star/chart2/XScaling.idl>
module com { module sun { module star { module chart2 { module com { module sun { module star { module chart2 {
...@@ -31,10 +31,7 @@ module com { module sun { module star { module chart2 { ...@@ -31,10 +31,7 @@ module com { module sun { module star { module chart2 {
<p>If not mentioned explicitly, the exponent for the power <p>If not mentioned explicitly, the exponent for the power
function is 10.0</p> function is 10.0</p>
*/ */
service PowerScaling service PowerScaling : com::sun::star::chart2::XScaling;
{
service Scaling;
};
}; }; }; }; }; }; }; };
......
...@@ -27,12 +27,7 @@ module com { module sun { module star { module chart2 { ...@@ -27,12 +27,7 @@ module com { module sun { module star { module chart2 {
/** stateless service /** stateless service
*/ */
service Scaling service Scaling : com::sun::star::chart2::XScaling;
{
/** required interface
*/
interface com::sun::star::chart2::XScaling;
};
}; }; }; }; }; }; }; };
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart/TimeUnit.hpp>
#include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/TickmarkStyle.hpp> #include <com/sun/star/chart2/TickmarkStyle.hpp>
#include <com/sun/star/chart2/LinearScaling.hpp>
#include <com/sun/star/chart2/LogarithmicScaling.hpp>
#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XCoordinateSystem.hpp> #include <com/sun/star/chart2/XCoordinateSystem.hpp>
#include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XTitled.hpp>
...@@ -34,6 +36,7 @@ ...@@ -34,6 +36,7 @@
#include "oox/drawingml/chart/titleconverter.hxx" #include "oox/drawingml/chart/titleconverter.hxx"
#include "oox/drawingml/chart/typegroupconverter.hxx" #include "oox/drawingml/chart/typegroupconverter.hxx"
#include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/lineproperties.hxx"
#include "comphelper/processfactory.hxx"
namespace oox { namespace oox {
namespace drawingml { namespace drawingml {
...@@ -219,7 +222,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo ...@@ -219,7 +222,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
if( mrModel.mnTypeId == C_TOKEN( dateAx ) ) if( mrModel.mnTypeId == C_TOKEN( dateAx ) )
{ {
// scaling algorithm // scaling algorithm
aScaleData.Scaling.set( createInstance( "com.sun.star.chart2.LinearScaling" ), UNO_QUERY ); aScaleData.Scaling = LinearScaling::create( comphelper::getProcessComponentContext() );
// min/max // min/max
lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin ); lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin );
lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax ); lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax );
...@@ -249,10 +252,10 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo ...@@ -249,10 +252,10 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
{ {
// scaling algorithm // scaling algorithm
bool bLogScale = lclIsLogarithmicScale( mrModel ); bool bLogScale = lclIsLogarithmicScale( mrModel );
OUString aScalingService = bLogScale ? if( bLogScale )
OUString( "com.sun.star.chart2.LogarithmicScaling" ) : aScaleData.Scaling = LogarithmicScaling::create( comphelper::getProcessComponentContext() );
OUString( "com.sun.star.chart2.LinearScaling" ); else
aScaleData.Scaling.set( createInstance( aScalingService ), UNO_QUERY ); aScaleData.Scaling = LinearScaling::create( comphelper::getProcessComponentContext() );
// min/max // min/max
lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin ); lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin );
lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax ); lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax );
......
...@@ -2750,7 +2750,7 @@ XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : ...@@ -2750,7 +2750,7 @@ XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) :
void XclExpChValueRange::Convert( const ScaleData& rScaleData ) void XclExpChValueRange::Convert( const ScaleData& rScaleData )
{ {
// scaling algorithm // scaling algorithm
bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING; bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == "com.sun.star.chart2.LogarithmicScaling";
::set_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE, bLogScale ); ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE, bLogScale );
// min/max // min/max
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#include <com/sun/star/chart2/CartesianCoordinateSystem2d.hpp> #include <com/sun/star/chart2/CartesianCoordinateSystem2d.hpp>
#include <com/sun/star/chart2/CartesianCoordinateSystem3d.hpp> #include <com/sun/star/chart2/CartesianCoordinateSystem3d.hpp>
#include <com/sun/star/chart2/FormattedString.hpp> #include <com/sun/star/chart2/FormattedString.hpp>
#include <com/sun/star/chart2/LogarithmicScaling.hpp>
#include <com/sun/star/chart2/LinearScaling.hpp>
#include <com/sun/star/chart2/PolarCoordinateSystem2d.hpp> #include <com/sun/star/chart2/PolarCoordinateSystem2d.hpp>
#include <com/sun/star/chart2/PolarCoordinateSystem3d.hpp> #include <com/sun/star/chart2/PolarCoordinateSystem3d.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartDocument.hpp>
...@@ -2982,7 +2984,7 @@ void XclImpChLabelRange::Convert( ScfPropertySet& rPropSet, ScaleData& rScaleDat ...@@ -2982,7 +2984,7 @@ void XclImpChLabelRange::Convert( ScfPropertySet& rPropSet, ScaleData& rScaleDat
/* Chart2 requires axis type CATEGORY for automatic category/date axis /* Chart2 requires axis type CATEGORY for automatic category/date axis
(even if it is a date axis currently). */ (even if it is a date axis currently). */
rScaleData.AxisType = rScaleData.AutoDateAxis ? cssc2::AxisType::CATEGORY : cssc2::AxisType::DATE; rScaleData.AxisType = rScaleData.AutoDateAxis ? cssc2::AxisType::CATEGORY : cssc2::AxisType::DATE;
rScaleData.Scaling.set( ScfApiHelper::CreateInstance( SERVICE_CHART2_LINEARSCALING ), UNO_QUERY ); rScaleData.Scaling = css::chart2::LinearScaling::create( comphelper::getProcessComponentContext() );
/* Min/max values depend on base time unit, they specify the number of /* Min/max values depend on base time unit, they specify the number of
days, months, or years starting from null date. */ days, months, or years starting from null date. */
lclConvertTimeValue( GetRoot(), rScaleData.Minimum, maDateData.mnMinDate, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMIN ), maDateData.mnBaseUnit ); lclConvertTimeValue( GetRoot(), rScaleData.Minimum, maDateData.mnMinDate, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMIN ), maDateData.mnBaseUnit );
...@@ -3066,8 +3068,10 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co ...@@ -3066,8 +3068,10 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co
{ {
// scaling algorithm // scaling algorithm
bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE ); bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE );
OUString aScalingService = bLogScale ? OUString( SERVICE_CHART2_LOGSCALING ) : OUString( SERVICE_CHART2_LINEARSCALING ); if( bLogScale )
rScaleData.Scaling.set( ScfApiHelper::CreateInstance( aScalingService ), UNO_QUERY ); rScaleData.Scaling = css::chart2::LogarithmicScaling::create( comphelper::getProcessComponentContext() );
else
rScaleData.Scaling = css::chart2::LinearScaling::create( comphelper::getProcessComponentContext() );
// min/max // min/max
lclSetExpValueOrClearAny( rScaleData.Minimum, maData.mfMin, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) ); lclSetExpValueOrClearAny( rScaleData.Minimum, maData.mfMin, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
......
...@@ -56,9 +56,7 @@ class XclRoot; ...@@ -56,9 +56,7 @@ class XclRoot;
#define SERVICE_CHART2_EXPREGCURVE "com.sun.star.chart2.ExponentialRegressionCurve" #define SERVICE_CHART2_EXPREGCURVE "com.sun.star.chart2.ExponentialRegressionCurve"
#define SERVICE_CHART2_LEGEND "com.sun.star.chart2.Legend" #define SERVICE_CHART2_LEGEND "com.sun.star.chart2.Legend"
#define SERVICE_CHART2_LINEARREGCURVE "com.sun.star.chart2.LinearRegressionCurve" #define SERVICE_CHART2_LINEARREGCURVE "com.sun.star.chart2.LinearRegressionCurve"
#define SERVICE_CHART2_LINEARSCALING "com.sun.star.chart2.LinearScaling"
#define SERVICE_CHART2_LOGREGCURVE "com.sun.star.chart2.LogarithmicRegressionCurve" #define SERVICE_CHART2_LOGREGCURVE "com.sun.star.chart2.LogarithmicRegressionCurve"
#define SERVICE_CHART2_LOGSCALING "com.sun.star.chart2.LogarithmicScaling"
#define SERVICE_CHART2_POTREGCURVE "com.sun.star.chart2.PotentialRegressionCurve" #define SERVICE_CHART2_POTREGCURVE "com.sun.star.chart2.PotentialRegressionCurve"
#define SERVICE_CHART2_TITLE "com.sun.star.chart2.Title" #define SERVICE_CHART2_TITLE "com.sun.star.chart2.Title"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment