diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2023-05-25 08:15:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-05-25 10:35:41 +0200 |
| commit | 98a87f015800cd2e81e43732d7effe723b61e02a (patch) | |
| tree | f590a9b0e8e6f22fe8a38a5cc4e5bf3dbe66e7a4 /framework/source | |
| parent | f5dc52dc9a068fec3323c3089929a81675b0d1ba (diff) | |
[API CHANGE] remove XModuleUIConfigurationManager3 and XUIConfigurationManager3
The motivation was to not modify XModuleUIConfigurationManager /
XUIConfigurationManager, but as pointed out at
<https://gerrit.libreoffice.org/c/core/+/151798/10#message-31d00a775989b981a5f50639623cc773d6ea930d>,
it may be fine to modify XModuleUIConfigurationManager2 and
XUIConfigurationManager2 instead of adding
XModuleUIConfigurationManager3 and XUIConfigurationManager3.
Indeed, searching for usage in <https://github.com/libreoffice/wollmux>,
only the published interfaces are used, so let's fold
XModuleUIConfigurationManager3 into XModuleUIConfigurationManager2 and
XUIConfigurationManager3 into XUIConfigurationManager2.
This is a reasonable middle ground between 0 API change and breaking
known users of the public API.
Change-Id: I2dedee7e255f9dda9c9057961e6c829f83b2b709
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152254
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'framework/source')
3 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index f127c81d7fb9..cdbd647c3108 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManager3.hpp> +#include <com/sun/star/ui/XModuleUIConfigurationManager2.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> #include <comphelper/compbase.hxx> @@ -80,7 +80,7 @@ public: private: virtual void disposing(std::unique_lock<std::mutex>&) final override; - typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager3 > > ModuleToModuleCfgMgr; + typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 > > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); @@ -99,7 +99,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY_THROW ); const Sequence< OUString > aNameSeq = xNameAccess->getElementNames(); for ( const OUString& rName : aNameSeq ) - m_aModuleToModuleUICfgMgrMap.emplace( rName, Reference< XModuleUIConfigurationManager3 >() ); + m_aModuleToModuleUICfgMgrMap.emplace( rName, Reference< XModuleUIConfigurationManager2 >() ); } catch(...) { diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index dfa73e9bd39a..7427cd925956 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/ui/ModuleAcceleratorConfiguration.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManager3.hpp> +#include <com/sun/star/ui/XModuleUIConfigurationManager2.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> @@ -83,7 +83,7 @@ namespace { class ModuleUIConfigurationManager : public cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XComponent, - css::ui::XModuleUIConfigurationManager3 > + css::ui::XModuleUIConfigurationManager2 > { public: ModuleUIConfigurationManager( diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index c3e2bc7ca9e1..0140d17866d1 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/ui/DocumentAcceleratorConfiguration.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <com/sun/star/ui/XUIConfigurationManager3.hpp> +#include <com/sun/star/ui/XUIConfigurationManager2.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -73,7 +73,7 @@ namespace { class UIConfigurationManager : public ::cppu::WeakImplHelper< css::lang::XServiceInfo , - css::ui::XUIConfigurationManager3 > + css::ui::XUIConfigurationManager2 > { public: virtual OUString SAL_CALL getImplementationName() override |