diff options
40 files changed, 148 insertions, 148 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 0454cac1bab0..20889b2754be 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -148,28 +148,28 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AutoMax", PROP_AXIS_AUTO_MAX, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "AutoMin", PROP_AXIS_AUTO_MIN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "AutoStepMain", PROP_AXIS_AUTO_STEPMAIN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "AutoStepHelp", PROP_AXIS_AUTO_STEPHELP, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); @@ -197,14 +197,14 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Logarithmic", PROP_AXIS_LOGARITHMIC, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "ReverseDirection", PROP_AXIS_REVERSEDIRECTION, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); @@ -212,7 +212,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Visible", PROP_AXIS_VISIBLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -238,7 +238,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AutoOrigin", PROP_AXIS_AUTO_ORIGIN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); @@ -267,7 +267,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DisplayLabels", PROP_AXIS_DISPLAY_LABELS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -281,7 +281,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT, PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -308,21 +308,21 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "TextBreak", PROP_AXIS_TEXTBREAK, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "TextCanOverlap", PROP_AXIS_CAN_OVERLAP, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "StackedText", PROP_AXIS_STACKEDTEXT, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -345,7 +345,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DisplayUnits", PROP_AXIS_DISPLAY_UNITS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 2915cd3fbed5..b6a20b89cfa6 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -162,19 +162,19 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasMainTitle", PROP_DOCUMENT_HAS_MAIN_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasSubTitle", PROP_DOCUMENT_HAS_SUB_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasLegend", PROP_DOCUMENT_HAS_LEGEND, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); @@ -182,13 +182,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DataSourceLabelsInFirstRow", PROP_DOCUMENT_LABELS_IN_FIRST_ROW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataSourceLabelsInFirstColumn", PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); @@ -215,7 +215,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "RefreshAddInAllowed", PROP_DOCUMENT_UPDATE_ADDIN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::TRANSIENT )); @@ -229,13 +229,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "EnableComplexChartTypes", PROP_DOCUMENT_ENABLE_COMPLEX_CHARTTYPES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i112666# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT ) ); rOutProperties.push_back( Property( "EnableDataTableDialog", PROP_DOCUMENT_ENABLE_DATATABLE_DIALOG, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), //#i112666# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT ) ); } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index b85a88daa270..149d05546b37 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -191,7 +191,7 @@ void lcl_AddPropertiesToVector_SeriesOnly( rOutProperties.push_back( Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT, PROP_SERIES_LINK_NUMBERFORMAT_TO_SOURCE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index c0c7c7f0f494..50163df910cf 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -151,7 +151,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AttributedDataPoints", PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS, - ::getCppuType( reinterpret_cast< const uno::Sequence< uno::Sequence< sal_Int32 > > * >(0)), + cppu::UnoType<uno::Sequence< uno::Sequence< sal_Int32 > >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); @@ -159,20 +159,20 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Percent", PROP_DIAGRAM_PERCENT_STACKED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Stacked", PROP_DIAGRAM_STACKED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Dim3D", PROP_DIAGRAM_THREE_D, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -188,13 +188,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Deep", PROP_DIAGRAM_DEEP, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Vertical", PROP_DIAGRAM_VERTICAL, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( @@ -206,7 +206,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "StackedBarsConnected", PROP_DIAGRAM_STACKED_BARS_CONNECTED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -220,14 +220,14 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "GroupBarsPerAxis", PROP_DIAGRAM_GROUP_BARS_PER_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "IncludeHiddenCells", PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -235,7 +235,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( CHART_UNONAME_SORT_BY_XVALUES, PROP_DIAGRAM_SORT_BY_X_VALUES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -251,7 +251,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "RightAngledAxes", PROP_DIAGRAM_RIGHT_ANGLED_AXES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -277,31 +277,31 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasXAxis", PROP_DIAGRAM_HAS_X_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasXAxisDescription", PROP_DIAGRAM_HAS_X_AXIS_DESCR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasXAxisTitle", PROP_DIAGRAM_HAS_X_AXIS_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasXAxisGrid", PROP_DIAGRAM_HAS_X_AXIS_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasXAxisHelpGrid", PROP_DIAGRAM_HAS_X_AXIS_HELP_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -309,31 +309,31 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasYAxis", PROP_DIAGRAM_HAS_Y_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasYAxisDescription", PROP_DIAGRAM_HAS_Y_AXIS_DESCR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasYAxisTitle", PROP_DIAGRAM_HAS_Y_AXIS_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasYAxisGrid", PROP_DIAGRAM_HAS_Y_AXIS_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasYAxisHelpGrid", PROP_DIAGRAM_HAS_Y_AXIS_HELP_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -341,31 +341,31 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasZAxis", PROP_DIAGRAM_HAS_Z_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasZAxisDescription", PROP_DIAGRAM_HAS_Z_AXIS_DESCR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasZAxisTitle", PROP_DIAGRAM_HAS_Z_AXIS_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasZAxisGrid", PROP_DIAGRAM_HAS_Z_AXIS_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasZAxisHelpGrid", PROP_DIAGRAM_HAS_Z_AXIS_HELP_GRID, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -373,13 +373,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasSecondaryXAxis", PROP_DIAGRAM_HAS_SECOND_X_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasSecondaryXAxisDescription", PROP_DIAGRAM_HAS_SECOND_X_AXIS_DESCR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -387,13 +387,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasSecondaryYAxis", PROP_DIAGRAM_HAS_SECOND_Y_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasSecondaryYAxisDescription", PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -401,13 +401,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "HasSecondaryXAxisTitle", PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "HasSecondaryYAxisTitle", PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -421,25 +421,25 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "AutomaticSize", PROP_DIAGRAM_AUTOMATIC_SIZE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataTableHBorder", PROP_DIAGRAM_DATATABLEHBORDER, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataTableVBorder", PROP_DIAGRAM_DATATABLEVBORDER, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataTableOutline", PROP_DIAGRAM_DATATABLEOUTLINE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index d6d2b43e55a6..23a9a3b302eb 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -156,7 +156,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "StackedText", PROP_TITLE_TEXT_STACKED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index d48727ace25d..eb35d3f9c284 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -121,7 +121,7 @@ void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property rOutProperties.push_back( Property( "AutomaticPosition", PROP_CHART_AUTOMATIC_POSITION, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx index 5625242362c1..24dfe0355a0e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx @@ -130,7 +130,7 @@ void WrappedGL3DProperties::addProperties( std::vector<css::beans::Property> & r beans::Property( CHART_UNONAME_ROUNDED_EDGE, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - ::getCppuBooleanType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index b7a66ec67ace..5b7c4f4cbab6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -131,7 +131,7 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "ScaleText", PROP_CHART_SCALE_TEXT, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 1c63fe658595..9c0e387c9548 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -1006,7 +1006,7 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut rOutProperties.push_back( Property( "MeanValue", PROP_CHART_STATISTIC_MEAN_VALUE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 59050edfbbee..83d134d446c4 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -206,7 +206,7 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro rOutProperties.push_back( Property( "Lines", PROP_CHART_SYMBOL_AND_LINES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 3e18fb46af55..07125082ff95 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -611,11 +611,11 @@ sal_Int32 XMLFilter::impl_Export( // property map for export info set comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("UsePrettyPrinting"), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ExportTableNumberList"), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 663fd405b9eb..314592da0c43 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -92,7 +92,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Show", PROP_AXIS_SHOW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -111,7 +111,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DisplayLabels", PROP_AXIS_DISPLAY_LABELS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -125,7 +125,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT, PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -145,21 +145,21 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "TextBreak", PROP_AXIS_TEXT_BREAK, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "TextOverlap", PROP_AXIS_TEXT_OVERLAP, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "StackCharacters", PROP_AXIS_TEXT_STACKED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -199,7 +199,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DisplayUnits", PROP_AXIS_DISPLAY_UNITS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index c4acb4481232..965c7c358f05 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "SwapXAndYAxis", PROP_COORDINATESYSTEM_SWAPXANDYAXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 80b549439639..6ea53671da16 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -689,7 +689,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XTypeProvider > xAggTypeProvider; - if( (m_xOldModelAgg->queryAggregation( ::getCppuType( & xAggTypeProvider )) >>= xAggTypeProvider) + if( (m_xOldModelAgg->queryAggregation( cppu::UnoType<decltype(xAggTypeProvider)>::get()) >>= xAggTypeProvider) && xAggTypeProvider.is()) { uno::Sequence< uno::Type > aOwnTypes( impl::ChartModel_Base::getTypes()); @@ -1111,14 +1111,14 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio { datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType, "GDIMetaFile", - ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); + cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); uno::Any aData( xTransferable->getTransferData( aDataFlavor ) ); aData >>= aMetafile; } aResult.Flavor.MimeType = lcl_aGDIMetaFileMIMEType; - aResult.Flavor.DataType = getCppuType( &aMetafile ); + aResult.Flavor.DataType = cppu::UnoType<decltype(aMetafile)>::get(); aResult.Data <<= aMetafile; } @@ -1181,7 +1181,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, "GDIMetaFile", - ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); + cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); return aRet; } diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 13a7c8d8c9da..ab1116f423f5 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -114,7 +114,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "FillBackground", PROP_DATAPOINT_FILL_BACKGROUND, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -218,7 +218,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -273,7 +273,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT, PROP_DATAPOINT_LINK_NUMBERFORMAT_TO_SOURCE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -324,7 +324,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "ShowErrorBox", PROP_DATAPOINT_SHOW_ERROR_BOX, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index c7768f6016f4..c6228549d8d7 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -41,7 +41,7 @@ void DataSeriesProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "AttributedDataPoints", PROP_DATASERIES_ATTRIBUTED_DATA_POINTS, - ::getCppuType( reinterpret_cast< const uno::Sequence< sal_Int32 > * >(0)), + cppu::UnoType<uno::Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); @@ -55,7 +55,7 @@ void DataSeriesProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "VaryColorsByPoint", PROP_DATASERIES_VARY_COLORS_BY_POINT, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index a11cf12539b2..0996f9fec217 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -101,35 +101,35 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "PosSizeExcludeAxes", PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( CHART_UNONAME_SORT_BY_XVALUES, PROP_DIAGRAM_SORT_BY_X_VALUES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "ConnectBars", PROP_DIAGRAM_CONNECT_BARS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "GroupBarsPerAxis", PROP_DIAGRAM_GROUP_BARS_PER_AXIS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "IncludeHiddenCells", PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -143,7 +143,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "RightAngledAxes", PROP_DIAGRAM_RIGHT_ANGLED_AXES, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -179,19 +179,19 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "DataTableHBorder", PROP_DIAGRAM_DATATABLEHBORDER, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataTableVBorder", PROP_DIAGRAM_DATATABLEVBORDER, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "DataTableOutline", PROP_DIAGRAM_DATATABLEOUTLINE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index a5a0118b3f5d..c49be891eacb 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -52,7 +52,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Show", PROP_GRID_SHOW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 37c457a3693d..369da0f1037a 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -80,7 +80,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Show", PROP_LEGEND_SHOW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 1111d93eb6fb..6808484b8a6f 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -114,7 +114,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ParaIsHyphenation", PROP_TITLE_PARA_IS_HYPHENATION, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -127,7 +127,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "StackCharacters", PROP_TITLE_TEXT_STACKED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index fc6baa6c1225..d92aaf42e8b2 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Japanese", PROP_CANDLESTICKCHARTTYPE_JAPANESE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -73,13 +73,13 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ShowFirst", PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "ShowHighLow", PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 4f8734c236e6..3584a3d61aa9 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -44,14 +44,14 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "OverlapSequence", PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, - ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), + cppu::UnoType<Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "GapwidthSequence", PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, - ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), + cppu::UnoType<Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index 8eda8703fa18..8141359179de 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -63,7 +63,7 @@ struct InfoHelperInitializer aRet[0] = beans::Property( CHART_UNONAME_ROUNDED_EDGE, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - ::getCppuBooleanType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT); return aRet; diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index f027fa500cc0..6ea9e6d77740 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -66,7 +66,7 @@ struct InfoHelperInitializer aRet[0] = beans::Property( CHART_UNONAME_ROUNDED_EDGE, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - ::getCppuBooleanType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT); return aRet; diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index a3e9d0b34f67..683d764bd103 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -52,7 +52,7 @@ static void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "UseRings", PROP_PIECHARTTYPE_USE_RINGS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index e49decf1150e..77cd1e85e245 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -81,7 +81,7 @@ static void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "UseRings", PROP_PIE_TEMPLATE_USE_RINGS, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index dca4cbb99c6a..6177bd67deeb 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -65,25 +65,25 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "Volume", PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Open", PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "LowHigh", PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "Japanese", PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index ac7e239a2f1f..68afef590eb2 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -123,13 +123,13 @@ void CachedDataSequence::registerProperties() PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, - ::getCppuType( & m_nNumberFormatKey ) ); + cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); registerProperty( "Role", PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, - ::getCppuType( & m_sRole ) ); + cppu::UnoType<decltype(m_sRole)>::get() ); } Sequence< double > CachedDataSequence::Impl_getNumericalData() const diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index ac4add4061f3..f35495b35782 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -131,7 +131,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "CharUnderlineHasColor", PROP_CHAR_UNDERLINE_HAS_COLOR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharOverline (see awt.FontUnderline) @@ -153,7 +153,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "CharOverlineHasColor", PROP_CHAR_OVERLINE_HAS_COLOR, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ) ); // CharWeight (see awt.FontWeight) @@ -173,7 +173,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "CharAutoKerning", PROP_CHAR_AUTO_KERNING, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -202,7 +202,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "CharWordMode", PROP_CHAR_WORD_MODE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharLocale @@ -216,14 +216,14 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "CharShadowed", PROP_CHAR_SHADOWED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharContoured rOutProperties.push_back( Property( "CharContoured", PROP_CHAR_CONTOURED, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharRelief (see text.FontRelief) @@ -386,7 +386,7 @@ void CharacterProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "ParaIsCharacterDistance", PROP_PARA_IS_CHARACTER_DISTANCE, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); } diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index a6f37f00497f..fea62683c3d9 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -418,7 +418,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( else if ( aProperty.Name == "FirstCellAsLabel" ) { bHasFirstCellAsLabel = - (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType())); + (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(cppu::UnoType<bool>::get())); } else if ( aProperty.Name == "CellRangeRepresentation" ) { diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 19f086eaf7d0..14a4e0cf646f 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -56,8 +56,8 @@ const SfxItemPropertySet* GetErrorBarPropertySet() { static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] = { - {OUString("ShowPositiveError"),0,getBooleanCppuType(), 0, 0}, - {OUString("ShowNegativeError"),1,getBooleanCppuType(), 0, 0}, + {OUString("ShowPositiveError"),0,cppu::UnoType<bool>::get(), 0, 0}, + {OUString("ShowNegativeError"),1,cppu::UnoType<bool>::get(), 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}, diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index ae5e5d0ddf53..c322a48b012c 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -122,7 +122,7 @@ void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener > m_aListenerMap.push_back( tListenerMap::value_type( xWeakRef, xListenerToAdd )); } - m_aModifyListeners.addListener( ::getCppuType( &xListenerToAdd ), xListenerToAdd ); + m_aModifyListeners.addListener( cppu::UnoType<decltype(xListenerToAdd)>::get(), xListenerToAdd ); } catch( const uno::Exception & ex ) { @@ -145,7 +145,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene m_aListenerMap.erase( aIt ); } - m_aModifyListeners.removeListener( ::getCppuType( &aListener ), xListenerToRemove ); + m_aModifyListeners.removeListener( cppu::UnoType<decltype(aListener)>::get(), xListenerToRemove ); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 5703a2573d93..c54537f5a9ea 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -88,7 +88,7 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) static_cast< XStyleSupplier * >( this ) ); } -#define LCL_PROP_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const Reference<t> *>(0))) +#define LCL_PROP_CPPUTYPE(t) (cppu::UnoType<t>::get()) // // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 8a623988fdd1..40a7e4312b99 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -305,7 +305,7 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie if( m_nAddedListenerCount == 0 ) startListening(); - rBHelper.addListener( ::getCppuType( & xListener ), xListener); + rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener); ++m_nAddedListenerCount; //bring the new listener up to the current state @@ -316,7 +316,7 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) throw (uno::RuntimeException, std::exception) { - rBHelper.removeListener( ::getCppuType( & xListener ), xListener ); + rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener ); --m_nAddedListenerCount; if( m_nAddedListenerCount == 0 ) stopListening(); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 87e5c01005fc..be309fba0ead 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -101,7 +101,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ForceIntercept", PROPERTY_FORCE_INTERCEPT, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 5cad641f7050..0c97028a5732 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -64,14 +64,14 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "ShowEquation", PROP_EQUATION_SHOW, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( Property( "ShowCorrelationCoefficient", PROP_EQUATION_SHOW_CORRELATION_COEFF, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 8135f4290808..158486c3975c 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -96,7 +96,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneTwoSidedLighting", PROP_SCENE_TWO_SIDED_LIGHTING, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -138,7 +138,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn1", PROP_SCENE_LIGHT_ON_1, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -160,7 +160,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn2", PROP_SCENE_LIGHT_ON_2, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -182,7 +182,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn3", PROP_SCENE_LIGHT_ON_3, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -204,7 +204,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn4", PROP_SCENE_LIGHT_ON_4, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -226,7 +226,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn5", PROP_SCENE_LIGHT_ON_5, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -248,7 +248,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn6", PROP_SCENE_LIGHT_ON_6, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -270,7 +270,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn7", PROP_SCENE_LIGHT_ON_7, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -292,7 +292,7 @@ void SceneProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "D3DSceneLightOn8", PROP_SCENE_LIGHT_ON_8, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 27479f914254..d2faab7ec841 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -105,19 +105,19 @@ void UncachedDataSequence::registerProperties() PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, - ::getCppuType( & m_nNumberFormatKey ) ); + cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); registerProperty( "Role", PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, - ::getCppuType( & m_sRole ) ); + cppu::UnoType<decltype(m_sRole)>::get() ); registerProperty( "CachedXMLRange", PROP_XML_RANGE, 0, // PropertyAttributes & m_aXMLRange, - ::getCppuType( & m_aXMLRange ) ); + cppu::UnoType<decltype(m_aXMLRange)>::get() ); } Sequence< OUString > UncachedDataSequence::getSupportedServiceNames_Static() @@ -281,7 +281,7 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) uno::Type SAL_CALL UncachedDataSequence::getElementType() throw (uno::RuntimeException, std::exception) { - return ::getCppuType( reinterpret_cast< uno::Any * >(0)); + return cppu::UnoType<uno::Any>::get(); } sal_Bool SAL_CALL UncachedDataSequence::hasElements() diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 66d64bfc5580..b9a1e37f348e 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1358,10 +1358,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, "GDIMetaFile", - ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); + cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); aRet[1] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, "GDIMetaFile", - ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); + cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); return aRet; } diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 48b92efa9179..b6f6237aa3c8 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -1033,11 +1033,11 @@ DummyChart* DummyChart::getRootShape() } #define QUERYINT( xint ) \ - if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \ + if( rType == cppu::UnoType<xint>::get() ) \ aAny <<= uno::Reference< xint >(this) #define QUERY_INTERFACE( xint ) \ - if( rType == ::getCppuType((const uno::Reference< xint >*)0 ) ) \ + if( rType == cppu::UnoType<xint>::get() ) \ return uno::makeAny(uno::Reference<xint>(this)); uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) |