From 917bd2350cfb0e697595cdb7bd61fdfd00b9faa3 Mon Sep 17 00:00:00 2001 From: Ursache Vladimir Date: Thu, 12 Feb 2015 03:47:36 +0200 Subject: Use constructors for services from chartcore.component. Change-Id: I72227b45f305734060a669275044f6f9c8859bc5 --- chart2/source/model/main/Axis.cxx | 7 + .../model/main/CartesianCoordinateSystem.cxx | 14 ++ chart2/source/model/main/ChartModel.cxx | 7 + chart2/source/model/main/DataSeries.cxx | 7 + chart2/source/model/main/Diagram.cxx | 7 + chart2/source/model/main/FormattedString.cxx | 7 + chart2/source/model/main/GridProperties.cxx | 7 + chart2/source/model/main/Legend.cxx | 7 + chart2/source/model/main/PageBackground.cxx | 7 + chart2/source/model/main/PolarCoordinateSystem.cxx | 14 ++ chart2/source/model/main/Title.cxx | 7 + .../model/main/_serviceregistration_model.cxx | 198 --------------------- 12 files changed, 91 insertions(+), 198 deletions(-) delete mode 100644 chart2/source/model/main/_serviceregistration_model.cxx (limited to 'chart2/source/model/main') diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 428e75afe387..663fd405b9eb 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -663,4 +663,11 @@ css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::Axis(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 47b7b0c9fc52..5d44bf12288d 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -200,4 +200,18 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::CartesianCoordinateSystem2d(context)); +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::CartesianCoordinateSystem3d(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 4dddbdfd8c84..80b549439639 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1461,4 +1461,11 @@ void ChartModel::update() } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_ChartModel_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::ChartModel(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 393c279e2d96..3cf89fa952d7 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -602,4 +602,11 @@ css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::DataSeries(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index a01657078c75..a11cf12539b2 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -771,4 +771,11 @@ css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_Diagram_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::Diagram(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 8ecfb0291d07..e4d9c50491ff 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -266,4 +266,11 @@ css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceName } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::FormattedString(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index ce6a950c5333..a5a0118b3f5d 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -275,4 +275,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::propert } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::GridProperties(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 164612e91ad6..37c457a3693d 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -333,4 +333,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::Legend(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index e2c766102626..0cd7544bd500 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -253,4 +253,11 @@ IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property:: } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::PageBackground(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index ca75de53a49b..fe6e8c9cc95c 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -200,4 +200,18 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::PolarCoordinateSystem2d(context)); +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::PolarCoordinateSystem3d(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 2a9b1caec081..1111d93eb6fb 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -406,4 +406,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet ) } // namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence const &) +{ + return cppu::acquire(new ::chart::Title(context)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx deleted file mode 100644 index 0245532004ca..000000000000 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ /dev/null @@ -1,198 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "ChartModel.hxx" - -#include "Diagram.hxx" -#include "Legend.hxx" -#include "Axis.hxx" -#include "GridProperties.hxx" -#include "Title.hxx" -#include "FormattedString.hxx" -#include "PageBackground.hxx" -#include "DataSeries.hxx" -#include "PolarCoordinateSystem.hxx" -#include "CartesianCoordinateSystem.hxx" - -#include "ChartTypeManager.hxx" -#include "XMLFilter.hxx" - -#include "_serviceregistration_charttypes.hxx" -#include "charttoolsdllapi.hxx" - -static const struct ::cppu::ImplementationEntry g_entries_chart2_model[] = -{ - { - ::chart::ChartModel::create - , ::chart::ChartModel::getImplementationName_Static - , ::chart::ChartModel::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::Diagram::create - , ::chart::Diagram::getImplementationName_Static - , ::chart::Diagram::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::Legend::create - , ::chart::Legend::getImplementationName_Static - , ::chart::Legend::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::Axis::create - , ::chart::Axis::getImplementationName_Static - , ::chart::Axis::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::GridProperties::create - , ::chart::GridProperties::getImplementationName_Static - , ::chart::GridProperties::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::Title::create - , ::chart::Title::getImplementationName_Static - , ::chart::Title::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - - ,{ - ::chart::FormattedString::create - , ::chart::FormattedString::getImplementationName_Static - , ::chart::FormattedString::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - - ,{ - ::chart::ChartTypeManager::create - , ::chart::ChartTypeManager::getImplementationName_Static - , ::chart::ChartTypeManager::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::PageBackground::create - , ::chart::PageBackground::getImplementationName_Static - , ::chart::PageBackground::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::DataSeries::create - , ::chart::DataSeries::getImplementationName_Static - , ::chart::DataSeries::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::XMLFilter::create - , ::chart::XMLFilter::getImplementationName_Static - , ::chart::XMLFilter::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::XMLReportFilterHelper::create - , ::chart::XMLReportFilterHelper::getImplementationName_Static - , ::chart::XMLFilter::getSupportedServiceNames_Static // we support the same, because we are derived from - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::PolarCoordinateSystem2d::create - , ::chart::PolarCoordinateSystem2d::getImplementationName_Static - , ::chart::PolarCoordinateSystem2d::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::PolarCoordinateSystem3d::create - , ::chart::PolarCoordinateSystem3d::getImplementationName_Static - , ::chart::PolarCoordinateSystem3d::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::CartesianCoordinateSystem2d::create - , ::chart::CartesianCoordinateSystem2d::getImplementationName_Static - , ::chart::CartesianCoordinateSystem2d::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ - ::chart::CartesianCoordinateSystem3d::create - , ::chart::CartesianCoordinateSystem3d::getImplementationName_Static - , ::chart::CartesianCoordinateSystem3d::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ 0, 0, 0, 0, 0, 0 } -}; - -// component exports -extern "C" -{ -SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcore_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) -{ - void * pResult = ::cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, g_entries_chart2_model ); - - if( ! pResult ) - pResult = ::cppu::component_getFactoryHelper( - pImplName, pServiceManager, pRegistryKey, - ChartTypeEntriesForServiceRegistration::getImplementationEntries() ); - if (!pResult) - { - pResult = charttools_component_getFactory( - pImplName, pServiceManager, pRegistryKey); - } - - return pResult; -} -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3