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

loplugin:expandablemethods in chart2

Change-Id: Ie6650628683ec7c67359351eec0e09033f2b50cb
Reviewed-on: https://gerrit.libreoffice.org/30750Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 78b4a1fb
......@@ -227,9 +227,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// css::lang::XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
......
......@@ -120,9 +120,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ___lang::XInitialization___
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
......
......@@ -879,12 +879,10 @@ sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName )
uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
uno::Sequence< OUString > aSeq( 2 );
OUString* pStr = aSeq.getArray();
pStr[ 0 ] = "com.sun.star.accessibility.Accessible";
pStr[ 1 ] = "com.sun.star.accessibility.AccessibleContext";
return aSeq;
return {
"com.sun.star.accessibility.Accessible",
"com.sun.star.accessibility.AccessibleContext"
};
}
// ________ AccessibleBase::XEventListener ________
......
......@@ -306,7 +306,8 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
MutexGuard aGuard( GetMutex());
Reference< chart2::XChartDocument > xChartDoc( xChartModel, uno::UNO_QUERY );
if( xChartDoc.is())
m_spObjectHierarchy.reset( new ObjectHierarchy( xChartDoc, getExplicitValueProvider() ));
m_spObjectHierarchy.reset(
new ObjectHierarchy( xChartDoc, ExplicitValueProvider::getExplicitValueProvider(m_xChartView) ));
else
m_spObjectHierarchy.reset();
}
......@@ -335,11 +336,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
}
}
ExplicitValueProvider* AccessibleChartView::getExplicitValueProvider()
{
return ExplicitValueProvider::getExplicitValueProvider(m_xChartView);
}
// view::XSelectionChangeListener
void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ )
......
......@@ -164,25 +164,8 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
return aWrappedProperties;
}
Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
aServices[ 2 ] = "com.sun.star.drawing.FillProperties";
aServices[ 3 ] = "com.sun.star.drawing.LineProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL AreaWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString AreaWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Area");
}
......@@ -196,7 +179,11 @@ sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.beans.PropertySet",
"com.sun.star.drawing.FillProperties",
"com.sun.star.drawing.LineProperties" };
}
} // namespace wrapper
......
......@@ -58,9 +58,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XShape ____
virtual css::awt::Point SAL_CALL getPosition()
throw (css::uno::RuntimeException, std::exception) override;
......
......@@ -690,24 +690,8 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
return aWrappedProperties;
}
Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart.ChartAxis";
aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.style.CharacterProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL AxisWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString AxisWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Axis");
}
......@@ -721,7 +705,11 @@ sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartAxis",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.style.CharacterProperties"
};
}
} // namespace wrapper
......
......@@ -74,9 +74,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
virtual css::uno::Any getReferenceSize() override;
......
......@@ -701,23 +701,8 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
// \-- locked controllers
}
uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart.ChartDataArray";
aServices[ 1 ] = "com.sun.star.chart.ChartData";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ChartDataWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartDataWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.ChartData");
}
......@@ -731,7 +716,10 @@ sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartDataArray",
"com.sun.star.chart.ChartData"
};
}
} // namespace wrapper
......
......@@ -61,9 +61,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
protected:
// ____ XDateCategories ____
virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
......
......@@ -1540,24 +1540,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
return aWrappedProperties;
}
uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartDocument";
aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME;
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ChartDocumentWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartDocumentWrapper::getImplementationName_Static()
{
return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME);
}
......@@ -1571,7 +1555,12 @@ sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServic
css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartDocument",
CHART_CHARTAPIWRAPPER_SERVICE_NAME,
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.beans.PropertySet"
};
}
} // namespace wrapper
......
......@@ -908,28 +908,8 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
return WrappedPropertySet::getPropertyValue( rPropertyName );
}
uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 7 );
aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties";
aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties";
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
aServices[ 4 ] = "com.sun.star.drawing.FillProperties";
aServices[ 5 ] = "com.sun.star.drawing.LineProperties";
aServices[ 6 ] = "com.sun.star.style.CharacterProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DataSeriesPointWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString DataSeriesPointWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.DataSeries");
}
......@@ -943,7 +923,15 @@ sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServ
css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartDataRowProperties",
"com.sun.star.chart.ChartDataPointProperties",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.beans.PropertySet",
"com.sun.star.drawing.FillProperties",
"com.sun.star.drawing.LineProperties",
"com.sun.star.style.CharacterProperties"
};
}
} // namespace wrapper
......
......@@ -80,9 +80,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ___lang::XInitialization___
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
......
......@@ -2066,29 +2066,8 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
return aWrappedProperties;
}
uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 8 );
aServices[ 0 ] = "com.sun.star.chart.Diagram";
aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.chart.StackableDiagram";
aServices[ 3 ] = "com.sun.star.chart.ChartAxisXSupplier";
aServices[ 4 ] = "com.sun.star.chart.ChartAxisYSupplier";
aServices[ 5 ] = "com.sun.star.chart.ChartAxisZSupplier";
aServices[ 6 ] = "com.sun.star.chart.ChartTwoAxisXSupplier";
aServices[ 7 ] = "com.sun.star.chart.ChartTwoAxisYSupplier";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DiagramWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString DiagramWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Diagram");
}
......@@ -2102,7 +2081,16 @@ sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.Diagram",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.chart.StackableDiagram",
"com.sun.star.chart.ChartAxisXSupplier",
"com.sun.star.chart.ChartAxisYSupplier",
"com.sun.star.chart.ChartAxisZSupplier",
"com.sun.star.chart.ChartTwoAxisXSupplier",
"com.sun.star.chart.ChartTwoAxisYSupplier"
};
}
} // namespace wrapper
......
......@@ -82,9 +82,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
throw (css::uno::RuntimeException, std::exception) override;
......
......@@ -169,25 +169,8 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
return aWrappedProperties;
}
Sequence< OUString > GridWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartGrid";
aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.drawing.LineProperties";
aServices[ 3 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL GridWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString GridWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Grid");
}
......@@ -201,7 +184,12 @@ sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartGrid",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.drawing.LineProperties",
"com.sun.star.beans.PropertySet"\
};
}
} // namespace wrapper
......
......@@ -68,9 +68,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
throw (css::uno::RuntimeException, std::exception) override;
......
......@@ -418,25 +418,8 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
return aWrappedProperties;
}
Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartLegend";
aServices[ 1 ] = "com.sun.star.drawing.Shape";
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.style.CharacterProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL LegendWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString LegendWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Legend");
}
......@@ -450,7 +433,12 @@ sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartLegend",
"com.sun.star.drawing.Shape",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.style.CharacterProperties"
};
}
} // namespace wrapper
......
......@@ -61,9 +61,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
virtual css::uno::Any getReferenceSize() override;
......
......@@ -47,14 +47,9 @@ struct StaticMinMaxLineWrapperDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
lcl_AddDefaultsToMap( aStaticDefaults );
::chart::LinePropertiesHelper::AddDefaultsToMap( aStaticDefaults );
return &aStaticDefaults;
}
private:
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
}
};
struct StaticMinMaxLineWrapperDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticMinMaxLineWrapperDefaults_Initializer >
......@@ -155,11 +150,6 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener(
m_aEventListenerContainer.removeInterface( aListener );
}
::cppu::IPropertyArrayHelper& MinMaxLineWrapper::getInfoHelper()
{
return *StaticMinMaxLineWrapperInfoHelper::get();
}
//XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo()
throw (uno::RuntimeException, std::exception)
......@@ -363,7 +353,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) );
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
if( aFound == rStaticDefaults.end() )
return uno::Any();
return (*aFound).second;
......@@ -406,24 +396,8 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const
return aRetSeq;
}
Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart.ChartLine";
aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 2 ] = "com.sun.star.drawing.LineProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL MinMaxLineWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString MinMaxLineWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.ChartLine");
}
......@@ -437,7 +411,11 @@ sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceNa
css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartLine",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.drawing.LineProperties"
};
}
} // namespace wrapper
......
......@@ -66,9 +66,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XComponent ____
virtual void SAL_CALL dispose()
throw (css::uno::RuntimeException, std::exception) override;
......@@ -108,9 +105,6 @@ public:
virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
private: //methods
static ::cppu::IPropertyArrayHelper& getInfoHelper();
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer;
......
......@@ -509,25 +509,8 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
return aWrappedProperties;
}
Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartTitle";
aServices[ 1 ] = "com.sun.star.drawing.Shape";
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 3 ] = "com.sun.star.style.CharacterProperties";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL TitleWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString TitleWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.Title");
}
......@@ -541,7 +524,12 @@ sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartTitle",
"com.sun.star.drawing.Shape",
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.style.CharacterProperties"
};
}
} // namespace wrapper
......
......@@ -60,9 +60,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
virtual css::uno::Any getReferenceSize() override;
......
......@@ -158,11 +158,6 @@ void SAL_CALL UpDownBarWrapper::removeEventListener(
m_aEventListenerContainer.removeInterface( aListener );
}
::cppu::IPropertyArrayHelper& UpDownBarWrapper::getInfoHelper()
{
return *StaticUpDownBarWrapperInfoHelper::get();
}
//XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo()
throw (uno::RuntimeException, std::exception)
......@@ -326,7 +321,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) );
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
if( aFound == rStaticDefaults.end() )