mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:expandablemethods in chart2

Browse Source 
Change-Id: Ie6650628683ec7c67359351eec0e09033f2b50cb
Reviewed-on: https://gerrit.libreoffice.org/30750
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2016-11-10 15:06:03 +02:00
parent 78b4a1fb01
commit 22d0d2455f
133 changed files with 271 additions and 1426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/inc/ChartModel.hxx
View File

@ -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;

3
chart2/inc/ChartView.hxx
View File

@ -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;

10
chart2/source/controller/accessibility/AccessibleBase.cxx
View File

@ -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 ________

8
chart2/source/controller/accessibility/AccessibleChartView.cxx
View File

@ -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*/ )

23
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
View File

@ -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;

22
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
View File

@ -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;

20
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
View File

@ -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;

23
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
View File

@ -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

30
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
View File

@ -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;

32
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
View File

@ -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;

24
chart2/source/controller/chartapiwrapper/GridWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/GridWrapper.hxx
View File

@ -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;

24
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
View File

@ -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;

36
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
View File

@ -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

6
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
View File

@ -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;

24
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
View File

@ -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

3
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
View File

@ -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;

31
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
View File

@ -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() )
return uno::Any();
return (*aFound).second;
@ -369,25 +364,8 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
return aRetSeq;
}
Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartArea";
aServices[ 1 ] = "com.sun.star.drawing.LineProperties";
aServices[ 2 ] = "com.sun.star.drawing.FillProperties";
aServices[ 3 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL UpDownBarWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString UpDownBarWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.ChartArea");
}
@ -401,7 +379,12 @@ sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart.ChartArea",
"com.sun.star.drawing.LineProperties",
"com.sun.star.drawing.FillProperties",
"com.sun.star.xml.UserDefinedAttributesSupplier"
};
}
} // namespace wrapper

6
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
View File

@ -65,9 +65,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;
@ -109,9 +106,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;

24
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
View File

@ -152,25 +152,8 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
return aWrappedProperties;
}
Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 1 ] = "com.sun.star.drawing.FillProperties";
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 WallFloorWrapper::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString WallFloorWrapper::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.WallOrFloor");
}
@ -184,7 +167,12 @@ sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.xml.UserDefinedAttributesSupplier",
"com.sun.star.drawing.FillProperties",
"com.sun.star.drawing.LineProperties",
"com.sun.star.beans.PropertySet"
};
}
} // namespace wrapper

3
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
View File

@ -55,9 +55,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;

14
chart2/source/controller/dialogs/DataBrowser.cxx
View File

