offapi/UnoApi_offapi.mk
| 1
offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
| 60 ----------
sd/source/ui/framework/configuration/ConfigurationController.cxx
| 4
sd/source/ui/inc/framework/ConfigurationController.hxx
| 31 +++--
4 files changed, 25 insertions(+), 71 deletions(-)
New commits:
commit 370e71ccff5c84d9ca6c267e1868e8b0844aafb5
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jun 17 19:47:20 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jun 19 11:38:08 2025 +0200
[API CHANGE] remove drawing::framework::XConfigurationControllerRequestQueue
this is internal to sd, no need to use UNO here
Change-Id: Idc2c67562539b041ada5f6db7b450598248842e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186698
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 405d7c97a59e..cbc5d8d0ed3c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2397,7 +2397,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
XConfiguration \
XConfigurationChangeListener \
XConfigurationChangeRequest \
- XConfigurationControllerRequestQueue \
XModuleController \
XPane \
XPane2 \
diff --git
a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
deleted file mode 100644
index adb77ea5fc7a..000000000000
---
a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ /dev/null
@@ -1,60 +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 XConfigurationChangeRequest;
-
-/** The request queue of the configuration controller handles requests for
- changes to the current configuration.
-
- <p>This interface allows callers to add requests to the back of the
- queue and to determine whether the queue is empty. Using this interface
- should normally not be necessary for anyone else than the
- XConfigurationController. It may be removed in the future.</p>
-*/
-interface XConfigurationControllerRequestQueue
-{
- /** Return whether there are pending requests for configuration changes.
- @return
- Returns `TRUE` when there is at least one request object in the
- queue that has not yet been processed. It returns `FALSE` when
- the queue is empty.
- */
- boolean hasPendingRequests ();
-
- /** Add a request for a configuration change to the request queue.
- <p>This method should not be called from outside the drawing
- framework. Other sub controllers of the drawing framework are typical
- callers. They can add change requests that can not be made with the
- requestResourceActivation() and
- requestResourceDeactivation() methods.</p>
- @param xRequest
- The configuration change represented by this request object must
only
- be committed to the configuration when the
-
com::sun::star::drawing::framework::XConfigurationChangeRequest::execute()
- method of the xRequest object is called.
- */
- void postChangeRequest (
- [in] XConfigurationChangeRequest xRequest);
-};
-
-}; }; }; }; }; // ::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 0e7b2242f5ed..0c2736d8e577 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -342,7 +342,7 @@ void ConfigurationController::update()
}
}
-sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
+bool ConfigurationController::hasPendingRequests()
{
::osl::MutexGuard aGuard (m_aMutex);
ThrowIfDisposed();
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL
ConfigurationController::hasPendingRequests()
return ! mpImplementation->mpQueueProcessor->IsEmpty();
}
-void SAL_CALL ConfigurationController::postChangeRequest (
+void ConfigurationController::postChangeRequest (
const Reference<XConfigurationChangeRequest>& rxRequest)
{
::osl::MutexGuard aGuard (m_aMutex);
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx
b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 5eee412a7598..f89970bd4348 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/XConfigurationControllerRequestQueue.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/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
@@ -37,7 +37,6 @@ namespace sd { class DrawController; }
namespace sd::framework {
typedef ::cppu::WeakComponentImplHelper<
- css::drawing::framework::XConfigurationControllerRequestQueue,
css::drawing::framework::XResourceFactoryManager
> ConfigurationControllerInterfaceBase;
@@ -113,13 +112,29 @@ public:
void notifyEvent (
const css::drawing::framework::ConfigurationChangeEvent& rEvent);
- // XConfigurationRequestQueue
-
- virtual sal_Bool SAL_CALL hasPendingRequests() override;
-
- virtual void SAL_CALL postChangeRequest (
+ /** Return whether there are pending requests for configuration changes.
+ @return
+ Returns `TRUE` when there is at least one request object in the
+ queue that has not yet been processed. It returns `FALSE` when
+ the queue is empty.
+ */
+ bool hasPendingRequests();
+
+ /** Add a request for a configuration change to the request queue.
+ <p>This method should not be called from outside the drawing
+ framework. Other sub controllers of the drawing framework are typical
+ callers. They can add change requests that can not be made with the
+ requestResourceActivation() and
+ requestResourceDeactivation() methods.</p>
+ @param xRequest
+ The configuration change represented by this request object must
only
+ be committed to the configuration when the
+
com::sun::star::drawing::framework::XConfigurationChangeRequest::execute()
+ method of the xRequest object is called.
+ */
+ void postChangeRequest (
const css::uno::Reference<
- css::drawing::framework::XConfigurationChangeRequest>& rxRequest)
override;
+ css::drawing::framework::XConfigurationChangeRequest>& rxRequest);
// XResourceFactoryManager
