diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-23 08:50:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-23 18:38:39 +0000 |
commit | 5994aedd44bcf3fba93cdc33e33844231929afa8 (patch) | |
tree | 1eb56901ba9bb12d322d91f48f6f64fba14a4504 /sd | |
parent | f8604f08ed5e07e50a65b5d35f3c0c18bf19044a (diff) |
[API CHANGE] sd::frame::Configuration does not need to be an UNO service
It does not ever appear to have been used as such, and it makes
no sense to be constructed externally.
Change-Id: Ia1a0cccdaeb19ded1197ad8aae701ac86dd3bb48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145989
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/framework/configuration/Configuration.cxx | 26 | ||||
-rw-r--r-- | sd/source/ui/inc/framework/Configuration.hxx | 9 | ||||
-rw-r--r-- | sd/util/sd.component | 4 |
3 files changed, 1 insertions, 38 deletions
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 7b813a42bddb..56ade027b8f3 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -215,23 +215,6 @@ void SAL_CALL Configuration::setName (const OUString&) // ignored. } -OUString Configuration::getImplementationName() -{ - return - "com.sun.star.comp.Draw.framework.configuration.Configuration"; -} - -sal_Bool Configuration::supportsService(OUString const & ServiceName) -{ - return cppu::supportsService(this, ServiceName); -} - -css::uno::Sequence<OUString> Configuration::getSupportedServiceNames() -{ - return css::uno::Sequence<OUString>{ - "com.sun.star.drawing.framework.Configuration"}; -} - void Configuration::PostEvent ( const Reference<XResourceId>& rxResourceId, const bool bActivation) @@ -299,13 +282,4 @@ bool AreConfigurationsEquivalent ( } // end of namespace sd::framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* -com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation( - css::uno::XComponentContext*, - css::uno::Sequence<css::uno::Any> const &) -{ - return cppu::acquire(new sd::framework::Configuration(nullptr, false)); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 8f33ef4311be..1b245e47afea 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -33,8 +33,7 @@ namespace sd::framework { typedef comphelper::WeakComponentImplHelper < css::drawing::framework::XConfiguration, - css::container::XNamed, - css::lang::XServiceInfo + css::container::XNamed > ConfigurationInterfaceBase; /** A configuration describes the resources of an application like panes, @@ -115,12 +114,6 @@ public: */ virtual void SAL_CALL setName (const OUString& rName) override; - OUString SAL_CALL getImplementationName() override; - - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - private: class ResourceContainer; /** The resource container holds the URLs of unique resource and of diff --git a/sd/util/sd.component b/sd/util/sd.component index 1d1b1fb6fd05..414e25dd49a4 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -65,10 +65,6 @@ constructor="org_openoffice_comp_Draw_framework_PanelFactory_get_implementation"> <service name="com.sun.star.drawing.framework.PanelFactory"/> </implementation> - <implementation name="com.sun.star.comp.Draw.framework.configuration.Configuration" - constructor="com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation"> - <service name="com.sun.star.drawing.framework.Configuration"/> - </implementation> <implementation name="com.sun.star.comp.Draw.framework.configuration.ConfigurationController" constructor="com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation"> <service name="com.sun.star.drawing.framework.ConfigurationController"/> |