@ -617,18 +617,13 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
return OUString();
}
OUString DataBrowser::GetRowString( sal_Int32 nRow )
{
return OUString::number(nRow + 1);
}
OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
{
OUString aResult;
if( nColumnId == 0 )
{
aResult = GetRowString( static_cast< sal_Int32 >( nRow ));
aResult = OUString::number(static_cast< sal_Int32 >( nRow ) + 1);
}
else if( nRow >= 0 && m_apDataBrowserModel.get())
{
@ -1171,11 +1166,6 @@ bool DataBrowser::EndEditing()
return ShowQueryBox();
}
sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const
{
return GetFirstVisibleColNumber();
}
void DataBrowser::ColumnResized( sal_uInt16 nColId )
{
bool bLastUpdateMode = GetUpdateMode();
@ -1250,7 +1240,7 @@ void DataBrowser::ImplAdjustHeaderControls()
pColorWin->set_margin_left(nCurrentPos);
tSeriesHeaderContainer::iterator aIt( m_aSeriesHeaders.begin());
sal_uInt16 i = this->GetFirstVisibleColumNumber();
sal_uInt16 i = GetFirstVisibleColNumber();
while( (aIt != m_aSeriesHeaders.end()) && ((*aIt)->GetStartColumn() < i) )
{
(*aIt)->Hide();

4
chart2/source/controller/dialogs/DataBrowser.hxx
View File

@ -128,9 +128,6 @@ public:
/// confirms all pending changes to be ready to be closed
bool EndEditing();
// calls the protected inline-function BrowseBox::GetFirstVisibleColNumber()
sal_Int16 GetFirstVisibleColumNumber() const;
bool CellContainsNumbers( sal_Int32 nRow, sal_uInt16 nCol ) const;
sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const;
@ -173,7 +170,6 @@ private:
void ImplAdjustHeaderControls();
OUString GetColString( sal_Int32 nColumnId ) const;
static OUString GetRowString( sal_Int32 nRow );
DECL_LINK( SeriesHeaderGotFocus, Control&, void );
DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void );

13
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
View File

@ -42,24 +42,13 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg()
}
// lang::XServiceInfo
OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception)
{
return getImplementationName_Static();
}
OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException)
{
return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aSNS { CHART_TYPE_DIALOG_SERVICE_NAME };
return aSNS;
return { CHART_TYPE_DIALOG_SERVICE_NAME };
}
uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception )
{

13
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
View File

@ -59,11 +59,6 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
// lang::XServiceInfo
OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString CreationWizardUnoDlg::getImplementationName_Static()
{
return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
@ -77,13 +72,7 @@ sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServic
css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
uno::Sequence< OUString > CreationWizardUnoDlg::getSupportedServiceNames_Static()
{
uno::Sequence<OUString> aSNS { CHART_WIZARD_DIALOG_SERVICE_NAME };
return aSNS;
return { CHART_WIZARD_DIALOG_SERVICE_NAME };
}
// XInterface

7
chart2/source/controller/dialogs/dlg_DataEditor.cxx
View File

@ -71,7 +71,7 @@ DataEditor::DataEditor(vcl::Window* pParent,
m_xBrwData->SetCursorMovedHdl( LINK( this, DataEditor, BrowserCursorMovedHdl ));
UpdateData();
m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext );
GrabFocus();
m_xBrwData->GrabFocus();
@ -175,11 +175,6 @@ IMPL_LINK_NOARG(DataEditor, MiscHdl, LinkParamNone*, void)
m_pTbxData->SetOutStyle( nStyle );
}
void DataEditor::UpdateData()
{
m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext );
}
bool DataEditor::Close()
{
if( ApplyChangesToModel() )

7
chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
View File

@ -31,16 +31,11 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt
m_rInAttrs(rInAttrs)
{
m_apDataLabelResources->SetNumberFormatter( pFormatter );
Reset();
m_apDataLabelResources->Reset(m_rInAttrs);
}
DataLabelsDialog::~DataLabelsDialog() = default;
void DataLabelsDialog::Reset()
{
m_apDataLabelResources->Reset(m_rInAttrs);
}
void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs)
{
m_apDataLabelResources->FillItemSet(&rOutAttrs);

2
chart2/source/controller/inc/AccessibleChartView.hxx
View File

@ -112,8 +112,6 @@ private: // methods
*/
css::awt::Rectangle GetWindowPosSize() const;
ExplicitValueProvider* getExplicitValueProvider();
private: // members
css::uno::WeakReference< css::view::XSelectionSupplier > m_xSelectionSupplier;
css::uno::WeakReference< css::frame::XModel > m_xChartModel;

3
chart2/source/controller/inc/ChartController.hxx
View File

@ -119,9 +119,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::frame::XController (required interface)
virtual void SAL_CALL
attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame )

3
chart2/source/controller/inc/ChartDocumentWrapper.hxx
View File

@ -69,9 +69,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();
void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn );
const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;}

3
chart2/source/controller/inc/dlg_ChartType_UNO.hxx
View File

@ -36,9 +36,6 @@ class ChartTypeUnoDlg : public ChartTypeUnoDlg_BASE
public:
ChartTypeUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext );
// XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
private:
virtual ~ChartTypeUnoDlg() override;

3
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
View File

@ -70,9 +70,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();
// XExecutableDialog
virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override;

4
chart2/source/controller/inc/dlg_DataEditor.hxx
View File

