cui/source/options/optgdlg.hxx | 1 editeng/source/items/textitem.cxx | 1 include/editeng/scripthintitem.hxx | 5 include/svtools/ctrlbox.hxx | 2 include/svx/txencbox.hxx | 1 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl | 73 ---------- sd/inc/PresenterPreviewCache.hxx | 4 sd/inc/SlideRenderer.hxx | 5 sd/source/ui/framework/configuration/Configuration.cxx | 6 sd/source/ui/framework/configuration/ConfigurationController.cxx | 8 - sd/source/ui/inc/framework/Configuration.hxx | 12 - sd/source/ui/inc/framework/ConfigurationController.hxx | 17 -- sd/source/ui/presenter/PresenterPreviewCache.cxx | 14 - sd/source/ui/presenter/SlideRenderer.cxx | 12 - sw/inc/charatr.hxx | 2 sw/inc/swatrset.hxx | 1 sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx | 6 sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx | 1 19 files changed, 18 insertions(+), 154 deletions(-)
New commits: commit 09a1a5b8c8331437f88230f169bbb36cb83ed922 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jun 18 12:43:32 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jun 19 07:53:03 2025 +0200 loplugin:unusedmethods Change-Id: I245db9dcee5e4193cbc4b811c8e7d6145ea46415 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186671 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 7b4c006393e7..4f764506b2c2 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -122,7 +122,6 @@ private: void UpdateSkiaStatus(); void HideSkiaWidgets(); void UpdateHardwareAccelStatus(); - void UpdateIconThemes(); public: OfaViewTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index e554e3fc4386..ca664777ff58 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -92,7 +92,6 @@ using namespace ::com::sun::star::text; SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);} SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_NONE, 0);} SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);} -SfxPoolItem* SvxScriptHintItem::CreateDefault() {return new SvxScriptHintItem(0);} SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);} SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(LINESTYLE_NONE, 0);} SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(LINESTYLE_NONE, 0);} diff --git a/include/editeng/scripthintitem.hxx b/include/editeng/scripthintitem.hxx index f9928ad118a7..a8b6df13dec3 100644 --- a/include/editeng/scripthintitem.hxx +++ b/include/editeng/scripthintitem.hxx @@ -30,8 +30,6 @@ protected: virtual ItemInstanceManager* getItemInstanceManager() const override; public: - static SfxPoolItem* CreateDefault(); - DECLARE_ITEM_TYPE_FUNCTION(SvxScriptHintItem) SvxScriptHintItem(const sal_uInt16 nId); SvxScriptHintItem(i18nutil::ScriptHintType eType, const sal_uInt16 nId); @@ -47,9 +45,6 @@ public: virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - // enum cast - i18nutil::ScriptHintType GetScriptHintValue() const { return GetValue(); } - void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 246e22922320..33dfbc14cef3 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -238,8 +238,6 @@ public: UpdatePreview(); } - const Color& GetColor() const { return aColor; } - void SetSelectHdl(const Link<SvtLineListBox&,void>& rLink) { maSelectHdl = rLink; } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 39a878c3dc49..c50fe81fe897 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -80,7 +80,6 @@ public: void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } void grab_focus() { m_xControl->grab_focus(); } int get_active() const { return m_xControl->get_active(); } - void set_active(int nActive) { m_xControl->set_active(nActive); } void show() { m_xControl->show(); } void hide() { m_xControl->hide(); } }; diff --git a/sd/inc/PresenterPreviewCache.hxx b/sd/inc/PresenterPreviewCache.hxx index dc336c6847fe..7467612bda7c 100644 --- a/sd/inc/PresenterPreviewCache.hxx +++ b/sd/inc/PresenterPreviewCache.hxx @@ -68,10 +68,6 @@ public: void removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) ; - void pause(); - - void resume(); - private: class PresenterCacheContext; Size maPreviewSize; diff --git a/sd/inc/SlideRenderer.hxx b/sd/inc/SlideRenderer.hxx index 41f9f43cebd3..6c6e395767c7 100644 --- a/sd/inc/SlideRenderer.hxx +++ b/sd/inc/SlideRenderer.hxx @@ -42,11 +42,6 @@ public: SlideRenderer(const SlideRenderer&) = delete; SlideRenderer& operator=(const SlideRenderer&) = delete; - css::uno::Reference<css::awt::XBitmap> createPreview ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, - const css::awt::Size& rMaximumPreviewPixelSize, - sal_Int16 nSuperSampleFactor); - css::uno::Reference<css::rendering::XBitmap> createPreviewForCanvas ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index e07b64dafa06..ea1d65400980 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -156,20 +156,6 @@ void PresenterPreviewCache::removePreviewCreationNotifyListener ( mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); } -void PresenterPreviewCache::pause() -{ - ThrowIfDisposed(); - OSL_ASSERT(mpCache != nullptr); - mpCache->Pause(); -} - -void PresenterPreviewCache::resume() -{ - ThrowIfDisposed(); - OSL_ASSERT(mpCache != nullptr); - mpCache->Resume(); -} - void PresenterPreviewCache::ThrowIfDisposed() { if (m_bDisposed) diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index bf817dd63f9a..69f9a7d4bd89 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -39,18 +39,6 @@ SlideRenderer::~SlideRenderer() { } -Reference<awt::XBitmap> SlideRenderer::createPreview ( - const Reference<drawing::XDrawPage>& rxSlide, - const awt::Size& rMaximalSize, - sal_Int16 nSuperSampleFactor) -{ - ThrowIfDisposed(); - SolarMutexGuard aGuard; - - return VCLUnoHelper::CreateBitmap( - CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor)); -} - Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index eb13fb982094..3bea7a6d38e7 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -112,8 +112,6 @@ inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( bool bInP ) const { return Get( RES_CHRATR_RELIEF, bInP ); } inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( bool bInP ) const { return Get( RES_CHRATR_HIDDEN, bInP ); } -inline const SvxScriptHintItem &SwAttrSet::GetCharScriptTypeHint( bool bInP ) const - { return Get( RES_CHRATR_SCRIPT_HINT, bInP ); } // implementation of the character attribute methods of SwFormat diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 8475e5dd95ab..ead0d7dcb11c 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -242,7 +242,6 @@ public: inline const SvxCharRotateItem &GetCharRotate( bool = true ) const; inline const SvxCharReliefItem &GetCharRelief( bool = true ) const; inline const SvxCharHiddenItem &GetCharHidden( bool = true ) const; - inline const SvxScriptHintItem& GetCharScriptTypeHint(bool = true) const; // Frame attributes. Implementation in frmatr.hxx. inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx index ba1799e71717..a6e642a3f6f8 100644 --- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx +++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx @@ -164,12 +164,6 @@ void AccessibilityCheckLevel::addEntryForGroup( m_aEntries[nGroupIndex].push_back(std::move(xEntry)); } -size_t AccessibilityCheckLevel::getEntrySize(AccessibilityCheckGroups eGroup) const -{ - auto nGroupIndex = size_t(eGroup); - return m_aEntries[nGroupIndex].size(); -} - void AccessibilityCheckLevel::show(size_t nGroupIndex) { m_xExpanders[nGroupIndex]->show(); } void AccessibilityCheckLevel::hide(size_t nGroupIndex) { m_xExpanders[nGroupIndex]->hide(); } diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx index 10fb734b9734..cb67ed1f8f1b 100644 --- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx +++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx @@ -80,7 +80,6 @@ public: void addEntryForGroup(AccessibilityCheckGroups eGroup, std::vector<sal_Int32>& rIndices, std::shared_ptr<sfx::AccessibilityIssue> const& pIssue); - size_t getEntrySize(AccessibilityCheckGroups eGroup) const; void show(size_t nGroupIndex); void hide(size_t nGroupIndex); commit 48ef5c5b35ece40fbecb717ed861d80403bc923c Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Tue Jun 17 19:42:26 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jun 19 07:52:50 2025 +0200 [API CHANGE] remove drawing::framework::XConfigurationControllerBroadcaster this is internal to sd, no need to use UNO here Change-Id: I5dfc7abb58051002c697da9c75cc750f2f2807ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186687 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 9dd39f3ecb25..405d7c97a59e 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 \ - XConfigurationControllerBroadcaster \ XConfigurationControllerRequestQueue \ XModuleController \ XPane \ diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl deleted file mode 100644 index c3b3e373dbfe..000000000000 --- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl +++ /dev/null @@ -1,73 +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 XConfigurationChangeListener; - -/** Manage the set of registered event listeners and the event notification for a configuration - controller. - <p>The listeners are called in the order in which they are registered.</p> -*/ -interface XConfigurationControllerBroadcaster -{ - /** Add a new listener for configuration changes. - <p>The listener is notified only for the specified type of - configuration changes. When the listener is interested in more than - one event type this method has to be called multiple times. - Alternatively it can register as universal listener that will be - called for all event types. However, this option is provided - primarily to support debugging and monitoring.</p> - @param xListener - The new listener. - @param sEventType - The event type that the listener is interested in. The set of - event types is not fixed and there can be no exhaustive - list. The empty string is a special value in that the listener - will be called for all types of event. - @param aUserData - Arbitrary data that is passed to the listener when it is called - for the specified event type. When one listener is registered - for more than one event type then different user data objects - may be given as well. Supplying unique integer values allows - the listener to use a switch statement to distinguish between - the different event types. - */ - void addConfigurationChangeListener ( - [in] XConfigurationChangeListener xListener, - [in] string sEventType, - [in] any aUserData); - - /** Remove a listener for configuration changes. - @param xListener - The listener that is to be removed. - */ - void removeConfigurationChangeListener ( - [in] XConfigurationChangeListener xListener); - - /** With this method other objects can send events to all the registered - listeners. - */ - void notifyEvent ( - [in] ConfigurationChangeEvent aEvent); -}; - -}; }; }; }; }; // ::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 765026f1da31..d69b883d1cd8 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -20,9 +20,9 @@ #include <framework/Configuration.hxx> #include <framework/FrameworkHelper.hxx> +#include <framework/ConfigurationController.hxx> #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp> -#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> @@ -60,7 +60,7 @@ public: //===== Configuration ========================================================= Configuration::Configuration ( - const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, + const rtl::Reference<ConfigurationController>& rxBroadcaster, bool bBroadcastRequestEvents) : mpResourceContainer(new ResourceContainer()), mxBroadcaster(rxBroadcaster), @@ -69,7 +69,7 @@ Configuration::Configuration ( } Configuration::Configuration ( - const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, + const rtl::Reference<ConfigurationController>& rxBroadcaster, bool bBroadcastRequestEvents, const ResourceContainer& rResourceContainer) : mpResourceContainer(new ResourceContainer(rResourceContainer)), diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index db7ab5deaf34..0e7b2242f5ed 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -165,9 +165,7 @@ void ConfigurationController::RequestSynchronousUpdate() mpImplementation->mpQueueProcessor->ProcessUntilEmpty(); } -//----- XConfigurationControllerBroadcaster ----------------------------------- - -void SAL_CALL ConfigurationController::addConfigurationChangeListener ( +void ConfigurationController::addConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const Any& rUserData) @@ -179,7 +177,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType, rUserData); } -void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( +void ConfigurationController::removeConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener) { ::osl::MutexGuard aGuard (m_aMutex); @@ -188,7 +186,7 @@ void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( mpImplementation->mpBroadcaster->RemoveListener(rxListener); } -void SAL_CALL ConfigurationController::notifyEvent ( +void ConfigurationController::notifyEvent ( const ConfigurationChangeEvent& rEvent) { ThrowIfDisposed(); diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index f97d1a3bf8ee..beae62159fae 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -23,12 +23,11 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNamed.hpp> #include <comphelper/compbase.hxx> - +#include <rtl/ref.hxx> #include <memory> -namespace com::sun::star::drawing::framework { class XConfigurationControllerBroadcaster; } - namespace sd::framework { +class ConfigurationController; typedef comphelper::WeakComponentImplHelper < css::drawing::framework::XConfiguration, @@ -70,7 +69,7 @@ public: then events with type "ResourceActivationEvent" and "ResourceDeactivationEvent" are broadcasted. */ - Configuration (const css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, + Configuration (const rtl::Reference<ConfigurationController>& rxBroadcaster, bool bBroadcastRequestEvents); virtual ~Configuration() override; @@ -123,8 +122,7 @@ private: /** The broadcaster used for notifying listeners of requests for configuration changes. */ - css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster> - mxBroadcaster; + rtl::Reference<ConfigurationController> mxBroadcaster; bool mbBroadcastRequestEvents; @@ -134,7 +132,7 @@ private: The new Configuration is created with a copy of the elements in this container. */ - Configuration (const css::uno::Reference<css::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, + Configuration (const rtl::Reference<ConfigurationController>& rxBroadcaster, bool bBroadcastRequestEvents, const ResourceContainer& rResourceContainer); diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 8390724f46f7..5eee412a7598 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -22,8 +22,8 @@ #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/XConfigurationControllerBroadcaster.hpp> #include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp> +#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/basemutex.hxx> @@ -38,7 +38,6 @@ namespace sd::framework { typedef ::cppu::WeakComponentImplHelper< css::drawing::framework::XConfigurationControllerRequestQueue, - css::drawing::framework::XConfigurationControllerBroadcaster, css::drawing::framework::XResourceFactoryManager > ConfigurationControllerInterfaceBase; @@ -101,20 +100,18 @@ public: const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - // XConfigurationControllerBroadcaster - - virtual void SAL_CALL addConfigurationChangeListener ( + void addConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, const OUString& rsEventType, - const css::uno::Any& rUserData) override; + const css::uno::Any& rUserData); - virtual void SAL_CALL removeConfigurationChangeListener ( + void removeConfigurationChangeListener ( const css::uno::Reference< - css::drawing::framework::XConfigurationChangeListener>& rxListener) override; + css::drawing::framework::XConfigurationChangeListener>& rxListener); - virtual void SAL_CALL notifyEvent ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; + void notifyEvent ( + const css::drawing::framework::ConfigurationChangeEvent& rEvent); // XConfigurationRequestQueue