[Libreoffice-commits] core.git: chart2/source
Julien Nabet
serval2412 at yahoo.fr
Sat May 17 15:37:02 PDT 2014
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 42 ++---
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 18 +-
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 18 +-
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 20 +-
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 6
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 10 -
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 4
chart2/source/controller/main/ChartController.cxx | 4
chart2/source/model/main/Axis.cxx | 22 +-
chart2/source/model/main/ChartModel.cxx | 12 -
chart2/source/model/main/ChartModel_Persistence.cxx | 12 -
chart2/source/model/main/DataPointProperties.cxx | 76 ++++-----
chart2/source/model/main/DataSeriesProperties.cxx | 4
chart2/source/model/main/Diagram.cxx | 18 +-
chart2/source/model/main/Legend.cxx | 10 -
chart2/source/model/main/Title.cxx | 18 +-
chart2/source/model/template/AreaChartTypeTemplate.cxx | 2
chart2/source/model/template/BarChartTypeTemplate.cxx | 4
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 2
chart2/source/model/template/LineChartType.cxx | 6
chart2/source/model/template/LineChartTypeTemplate.cxx | 6
chart2/source/model/template/PieChartType.cxx | 2
chart2/source/model/template/PieChartTypeTemplate.cxx | 4
chart2/source/model/template/ScatterChartType.cxx | 6
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 6
chart2/source/tools/CharacterProperties.cxx | 78 +++++-----
chart2/source/tools/DataSourceHelper.cxx | 3
chart2/source/tools/ErrorBar.cxx | 18 +-
chart2/source/tools/FillProperties.cxx | 32 ++--
chart2/source/tools/LifeTime.cxx | 6
chart2/source/tools/LinePropertiesHelper.cxx | 14 -
chart2/source/tools/RegressionCurveModel.cxx | 12 -
chart2/source/tools/RegressionEquation.cxx | 6
chart2/source/tools/SceneProperties.cxx | 48 +++---
chart2/source/tools/UserDefinedProperties.cxx | 8 -
chart2/source/view/main/ChartView.cxx | 6
chart2/source/view/main/DummyXShape.cxx | 2
chart2/source/view/main/ShapeFactory.cxx | 6
chart2/source/view/main/Stripe.cxx | 6
44 files changed, 297 insertions(+), 298 deletions(-)
New commits:
commit 0d8908b35999795ba1ffe2d3530aa9711918840a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun May 18 00:35:50 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part16
Change-Id: I78b3a0151397d4e69521e6b2451e93ea6e463376
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index ddad87b..06d56b3 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -110,28 +110,28 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Max",
PROP_AXIS_MAX,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "Min",
PROP_AXIS_MIN,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "StepMain",
PROP_AXIS_STEPMAIN,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "StepHelpCount",
PROP_AXIS_STEPHELP_COUNT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -139,7 +139,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "StepHelp",
PROP_AXIS_STEPHELP,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -174,21 +174,21 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AxisType",
PROP_AXIS_TYPE,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), //type com::sun::star::chart::ChartAxisType
+ cppu::UnoType<sal_Int32>::get(), //type com::sun::star::chart::ChartAxisType
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "TimeIncrement",
PROP_AXIS_TIME_INCREMENT,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
+ cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "ExplicitTimeIncrement",
PROP_AXIS_EXPLICIT_TIME_INCREMENT,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
+ cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(),
beans::PropertyAttribute::READONLY |
beans::PropertyAttribute::MAYBEVOID ));
@@ -217,19 +217,19 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "CrossoverPosition",
PROP_AXIS_CROSSOVER_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "CrossoverValue",
PROP_AXIS_CROSSOVER_VALUE,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "Origin",
PROP_AXIS_ORIGIN,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -244,21 +244,21 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Marks",
PROP_AXIS_MARKS,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "HelpMarks",
PROP_AXIS_HELPMARKS,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "MarkPosition",
PROP_AXIS_MARK_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisMarkPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
//Properties for labels:
@@ -272,7 +272,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "NumberFormat",
PROP_AXIS_NUMBERFORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -286,20 +286,20 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "LabelPosition",
PROP_AXIS_LABEL_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisLabelPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisLabelPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "TextRotation",
PROP_AXIS_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ArrangeOrder",
PROP_AXIS_ARRANGE_ORDER,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisArrangeOrderType>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -328,14 +328,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Overlap",
PROP_AXIS_OVERLAP,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "GapWidth",
PROP_AXIS_GAP_WIDTH,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -351,7 +351,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "BuiltInUnit",
PROP_AXIS_BUILTINUNIT,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 32986f2..4633f2a 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -201,7 +201,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "BaseDiagram",
PROP_DOCUMENT_BASEDIAGRAM,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index d33e617..4638487 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -88,56 +88,56 @@ void lcl_AddPropertiesToVector_PointProperties(
rOutProperties.push_back(
Property( "SolidType",
PROP_SERIES_DATAPOINT_SOLIDTYPE,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "SegmentOffset",
PROP_SERIES_DATAPOINT_SEGMENT_OFFSET,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "D3DPercentDiagonal",
PROP_SERIES_DATAPOINT_PERCENT_DIAGONAL,
- ::getCppuType( reinterpret_cast< sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LabelSeparator",
PROP_SERIES_DATAPOINT_LABEL_SEPARATOR,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "NumberFormat",
PROP_SERIES_NUMBERFORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "PercentageNumberFormat",
PROP_SERIES_PERCENTAGE_NUMBERFORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LabelPlacement",
PROP_SERIES_DATAPOINT_LABEL_PLACEMENT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "TextRotation",
PROP_SERIES_DATAPOINT_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
@@ -148,7 +148,7 @@ void lcl_AddPropertiesToVector_SeriesOnly(
rOutProperties.push_back(
Property( "Axis",
PROP_SERIES_ATTACHED_AXIS,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index a62c6e2..fba08df 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -179,7 +179,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "SolidType",
PROP_DIAGRAM_SOLIDTYPE,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -199,7 +199,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "NumberOfLines",
PROP_DIAGRAM_NUMBER_OF_LINES,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
@@ -212,7 +212,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "DataRowSource",
PROP_DIAGRAM_DATAROW_SOURCE,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartDataRowSource * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartDataRowSource>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -242,7 +242,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "StartingAngle",
PROP_DIAGRAM_STARTING_ANGLE,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0) ),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -257,19 +257,19 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Perspective",
PROP_DIAGRAM_PERSPECTIVE,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RotationHorizontal",
PROP_DIAGRAM_ROTATION_HORIZONTAL,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RotationVertical",
PROP_DIAGRAM_ROTATION_VERTICAL,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
// XAxisXSupplier
@@ -413,7 +413,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "MissingValueTreatment",
PROP_DIAGRAM_MISSING_VALUE_TREATMENT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -444,7 +444,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 380bc7b..e069fc2 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -224,14 +224,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Alignment",
PROP_LEGEND_ALIGNMENT,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartLegendPosition>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Expansion",
PROP_LEGEND_EXPANSION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartLegendExpansion>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index bed0350..5197a09 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -142,14 +142,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "String",
PROP_TITLE_STRING,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "TextRotation",
PROP_TITLE_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 2b35203..8ea038b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -104,7 +104,7 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO
rOutProperties.push_back(
Property( "DataCaption",
PROP_CHART_DATAPOINT_DATA_CAPTION,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 13cb3cf..1698c0a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -186,21 +186,21 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_TYPE,
PROP_CHART_SPLINE_TYPE,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_ORDER,
PROP_CHART_SPLINE_ORDER,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_RESOLUTION,
PROP_CHART_SPLINE_RESOLUTION,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index f0e5080b..796d755 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -992,13 +992,13 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
rOutProperties.push_back(
Property( "ConstantErrorLow",
PROP_CHART_STATISTIC_CONST_ERROR_LOW,
- ::getCppuType( reinterpret_cast< double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ConstantErrorHigh",
PROP_CHART_STATISTIC_CONST_ERROR_HIGH,
- ::getCppuType( reinterpret_cast< double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
@@ -1010,49 +1010,49 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
rOutProperties.push_back(
Property( "ErrorCategory",
PROP_CHART_STATISTIC_ERROR_CATEGORY,
- ::getCppuType( reinterpret_cast< ::com::sun::star::chart::ChartErrorCategory * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartErrorCategory>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ErrorBarStyle",
PROP_CHART_STATISTIC_ERROR_BAR_STYLE,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "PercentageError",
PROP_CHART_STATISTIC_PERCENT_ERROR,
- ::getCppuType( reinterpret_cast< double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ErrorMargin",
PROP_CHART_STATISTIC_ERROR_MARGIN,
- ::getCppuType( reinterpret_cast< double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ErrorIndicator",
PROP_CHART_STATISTIC_ERROR_INDICATOR,
- ::getCppuType( reinterpret_cast< ::com::sun::star::chart::ChartErrorIndicatorType * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartErrorIndicatorType>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ErrorBarRangePositive",
PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE,
- ::getCppuType( reinterpret_cast< OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ErrorBarRangeNegative",
PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE,
- ::getCppuType( reinterpret_cast< OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "RegressionCurves",
PROP_CHART_STATISTIC_REGRESSION_CURVES,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartRegressionCurveType * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartRegressionCurveType>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index bc71bee..59050ed 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -185,21 +185,21 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro
rOutProperties.push_back(
Property( "SymbolType",
PROP_CHART_SYMBOL_TYPE,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "SymbolBitmapURL",
PROP_CHART_SYMBOL_BITMAP_URL,
- ::getCppuType( reinterpret_cast< OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "SymbolSize",
PROP_CHART_SYMBOL_SIZE,
- ::getCppuType( reinterpret_cast< awt::Size * >(0)),
+ cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index dc3bc33..d312b58 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -85,27 +85,27 @@ void SAL_CALL CreationWizardUnoDlg::release() throw ()
}
uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception)
{
- if (rType == ::getCppuType( (uno::Reference< ui::dialogs::XExecutableDialog > const *)0 ))
+ if (rType == cppu::UnoType<ui::dialogs::XExecutableDialog>::get())
{
void * p = static_cast< ui::dialogs::XExecutableDialog * >( this );
return uno::Any( &p, rType );
}
- else if (rType == ::getCppuType( (uno::Reference< lang::XServiceInfo > const *)0 ))
+ else if (rType == cppu::UnoType<lang::XServiceInfo>::get())
{
void * p = static_cast< lang::XTypeProvider * >( this );
return uno::Any( &p, rType );
}
- else if (rType == ::getCppuType( (uno::Reference< lang::XInitialization > const *)0 ))
+ else if (rType == cppu::UnoType<lang::XInitialization>::get())
{
void * p = static_cast< lang::XInitialization * >( this );
return uno::Any( &p, rType );
}
- else if (rType == ::getCppuType( (uno::Reference< frame::XTerminateListener > const *)0 ))
+ else if (rType == cppu::UnoType<frame::XTerminateListener>::get())
{
void * p = static_cast< frame::XTerminateListener * >( this );
return uno::Any( &p, rType );
}
- else if (rType == ::getCppuType( (uno::Reference< beans::XPropertySet > const *)0 ))
+ else if (rType == cppu::UnoType<beans::XPropertySet>::get())
{
void * p = static_cast< beans::XPropertySet * >( this );
return uno::Any( &p, rType );
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index f7e03ff..db93434 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -700,7 +700,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue ))
{
OSL_ENSURE( ! aValue.isExtractableTo(
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0))),
+ cppu::UnoType<sal_Int16>::get()),
"TransparenceItem QueryValue bug is fixed. Remove hack." );
sal_Int32 nValue = 0;
if( aValue >>= nValue )
@@ -737,7 +737,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue ))
{
OSL_ENSURE( ! aValue.isExtractableTo(
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0))),
+ cppu::UnoType<sal_Int16>::get()),
"TransparenceItem QueryValue bug is fixed. Remove hack." );
sal_Int32 nValue = 0;
if( aValue >>= nValue )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index caf03db..ef1d606 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -804,7 +804,7 @@ void SAL_CALL ChartController::addEventListener(
return; //behave passive if already disposed or suspended
//--add listener
- m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener );
+ m_aLifeTimeManager.m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
void SAL_CALL ChartController::removeEventListener(
@@ -816,7 +816,7 @@ void SAL_CALL ChartController::removeEventListener(
return; //behave passive if already disposed or suspended
//--remove listener
- m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener );
+ m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
// util::XCloseListener
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index fdc2798..c3c1e65 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -95,13 +95,13 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "CrossoverPosition",
PROP_AXIS_CROSSOVER_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "CrossoverValue",
PROP_AXIS_CROSSOVER_VALUE,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -114,20 +114,20 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "NumberFormat",
PROP_AXIS_NUMBER_FORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LabelPosition",
PROP_AXIS_LABEL_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisLabelPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisLabelPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "TextRotation",
PROP_AXIS_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -155,33 +155,33 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "ArrangeOrder",
PROP_AXIS_TEXT_ARRANGE_ORDER,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisArrangeOrderType>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ReferencePageSize",
PROP_AXIS_REFERENCE_DIAGRAM_SIZE,
- ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
+ cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "MajorTickmarks",
PROP_AXIS_MAJOR_TICKMARKS,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "MinorTickmarks",
PROP_AXIS_MINOR_TICKMARKS,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "MarkPosition",
PROP_AXIS_MARK_POSITION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartAxisMarkPosition>::get(),
beans::PropertyAttribute::MAYBEDEFAULT ));
//Properties for display units:
@@ -196,7 +196,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "BuiltInUnit",
PROP_AXIS_BUILTINUNIT,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 34e8f47..c61e83c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -261,7 +261,7 @@ void SAL_CALL ChartModel::impl_notifyCloseListeners()
throw( uno::RuntimeException)
{
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
- .getContainer( ::getCppuType((const uno::Reference< util::XCloseListener >*)0) );
+ .getContainer( cppu::UnoType<util::XCloseListener>::get());
if( pIC )
{
lang::EventObject aEvent( static_cast< lang::XComponent*>(this) );
@@ -577,7 +577,7 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi
if( m_aLifeTimeManager.impl_isDisposedOrClosed() )
return; //behave passive if already disposed or closed
- m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener );
+ m_aLifeTimeManager.m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener )
@@ -586,7 +586,7 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven
if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
return; //behave passive if already disposed or closed
- m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener );
+ m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
return;
}
@@ -603,7 +603,7 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos
if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
return; //behave passive if already disposed or closed
- m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< util::XCloseListener >*)0), xListener );
+ m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
return;
}
@@ -1233,7 +1233,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString
{
if( m_xOldModelAgg.is() )
{
- Any aAny = m_xOldModelAgg->queryAggregation( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) );
+ Any aAny = m_xOldModelAgg->queryAggregation( cppu::UnoType<lang::XMultiServiceFactory>::get());
uno::Reference< lang::XMultiServiceFactory > xOldModelFactory;
if( (aAny >>= xOldModelFactory) && xOldModelFactory.is() )
{
@@ -1260,7 +1260,7 @@ Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames()
if( m_xOldModelAgg.is())
{
- Any aAny = m_xOldModelAgg->queryAggregation( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) );
+ Any aAny = m_xOldModelAgg->queryAggregation( cppu::UnoType<lang::XMultiServiceFactory>::get());
uno::Reference< lang::XMultiServiceFactory > xOldModelFactory;
if( (aAny >>= xOldModelFactory) && xOldModelFactory.is() )
{
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 55a0cd4..80ddf7a 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -662,7 +662,7 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners()
ChartViewHelper::setViewToDirtyState( this );
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
- .getContainer( ::getCppuType((const uno::Reference< util::XModifyListener >*)0) );
+ .getContainer( cppu::UnoType<util::XModifyListener>::get());
if( pIC )
{
lang::EventObject aEvent( static_cast< lang::XComponent*>(this) );
@@ -712,7 +712,7 @@ void SAL_CALL ChartModel::addModifyListener(
return; //behave passive if already disposed or closed
m_aLifeTimeManager.m_aListenerContainer.addInterface(
- ::getCppuType((const uno::Reference< util::XModifyListener >*)0), xListener );
+ cppu::UnoType<util::XModifyListener>::get(), xListener );
}
void SAL_CALL ChartModel::removeModifyListener(
@@ -723,7 +723,7 @@ void SAL_CALL ChartModel::removeModifyListener(
return; //behave passive if already disposed or closed
m_aLifeTimeManager.m_aListenerContainer.removeInterface(
- ::getCppuType((const uno::Reference< util::XModifyListener >*)0), xListener );
+ cppu::UnoType<util::XModifyListener>::get(), xListener );
}
// util::XModifyListener
@@ -788,7 +788,7 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners()
throw( uno::RuntimeException)
{
::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
- .getContainer( ::getCppuType((const uno::Reference< document::XStorageChangeListener >*)0) );
+ .getContainer( cppu::UnoType<document::XStorageChangeListener>::get());
if( pIC )
{
::cppu::OInterfaceIteratorHelper aIt( *pIC );
@@ -808,7 +808,7 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X
return; //behave passive if already disposed or closed
m_aLifeTimeManager.m_aListenerContainer.addInterface(
- ::getCppuType((const uno::Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener )
@@ -818,7 +818,7 @@ void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document
return; //behave passive if already disposed or closed
m_aLifeTimeManager.m_aListenerContainer.removeInterface(
- ::getCppuType((const uno::Reference< document::XStorageChangeListener >*)0), xListener );
+ cppu::UnoType<document::XStorageChangeListener>::get(), xListener );
}
} // namespace chart
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 66f3830..1f6ae08 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -52,7 +52,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "Color",
PROP_DATAPOINT_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID // "maybe auto"
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -60,7 +60,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "Transparency",
PROP_DATAPOINT_TRANSPARENCY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -68,14 +68,14 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "FillStyle",
PROP_DATAPOINT_FILL_STYLE,
- ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)),
+ cppu::UnoType<drawing::FillStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "TransparencyGradientName",
PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -83,7 +83,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "GradientName",
PROP_DATAPOINT_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -91,14 +91,14 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
beans::Property( "GradientStepCount",
PROP_DATAPOINT_GRADIENT_STEPCOUNT,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "HatchName",
PROP_DATAPOINT_HATCH_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -106,7 +106,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "FillBitmapName",
PROP_DATAPOINT_FILL_BITMAP_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -122,32 +122,32 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "BorderColor",
PROP_DATAPOINT_BORDER_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID // "maybe auto"
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "BorderStyle",
PROP_DATAPOINT_BORDER_STYLE,
- ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
+ cppu::UnoType<drawing::LineStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "BorderWidth",
PROP_DATAPOINT_BORDER_WIDTH,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "BorderDashName",
PROP_DATAPOINT_BORDER_DASH_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "BorderTransparency",
PROP_DATAPOINT_BORDER_TRANSPARENCY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -155,25 +155,25 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "LineStyle",
LinePropertiesHelper::PROP_LINE_STYLE,
- ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
+ cppu::UnoType<drawing::LineStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "LineWidth",
LinePropertiesHelper::PROP_LINE_WIDTH,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "LineDash",
LinePropertiesHelper::PROP_LINE_DASH,
- ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
+ cppu::UnoType<drawing::LineDash>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LineDashName",
LinePropertiesHelper::PROP_LINE_DASH_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -182,35 +182,35 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "FillBitmapOffsetX",
FillProperties::PROP_FILL_BITMAP_OFFSETX,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapOffsetY",
FillProperties::PROP_FILL_BITMAP_OFFSETY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapPositionOffsetX",
FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapPositionOffsetY",
FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapRectanglePoint",
FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT,
- ::getCppuType( reinterpret_cast< const drawing::RectanglePoint * >(0)),
+ cppu::UnoType<drawing::RectanglePoint>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -224,21 +224,21 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "FillBitmapSizeX",
FillProperties::PROP_FILL_BITMAP_SIZEX,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapSizeY",
FillProperties::PROP_FILL_BITMAP_SIZEY,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "FillBitmapMode",
FillProperties::PROP_FILL_BITMAP_MODE,
- ::getCppuType( reinterpret_cast< const drawing::BitmapMode * >(0)),
+ cppu::UnoType<drawing::BitmapMode>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -246,40 +246,40 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "Symbol",
PROP_DATAPOINT_SYMBOL_PROP,
- ::getCppuType( reinterpret_cast< const chart2::Symbol * >(0)),
+ cppu::UnoType<chart2::Symbol>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Offset",
PROP_DATAPOINT_OFFSET,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Geometry3D",
PROP_DATAPOINT_GEOMETRY3D,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Label",
PROP_DATAPOINT_LABEL,
- ::getCppuType( reinterpret_cast< const chart2::DataPointLabel * >(0)),
+ cppu::UnoType<chart2::DataPointLabel>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "LabelSeparator",
PROP_DATAPOINT_LABEL_SEPARATOR,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "NumberFormat",
PROP_DATAPOINT_NUMBER_FORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -287,28 +287,28 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "PercentageNumberFormat",
PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LabelPlacement",
PROP_DATAPOINT_LABEL_PLACEMENT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "ReferencePageSize",
PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE,
- ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
+ cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "TextRotation",
PROP_DATAPOINT_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -317,14 +317,14 @@ void DataPointProperties::AddPropertiesToVector(
Property( "ErrorBarX",
PROP_DATAPOINT_ERROR_BAR_X,
// XPropertySet supporting service ErrorBar
- ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "ErrorBarY",
PROP_DATAPOINT_ERROR_BAR_Y,
// XPropertySet supporting service ErrorBar
- ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)),
+ cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -336,7 +336,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "PercentDiagonal",
PROP_DATAPOINT_PERCENT_DIAGONAL,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
}
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 5a270fc..c7768f6 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -48,7 +48,7 @@ void DataSeriesProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "StackingDirection",
PROP_DATASERIES_STACKING_DIRECTION,
- ::getCppuType( reinterpret_cast< const chart2::StackingDirection * >(0)),
+ cppu::UnoType<chart2::StackingDirection>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -62,7 +62,7 @@ void DataSeriesProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "AttachedAxisIndex",
PROP_DATASERIES_ATTACHED_AXIS_INDEX,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index f6beaa4..b96c1ac 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -86,14 +86,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "RelativePosition",
PROP_DIAGRAM_REL_POS,
- ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
+ cppu::UnoType<chart2::RelativePosition>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RelativeSize",
PROP_DIAGRAM_REL_SIZE,
- ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
+ cppu::UnoType<chart2::RelativeSize>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -135,7 +135,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "StartingAngle",
PROP_DIAGRAM_STARTING_ANGLE,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0) ),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -149,31 +149,31 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Perspective",
PROP_DIAGRAM_PERSPECTIVE,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RotationHorizontal",
PROP_DIAGRAM_ROTATION_HORIZONTAL,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RotationVertical",
PROP_DIAGRAM_ROTATION_VERTICAL,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "MissingValueTreatment",
PROP_DIAGRAM_MISSING_VALUE_TREATMENT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "3DRelativeHeight",
PROP_DIAGRAM_3DRELATIVEHEIGHT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "DataTableHBorder",
@@ -196,7 +196,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID ));
}
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 01f5a11..3dac3c4 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -65,14 +65,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "AnchorPosition",
PROP_LEGEND_ANCHOR_POSITION,
- ::getCppuType( reinterpret_cast< const chart2::LegendPosition * >(0)),
+ cppu::UnoType<chart2::LegendPosition>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Expansion",
PROP_LEGEND_EXPANSION,
- ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)),
+ cppu::UnoType<com::sun::star::chart::ChartLegendExpansion>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -85,21 +85,21 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "ReferencePageSize",
PROP_LEGEND_REF_PAGE_SIZE,
- ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
+ cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RelativePosition",
PROP_LEGEND_REL_POS,
- ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
+ cppu::UnoType<chart2::RelativePosition>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "RelativeSize",
PROP_LEGEND_REL_SIZE,
- ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)),
+ cppu::UnoType<chart2::RelativeSize>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 2e6b1b2..35ee200 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -71,42 +71,42 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "ParaAdjust",
PROP_TITLE_PARA_ADJUST,
- ::getCppuType( reinterpret_cast< ::com::sun::star::style::ParagraphAdjust * >(0)),
+ cppu::UnoType<com::sun::star::style::ParagraphAdjust>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ParaLastLineAdjust",
PROP_TITLE_PARA_LAST_LINE_ADJUST,
- ::getCppuType( reinterpret_cast< sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ParaLeftMargin",
PROP_TITLE_PARA_LEFT_MARGIN,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ParaRightMargin",
PROP_TITLE_PARA_RIGHT_MARGIN,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ParaTopMargin",
PROP_TITLE_PARA_TOP_MARGIN,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "ParaBottomMargin",
PROP_TITLE_PARA_BOTTOM_MARGIN,
- ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -120,7 +120,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "TextRotation",
PROP_TITLE_TEXT_ROTATION,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
@@ -133,14 +133,14 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "RelativePosition",
PROP_TITLE_REL_POS,
- ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)),
+ cppu::UnoType<chart2::RelativePosition>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "ReferencePageSize",
PROP_TITLE_REF_PAGE_SIZE,
- ::getCppuType( reinterpret_cast< const awt::Size * >(0)),
+ cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
}
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 90e164e..f30bbfd 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -51,7 +51,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Dimension",
PROP_AREA_TEMPLATE_DIMENSION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 5ccc308..8a504c8 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -52,13 +52,13 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "Dimension",
PROP_BAR_TEMPLATE_DIMENSION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Geometry3D",
PROP_BAR_TEMPLATE_GEOMETRY3D,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 81489ff..e82cf5a 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -56,7 +56,7 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "NumberOfLines",
PROP_COL_LINE_NUMBER_OF_LINES,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index d1b9185..c55f6c8 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -51,20 +51,20 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
PROP_LINECHARTTYPE_CURVE_STYLE,
- ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)),
+ cppu::UnoType<chart2::CurveStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_RESOLUTION,
PROP_LINECHARTTYPE_CURVE_RESOLUTION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_ORDER,
PROP_LINECHARTTYPE_SPLINE_ORDER,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 5d0f544..b928eb0 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -58,19 +58,19 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE,
- ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)),
+ cppu::UnoType<chart2::CurveStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_RESOLUTION,
PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_ORDER,
PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 312f25c..841bf5a 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -57,7 +57,7 @@ static void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "3DRelativeHeight",
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::MAYBEVOID ));
}
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 77294b0..b30f633 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -69,13 +69,13 @@ static void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( "DefaultOffset",
PROP_PIE_TEMPLATE_DEFAULT_OFFSET,
- ::getCppuType( reinterpret_cast< const double * >(0)),
+ cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "Dimension",
PROP_PIE_TEMPLATE_DIMENSION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 2ae99ea..6d3fb90 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -55,20 +55,20 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
PROP_SCATTERCHARTTYPE_CURVE_STYLE,
- ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)),
+ cppu::UnoType<chart2::CurveStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_RESOLUTION,
PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_ORDER,
PROP_SCATTERCHARTTYPE_SPLINE_ORDER,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 87efd97..0c04c41 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -60,19 +60,19 @@ void lcl_AddPropertiesToVector(
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE,
- ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)),
+ cppu::UnoType<chart2::CurveStyle>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_RESOLUTION,
PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_ORDER,
PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 2918d60..75f3171 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -60,13 +60,13 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontName",
PROP_CHAR_FONT_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "CharFontStyleName",
PROP_CHAR_FONT_STYLE_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -74,56 +74,56 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontFamily",
PROP_CHAR_FONT_FAMILY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontCharSet (see awt.CharSet)
rOutProperties.push_back(
Property( "CharFontCharSet",
PROP_CHAR_FONT_CHAR_SET,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontPitch (see awt.FontPitch)
rOutProperties.push_back(
Property( "CharFontPitch",
PROP_CHAR_FONT_PITCH,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharColor
rOutProperties.push_back(
Property( "CharColor",
PROP_CHAR_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharEscapement
rOutProperties.push_back(
Property( "CharEscapement",
PROP_CHAR_ESCAPEMENT,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
// CharHeight
rOutProperties.push_back(
Property( "CharHeight",
PROP_CHAR_CHAR_HEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharUnderline (see awt.FontUnderline)
rOutProperties.push_back(
Property( "CharUnderline",
PROP_CHAR_UNDERLINE,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharUnderlineColor
rOutProperties.push_back(
Property( "CharUnderlineColor",
PROP_CHAR_UNDERLINE_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -138,14 +138,14 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharOverline",
PROP_CHAR_OVERLINE,
- ::getCppuType( reinterpret_cast< const sal_Int16* >( 0 ) ),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ) );
// CharOverlineColor
rOutProperties.push_back(
Property( "CharOverlineColor",
PROP_CHAR_OVERLINE_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32* >( 0 ) ),
+ cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ) );
@@ -160,14 +160,14 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharWeight",
PROP_CHAR_WEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharPosture
rOutProperties.push_back(
Property( "CharPosture",
PROP_CHAR_POSTURE,
- ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)),
+ cppu::UnoType<awt::FontSlant>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
@@ -180,7 +180,7 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharKerning",
PROP_CHAR_KERNING,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -188,14 +188,14 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharEscapementHeight",
PROP_CHAR_ESCAPEMENT_HEIGHT,
- ::getCppuType( reinterpret_cast< const sal_Int8 * >(0)),
+ cppu::UnoType<sal_Int8>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
// CharStrikeout (see awt.FontStrikeout)
rOutProperties.push_back(
Property( "CharStrikeout",
PROP_CHAR_STRIKE_OUT,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharWordMode
@@ -209,7 +209,7 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharLocale",
PROP_CHAR_LOCALE,
- ::getCppuType( reinterpret_cast< const lang::Locale * >(0)),
+ cppu::UnoType<lang::Locale>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
// CharShadowed
@@ -230,7 +230,7 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharRelief",
PROP_CHAR_RELIEF,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -238,7 +238,7 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharEmphasis",
PROP_CHAR_EMPHASIS,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharacterPropertiesAsian
@@ -247,14 +247,14 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontNameAsian",
PROP_CHAR_ASIAN_FONT_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontStyleNameAsian
rOutProperties.push_back(
Property( "CharFontStyleNameAsian",
PROP_CHAR_ASIAN_FONT_STYLE_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -262,49 +262,49 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontFamilyAsian",
PROP_CHAR_ASIAN_FONT_FAMILY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontCharSetAsian (see awt.CharSet)
rOutProperties.push_back(
Property( "CharFontCharSetAsian",
PROP_CHAR_ASIAN_CHAR_SET,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontPitchAsian (see awt.FontPitch)
rOutProperties.push_back(
Property( "CharFontPitchAsian",
PROP_CHAR_ASIAN_FONT_PITCH,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharHeightAsian
rOutProperties.push_back(
Property( "CharHeightAsian",
PROP_CHAR_ASIAN_CHAR_HEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharWeightAsian
rOutProperties.push_back(
Property( "CharWeightAsian",
PROP_CHAR_ASIAN_WEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharPostureAsian
rOutProperties.push_back(
Property( "CharPostureAsian",
PROP_CHAR_ASIAN_POSTURE,
- ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)),
+ cppu::UnoType<awt::FontSlant>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharLocaleAsian
rOutProperties.push_back(
Property( "CharLocaleAsian",
PROP_CHAR_ASIAN_LOCALE,
- ::getCppuType( reinterpret_cast< const lang::Locale * >(0)),
+ cppu::UnoType<lang::Locale>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -314,14 +314,14 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontNameComplex",
PROP_CHAR_COMPLEX_FONT_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontStyleNameComplex
rOutProperties.push_back(
Property( "CharFontStyleNameComplex",
PROP_CHAR_COMPLEX_FONT_STYLE_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -329,49 +329,49 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "CharFontFamilyComplex",
PROP_CHAR_COMPLEX_FONT_FAMILY,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontCharSetComplex (see awt.CharSet)
rOutProperties.push_back(
Property( "CharFontCharSetComplex",
PROP_CHAR_COMPLEX_CHAR_SET,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharFontPitchComplex (see awt.FontPitch)
rOutProperties.push_back(
Property( "CharFontPitchComplex",
PROP_CHAR_COMPLEX_FONT_PITCH,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharHeightComplex
rOutProperties.push_back(
Property( "CharHeightComplex",
PROP_CHAR_COMPLEX_CHAR_HEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharWeightComplex
rOutProperties.push_back(
Property( "CharWeightComplex",
PROP_CHAR_COMPLEX_WEIGHT,
- ::getCppuType( reinterpret_cast< const float * >(0)),
+ cppu::UnoType<float>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharPostureComplex
rOutProperties.push_back(
Property( "CharPostureComplex",
PROP_CHAR_COMPLEX_POSTURE,
- ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)),
+ cppu::UnoType<awt::FontSlant>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
// CharLocaleComplex
rOutProperties.push_back(
Property( "CharLocaleComplex",
PROP_CHAR_COMPLEX_LOCALE,
- ::getCppuType( reinterpret_cast< const lang::Locale * >(0)),
+ cppu::UnoType<lang::Locale>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -379,7 +379,7 @@ void CharacterProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "WritingMode",
PROP_WRITING_MODE,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), /*com::sun::star::text::WritingMode2*/
+ cppu::UnoType<sal_Int16>::get(), /*com::sun::star::text::WritingMode2*/
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index ccbbc28..611d1e5 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -412,8 +412,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
{
bHasDataRowSource =
(aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
- ::getCppuType( reinterpret_cast<
- const ::com::sun::star::chart::ChartDataRowSource * >(0))));
+ cppu::UnoType<com::sun::star::chart::ChartDataRowSource>::get()));
}
else if ( aProperty.Name == "FirstCellAsLabel" )
{
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index b6c1844..ea675b9 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -57,19 +57,19 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{
{OUString("ShowPositiveError"),0,getBooleanCppuType(), 0, 0},
{OUString("ShowNegativeError"),1,getBooleanCppuType(), 0, 0},
- {OUString("PositiveError"),2,getCppuType((const double*)0),0,0},
- {OUString("NegativeError"),3,getCppuType((const double*)0), 0, 0},
- {OUString("PercentageError"),4,getCppuType((const double*)0), 0, 0},
+ {OUString("PositiveError"),2,cppu::UnoType<double>::get(),0,0},
+ {OUString("NegativeError"),3,cppu::UnoType<double>::get(), 0, 0},
+ {OUString("PercentageError"),4,cppu::UnoType<double>::get(), 0, 0},
{OUString("ErrorBarStyle"),5,cppu::UnoType<sal_Int32>::get(),0,0},
{OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
{OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
- {OUString("Weight"),8,getCppuType((const double*)0),0,0},
- {OUString("LineStyle"),9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
- {OUString("LineDash"),10,getCppuType((drawing::LineDash*)0),0,0},
+ {OUString("Weight"),8,cppu::UnoType<double>::get(),0,0},
+ {OUString("LineStyle"),9,cppu::UnoType<com::sun::star::drawing::LineStyle>::get(),0,0},
+ {OUString("LineDash"),10,cppu::UnoType<drawing::LineDash>::get(),0,0},
{OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get(),0,0},
- {OUString("LineColor"),12,getCppuType((com::sun::star::util::Color*)0),0,0},
- {OUString("LineTransparence"),13,getCppuType((sal_Int16*)0),0,0},
- {OUString("LineJoint"),14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
+ {OUString("LineColor"),12,cppu::UnoType<com::sun::star::util::Color>::get(),0,0},
+ {OUString("LineTransparence"),13,cppu::UnoType<sal_Int16>::get(),0,0},
+ {OUString("LineJoint"),14,cppu::UnoType<com::sun::star::drawing::LineJoint>::get(),0,0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index ee92dfe..a6177d6 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -39,14 +39,14 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillStyle",
FillProperties::PROP_FILL_STYLE,
- ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)),
+ cppu::UnoType<drawing::FillStyle>::get(),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list