chart2/source/controller/chartcontroller.component | 5 ---
chart2/source/controller/inc/ChartController.hxx | 6 ----
chart2/source/controller/main/ChartController.cxx | 28 ---------------------
chart2/source/inc/servicenames.hxx | 6 ----
solenv/bin/native-code.py | 1
5 files changed, 46 deletions(-)
New commits:
commit 2b1d21d5cd79da6990412e0bd390f1514218f1c9
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 2 14:32:04 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 2 18:28:09 2023 +0200
drop ChartController service name
not the implementation, just the registering as a component - there
is no way to instantiate and use this object as a real service, it
is intimately tied into the chart2 internals.
Change-Id: I5c80e23f2b043bef23650664a7cc2c7813248433
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156471
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index 01201cbb2494..ef8e748242e8 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -23,11 +23,6 @@
constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartController"
-
constructor="com_sun_star_comp_chart2_ChartController_get_implementation">
- <service name="com.sun.star.chart2.ChartController"/>
- <service name="com.sun.star.frame.Controller"/>
- </implementation>
<implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper"
constructor="com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation">
<service name="com.sun.star.beans.PropertySet"/>
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 0a98b8df0364..8da5a4bba13e 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -100,7 +100,6 @@ class ChartController final : public ::cppu::WeakImplHelper
<
,css::view::XSelectionSupplier //(optional interface)
,css::ui::XContextMenuInterception //(optional interface)
,css::util::XCloseListener //(needed for communication with
XModel)
- ,css::lang::XServiceInfo
,css::frame::XDispatch
,css::awt::XWindow //this is the Window Controller part of this
Controller, that will be given to a Frame via setComponent
,css::lang::XMultiServiceFactory
@@ -116,11 +115,6 @@ public:
OUString GetContextName();
- // css::lang::XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
-
// css::frame::XController (required interface)
virtual void SAL_CALL
attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame
) override;
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index d33fceff86be..2a233aa5f851 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -306,27 +306,6 @@ bool ChartController::impl_isDisposedOrSuspended() const
return false;
}
-// lang::XServiceInfo
-
-OUString SAL_CALL ChartController::getImplementationName()
-{
- return CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME;
-}
-
-sal_Bool SAL_CALL ChartController::supportsService( const OUString&
rServiceName )
-{
- return cppu::supportsService(this, rServiceName);
-}
-
-css::uno::Sequence< OUString > SAL_CALL
ChartController::getSupportedServiceNames()
-{
- return {
- CHART_CONTROLLER_SERVICE_NAME,
- "com.sun.star.frame.Controller"
- //// @todo : add additional services if you support any further
- };
-}
-
namespace {
uno::Reference<ui::XSidebar> getSidebarFromModel(const
uno::Reference<frame::XModel>& xModel)
@@ -1697,11 +1676,4 @@ ViewElementListProvider
ChartController::getViewElementListProvider()
} //namespace chart
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponentContext
*context,
-
css::uno::Sequence<css::uno::Any> const &)
-{
- return cppu::acquire(new chart::ChartController(context));
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames.hxx
b/chart2/source/inc/servicenames.hxx
index 30e9b40f5efa..b9f0bb554458 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -25,12 +25,6 @@ inline constexpr OUStringLiteral
CHART_MODEL_SERVICE_IMPLEMENTATION_NAME
inline constexpr OUStringLiteral CHART_MODEL_SERVICE_NAME =
u"com.sun.star.chart2.ChartDocument";
//@todo create your own service containing the service
com.sun.star.document.OfficeDocument
-inline constexpr OUStringLiteral CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME
- = u"com.sun.star.comp.chart2.ChartController";
-inline constexpr OUStringLiteral CHART_CONTROLLER_SERVICE_NAME
- = u"com.sun.star.chart2.ChartController";
-//@todo create your own service containing the service
com.sun.star.frame.Controller
-
inline constexpr OUStringLiteral CHART_VIEW_SERVICE_IMPLEMENTATION_NAME
= u"com.sun.star.comp.chart2.ChartView";
inline constexpr OUStringLiteral CHART_VIEW_SERVICE_NAME =
u"com.sun.star.chart2.ChartView";
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6dc5def61b1a..3e472746fe67 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -65,7 +65,6 @@ core_constructor_list = [
"com_sun_star_comp_chart2_Axis_get_implementation",
"com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation",
"com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation",
- "com_sun_star_comp_chart2_ChartController_get_implementation",
"com_sun_star_comp_chart2_ChartModel_get_implementation",
"com_sun_star_comp_chart2_ChartView_get_implementation",
"com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation",
