offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl | 83
----------
sd/source/ui/framework/configuration/ConfigurationController.cxx | 12 -
sd/source/ui/inc/framework/ConfigurationController.hxx | 28 +--
4 files changed, 16 insertions(+), 108 deletions(-)
New commits:
commit 7082d14be38485abde536a347a84789b85735778
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jun 17 19:50:17 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jun 19 17:17:44 2025 +0200
[API CHANGE] remove drawing::framework::XConfigurationControllerBroadcaster
this is internal to sd, no need to use UNO here
Change-Id: I2e69ee45e3b5ee58c52cfc247d8ef0a497bad0c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186699
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index cbc5d8d0ed3c..4ecf261816f6 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2402,7 +2402,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
XPane2 \
XResource \
XResourceFactory \
- XResourceFactoryManager \
XResourceId \
XTabBar \
XToolBar \
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
deleted file mode 100644
index 86dfe2b03904..000000000000
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ /dev/null
@@ -1,83 +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 {
-
-interface XResourceId;
-interface XResourceFactory;
-
-/** The XResourceFactoryManager is part of the configuration controller and
- manages the set of registered resource factories.
-
- @see XConfigurationController
- @see XResourceFactory
-*/
-interface XResourceFactoryManager
-{
- /** Register a new resource factory for the given URL.
- <p>When one factory is responsible for more than one type of resource
- then this method has to be called for each type. If this method is
- called multiple times for the same URL then a previously registered
- factory is removed for the URL.</p>
- @param sResourceURL
- The URL of the resource that the factory can create.
- @param xResourceFactory
- The resource factory object.
- */
- void addResourceFactory (
- [in] string sResourceURL,
- [in] XResourceFactory xResourceFactory);
-
- /** Remove a resource factory for one type of resource. When the
- factory has been registered for other URLs as well then it remains
- registered for them. Use the
- removeResourceFactoryForReference() to remove a
- factory completely.
- @param sResourceURL
- The URL for which to remove the resource factory.
- */
- void removeResourceFactoryForURL (
- [in] string sResourceURL);
-
- /** Remove a resource factory for all resource types it has been
registered for. Use
- removeResourceFactoryForURL() to remove a factory
- just for one resource type and to leave it registered for others.
- @param xResourceFactory
- The resource factory object to remove.
- */
- void removeResourceFactoryForReference (
- [in] XResourceFactory xResourceFactory);
-
- /** Return the resource factory that was previously registered for the
- given resource type. This method is typically called by one of the
- resource controllers.
- @param sResourceURL
- The URL of the resource type for which to return the resource
- factory.
- @return
- When no resource factory was registered for the given resource
- type then an empty reference is returned.
- */
- XResourceFactory getResourceFactory (
- [in] string sResourceURL);
-};
-
-}; }; }; }; }; // ::com::sun::star::drawing::framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 0c2736d8e577..49338bd0eea4 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -100,7 +100,7 @@ ConfigurationController::Lock::~Lock()
//===== ConfigurationController ===============================================
ConfigurationController::ConfigurationController(const
rtl::Reference<::sd::DrawController>& rxController)
- : ConfigurationControllerInterfaceBase(m_aMutex)
+ : cppu::WeakComponentImplHelperBase(m_aMutex)
, mbIsDisposed(false)
{
const SolarMutexGuard aSolarGuard;
@@ -438,9 +438,7 @@ void ConfigurationController::restoreConfiguration (
pLock.reset();
}
-//----- XResourceFactoryManager -----------------------------------------------
-
-void SAL_CALL ConfigurationController::addResourceFactory(
+void ConfigurationController::addResourceFactory(
const OUString& sResourceURL,
const Reference<XResourceFactory>& rxResourceFactory)
{
@@ -449,7 +447,7 @@ void SAL_CALL ConfigurationController::addResourceFactory(
mpImplementation->mpResourceFactoryContainer->AddFactory(sResourceURL,
rxResourceFactory);
}
-void SAL_CALL ConfigurationController::removeResourceFactoryForURL(
+void ConfigurationController::removeResourceFactoryForURL(
const OUString& sResourceURL)
{
::osl::MutexGuard aGuard (m_aMutex);
@@ -457,7 +455,7 @@ void SAL_CALL
ConfigurationController::removeResourceFactoryForURL(
mpImplementation->mpResourceFactoryContainer->RemoveFactoryForURL(sResourceURL);
}
-void SAL_CALL ConfigurationController::removeResourceFactoryForReference(
+void ConfigurationController::removeResourceFactoryForReference(
const Reference<XResourceFactory>& rxResourceFactory)
{
::osl::MutexGuard aGuard (m_aMutex);
@@ -465,7 +463,7 @@ void SAL_CALL
ConfigurationController::removeResourceFactoryForReference(
mpImplementation->mpResourceFactoryContainer->RemoveFactoryForReference(rxResourceFactory);
}
-Reference<XResourceFactory> SAL_CALL
ConfigurationController::getResourceFactory (
+Reference<XResourceFactory> ConfigurationController::getResourceFactory (
const OUString& sResourceURL)
{
::osl::MutexGuard aGuard (m_aMutex);
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx
b/sd/source/ui/inc/framework/ConfigurationController.hxx
index f89970bd4348..47a430eddd5e 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -21,9 +21,9 @@
#include <sddllapi.h>
#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
-#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
+#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
@@ -36,10 +36,6 @@ namespace sd { class DrawController; }
namespace sd::framework {
-typedef ::cppu::WeakComponentImplHelper<
- css::drawing::framework::XResourceFactoryManager
-> ConfigurationControllerInterfaceBase;
-
/** The configuration controller is responsible for maintaining the current
configuration.
@@ -48,7 +44,7 @@ typedef ::cppu::WeakComponentImplHelper<
*/
class SD_DLLPUBLIC ConfigurationController final
: private cppu::BaseMutex,
- public ConfigurationControllerInterfaceBase
+ public cppu::WeakComponentImplHelperBase
{
public:
ConfigurationController(const rtl::Reference<::sd::DrawController>&
rxController);
@@ -136,21 +132,19 @@ public:
const css::uno::Reference<
css::drawing::framework::XConfigurationChangeRequest>& rxRequest);
- // XResourceFactoryManager
-
- virtual void SAL_CALL addResourceFactory(
+ void addResourceFactory(
const OUString& sResourceURL,
- const css::uno::Reference<css::drawing::framework::XResourceFactory>&
rxResourceFactory) override;
+ const css::uno::Reference<css::drawing::framework::XResourceFactory>&
rxResourceFactory);
- virtual void SAL_CALL removeResourceFactoryForURL(
- const OUString& sResourceURL) override;
+ void removeResourceFactoryForURL(
+ const OUString& sResourceURL);
- virtual void SAL_CALL removeResourceFactoryForReference(
- const css::uno::Reference<css::drawing::framework::XResourceFactory>&
rxResourceFactory) override;
+ void removeResourceFactoryForReference(
+ const css::uno::Reference<css::drawing::framework::XResourceFactory>&
rxResourceFactory);
- virtual css::uno::Reference<css::drawing::framework::XResourceFactory>
- SAL_CALL getResourceFactory (
- const OUString& sResourceURL) override;
+ css::uno::Reference<css::drawing::framework::XResourceFactory>
+ getResourceFactory (
+ const OUString& sResourceURL);
/** Use this class instead of calling lock() and unlock() directly in
order to be exception safe.
