diff options
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
| -rw-r--r-- | offapi/com/sun/star/drawing/framework/Configuration.idl | 42 | ||||
| -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 | ||||
| -rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
| -rw-r--r-- | vcl/workben/cgmfuzzer.cxx | 2 |
7 files changed, 1 insertions, 84 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4913d17747c6..0041655dac91 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -148,7 +148,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/drawing/framework BasicPaneFactory \ BasicToolBarFactory \ BasicViewFactory \ - Configuration \ ConfigurationController \ ModuleController \ ResourceId \ diff --git a/offapi/com/sun/star/drawing/framework/Configuration.idl b/offapi/com/sun/star/drawing/framework/Configuration.idl deleted file mode 100644 index cf21c44ae784..000000000000 --- a/offapi/com/sun/star/drawing/framework/Configuration.idl +++ /dev/null @@ -1,42 +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 . - */ - -module com { module sun { module star { module drawing { module framework { - -/** This service provides the means for constructing new configurations. - - <p>Most likely use is the XConfigurationController::restoreConfiguration() - method.</p> - - @see XConfiguration - for a description of the configuration. -*/ -service Configuration - : XConfiguration -{ - /** Create an empty configuration. - <p>This should not be necessary very often. Changes to an - existing configuration are more likely.</p> - */ - create(); -}; - -}; }; }; }; }; // ::com::sun::star::drawing::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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"/> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index f306f0833dc1..697eef875815 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -695,7 +695,6 @@ draw_constructor_list = [ "com_sun_star_comp_Draw_PresenterHelper_get_implementation", "com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation", "com_sun_star_comp_Draw_SlideRenderer_get_implementation", - "com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation", "com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation", "com_sun_star_comp_sd_InsertSlideController_get_implementation", "com_sun_star_comp_sd_SlideLayoutController_get_implementation", diff --git a/vcl/workben/cgmfuzzer.cxx b/vcl/workben/cgmfuzzer.cxx index dc677edaa7ed..7aba911c5fe0 100644 --- a/vcl/workben/cgmfuzzer.cxx +++ b/vcl/workben/cgmfuzzer.cxx @@ -61,7 +61,6 @@ void * sd_PresentationDocument_get_implementation( void *, void * ); void * com_sun_star_comp_Draw_PresenterHelper_get_implementation( void *, void * ); void * com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation( void *, void * ); void * com_sun_star_comp_Draw_SlideRenderer_get_implementation( void *, void * ); -void * com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation( void *, void * ); void * com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation( void *, void * ); void * com_sun_star_comp_sd_InsertSlideController_get_implementation( void *, void * ); void * com_sun_star_comp_sd_SlideLayoutController_get_implementation( void *, void * ); @@ -133,7 +132,6 @@ lo_get_constructor_map(void) { "com_sun_star_comp_Draw_PresenterHelper_get_implementation", com_sun_star_comp_Draw_PresenterHelper_get_implementation }, { "com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation", com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation }, { "com_sun_star_comp_Draw_SlideRenderer_get_implementation", com_sun_star_comp_Draw_SlideRenderer_get_implementation }, - { "com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation", com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation }, { "com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation", com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation }, { "com_sun_star_comp_sd_InsertSlideController_get_implementation", com_sun_star_comp_sd_InsertSlideController_get_implementation }, { "com_sun_star_comp_sd_SlideLayoutController_get_implementation", com_sun_star_comp_sd_SlideLayoutController_get_implementation }, |