chart2/source/model/template/AreaChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/AreaChartTypeTemplate.hxx | 3 --
chart2/source/model/template/BarChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/BarChartTypeTemplate.hxx | 3 --
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/BubbleChartTypeTemplate.hxx | 3 --
chart2/source/model/template/ChartTypeTemplate.cxx | 14 ---------
chart2/source/model/template/ChartTypeTemplate.hxx | 14 ---------
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/ColumnLineChartTypeTemplate.hxx | 3 --
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 16 -----------
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 2 -
chart2/source/model/template/LineChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/LineChartTypeTemplate.hxx | 3 --
chart2/source/model/template/NetChartTypeTemplate.cxx | 16 -----------
chart2/source/model/template/NetChartTypeTemplate.hxx | 2 -
chart2/source/model/template/PieChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/PieChartTypeTemplate.hxx | 3 --
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/ScatterChartTypeTemplate.hxx | 3 --
chart2/source/model/template/StockChartTypeTemplate.cxx | 13 --------
chart2/source/model/template/StockChartTypeTemplate.hxx | 3 --
22 files changed, 192 deletions(-)
New commits:
commit c260edff34555c1f0209430d8e34c22fc9a98d3b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 28 14:14:23 2014 +0100
ChartTypeTemplate and its derivatives are not UNO service implementations
Change-Id: Ic4a4c0fe411c359f5305f01c8ff79ca48384b484
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx
b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 1b453e1..90e164e 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -40,8 +40,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.AreaChartTypeTemplate" );
-
enum
{
PROP_AREA_TEMPLATE_DIMENSION
@@ -244,17 +242,6 @@ Reference< chart2::XChartType > SAL_CALL
AreaChartTypeTemplate::getChartTypeForN
return xResult;
}
-uno::Sequence< OUString >
AreaChartTypeTemplate::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( AreaChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( AreaChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( AreaChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx
b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index 9a97fe0..b699f74 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -43,9 +43,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~AreaChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx
b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 8f10e37..8a03341 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -40,8 +40,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.BarChartTypeTemplate" );
-
enum
{
PROP_BAR_TEMPLATE_DIMENSION,
@@ -313,17 +311,6 @@ void BarChartTypeTemplate::createCoordinateSystems(
DiagramHelper::setVertical( xDiagram, m_eBarDirection == HORIZONTAL );
}
-Sequence< OUString > BarChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( BarChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( BarChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( BarChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx
b/chart2/source/model/template/BarChartTypeTemplate.hxx
index f5f931a..7c882aa 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -50,9 +50,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~BarChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index d2c907d..5ea692e 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -43,8 +43,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.BubbleChartTypeTemplate" );
-
void lcl_AddPropertiesToVector(
::std::vector< Property > & /*rOutProperties*/ )
{
@@ -222,17 +220,6 @@ Reference< chart2::XDataInterpreter > SAL_CALL
BubbleChartTypeTemplate::getDataI
return m_xDataInterpreter;
}
-Sequence< OUString > BubbleChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( BubbleChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( BubbleChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( BubbleChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index 57e6193..c8a9eb3 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -39,9 +39,6 @@ public:
const OUString & rServiceName );
virtual ~BubbleChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 39b57c3..1b2a69d 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -908,25 +908,11 @@ void
ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
comphelper::copyProperties( xSource, xDestination );
}
-
-
-Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = "com.sun.star.chart2.ChartTypeTemplate";
- aServices[ 1 ] = "com.sun.star.layout.LayoutElement";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext()
const
{
return m_xContext;
}
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ChartTypeTemplate,
-
OUString("com.sun.star.comp.chart.ChartTypeTemplate") );
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx
b/chart2/source/model/template/ChartTypeTemplate.hxx
index 78f45b8..689668c 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -81,20 +81,6 @@ public:
const OUString & rServiceName );
virtual ~ChartTypeTemplate();
- //TODO: are these actually used (given they are not SAL_OVERRIDE)?
- virtual OUString SAL_CALL
- getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
-
/// establish methods for factory instatiation
// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate )
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 8db0c36..901cd52 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -45,8 +45,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.ColumnLineChartTypeTemplate" );
-
enum
{
PROP_COL_LINE_NUMBER_OF_LINES
@@ -416,17 +414,6 @@ Reference< XDataInterpreter > SAL_CALL
ColumnLineChartTypeTemplate::getDataInter
return m_xDataInterpreter;
}
-uno::Sequence< OUString >
ColumnLineChartTypeTemplate::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ColumnLineChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( ColumnLineChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( ColumnLineChartTypeTemplate,
ChartTypeTemplate, OPropertySet )
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index 117f0bb..f4739ce 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -43,9 +43,6 @@ public:
sal_Int32 nNumberOfLines );
virtual ~ColumnLineChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index da5b8c1..7f07028 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -17,12 +17,6 @@ using namespace com::sun::star;
namespace chart {
-namespace {
-
-const OUString aServiceName("com.sun.star.chart2.GL3DBarChartTypeTemplate");
-
-}
-
GL3DBarChartTypeTemplate::GL3DBarChartTypeTemplate(
const uno::Reference<uno::XComponentContext>& xContext, const OUString&
rServiceName ) :
ChartTypeTemplate(xContext, rServiceName) {}
@@ -82,16 +76,6 @@ sal_Bool GL3DBarChartTypeTemplate::supportsCategories()
return false;
}
-uno::Sequence<OUString>
GL3DBarChartTypeTemplate::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aServices(2);
- aServices[0] = aServiceName;
- aServices[1] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-APPHELPER_XSERVICEINFO_IMPL(GL3DBarChartTypeTemplate, aServiceName);
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index 3f86fa0..78e7a74 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -20,8 +20,6 @@ namespace chart {
class GL3DBarChartTypeTemplate : public ChartTypeTemplate
{
public:
- APPHELPER_XSERVICEINFO_DECL()
-
GL3DBarChartTypeTemplate(
const css::uno::Reference<
css::uno::XComponentContext>& xContext,
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx
b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 5d833df..14ba91c 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -42,8 +42,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.LineChartTypeTemplate" );
-
enum
{
PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE,
@@ -375,17 +373,6 @@ void SAL_CALL LineChartTypeTemplate::applyStyle(
}
}
-Sequence< OUString > LineChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LineChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( LineChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( LineChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx
b/chart2/source/model/template/LineChartTypeTemplate.hxx
index 4097d7e..07c797e 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -45,9 +45,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~LineChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx
b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 0695c88..c0a9079 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -34,11 +34,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
-namespace
-{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.NetChartTypeTemplate" );
-} // anonymous namespace
-
namespace chart
{
@@ -199,17 +194,6 @@ Reference< chart2::XChartType > SAL_CALL
NetChartTypeTemplate::getChartTypeForNe
return xResult;
}
-Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( NetChartTypeTemplate, lcl_aServiceName );
-
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx
b/chart2/source/model/template/NetChartTypeTemplate.hxx
index 563e088..5d8482f 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.hxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.hxx
@@ -39,8 +39,6 @@ public:
);
virtual ~NetChartTypeTemplate();
- APPHELPER_XSERVICEINFO_DECL()
-
protected:
// ____ XChartTypeTemplate ____
virtual sal_Bool SAL_CALL matchesTemplate(
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index d25d283..9da96d6 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -49,8 +49,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.PieChartTypeTemplate" );
-
enum
{
PROP_PIE_TEMPLATE_DEFAULT_OFFSET,
@@ -616,17 +614,6 @@ void PieChartTypeTemplate::adaptDiagram( const
uno::Reference< chart2::XDiagram
ThreeDHelper::setDefaultRotation( uno::Reference< beans::XPropertySet >(
xDiagram, uno::UNO_QUERY ), true );
}
-uno::Sequence< OUString >
PieChartTypeTemplate::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( PieChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( PieChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( PieChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx
b/chart2/source/model/template/PieChartTypeTemplate.hxx
index 117feeb..a21972a 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -44,9 +44,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~PieChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 2312ae8..c1f8682 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -44,8 +44,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.ScatterChartTypeTemplate" );
-
enum
{
PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE,
@@ -395,17 +393,6 @@ Reference< chart2::XDataInterpreter > SAL_CALL
ScatterChartTypeTemplate::getData
return m_xDataInterpreter;
}
-Sequence< OUString >
ScatterChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ScatterChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( ScatterChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScatterChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index 0d9e879..73a5a78 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -43,9 +43,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~ScatterChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx
b/chart2/source/model/template/StockChartTypeTemplate.cxx
index d1d0b89..cf8ca49 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -51,8 +51,6 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName(
"com.sun.star.chart2.StockChartTypeTemplate" );
-
enum
{
PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME,
@@ -518,17 +516,6 @@ Reference< XDataInterpreter > SAL_CALL
StockChartTypeTemplate::getDataInterprete
return m_xDataInterpreter;
}
-Sequence< OUString > StockChartTypeTemplate::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = lcl_aServiceName;
- aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( StockChartTypeTemplate, lcl_aServiceName );
-
IMPLEMENT_FORWARD_XINTERFACE2( StockChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( StockChartTypeTemplate, ChartTypeTemplate,
OPropertySet )
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx
b/chart2/source/model/template/StockChartTypeTemplate.hxx
index 954ea24..36a1041 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -57,9 +57,6 @@ public:
bool bJapaneseStyle );
virtual ~StockChartTypeTemplate();
- /// XServiceInfo declarations
- APPHELPER_XSERVICEINFO_DECL()
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
