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

ChartTypeTemplate and its derivatives are not UNO service implementations

Browse Source 
Change-Id: Ic4a4c0fe411c359f5305f01c8ff79ca48384b484
This commit is contained in:
Stephan Bergmann
2014-03-28 14:14:23 +01:00
parent 68531dbd88
commit c260edff34
22 changed files with 0 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -43,9 +43,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~AreaChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

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

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

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

@@ -50,9 +50,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~BarChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

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

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

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

@@ -39,9 +39,6 @@ public:
const OUString & rServiceName );
virtual ~BubbleChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

14
chart2/source/model/template/ChartTypeTemplate.cxx
View File

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

14
chart2/source/model/template/ChartTypeTemplate.hxx
View File

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

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

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

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

@@ -43,9 +43,6 @@ public:
sal_Int32 nNumberOfLines );
virtual ~ColumnLineChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

16
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
View File

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

2
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
View File

@@ -20,8 +20,6 @@ namespace chart {
class GL3DBarChartTypeTemplate : public ChartTypeTemplate
{
public:
APPHELPER_XSERVICEINFO_DECL()
GL3DBarChartTypeTemplate(
const css::uno::Reference<
css::uno::XComponentContext>& xContext,

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

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

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

@@ -45,9 +45,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~LineChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

16
chart2/source/model/template/NetChartTypeTemplate.cxx
View File

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

2
chart2/source/model/template/NetChartTypeTemplate.hxx
View File

@@ -39,8 +39,6 @@ public:
);
virtual ~NetChartTypeTemplate();
APPHELPER_XSERVICEINFO_DECL()
protected:
// ____ XChartTypeTemplate ____
virtual sal_Bool SAL_CALL matchesTemplate(

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

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

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

@@ -44,9 +44,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~PieChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

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

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

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

@@ -43,9 +43,6 @@ public:
sal_Int32 nDim = 2 );
virtual ~ScatterChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations

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

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

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

@@ -57,9 +57,6 @@ public:
bool bJapaneseStyle );
virtual ~StockChartTypeTemplate();
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations