diff options
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
12 files changed, 12 insertions, 25 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 2a408c54e0d6..26926b35d22f 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Area"; struct StaticAreaWrapperPropertyArray_Initializer { @@ -185,7 +184,7 @@ OUString SAL_CALL AreaWrapper::getImplementationName() OUString AreaWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Area"); } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 288e22488987..16998053aba9 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -60,7 +60,6 @@ using ::com::sun::star::uno::Any; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Axis"; enum { @@ -710,7 +709,7 @@ OUString SAL_CALL AxisWrapper::getImplementationName() OUString AxisWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Axis"); } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index ae403bbe9854..f824d8baba5c 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -59,7 +59,6 @@ using ::com::sun::star::chart::XDateCategories; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartData"; uno::Sequence< uno::Sequence< double > > lcl_getNANInsteadDBL_MIN( const uno::Sequence< uno::Sequence< double > >& rData ) { @@ -720,7 +719,7 @@ OUString SAL_CALL ChartDataWrapper::getImplementationName() OUString ChartDataWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.ChartData"); } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index b17ed8eae018..001b63c3b287 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Any; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.DataSeries"; enum { @@ -932,7 +931,7 @@ OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() OUString DataSeriesPointWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 7e3c1c2813ce..78195fc5ce1d 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -79,7 +79,6 @@ using ::osl::MutexGuard; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Diagram"; enum { @@ -2091,7 +2090,7 @@ OUString SAL_CALL DiagramWrapper::getImplementationName() OUString DiagramWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Diagram"); } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index cb6bc2102bcb..4e92d9b0f4a2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -42,7 +42,6 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Grid"; struct StaticGridWrapperPropertyArray_Initializer { @@ -190,7 +189,7 @@ OUString SAL_CALL GridWrapper::getImplementationName() OUString GridWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Grid"); } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 3e90e8f09fc4..87bac97c0cf9 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -209,7 +209,6 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Legend"; enum { @@ -439,7 +438,7 @@ OUString SAL_CALL LegendWrapper::getImplementationName() OUString LegendWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Legend"); } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index a4f006075705..cea132d0928a 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -41,7 +41,6 @@ using ::com::sun::star::uno::Any; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartLine"; struct StaticMinMaxLineWrapperDefaults_Initializer { @@ -426,7 +425,7 @@ OUString SAL_CALL MinMaxLineWrapper::getImplementationName() OUString MinMaxLineWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.ChartLine"); } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 97d7d04c0152..f2e26d6209e5 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -126,7 +126,6 @@ WrappedStackedTextProperty::~WrappedStackedTextProperty() namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Title"; enum { @@ -530,7 +529,7 @@ OUString SAL_CALL TitleWrapper::getImplementationName() OUString TitleWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.Title"); } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index d0feec2d8077..6dac6a7ffb12 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -41,7 +41,6 @@ using ::com::sun::star::uno::Any; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartArea"; struct StaticUpDownBarWrapperPropertyArray_Initializer { @@ -390,7 +389,7 @@ OUString SAL_CALL UpDownBarWrapper::getImplementationName() OUString UpDownBarWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.ChartArea"); } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 66d485599f1a..8878a601b38b 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -43,7 +43,6 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.WallOrFloor"; struct StaticWallFloorWrapperPropertyArray_Initializer { @@ -173,7 +172,7 @@ OUString SAL_CALL WallFloorWrapper::getImplementationName() OUString WallFloorWrapper::getImplementationName_Static() { - return OUString(lcl_aServiceName); + return OUString("com.sun.star.comp.chart.WallOrFloor"); } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index f8f83ec33fe8..a8bcfa624490 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -94,12 +94,10 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - static const char aRefSizeName[] = "ReferencePageSize"; - Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { - if( xInnerPropertySet->getPropertyValue( aRefSizeName ).hasValue() ) + if( xInnerPropertySet->getPropertyValue( "ReferencePageSize" ).hasValue() ) aRet <<= true; else aRet <<= false; |