@ -75,10 +75,6 @@ private:
/// this is called if MiscOptions change, esp. High-Contrast mode
DECL_LINK( MiscHdl, LinkParamNone*, void );
void UpdateData();
/// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox
// void ImplAdjustHeaderControls( bool bRefreshFromModel );
/** notifySystemWindow adds or remove the given window pToRegister at the Systemwindow found when search pWindow.
@param pWindow
The window which is used to search for the SystemWindow.

2
chart2/source/controller/inc/dlg_InsertDataLabel.hxx
View File

@ -40,8 +40,6 @@ private:
const SfxItemSet& m_rInAttrs;
void Reset();
public:
DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
virtual ~DataLabelsDialog() override;

20
chart2/source/controller/main/ChartController.cxx
View File

@ -360,11 +360,6 @@ bool ChartController::impl_isDisposedOrSuspended() const
OUString SAL_CALL ChartController::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartController::getImplementationName_Static()
{
return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME);
}
@ -378,16 +373,11 @@ sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller";
//// @todo : add additional services if you support any further
return aSNS;
return {
CHART_CONTROLLER_SERVICE_NAME,
"com.sun.star.frame.Controller"
//// @todo : add additional services if you support any further
};
}
namespace {

10
chart2/source/controller/main/ChartFrameloader.cxx
View File

@ -58,11 +58,6 @@ bool ChartFrameLoader::impl_checkCancel()
OUString SAL_CALL ChartFrameLoader::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartFrameLoader::getImplementationName_Static()
{
return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME);
}
@ -75,11 +70,6 @@ sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static()
{
return { CHART_FRAMELOADER_SERVICE_NAME };
}

3
chart2/source/controller/main/ChartFrameloader.hxx
View File

@ -55,9 +55,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::frame::XFrameLoader
virtual sal_Bool SAL_CALL

11
chart2/source/controller/main/ElementSelector.cxx
View File

@ -243,14 +243,8 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible()
return ListBox::CreateAccessible();
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ElementSelectorToolbarController::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ElementSelectorToolbarController::getImplementationName_Static()
{
return OUString(lcl_aServiceName);
}
@ -263,11 +257,6 @@ sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUStr
css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
{
return { "com.sun.star.frame.ToolbarController" };
}

3
chart2/source/controller/main/ElementSelector.hxx
View File

@ -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();
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw () override;

3
chart2/source/inc/CachedDataSequence.hxx
View File

@ -89,9 +89,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

3
chart2/source/inc/ConfigColorScheme.hxx
View File

@ -56,9 +56,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();
// ____ ConfigItemListener ____
void notify( const OUString & rPropertyName );

3
chart2/source/inc/DataSource.hxx
View File

@ -50,9 +50,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:
// ____ XDataSource ____
virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL

3
chart2/source/inc/ErrorBar.hxx
View File

@ -93,9 +93,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();
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;

5
chart2/source/inc/InternalDataProvider.hxx
View File

@ -79,8 +79,6 @@ public:
explicit InternalDataProvider( const InternalDataProvider & rOther );
virtual ~InternalDataProvider() override;
void createDefaultData();
/// declare XServiceInfo methods
virtual OUString SAL_CALL getImplementationName()
throw( css::uno::RuntimeException, std::exception ) override;
@ -89,9 +87,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();
// ____ XInternalDataProvider ____
virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
throw (css::uno::RuntimeException, std::exception) override;

3
chart2/source/inc/LabeledDataSequence.hxx
View File

@ -62,9 +62,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:
// ____ XLabeledDataSequence ____
virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues()

2
chart2/source/inc/ModifyListenerHelper.hxx
View File

@ -59,8 +59,6 @@ class ModifyEventForwarder :
public:
ModifyEventForwarder();
void FireEvent( const css::lang::EventObject & rEvent );
void AddListener(
const css::uno::Reference< css::util::XModifyListener >& aListener );
void RemoveListener(

12
chart2/source/inc/Scaling.hxx
View File

@ -52,9 +52,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();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
throw (css::uno::RuntimeException, std::exception) override;
@ -93,9 +90,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();
// ____ XScaling ____
virtual double SAL_CALL
doScaling( double value )
@ -133,9 +127,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();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
throw (css::uno::RuntimeException, std::exception) override;
@ -172,9 +163,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();
// ____ XScaling ____
virtual double SAL_CALL
doScaling( double value )

3
chart2/source/inc/UncachedDataSequence.hxx
View File

@ -98,9 +98,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

23
chart2/source/model/filter/XMLFilter.cxx
View File

@ -732,17 +732,6 @@ sal_Int32 XMLFilter::impl_ExportStream(
return nWarning;
}
Sequence< OUString > XMLFilter::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.document.ImportFilter";
aServices[ 1 ] = "com.sun.star.document.ExportFilter";
// todo: services are incomplete. Missing:
// XInitialization, XNamed
return aServices;
}
void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS )
{
apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
@ -756,11 +745,6 @@ OUString XMLFilter::getMediaType(bool _bOasis)
OUString SAL_CALL XMLFilter::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString XMLFilter::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.XMLFilter");
}
@ -774,7 +758,12 @@ sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.document.ImportFilter",
"com.sun.star.document.ExportFilter"
};
// todo: services are incomplete. Missing:
// XInitialization, XNamed
}
void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS )

9
chart2/source/model/inc/CartesianCoordinateSystem.hxx
View File

@ -50,9 +50,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
@ -69,9 +66,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
@ -89,9 +83,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
} // namespace chart

3
chart2/source/model/inc/ChartTypeManager.hxx
View File

@ -55,9 +55,6 @@ public:
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString >
getSupportedServiceNames_Static();
protected:
// ____ XMultiServiceFactory ____

3
chart2/source/model/inc/DataSeries.hxx
View File

@ -78,9 +78,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

3
chart2/source/model/inc/Diagram.hxx
View File

@ -72,9 +72,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

9
chart2/source/model/inc/PolarCoordinateSystem.hxx
View File

@ -50,9 +50,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
class PolarCoordinateSystem2d : public PolarCoordinateSystem
@ -69,9 +66,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
class PolarCoordinateSystem3d : public PolarCoordinateSystem
@ -88,9 +82,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
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();
};
} // namespace chart

2
chart2/source/model/inc/StockBar.hxx
View File

@ -92,8 +92,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
const bool m_bRisingCourse;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;

9
chart2/source/model/inc/XMLFilter.hxx
View File

@ -69,9 +69,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:
// ____ XFilter ____
virtual sal_Bool SAL_CALL filter(
@ -152,16 +149,12 @@ public:
explicit XMLReportFilterHelper( css::uno::Reference< css::uno::XComponentContext > const & _xContext )
:XMLFilter(_xContext)
{}
static OUString getImplementationName_Static()
{
return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
}
protected:
virtual OUString SAL_CALL
getImplementationName()
throw( css::uno::RuntimeException, std::exception ) override
{
return getImplementationName_Static();
return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
}
// ____ XImporter ____
virtual void SAL_CALL setTargetDocument(

17
chart2/source/model/main/Axis.cxx
View File

@ -633,14 +633,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo()
return *StaticAxisInfo::get();
}
Sequence< OUString > Axis::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.Axis";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
using impl::Axis_Base;
IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet )
@ -649,11 +641,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL Axis::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString Axis::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.Axis");
}
@ -667,7 +654,9 @@ sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.Axis",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

3
chart2/source/model/main/Axis.hxx
View File

@ -65,9 +65,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

7
chart2/source/model/main/BaseCoordinateSystem.cxx
View File

@ -60,14 +60,9 @@ struct StaticCooSysDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
lcl_AddDefaultsToMap( aStaticDefaults );
::chart::PropertyHelper::setPropertyValueDefault( aStaticDefaults, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
return &aStaticDefaults;
}
private:
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
}
};
struct StaticCooSysDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticCooSysDefaults_Initializer >

51
chart2/source/model/main/CartesianCoordinateSystem.cxx
View File

@ -74,19 +74,8 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo
}
// ____ XServiceInfo ____
Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static()
{
return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME };
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString CartesianCoordinateSystem::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem");
}
@ -100,7 +89,7 @@ sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rS
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME };
}
// ==== CartesianCoordinateSystem2d ====
@ -114,22 +103,8 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
{}
// ____ XServiceInfo ____
Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem2d";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString CartesianCoordinateSystem2d::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d");
}
@ -143,7 +118,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
"com.sun.star.chart2.CartesianCoordinateSystem2d"
};
}
// ==== CartesianCoordinateSystem3d ====
@ -157,22 +135,8 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
{}
// ____ XServiceInfo ____
Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem3d";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString CartesianCoordinateSystem3d::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d");
}
@ -186,7 +150,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
"com.sun.star.chart2.CartesianCoordinateSystem3d"
};
}
} // namespace chart

21
chart2/source/model/main/ChartModel.cxx
View File

@ -317,11 +317,6 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
OUString SAL_CALL ChartModel::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartModel::getImplementationName_Static()
{
return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME);
}
@ -335,17 +330,11 @@ sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aSNS( 3 );
aSNS[0] = CHART_MODEL_SERVICE_NAME;
aSNS[1] = "com.sun.star.document.OfficeDocument";
aSNS[2] = "com.sun.star.chart.ChartDocument";
//// @todo : add additional services if you support any further
return aSNS;
return {
CHART_MODEL_SERVICE_NAME,
"com.sun.star.document.OfficeDocument",
"com.sun.star.chart.ChartDocument"
};
}
// frame::XModel (required interface)

27
chart2/source/model/main/DataPoint.cxx
View File

@ -271,25 +271,10 @@ void SAL_CALL DataPoint::disposing( const lang::EventObject& )
// ____ OPropertySet ____
void DataPoint::firePropertyChangeEvent()
{
fireModifyEvent();
}
void DataPoint::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
Sequence< OUString > DataPoint::getSupportedServiceNames_Static()
{
return Sequence< OUString >{
"com.sun.star.drawing.FillProperties",
"com.sun.star.chart2.DataPoint",
"com.sun.star.chart2.DataPointProperties",
"com.sun.star.beans.PropertySet"
};
}
// needed by MSC compiler
using impl::DataPoint_Base;
@ -298,11 +283,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DataPoint::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString DataPoint::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.DataPoint") ;
}
@ -316,7 +296,12 @@ sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return Sequence< OUString >{
"com.sun.star.drawing.FillProperties",
"com.sun.star.chart2.DataPoint",
"com.sun.star.chart2.DataPointProperties",
"com.sun.star.beans.PropertySet"
};
}
} // namespace chart

5
chart2/source/model/main/DataPoint.hxx
View File

@ -64,9 +64,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:
explicit DataPoint( const DataPoint & rOther );
@ -119,8 +116,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties;

19
chart2/source/model/main/DataSeries.cxx
View File

@ -232,15 +232,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone()
return xResult;
}
Sequence< OUString > DataSeries::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart2.DataSeries";
aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// ____ OPropertySet ____
uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException,
@ -568,11 +559,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DataSeries::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString DataSeries::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.DataSeries");
}
@ -586,7 +572,10 @@ sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.DataSeries",
"com.sun.star.chart2.DataPointProperties",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

20
chart2/source/model/main/Diagram.cxx
View File

@ -646,16 +646,6 @@ void Diagram::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
Sequence< OUString > Diagram::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
aServices[ 0 ] = "com.sun.star.chart2.Diagram";
aServices[ 1 ] = "com.sun.star.layout.LayoutElement";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// ____ OPropertySet ____
uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
throw(beans::UnknownPropertyException)
@ -746,11 +736,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL Diagram::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString Diagram::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.Diagram");
}
@ -764,7 +749,10 @@ sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.Diagram",
"com.sun.star.layout.LayoutElement",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

25
chart2/source/model/main/FormattedString.cxx
View File

@ -39,14 +39,9 @@ struct StaticFormattedStringDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
lcl_AddDefaultsToMap( aStaticDefaults );
::chart::CharacterProperties::AddDefaultsToMap( aStaticDefaults );
return &aStaticDefaults;
}
private:
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
}
};
struct StaticFormattedStringDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticFormattedStringDefaults_Initializer >
@ -197,15 +192,6 @@ void FormattedString::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
Sequence< OUString > FormattedString::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.FormattedString";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// ____ OPropertySet ____
uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException, uno::RuntimeException)
@ -240,11 +226,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL FormattedString::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString FormattedString::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.FormattedString");
}
@ -258,7 +239,9 @@ sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.FormattedString",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

3
chart2/source/model/main/FormattedString.hxx
View File

@ -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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

22
chart2/source/model/main/GridProperties.cxx
View File

@ -222,31 +222,13 @@ void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void GridProperties::firePropertyChangeEvent()
{
fireModifyEvent();
}
void GridProperties::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
Sequence< OUString > GridProperties::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.GridProperties";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL GridProperties::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString GridProperties::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.GridProperties");
}
@ -260,7 +242,9 @@ sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.GridProperties",
"com.sun.star.beans.PropertySet" };
}
// needed by MSC compiler

5
chart2/source/model/main/GridProperties.hxx
View File

@ -63,9 +63,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
@ -111,8 +108,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};

31
chart2/source/model/main/Legend.cxx
View File

@ -251,27 +251,10 @@ void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void Legend::firePropertyChangeEvent()
{
fireModifyEvent();
}
void Legend::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
Sequence< OUString > Legend::getSupportedServiceNames_Static()
{
return Sequence< OUString >{
"com.sun.star.chart2.Legend",
"com.sun.star.beans.PropertySet",
"com.sun.star.drawing.FillProperties",
"com.sun.star.drawing.LineProperties",
"com.sun.star.style.CharacterProperties",
"com.sun.star.layout.LayoutElement"
};
}
// ____ OPropertySet ____
Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException, uno::RuntimeException)
@ -298,11 +281,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo()
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL Legend::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString Legend::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.Legend");
}
@ -316,7 +294,14 @@ sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.Legend",
"com.sun.star.beans.PropertySet",
"com.sun.star.drawing.FillProperties",
"com.sun.star.drawing.LineProperties",
"com.sun.star.style.CharacterProperties",
"com.sun.star.layout.LayoutElement"
};
}
// needed by MSC compiler

5
chart2/source/model/main/Legend.hxx
View File

@ -62,9 +62,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
@ -111,8 +108,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};

23
chart2/source/model/main/PageBackground.cxx
View File

@ -202,31 +202,12 @@ void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void PageBackground::firePropertyChangeEvent()
{
fireModifyEvent();
}
void PageBackground::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.PageBackground";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PageBackground::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString PageBackground::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.PageBackground");
}
@ -240,7 +221,9 @@ sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.PageBackground",
"com.sun.star.beans.PropertySet" };
}
using impl::PageBackground_Base;

5
chart2/source/model/main/PageBackground.hxx
View File

@ -59,9 +59,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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
@ -106,8 +103,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;

49
chart2/source/model/main/PolarCoordinateSystem.cxx
View File

@ -74,19 +74,8 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone()
}
// ____ XServiceInfo ____
Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static()
{
return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME };
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString PolarCoordinateSystem::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.PolarCoordinateSystem");
}
@ -100,7 +89,7 @@ sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServi
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME };
}
// ==== PolarCoordinateSystem2d ====
@ -114,22 +103,8 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
{}
// ____ XServiceInfo ____
Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem2d";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString PolarCoordinateSystem2d::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ;
}
@ -143,7 +118,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rSer
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
"com.sun.star.chart2.PolarCoordinateSystem2d" };
}
// ==== PolarCoordinateSystem3d ====
@ -157,22 +134,8 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
{}
// ____ XServiceInfo ____
Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem3d";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString PolarCoordinateSystem3d::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d");
}
@ -186,7 +149,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rSer
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
"com.sun.star.chart2.PolarCoordinateSystem3d" };
}
} // namespace chart

5
chart2/source/model/main/StockBar.cxx
View File

@ -211,11 +211,6 @@ void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void StockBar::firePropertyChangeEvent()
{
fireModifyEvent();
}
void StockBar::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}

22
chart2/source/model/main/Title.cxx
View File

@ -372,24 +372,8 @@ void Title::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart2.Title";
aServices[ 1 ] = "com.sun.star.style.ParagraphProperties";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
aServices[ 3 ] = "com.sun.star.layout.LayoutElement";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL Title::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString Title::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.Title");
}
@ -403,7 +387,11 @@ sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.Title",
"com.sun.star.style.ParagraphProperties",
"com.sun.star.beans.PropertySet",
"com.sun.star.layout.LayoutElement" };
}
// needed by MSC compiler

3
chart2/source/model/main/Title.hxx
View File

@ -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();
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

5
chart2/source/model/main/Wall.cxx
View File

@ -204,11 +204,6 @@ void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void Wall::firePropertyChangeEvent()
{
fireModifyEvent();
}
void Wall::fireModifyEvent()
{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}

2
chart2/source/model/main/Wall.hxx
View File

@ -95,8 +95,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
void fireModifyEvent();
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;

18
chart2/source/model/template/AreaChartType.cxx
View File

@ -53,22 +53,8 @@ OUString SAL_CALL AreaChartType::getChartType()
return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA);
}
uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL AreaChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString AreaChartType::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.AreaChartType");
}
@ -82,7 +68,9 @@ sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_SERVICE_NAME_CHARTTYPE_AREA,
"com.sun.star.chart2.ChartType" };
}
} // namespace chart

3
chart2/source/model/template/AreaChartType.hxx
View File

@ -39,9 +39,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:
explicit AreaChartType( const AreaChartType & rOther );

7
chart2/source/model/template/AreaChartTypeTemplate.cxx
View File

@ -58,14 +58,9 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
lcl_AddDefaultsToMap( aStaticDefaults );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_AREA_TEMPLATE_DIMENSION, 2 );
return &aStaticDefaults;
}
private:
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 );
}
};
struct StaticAreaChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticAreaChartTypeTemplateDefaults_Initializer >

18
chart2/source/model/template/BarChartType.cxx
View File

@ -64,22 +64,8 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles()
return aPropRoles;
}
uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL BarChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString BarChartType::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.BarChartType");
}
@ -93,7 +79,9 @@ sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_SERVICE_NAME_CHARTTYPE_BAR,
"com.sun.star.chart2.ChartType" };
}
} // namespace chart

3
chart2/source/model/template/BarChartType.hxx
View File

@ -39,9 +39,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:
explicit BarChartType( const BarChartType & rOther );

20
chart2/source/model/template/BubbleChartType.cxx
View File

@ -204,23 +204,8 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS
return *StaticBubbleChartTypeInfo::get();
}
uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL BubbleChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString BubbleChartType::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.BubbleChartType");
}
@ -234,7 +219,10 @@ sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE,
"com.sun.star.chart2.ChartType",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

3
chart2/source/model/template/BubbleChartType.hxx
View File

@ -41,9 +41,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:
explicit BubbleChartType( const BubbleChartType & rOther );

20
chart2/source/model/template/CandleStickChartType.cxx
View File

@ -324,23 +324,8 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue );
}
uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CandleStickChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString CandleStickChartType::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.CandleStickChartType") ;
}
@ -354,7 +339,10 @@ sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServic
css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK,
"com.sun.star.chart2.ChartType",
"com.sun.star.beans.PropertySet" };
}
} // namespace chart

3
chart2/source/model/template/CandleStickChartType.hxx
View File

@ -40,9 +40,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:
explicit CandleStickChartType( const CandleStickChartType & rOther );

18
chart2/source/model/template/ChartTypeManager.cxx
View File

@ -603,22 +603,8 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
}
// ____ XServiceInfo ____
Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager";
aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ChartTypeManager::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ChartTypeManager::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.ChartTypeManager");
}
@ -632,7 +618,9 @@ sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
"com.sun.star.chart2.ChartTypeManager",
"com.sun.star.lang.MultiServiceFactory" };
}
} // namespace chart

18
chart2/source/model/template/ColumnChartType.cxx
View File

@ -185,22 +185,8 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS
return *StaticColumnChartTypeInfo::get();
}
uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static()
{
uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ColumnChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString ColumnChartType::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart.ColumnChartType");
}
@ -214,7 +200,9 @@ sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return {
CHART2_SERVICE_NAME_CHARTTYPE_COLUMN,
"com.sun.star.chart2.ChartType" };
}
} // namespace chart

3
chart2/source/model/template/ColumnChartType.hxx
View File

@ -39,9 +39,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:
explicit ColumnChartType( const ColumnChartType & rOther );

7
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
View File

@ -63,14 +63,9 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
lcl_AddDefaultsToMap( aStaticDefaults );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
return &aStaticDefaults;
}
private:
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
}
};
struct StaticColumnLineChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticColumnLineChartTypeTemplateDefaults_Initializer >

13
chart2/source/model/template/DataInterpreter.cxx
View File

@ -379,19 +379,8 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > &
return bUseCategoriesAsX;
}
Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static()
{
return { "com.sun.star.chart2.DataInterpreter" };
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DataInterpreter::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
OUString DataInterpreter::getImplementationName_Static()
{
return OUString("com.sun.star.comp.chart2.DataInterpreter");
}
@ -405,7 +394,7 @@ sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
return { "com.sun.star.chart2.DataInterpreter" };
}
} // namespace chart

3
chart2/source/model/template/DataInterpreter.hxx
View File

@ -46,9 +46,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();
// convenience methods
static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq );

Some files were not shown because too many files have changed in this diff Show More