filter/source/svg/svgfilter.cxx | 1 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/drawing/framework/XControllerManager.idl | 48 ---------- sd/IwyuFilter_sd.yaml | 1 sd/inc/pch/precompiled_sd.hxx | 1 sd/source/ui/framework/configuration/ConfigurationController.cxx | 1 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 1 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 2 sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 1 sd/source/ui/framework/factories/BasicPaneFactory.cxx | 1 sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 1 sd/source/ui/framework/factories/BasicViewFactory.cxx | 1 sd/source/ui/framework/factories/PresentationFactory.cxx | 1 sd/source/ui/framework/module/CenterViewFocusModule.cxx | 1 sd/source/ui/framework/module/NotesPaneModule.cxx | 1 sd/source/ui/framework/module/ShellStackGuard.cxx | 1 sd/source/ui/framework/module/SlideSorterModule.cxx | 1 sd/source/ui/framework/module/ViewTabBarModule.cxx | 1 sd/source/ui/framework/tools/FrameworkHelper.cxx | 1 sd/source/ui/inc/DrawController.hxx | 17 +-- sd/source/ui/sidebar/LayoutMenu.cxx | 1 sd/source/ui/slideshow/PaneHider.cxx | 1 sd/source/ui/slideshow/slideshow.cxx | 1 sd/source/ui/unoidl/DrawController.cxx | 7 - sd/source/ui/view/ViewShellBase.cxx | 1 sd/source/ui/view/ViewShellImplementation.cxx | 2 sd/source/ui/view/ViewTabBar.cxx | 1 sd/source/ui/view/drviews3.cxx | 13 +- sd/source/ui/view/viewshel.cxx | 1 29 files changed, 16 insertions(+), 96 deletions(-)
New commits: commit 8a6dd9e68b3a1fd4eea95fffbd70ae603a4223c1 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jun 17 15:37:58 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jun 18 16:38:58 2025 +0200 [API CHANGE] remove sd::drawing::framework::XControllerManager this is internal to sd, no need to use UNO here Change-Id: I7987fd8ac86348451f9df2a14b3c6fed431ad1d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186647 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index f18053a3f257..a65178295754 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/drawing/XSlideSorterSelectionSupplier.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/AnchorBindingMode.hpp> diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ed9967cf6492..e9b5e89a42f0 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2400,7 +2400,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\ XConfigurationController \ XConfigurationControllerBroadcaster \ XConfigurationControllerRequestQueue \ - XControllerManager \ XModuleController \ XPane \ XPane2 \ diff --git a/offapi/com/sun/star/drawing/framework/XControllerManager.idl b/offapi/com/sun/star/drawing/framework/XControllerManager.idl deleted file mode 100644 index 0d6543846fa7..000000000000 --- a/offapi/com/sun/star/drawing/framework/XControllerManager.idl +++ /dev/null @@ -1,48 +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 XConfigurationController; -interface XModuleController; - -/** The XControllerManager gives access to the controllers of the drawing - framework. - <p>The XControllerManager interface is typically - implemented by the same object that implements - com::sun::star::frame::XController.</p> -*/ -interface XControllerManager -{ - /** Return the XConfigurationController object. - @return - The returned reference is never empty. - */ - XConfigurationController getConfigurationController (); - - /** Return the XModuleController object. - @return - The returned reference is never empty. - */ - XModuleController getModuleController (); -}; - -}; }; }; }; }; // ::com::sun::star::drawing::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 259fd5687519..abf26c6534b1 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -190,7 +190,6 @@ excludelist: sd/source/ui/inc/DrawController.hxx: # base class has to be a complete type - com/sun/star/drawing/XDrawView.hpp - - com/sun/star/drawing/framework/XControllerManager.hpp - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/view/XFormLayerAccess.hpp diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 44aba021a613..d801d642767b 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -207,7 +207,6 @@ #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 25102a5428a4..568e04f867d2 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -30,7 +30,6 @@ #include "UpdateRequest.hxx" #include "ChangeRequestQueueProcessor.hxx" #include "ConfigurationClassifier.hxx" -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/frame/XController.hpp> #include <sal/log.hxx> diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 9a35356d99f5..2a0ef282f9f6 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -26,7 +26,6 @@ #include <framework/FrameworkHelper.hxx> #include <DrawController.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <comphelper/scopeguard.hxx> #include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 7dc619c4bb3c..edc21adf78a1 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -88,7 +88,7 @@ public: std::shared_ptr<ConfigurationUpdaterLock> GetLock(); private: - /** A reference to the XControllerManager is kept so that + /** A reference to the DrawController is kept so that UpdateConfiguration() has access to the other sub controllers. */ rtl::Reference<::sd::DrawController> mxControllerManager; diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 4ce9afd2c6b8..47f020d178f5 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/util/URLTransformer.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 7ff9043d330c..7a53e408c619 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -34,7 +34,6 @@ #include <ViewShellBase.hxx> #include <PaneChildWindows.hxx> #include <DrawController.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 0265fe3e1234..fe2b3d0cb947 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index d7cb8fe65f47..e842aefbc330 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -21,7 +21,6 @@ #include <framework/ViewShellWrapper.hxx> #include <framework/FrameworkHelper.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <framework/Pane.hxx> #include <DrawController.hxx> diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index ce0b168ce803..303597ff5ec3 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -20,7 +20,6 @@ #include <framework/PresentationFactory.hxx> #include <DrawController.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <comphelper/servicehelper.hxx> #include <comphelper/compbase.hxx> diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 2c799e04bbb1..a3e8fd182ebb 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -25,7 +25,6 @@ #include <DrawController.hxx> #include <ViewShellBase.hxx> #include <ViewShellManager.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <comphelper/servicehelper.hxx> diff --git a/sd/source/ui/framework/module/NotesPaneModule.cxx b/sd/source/ui/framework/module/NotesPaneModule.cxx index e489d8a8ff7c..2a18863b8db4 100644 --- a/sd/source/ui/framework/module/NotesPaneModule.cxx +++ b/sd/source/ui/framework/module/NotesPaneModule.cxx @@ -21,7 +21,6 @@ #include <officecfg/Office/Impress.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/frame/XController.hpp> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 3a3f31a01e1f..92c3e8d598c6 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -25,7 +25,6 @@ #include <DrawController.hxx> #include <ViewShellBase.hxx> #include <sfx2/printer.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <comphelper/servicehelper.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index b572f59ec9e9..1619fb8c1960 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -27,7 +27,6 @@ #include <DrawController.hxx> #include <com/sun/star/drawing/framework/XTabBar.hpp> #include <com/sun/star/drawing/framework/TabBarButton.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/frame/XController.hpp> #include <strings.hrc> diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 163b7adb022b..d8d33c0be37d 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -21,7 +21,6 @@ #include <framework/FrameworkHelper.hxx> #include <DrawController.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 16bc1192dcd3..7c0de73ff9d3 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -29,7 +29,6 @@ #include <ViewShellHint.hxx> #include <DrawController.hxx> #include <app.hrc> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/frame/XController.hpp> #include <comphelper/servicehelper.hxx> #include <comphelper/compbase.hxx> diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 280a930cf926..a9733a2b45b1 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -26,7 +26,8 @@ #include <com/sun/star/view/XFormLayerAccess.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/XSlideSorterSelectionSupplier.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> +#include <com/sun/star/drawing/framework/XConfigurationController.hpp> +#include <com/sun/star/drawing/framework/XModuleController.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> @@ -52,7 +53,6 @@ typedef ::cppu::ImplInheritanceHelper < css::drawing::XDrawView, css::view::XSelectionChangeListener, css::view::XFormLayerAccess, - css::drawing::framework::XControllerManager, css::drawing::XSlideSorterSelectionSupplier > DrawControllerInterfaceBase; @@ -70,9 +70,6 @@ class ViewShellBase; specific behaviour. The life time of the DrawController is roughly that of ViewShellBase but note that the DrawController can (in the case of a reload) outlive the ViewShellBase. - - The implementation of the XControllerManager interface is not yet in its - final form. */ class SAL_DLLPUBLIC_RTTI DrawController final : public DrawControllerInterfaceBase, @@ -215,13 +212,11 @@ public: virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) override; - // XControllerManager - - SD_DLLPUBLIC virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL - getConfigurationController() override; + SD_DLLPUBLIC css::uno::Reference<css::drawing::framework::XConfigurationController> + getConfigurationController(); - virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL - getModuleController() override; + css::uno::Reference<css::drawing::framework::XModuleController> + getModuleController(); // XSlideSorterSelectionSupplier virtual css::uno::Any SAL_CALL getSlideSorterSelection( ) override; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 7af16c562353..5c7306828184 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -55,7 +55,6 @@ #include <xmloff/autolayout.hxx> #include <comphelper/lok.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 9176ba3ce0dd..77c9c6f486af 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -25,7 +25,6 @@ #include "slideshowimpl.hxx" #include <framework/FrameworkHelper.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 49cb4f489bf5..f522abb4171b 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index c7f678237c1a..a2a953161620 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -550,9 +550,7 @@ void DrawController::ReleaseViewShellBase() mpBase = nullptr; } -//===== XControllerManager ============================================================== - -Reference<XConfigurationController> SAL_CALL +Reference<XConfigurationController> DrawController::getConfigurationController() { ThrowIfDisposed(); @@ -568,8 +566,7 @@ const rtl::Reference<sd::framework::ConfigurationController> & return mxConfigurationController; } -Reference<XModuleController> SAL_CALL - DrawController::getModuleController() +Reference<XModuleController> DrawController::getModuleController() { ThrowIfDisposed(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index cceed0d4a823..319ee4621a87 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -54,7 +54,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <framework/FrameworkHelper.hxx> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index fb3ee159ac1a..2541083d6fd4 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -48,8 +48,6 @@ #include <undo/undoobjects.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> - namespace sd { ViewShell::Implementation::Implementation (ViewShell& rViewShell) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index e6e91016bf6b..8c87e96d0989 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -31,7 +31,6 @@ #include <sfx2/viewfrm.hxx> #include <com/sun/star/drawing/framework/ResourceId.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index ea3faf8738fe..c9fd4840c51d 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -72,7 +72,6 @@ #include <ViewShellBase.hxx> #include <FormShellManager.hxx> #include <LayerTabBar.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -406,11 +405,13 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) Reference<XController> xController( xFrame->getController(), UNO_SET_THROW ); // Restore the configuration. - Reference<XControllerManager> xControllerManager( xController, UNO_QUERY_THROW ); - xConfigurationController.set( xControllerManager->getConfigurationController() ); - if ( ! xConfigurationController.is()) - throw RuntimeException(); - xConfigurationController->restoreConfiguration(xConfiguration); + if (auto pDrawController2 = dynamic_cast<DrawController*>( xController.get() )) + { + xConfigurationController.set( pDrawController2->getConfigurationController() ); + if ( ! xConfigurationController.is()) + throw RuntimeException(); + xConfigurationController->restoreConfiguration(xConfiguration); + } } } catch (RuntimeException&) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 2b3e7e09d98d..cbb19f4e9a74 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -93,7 +93,6 @@ #include <sdmod.hxx> #include <AccessibleDocumentViewBase.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/XView.hpp>
